Merge branch 'master' into vba-alpha
This commit is contained in:
commit
bebe7e8761
6 changed files with 30 additions and 71 deletions
60
package-lock.json
generated
60
package-lock.json
generated
|
@ -5141,9 +5141,9 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"cryptiles": {
|
"cryptiles": {
|
||||||
"version": "3.1.2",
|
"version": "3.1.4",
|
||||||
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-3.1.4.tgz",
|
||||||
"integrity": "sha1-qJ+7Ig9c4l7FboxKqKT9e1sNKf4=",
|
"integrity": "sha512-8I1sgZHfVwcSOY6mSGpVU3lw/GSIZvusg8dD2+OGehCJpOhQRLNcH0qb9upQnOH4XhgxxFJSg6E2kx95deb1Tw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"boom": "5.x.x"
|
"boom": "5.x.x"
|
||||||
},
|
},
|
||||||
|
@ -5151,7 +5151,7 @@
|
||||||
"boom": {
|
"boom": {
|
||||||
"version": "5.2.0",
|
"version": "5.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/boom/-/boom-5.2.0.tgz",
|
||||||
"integrity": "sha1-XdnabuOl8wIHdDYpDLcX0/SlTgI=",
|
"integrity": "sha512-Z5BTk6ZRe4tXXQlkqftmsAUANpXmuwlsF5Oov8ThoMbQRzdGTA1ngYRW160GexgOgjsFOKJz0LYhoNi+2AMBUw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"hoek": "4.x.x"
|
"hoek": "4.x.x"
|
||||||
}
|
}
|
||||||
|
@ -7221,8 +7221,7 @@
|
||||||
},
|
},
|
||||||
"ansi-regex": {
|
"ansi-regex": {
|
||||||
"version": "2.1.1",
|
"version": "2.1.1",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"aproba": {
|
"aproba": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
|
@ -7240,13 +7239,11 @@
|
||||||
},
|
},
|
||||||
"balanced-match": {
|
"balanced-match": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"brace-expansion": {
|
"brace-expansion": {
|
||||||
"version": "1.1.11",
|
"version": "1.1.11",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"balanced-match": "^1.0.0",
|
"balanced-match": "^1.0.0",
|
||||||
"concat-map": "0.0.1"
|
"concat-map": "0.0.1"
|
||||||
|
@ -7259,18 +7256,15 @@
|
||||||
},
|
},
|
||||||
"code-point-at": {
|
"code-point-at": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"concat-map": {
|
"concat-map": {
|
||||||
"version": "0.0.1",
|
"version": "0.0.1",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"console-control-strings": {
|
"console-control-strings": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"core-util-is": {
|
"core-util-is": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
|
@ -7373,8 +7367,7 @@
|
||||||
},
|
},
|
||||||
"inherits": {
|
"inherits": {
|
||||||
"version": "2.0.3",
|
"version": "2.0.3",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"ini": {
|
"ini": {
|
||||||
"version": "1.3.5",
|
"version": "1.3.5",
|
||||||
|
@ -7384,7 +7377,6 @@
|
||||||
"is-fullwidth-code-point": {
|
"is-fullwidth-code-point": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"number-is-nan": "^1.0.0"
|
"number-is-nan": "^1.0.0"
|
||||||
}
|
}
|
||||||
|
@ -7397,20 +7389,17 @@
|
||||||
"minimatch": {
|
"minimatch": {
|
||||||
"version": "3.0.4",
|
"version": "3.0.4",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"brace-expansion": "^1.1.7"
|
"brace-expansion": "^1.1.7"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"minimist": {
|
"minimist": {
|
||||||
"version": "0.0.8",
|
"version": "0.0.8",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"minipass": {
|
"minipass": {
|
||||||
"version": "2.2.4",
|
"version": "2.2.4",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"safe-buffer": "^5.1.1",
|
"safe-buffer": "^5.1.1",
|
||||||
"yallist": "^3.0.0"
|
"yallist": "^3.0.0"
|
||||||
|
@ -7427,7 +7416,6 @@
|
||||||
"mkdirp": {
|
"mkdirp": {
|
||||||
"version": "0.5.1",
|
"version": "0.5.1",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"minimist": "0.0.8"
|
"minimist": "0.0.8"
|
||||||
}
|
}
|
||||||
|
@ -7500,8 +7488,7 @@
|
||||||
},
|
},
|
||||||
"number-is-nan": {
|
"number-is-nan": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"object-assign": {
|
"object-assign": {
|
||||||
"version": "4.1.1",
|
"version": "4.1.1",
|
||||||
|
@ -7511,7 +7498,6 @@
|
||||||
"once": {
|
"once": {
|
||||||
"version": "1.4.0",
|
"version": "1.4.0",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"wrappy": "1"
|
"wrappy": "1"
|
||||||
}
|
}
|
||||||
|
@ -7587,8 +7573,7 @@
|
||||||
},
|
},
|
||||||
"safe-buffer": {
|
"safe-buffer": {
|
||||||
"version": "5.1.1",
|
"version": "5.1.1",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"safer-buffer": {
|
"safer-buffer": {
|
||||||
"version": "2.1.2",
|
"version": "2.1.2",
|
||||||
|
@ -7618,7 +7603,6 @@
|
||||||
"string-width": {
|
"string-width": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"code-point-at": "^1.0.0",
|
"code-point-at": "^1.0.0",
|
||||||
"is-fullwidth-code-point": "^1.0.0",
|
"is-fullwidth-code-point": "^1.0.0",
|
||||||
|
@ -7636,7 +7620,6 @@
|
||||||
"strip-ansi": {
|
"strip-ansi": {
|
||||||
"version": "3.0.1",
|
"version": "3.0.1",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"ansi-regex": "^2.0.0"
|
"ansi-regex": "^2.0.0"
|
||||||
}
|
}
|
||||||
|
@ -7675,13 +7658,11 @@
|
||||||
},
|
},
|
||||||
"wrappy": {
|
"wrappy": {
|
||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"yallist": {
|
"yallist": {
|
||||||
"version": "3.0.2",
|
"version": "3.0.2",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
@ -14072,7 +14053,6 @@
|
||||||
"align-text": {
|
"align-text": {
|
||||||
"version": "0.1.4",
|
"version": "0.1.4",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"kind-of": "^3.0.2",
|
"kind-of": "^3.0.2",
|
||||||
"longest": "^1.0.1",
|
"longest": "^1.0.1",
|
||||||
|
@ -14352,8 +14332,7 @@
|
||||||
},
|
},
|
||||||
"is-buffer": {
|
"is-buffer": {
|
||||||
"version": "1.1.6",
|
"version": "1.1.6",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"is-builtin-module": {
|
"is-builtin-module": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
|
@ -14425,7 +14404,6 @@
|
||||||
"kind-of": {
|
"kind-of": {
|
||||||
"version": "3.2.2",
|
"version": "3.2.2",
|
||||||
"bundled": true,
|
"bundled": true,
|
||||||
"optional": true,
|
|
||||||
"requires": {
|
"requires": {
|
||||||
"is-buffer": "^1.1.5"
|
"is-buffer": "^1.1.5"
|
||||||
}
|
}
|
||||||
|
@ -14466,8 +14444,7 @@
|
||||||
},
|
},
|
||||||
"longest": {
|
"longest": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"lru-cache": {
|
"lru-cache": {
|
||||||
"version": "4.1.3",
|
"version": "4.1.3",
|
||||||
|
@ -14696,8 +14673,7 @@
|
||||||
},
|
},
|
||||||
"repeat-string": {
|
"repeat-string": {
|
||||||
"version": "1.6.1",
|
"version": "1.6.1",
|
||||||
"bundled": true,
|
"bundled": true
|
||||||
"optional": true
|
|
||||||
},
|
},
|
||||||
"require-directory": {
|
"require-directory": {
|
||||||
"version": "2.1.1",
|
"version": "2.1.1",
|
||||||
|
|
|
@ -66,8 +66,7 @@
|
||||||
"botbuilder-choices": "^4.0.0-preview1.2",
|
"botbuilder-choices": "^4.0.0-preview1.2",
|
||||||
"botbuilder-dialogs": "^4.1.7",
|
"botbuilder-dialogs": "^4.1.7",
|
||||||
"botbuilder-prompts": "^4.0.0-preview1.2",
|
"botbuilder-prompts": "^4.0.0-preview1.2",
|
||||||
"botlib": "0.1.8",
|
"botlib": "^0.1.8",
|
||||||
"botlib": "0.1.7",
|
|
||||||
"chai": "4.2.0",
|
"chai": "4.2.0",
|
||||||
"child_process": "^1.0.2",
|
"child_process": "^1.0.2",
|
||||||
"chokidar": "2.0.4",
|
"chokidar": "2.0.4",
|
||||||
|
@ -127,15 +126,13 @@
|
||||||
"@types/url-join": "0.8.2",
|
"@types/url-join": "0.8.2",
|
||||||
"@types/winston": "2.4.4",
|
"@types/winston": "2.4.4",
|
||||||
"ban-sensitive-files": "1.9.2",
|
"ban-sensitive-files": "1.9.2",
|
||||||
"chai": "^4.2.0",
|
"commitizen": "^3.0.4",
|
||||||
"commitizen": "^3.0.5",
|
|
||||||
"coveralls": "^3.0.2",
|
"coveralls": "^3.0.2",
|
||||||
"cz-conventional-changelog": "^2.1.0",
|
"cz-conventional-changelog": "^2.1.0",
|
||||||
"dependency-check": "3.2.1",
|
"dependency-check": "3.2.1",
|
||||||
"deps-ok": "1.4.1",
|
"deps-ok": "1.4.1",
|
||||||
"git-issues": "1.3.1",
|
"git-issues": "1.3.1",
|
||||||
"license-checker": "24.0.1",
|
"license-checker": "24.0.1",
|
||||||
"mocha": "^5.2.0",
|
|
||||||
"nsp": "3.2.1",
|
"nsp": "3.2.1",
|
||||||
"pre-git": "3.17.1",
|
"pre-git": "3.17.1",
|
||||||
"prettier-standard": "8.0.1",
|
"prettier-standard": "8.0.1",
|
||||||
|
|
|
@ -70,7 +70,7 @@ export class AdminDialog extends IGBDialog {
|
||||||
await deployer.rebuildIndex(min.instance);
|
await deployer.rebuildIndex(min.instance);
|
||||||
}
|
}
|
||||||
|
|
||||||
public static async addConnectionCommand(text: any, min: GBMinInstance) {
|
public static async addConnectionCommand(min: GBMinInstance, text: any) {
|
||||||
const packageName = text.split(' ')[1];
|
const packageName = text.split(' ')[1];
|
||||||
const importer = new GBImporter(min.core);
|
const importer = new GBImporter(min.core);
|
||||||
const admin = new GBAdminService(min.core);
|
const admin = new GBAdminService(min.core);
|
||||||
|
@ -140,8 +140,7 @@ export class AdminDialog extends IGBDialog {
|
||||||
|
|
||||||
return await step.replaceDialog('/admin', { firstRun: false });
|
return await step.replaceDialog('/admin', { firstRun: false });
|
||||||
} else if (cmdName === 'addConnection') {
|
} else if (cmdName === 'addConnection') {
|
||||||
await AdminDialog.addConnectionCommand(min, text, deployer);
|
await AdminDialog.addConnectionCommand(min, text);
|
||||||
|
|
||||||
return await step.replaceDialog('/admin', { firstRun: false });
|
return await step.replaceDialog('/admin', { firstRun: false });
|
||||||
} else if (cmdName === 'undeployPackage') {
|
} else if (cmdName === 'undeployPackage') {
|
||||||
await AdminDialog.undeployPackageCommand(text, min);
|
await AdminDialog.undeployPackageCommand(text, min);
|
||||||
|
|
|
@ -40,13 +40,9 @@ import SidebarMenu from "./components/SidebarMenu.js";
|
||||||
import GBCss from "./components/GBCss.js";
|
import GBCss from "./components/GBCss.js";
|
||||||
import { DirectLine } from "botframework-directlinejs";
|
import { DirectLine } from "botframework-directlinejs";
|
||||||
import { ConnectionStatus } from "botframework-directlinejs";
|
import { ConnectionStatus } from "botframework-directlinejs";
|
||||||
import { SpeechRecognizer } from "botframework-webchat";
|
|
||||||
import { SpeechSynthesizer } from "botframework-webchat";
|
|
||||||
import { SynthesisGender } from "botframework-webchat";
|
|
||||||
import { Chat } from "botframework-webchat";
|
import { Chat } from "botframework-webchat";
|
||||||
import GBPowerBIPlayer from "./players/GBPowerBIPlayer.js";
|
import GBPowerBIPlayer from "./players/GBPowerBIPlayer.js";
|
||||||
import { UserAgentApplication } from "msal";
|
|
||||||
import { Observable } from 'rxjs'
|
|
||||||
|
|
||||||
class GBUIApp extends React.Component {
|
class GBUIApp extends React.Component {
|
||||||
constructor() {
|
constructor() {
|
||||||
|
@ -117,11 +113,11 @@ class GBUIApp extends React.Component {
|
||||||
|
|
||||||
configureChat() {
|
configureChat() {
|
||||||
var botId = window.location.href.split("/")[3];
|
var botId = window.location.href.split("/")[3];
|
||||||
if (botId.indexOf('#') != -1) {
|
if (botId.indexOf('#') !== -1) {
|
||||||
botId = botId.split("#")[0];
|
botId = botId.split("#")[0];
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!botId || botId == "") {
|
if (!botId || botId === "") {
|
||||||
botId = "[default]";
|
botId = "[default]";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -302,7 +298,7 @@ class GBUIApp extends React.Component {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
let speechOptions;
|
|
||||||
let chat = <div />;
|
let chat = <div />;
|
||||||
let gbCss = <div />;
|
let gbCss = <div />;
|
||||||
|
|
||||||
|
@ -314,11 +310,10 @@ class GBUIApp extends React.Component {
|
||||||
);
|
);
|
||||||
|
|
||||||
if (this.state.line && this.state.instance) {
|
if (this.state.line && this.state.instance) {
|
||||||
let token = this.state.instanceClient.speechToken;
|
|
||||||
gbCss = <GBCss instance={this.state.instance} />;
|
gbCss = <GBCss instance={this.state.instance} />;
|
||||||
|
|
||||||
function getToken() {
|
// let speechOptions;
|
||||||
}
|
// let token = this.state.instanceClient.speechToken;
|
||||||
|
|
||||||
// speechOptions = {
|
// speechOptions = {
|
||||||
// speechRecognizer: new SpeechRecognizer({
|
// speechRecognizer: new SpeechRecognizer({
|
||||||
|
|
|
@ -43,14 +43,6 @@ class GBLoginPlayer extends React.Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
doLogin(info) {
|
doLogin(info) {
|
||||||
let logger = new Logger(
|
|
||||||
(logLevel, message, piiEnabled) => {
|
|
||||||
console.log(message);
|
|
||||||
},
|
|
||||||
{ level: LogLevel.Verbose }
|
|
||||||
);
|
|
||||||
|
|
||||||
|
|
||||||
let authority =
|
let authority =
|
||||||
"https://login.microsoftonline.com/" +
|
"https://login.microsoftonline.com/" +
|
||||||
this.state.login.authenticatorTenant;
|
this.state.login.authenticatorTenant;
|
||||||
|
|
|
@ -119,13 +119,13 @@ class GBMarkdownPlayer extends Component {
|
||||||
}
|
}
|
||||||
|
|
||||||
if (this.state.prevId) {
|
if (this.state.prevId) {
|
||||||
prev = <a style={{ color: 'blue', cursor: 'pointer' }}
|
prev = <a style={{ color: 'blue', cursor: 'pointer' }} href={"#"}
|
||||||
onClick={() => this.sendAnswer(this.state.prevId)}>
|
onClick={() => this.sendAnswer(this.state.prevId)}>
|
||||||
Back
|
Back
|
||||||
</a>
|
</a>
|
||||||
}
|
}
|
||||||
if (this.state.nextId) {
|
if (this.state.nextId) {
|
||||||
next = <a style={{ color: 'blue', cursor: 'pointer' }}
|
next = <a style={{ color: 'blue', cursor: 'pointer' }} href={"#"}
|
||||||
onClick={() => this.sendAnswer(this.state.nextId)}>
|
onClick={() => this.sendAnswer(this.state.nextId)}>
|
||||||
Next
|
Next
|
||||||
</a>
|
</a>
|
||||||
|
|
Loading…
Add table
Reference in a new issue