Little improvements

javascript_nodejs/README.md

@@ -41,10 +41,10 @@
       "hostname": "https://your-qnamaker-app-name.azurewebsites.net/qnamaker"
     },
     "cosmosDb": {
-      "serviceEndpoint": "https://your-cosmosdb-account-name.documents.azure.com:443/",
+      "cosmosDbEndpoint": "https://your-cosmosdb-account-name.documents.azure.com:443/",
       "authKey": "<YOUR_AUTHORING_KEY>",
       "databaseId": "<YOUR_DATABASE_ID>",
-      "collectionId": "<YOUR_COLLECTION_ID>"
+      "containerId": "<YOUR_COLLECTION_ID>"
     },
     "publicResourcesUrl": "http://localhost:3978"
   }

javascript_nodejs/src/dialogs/chitchat/index.js

@@ -67,10 +67,8 @@ class ChitchatDialog extends ComponentDialog {
             return true;
         }
 
-        // This is a special case that leads to a new dialog,
-        // so it's not handled as a normal interruption flow.
         await dc.beginDialog(CancelDialog.name);
-        return false;
+        return true;
     }
 
     /**

javascript_nodejs/src/dialogs/main/index.js

@@ -150,8 +150,12 @@ class MainDialog extends ComponentDialog {
 
             if (interrupted) {
                 if (dc.activeDialog) {
-                    // issue a re-prompt on the active dialog
-                    await dc.repromptDialog();
+                    // issue a re-prompt on the active dialog if it's not Cancel dialog
+                    if (dc.activeDialog.id !== CancelDialog.name) {
+                        await dc.repromptDialog();
+                    } else {
+                        turnResult = await dc.continueDialog();
+                    }
                 } // Else: We don't have an active dialog so nothing to continue here.
             } else {
                 // No interruption. Continue any active dialogs.

javascript_nodejs/src/index.js

@@ -12,7 +12,7 @@ const localizer = require('i18n');
 // Import required bot services. See https://aka.ms/bot-services to learn more about the different parts of a bot.
 const { BotFrameworkAdapter, MemoryStorage, ConversationState, UserState } = require('botbuilder');
 const { LuisRecognizer, QnAMaker } = require('botbuilder-ai');
-const { CosmosDbStorage } = require('botbuilder-azure');
+const { CosmosDbPartitionedStorage } = require("botbuilder-azure");
 
 // Avoid uploading sensitive information like appsettings.json file to your source code repository.
 // .gitignore file contains appsettings.json as an ignored file.
@@ -73,7 +73,7 @@ if (NODE_ENV === DEV_ENV) {
     // is restarted, anything stored in memory will be gone.
     storage = new MemoryStorage();
 } else {
-    storage = new CosmosDbStorage(appsettings.cosmosDb);
+    storage = new CosmosDbPartitionedStorage(appsettings.cosmosDb);
 }
 
 conversationState = new ConversationState(storage);

typescript_nodejs/README.md

@@ -42,10 +42,10 @@
       "hostname": "https://your-qnamaker-app-name.azurewebsites.net/qnamaker"
     },
     "cosmosDb": {
-      "serviceEndpoint": "https://your-cosmosdb-account-name.documents.azure.com:443/",
+      "cosmosDbEndpoint": "https://your-cosmosdb-account-name.documents.azure.com:443/",
       "authKey": "<YOUR_AUTHORING_KEY>",
       "databaseId": "<YOUR_DATABASE_ID>",
-      "collectionId": "<YOUR_COLLECTION_ID>"
+      "containerId": "<YOUR_COLLECTION_ID>"
     },
     "publicResourcesUrl": "http://localhost:3978"
   }