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