From bf48d12f7631024ebd5f0fad555a09a5c26eac4f Mon Sep 17 00:00:00 2001
From: "Rodrigo Rodriguez (pragmatismo.io)" <rodriguez@pragmatismo.io>
Date: Mon, 12 Nov 2018 13:00:30 -0200
Subject: [PATCH] fix(btfmw): new dialog pattern fixing.

---
 packages/core.gbapp/services/GBImporter.ts |  6 +++---
 packages/kb.gbapp/dialogs/AskDialog.ts     | 18 +++++++++---------
 packages/kb.gbapp/dialogs/MenuDialog.ts    |  2 +-
 packages/kb.gbapp/services/KBService.ts    |  2 +-
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/core.gbapp/services/GBImporter.ts b/packages/core.gbapp/services/GBImporter.ts
index 35c5e11d..1ad9b0e6 100644
--- a/packages/core.gbapp/services/GBImporter.ts
+++ b/packages/core.gbapp/services/GBImporter.ts
@@ -55,7 +55,7 @@ export class GBImporter {
     localPath: string) {
 
     const packageJson = JSON.parse(
-      Fs.readFileSync(UrlJoin(localPath, 'package.json'), 'utf8')
+      fs.readFileSync(UrlJoin(localPath, 'package.json'), 'utf8')
     );
 
     const botId = packageJson.botId;
@@ -74,10 +74,10 @@ export class GBImporter {
     packageJson: any
   ) {
     const settings = JSON.parse(
-      Fs.readFileSync(UrlJoin(localPath, 'settings.json'), 'utf8')
+      fs.readFileSync(UrlJoin(localPath, 'settings.json'), 'utf8')
     );
     const servicesJson = JSON.parse(
-      Fs.readFileSync(UrlJoin(localPath, 'services.json'), 'utf8')
+      fs.readFileSync(UrlJoin(localPath, 'services.json'), 'utf8')
     );
 
     packageJson = {...packageJson, ...settings, ...servicesJson};
diff --git a/packages/kb.gbapp/dialogs/AskDialog.ts b/packages/kb.gbapp/dialogs/AskDialog.ts
index bdf4edd9..3b2f1774 100644
--- a/packages/kb.gbapp/dialogs/AskDialog.ts
+++ b/packages/kb.gbapp/dialogs/AskDialog.ts
@@ -59,10 +59,10 @@ export class AskDialog extends IGBDialog {
     min.dialogs.add(
       new WaterfallDialog('/answerEvent', [
         async step => {
-          if (step.options && step.options.questionId) {
+          if (step.options && step.options['questionId']) {
             const question = await service.getQuestionById(
               min.instance.instanceId,
-              step.options.questionId
+              step.options['questionId']
             );
             const answer = await service.getAnswerById(
               min.instance.instanceId,
@@ -84,9 +84,9 @@ export class AskDialog extends IGBDialog {
       new WaterfallDialog('/answer', [
         async step => {
           const user = await min.userProfile.get(step.context, {});
-          let text = step.options.query;
+          let text = step.options['query'];
           if (!text) {
-            throw new Error(`/answer being called with no args.query text.`);
+            throw new Error(`/answer being called with no args query text.`);
           }
 
           const locale = step.context.activity.locale;
@@ -97,9 +97,9 @@ export class AskDialog extends IGBDialog {
 
           // Handle extra text from FAQ.
 
-          if (step.options && step.options.query) {
-            text = step.options.query;
-          } else if (step.options && step.options.fromFaq) {
+          if (step.options && step.options['query']) {
+            text = step.options['query'];
+          } else if (step.options && step.options['fromFaq']) {
             await step.context.sendActivity(Messages[locale].going_answer);
           }
 
@@ -212,9 +212,9 @@ export class AskDialog extends IGBDialog {
 
           // Three forms of asking.
 
-          if (step.options && step.options.firstTime) {
+          if (step.options && step.options['firstTime'] ) {
             text = Messages[locale].ask_first_time;
-          } else if (step.options && step.options.isReturning) {
+          } else if (step.options && step.options['isReturning'] ) {
             text = Messages[locale].anything_else;
           } else if (user.subjects.length > 0) {
             text = Messages[locale].which_question;
diff --git a/packages/kb.gbapp/dialogs/MenuDialog.ts b/packages/kb.gbapp/dialogs/MenuDialog.ts
index 5ae6441f..fece9fc0 100644
--- a/packages/kb.gbapp/dialogs/MenuDialog.ts
+++ b/packages/kb.gbapp/dialogs/MenuDialog.ts
@@ -63,7 +63,7 @@ export class MenuDialog extends IGBDialog {
         const locale = step.context.activity.locale;
         let rootSubjectId = null;
 
-        if (step.options && step.options.data) {
+        if (step.options && step.options['data']) {
           const subject = step.result.data;
 
           // If there is a shortcut specified as subject destination, go there.
diff --git a/packages/kb.gbapp/services/KBService.ts b/packages/kb.gbapp/services/KBService.ts
index a9b71a1e..e94b9634 100644
--- a/packages/kb.gbapp/services/KBService.ts
+++ b/packages/kb.gbapp/services/KBService.ts
@@ -210,7 +210,7 @@ export class KBService {
 
   public async getFaqBySubjectArray(from: string, subjects: any): Promise<GuaribasQuestion[]> {
     const where = {
-      from: from
+      from: from, subject1: null, subject2: null, subject3: null, subject4:null
     };
 
     if (subjects) {