fix(core.gbapp): Any question can be forwarded to .docx dialogs.

GeneralBots · Nov 6, 2020 · 4f3ada1 · 4f3ada1
1 parent db6fd3e
commit 4f3ada1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/packages/admin.gbapp/dialogs/AdminDialog.ts b/packages/admin.gbapp/dialogs/AdminDialog.ts
@@ -173,7 +173,7 @@ export class AdminDialog extends IGBDialog {
               await min.conversationalService.sendText(min, step, Messages[locale].finished_working);
             }
           } catch (error) {
-            await min.conversationalService.sendText(min, step, error.message);
+            await min.conversationalService.sendText(min, step, error.message?error.message: error);
           }
           await step.replaceDialog('/ask', { isReturning: true });
         }

diff --git a/packages/core.gbapp/services/GBDeployer.ts b/packages/core.gbapp/services/GBDeployer.ts
@@ -74,7 +74,7 @@ export class GBDeployer implements IGBDeployer {
   }
 
   public static getConnectionStringFromInstance(instance: IGBInstance) {
-    return `Server=tcp:${instance.storageServer}.database.windows.net,1433;Database=${instance.storageName};User ID=${instance.storageUsername};Password=${instance.storagePassword};Trusted_Connection=False;Encrypt=True;Connection Timeout=30;`;
+    return `Server=tcp:${instance.storageServer},1433;Database=${instance.storageName};User ID=${instance.storageUsername};Password=${instance.storagePassword};Trusted_Connection=False;Encrypt=True;Connection Timeout=30;`;
   }
 
   /**

diff --git a/packages/core.gbapp/services/GBVMService.ts b/packages/core.gbapp/services/GBVMService.ts
@@ -93,9 +93,8 @@ export class GBVMService extends GBService {
 
         filename = vbsFile;
 
-        let mainName = filename.replace(/\s|\-/gi, '').split('.')[0];
-        mainName = mainName.toLowerCase();
-        min.scriptMap[filename] = mainName.toLowerCase();
+        let mainName = GBVMService.getMethodNameFromVBSFilename(filename);
+        min.scriptMap[filename] = mainName;
 
         const fullFilename = urlJoin(folder, filename);
         // TODO: Implement in development mode, how swap for .vbs files
@@ -122,6 +121,11 @@ export class GBVMService extends GBService {
     });
   }
 
+  public static getMethodNameFromVBSFilename(filename: string) {
+    let mainName = filename.replace(/\s|\-/gi, '').split('.')[0];
+    return mainName.toLowerCase();
+  }
+
   private async getTextFromWord(folder: string, filename: string) {
     return new Promise<string>(async (resolve, reject) => {
       textract.fromFileWithPath(urlJoin(folder, filename), { preserveLineBreaks: true }, (error, text) => {

diff --git a/packages/kb.gbapp/dialogs/AskDialog.ts b/packages/kb.gbapp/dialogs/AskDialog.ts
@@ -288,8 +288,9 @@ export class AskDialog extends IGBDialog {
   }
 
   private static async handleAnswer(service: KBService, min: GBMinInstance, step: any, answer: GuaribasAnswer) {
-    if (answer.content.endsWith('.docx')) {
-      const mainName = answer.content.replace(/\s|\-/gi, '').split('.')[0];
+    const text = answer.content
+    if (text.endsWith('.docx')) {
+      const mainName = GBVMService.getMethodNameFromVBSFilename(text);
       return await GBVMService.callVM(mainName, min, step, this.deployer);
     } else {
       await service.sendAnswer(min, AskDialog.getChannel(step), step, answer);