From 2c901f451bac49a58e2c1a8e8f4cb99f82b8c465 Mon Sep 17 00:00:00 2001 From: Rodrigo Rodriguez Date: Wed, 14 Oct 2020 13:43:58 -0300 Subject: [PATCH] fix(all): sendFile working after path fix. --- .vscode/launch.json | 3 +-- packages/core.gbapp/services/GBAPIService.ts | 16 +++++++++++----- .../services/GBConversationalService.ts | 4 ++-- packages/core.gbapp/services/GBMinService.ts | 3 ++- 4 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index 6f96fb68..ccf3af1b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -18,8 +18,7 @@ "node_modules/**/*.js" ], "outFiles": [ - "${workspaceRoot}/dist/*.js" - ], + "${workspaceRoot}/dist/**/*.js"], "stopOnEntry": false, "console": "integratedTerminal" } diff --git a/packages/core.gbapp/services/GBAPIService.ts b/packages/core.gbapp/services/GBAPIService.ts index 17fd0312..8869a861 100644 --- a/packages/core.gbapp/services/GBAPIService.ts +++ b/packages/core.gbapp/services/GBAPIService.ts @@ -95,8 +95,7 @@ class SysClass { await timeout(seconds * 1000); } - - public async set(file: string, address:string, value: any): Promise { + public async set(file: string, address: string, value: any): Promise { try { let token = await this.min.adminService.acquireElevatedToken(this.min.instance.instanceId); @@ -122,7 +121,7 @@ class SysClass { if (document === undefined) { throw `File '${file}' specified on save GBasic command SET not found. Check the .gbdata or the .gbdialog associated.`; } - + let body = { values: [[]] }; body.values[0][0] = value; @@ -226,7 +225,7 @@ class SysClass { ) .get(); - return results.text[0][0]; + return results.text[0][0]; } catch (error) { GBLog.error(error); } @@ -441,7 +440,14 @@ export class DialogClass { } public async sendFile(step, filename, caption) { - let url = urlJoin(GBServer.globals.publicAddress, 'kb', this.min.botId + '.gbkb', 'assets', filename); + let url = urlJoin( + GBServer.globals.publicAddress, + 'kb', + `${this.min.botId}.gbai`, + `${this.min.botId}.gbkb`, + 'assets', + filename + ); await this.min.conversationalService.sendFile(this.min, step, null, url, caption); } diff --git a/packages/core.gbapp/services/GBConversationalService.ts b/packages/core.gbapp/services/GBConversationalService.ts index cf077250..f796259c 100644 --- a/packages/core.gbapp/services/GBConversationalService.ts +++ b/packages/core.gbapp/services/GBConversationalService.ts @@ -36,7 +36,7 @@ 'use strict'; -import { MessageFactory, RecognizerResult } from 'botbuilder'; +import { MessageFactory, RecognizerResult, TurnContext } from 'botbuilder'; import { LuisRecognizer } from 'botbuilder-ai'; import { GBDialogStep, GBLog, GBMinInstance, IGBCoreService } from 'botlib'; import { GBServer } from '../../../src/app'; @@ -517,7 +517,7 @@ export class GBConversationalService { try { step.activeDialog.state.otptions.entities = nlp.entities; - await step.replaceDialog(`/${intent}`, step.activeDialog.state.options ); + await step.replaceDialog(`/${intent}`, step.activeDialog.state.options); return true; } catch (error) { diff --git a/packages/core.gbapp/services/GBMinService.ts b/packages/core.gbapp/services/GBMinService.ts index c23b8b72..ccfcc2f8 100644 --- a/packages/core.gbapp/services/GBMinService.ts +++ b/packages/core.gbapp/services/GBMinService.ts @@ -227,7 +227,8 @@ export class GBMinService { GBServer.globals.minInstances.push(min); await this.deployer.deployPackage(min, 'packages/default.gbtheme'); - + + // Install per bot deployed packages. let packagePath = `work/${min.botId}.gbai/${min.botId}.gbdialog`;