Merge pull request #834 from aws-samples/feature/remove-v1

Feature/remove v1

Author: atjohns

README-qbusiness.md

@@ -14,7 +14,7 @@ This feature supports integration with file attachments, enable both to allow QB
 ### Deploy the Web UI
 1. A deployment of the Lex Web UI with login enabled is required for Q Business integration. To launch a new deployment of the Web UI, go to the main [README](https://github.com/aws-samples/aws-lex-web-ui/blob/master/README.md) and select `Launch` for the region where your Q Business app is deployed.
 
-2. The other bot fields for both V1 & V2 bots must be empty for the template to create the Q Business integration bot, please ensure that `Lex V1 Bot Configuration Parameters` and `Lex V2 Bot Configuration Parameters` are blank.
+2. The other bot fields for both V2 bots must be empty for the template to create the Q Business integration bot, please ensure that the `Lex V2 Bot Configuration Parameters` are blank.
 
 3. To enable login, set `EnableCognitoLogin` to true. To force users to login to your bot, set `ForceCognitoLogin` to true. The ForceCognitoLogin setting will automatically redirect users to the login page if they are not logged in to the bot. 
 

README.md

@@ -278,7 +278,7 @@ to the latest supported versions.
         },
         lex: {
           // Lex Bot Name in your account
-          botName: '<your lex bot name>'
+          v2BotId: '<your lex bot id>'
         }
       };
       // load the LexWebUi component
@@ -373,7 +373,7 @@ page](#stand-alone-page) section.
         },
         lex: {
           // Lex Bot Name in your account
-          botName: '<your lex bot name>'
+          v2BotId: '<your lex bot id>'
         }
       };
 
@@ -431,7 +431,7 @@ and Lex Bot name. For example, set the appropriate values in the
     "poolId": "us-east-1:deadbeef-fade-babe-cafe-0123456789ab"
   },
   lex: {
-    "botName": "myHelpBot"
+    "v2BotId": "ABC123"
   }
   ...
 ```

config/base.env.js

@@ -31,8 +31,6 @@ module.exports = {
     v2BotId: process.env.V2_BOT_ID,
     v2BotAliasId: process.env.V2_BOT_ALIAS_ID,
     v2BotLocaleId: process.env.V2_BOT_LOCALE_ID,
-    botName: process.env.BOT_NAME,
-    botAlias: process.env.BOT_ALIAS,
     initialText: process.env.BOT_INITIAL_TEXT,
     initialSpeechInstruction: process.env.BOT_INITIAL_SPEECH,
     initialUtterance: process.env.BOT_INITIAL_UTTERANCE,

lex-web-ui/README.md

@@ -53,8 +53,7 @@ You can import the library as a module and use it in your code:
     },
     lex: {
       initialText: 'How can I help you?',
-      botName: 'helpBot',
-      botAlias: '$LATEST',
+      v2BotId: 'XYZ123',
     },
     ui: {
       toolbarTitle: 'Help Bot',
@@ -125,7 +124,7 @@ Mixing regions is not supported.
   // see the configuration section for details about the config fields
   const config = {
     cognito: { poolId },
-    lex: { botName: 'MyBot', initialText: 'How can I help you?' },
+    lex: { v2BotId: 'XYZ123', initialText: 'How can I help you?' },
     ui: { toolbarLogo: '', toolbarTitle: 'My Bot' },
   };
 
@@ -534,7 +533,7 @@ Here's an example of the `config.dev.json` file:
     "poolId": "us-east-1:deadbeef-cac0-babe-abcd-abcdef01234",
   },
   "lex": {
-    "bot": "MyLexBotName",
+    "v2BotId": "XYZ123",
     ...
   },
   "ui": {

lex-web-ui/package-lock.json

@@ -22,7 +22,6 @@
     "amazon-connect-chatjs": "^2.3.0",
     "@aws-sdk/client-cognito-identity": "3.470.0",
     "@aws-sdk/client-connect": "3.470.0",
-    "@aws-sdk/client-lex-runtime-service": "3.470.0",
     "@aws-sdk/client-lex-runtime-v2": "3.470.0",
     "@aws-sdk/client-polly": "3.470.0",
     "@aws-sdk/client-s3": "3.470.0",

lex-web-ui/package.json

@@ -74,12 +74,9 @@ import ToolbarContainer from '@/components/ToolbarContainer';
 import MessageList from '@/components/MessageList';
 import InputContainer from '@/components/InputContainer';
 // import { fromCognitoIdentityPool } from '@aws-sdk/credential-providers';
-import { LexRuntimeServiceClient } from '@aws-sdk/client-lex-runtime-service';
 import { LexRuntimeV2Client } from '@aws-sdk/client-lex-runtime-v2';
 import { PollyClient } from '@aws-sdk/client-polly';
 
-
-
 export default {
   name: 'lex-web',
   data() {
@@ -203,7 +200,6 @@ export default {
           credentials: this.$lexWebUi.awsConfig.credentials,
         };
 
-        this.$lexWebUi.lexRuntimeClient = new LexRuntimeServiceClient(awsConfig);
         this.$lexWebUi.lexRuntimeV2Client = new LexRuntimeV2Client(awsConfig);
         this.$lexWebUi.pollyClient = new PollyClient(awsConfig)
         /* eslint-disable no-console */
@@ -214,7 +210,7 @@ export default {
           this.$store.dispatch('initMessageList'),
           this.$store.dispatch('initPollyClient', this.$lexWebUi.pollyClient, this.$lexWebUi.awsConfig.credentials),
           this.$store.dispatch('initLexClient', {
-            v1client: this.$lexWebUi.lexRuntimeClient, v2client: this.$lexWebUi.lexRuntimeV2Client, credentials: this.$lexWebUi.awsConfig.credentials
+            v2client: this.$lexWebUi.lexRuntimeV2Client, credentials: this.$lexWebUi.awsConfig.credentials
           }),
         ];
         console.info('CONFIG : ', this.$store.state.config);

lex-web-ui/src/components/LexWeb.vue

@@ -12,7 +12,6 @@
       "apiGatewayEndpoint" : ""
     },
     "lex": {
-      "botName": "QnABot_BotuU",
       "initialText": "This is from AWS TEST CONFING",
       "initialSpeechInstruction": "Say 'Order Flowers' to get started."
     },

lex-web-ui/src/config/config.awstest.json

@@ -12,8 +12,6 @@
     "v2BotId": "",
     "v2BotAliasId": "",
     "v2BotLocaleId": "",
-    "botName": "",
-    "botAlias": "$LATEST",
     "initialText": "Type 'Buy Flowers' to get started.",
     "initialSpeechInstruction": "Say 'Buy Flowers' to get started.",
     "initialUtterance": "",

lex-web-ui/src/config/config.dev.json

@@ -3,7 +3,6 @@
     "poolId": ""
   },
   "lex": {
-    "botName": "WebUiOrderFlowers",
     "initialText": "You can ask me for help ordering flowers. Just type \"order flowers\" or click on the mic and say it.",
     "initialSpeechInstruction": "Say 'Order Flowers' to get started."
   },