Pass qnaId in value attribute of multiturn prompts (#4262)

microsoft · Jun 15, 2022 · a39a86b · a39a86b
1 parent 9c4f44d
commit a39a86b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/libraries/botbuilder-ai/src/qnaCardBuilder.ts b/libraries/botbuilder-ai/src/qnaCardBuilder.ts
@@ -76,9 +76,11 @@ export class QnACardBuilder {
 
         result.context?.prompts?.forEach((prompt) => {
             buttonList.push({
-                value: prompt.displayText,
-                type: 'imBack',
+                value: prompt.qnaId,
+                type: 'messageBack',
                 title: prompt.displayText,
+                text: prompt.displayText,
+                displayText: prompt.displayText,
             });
         });
 

diff --git a/libraries/botbuilder-ai/src/qnaMakerDialog.ts b/libraries/botbuilder-ai/src/qnaMakerDialog.ts
@@ -749,8 +749,16 @@ export class QnAMakerDialog extends WaterfallDialog implements QnAMakerDialogCon
     }
 
     private resetOptions(dc: DialogContext, dialogOptions: QnAMakerDialogOptions) {
-        // Resetting context and QnAId
-        dialogOptions.qnaMakerOptions.qnaId = 0;
+        // Resetting QnAId if not present in value
+        const qnaIdFromContext = dc.context.activity.value;
+
+        if (qnaIdFromContext != null) {
+            dialogOptions.qnaMakerOptions.qnaId = qnaIdFromContext;
+        } else {
+            dialogOptions.qnaMakerOptions.qnaId = 0;
+        }
+
+        // Resetting context
         dialogOptions.qnaMakerOptions.context = { previousQnAId: 0, previousUserQuery: '' };
 
         // Check if previous context is present, if yes then put it with the query