From 4948baadb55cce7f53e10185edc383f93dcc7fda Mon Sep 17 00:00:00 2001 From: Nahuel Perales Date: Wed, 21 Dec 2022 15:34:37 -0300 Subject: [PATCH 1/6] fix: add missing prompt options --- .../__tests__/mocks/mockProjectResponse.json | 2 +- Composer/packages/electron-server/locales/en-US.json | 2 +- .../src/lg/modalityEditors/SpeechModalityEditor.tsx | 10 ++++++++++ Composer/packages/lib/code-editor/src/lg/types.ts | 8 +++++++- Composer/packages/server/src/locales/en-US.json | 12 ++++++++++++ 5 files changed, 31 insertions(+), 3 deletions(-) diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json index f5ea636495..7413d32a0d 100644 --- a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json +++ b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/mocks/mockProjectResponse.json @@ -3085,7 +3085,7 @@ "title": "speak" }, "inputHint": { - "description": "Indicates whether your bot is accepting,\nexpecting, or ignoring user input after the message is delivered to the client. Possible\nvalues include: 'acceptingInput', 'ignoringInput', 'expectingInput'", + "description": "Indicates whether your bot is accepting,\nexpecting, or ignoring user input after the message is delivered to the client. Possible\nvalues include: 'acceptingInput', 'ignoringInput', 'expectingInput', 'ignoringSpeechInput', 'ignoringNonSpeechInput'", "type": "string", "title": "inputHint" }, diff --git a/Composer/packages/electron-server/locales/en-US.json b/Composer/packages/electron-server/locales/en-US.json index 7203f8cfa2..b05b780bc1 100644 --- a/Composer/packages/electron-server/locales/en-US.json +++ b/Composer/packages/electron-server/locales/en-US.json @@ -122,4 +122,4 @@ "zoom_out_dc7d60d2": { "message": "Zoom Out" } -} +} \ No newline at end of file diff --git a/Composer/packages/lib/code-editor/src/lg/modalityEditors/SpeechModalityEditor.tsx b/Composer/packages/lib/code-editor/src/lg/modalityEditors/SpeechModalityEditor.tsx index 312e04623b..b75e32888c 100644 --- a/Composer/packages/lib/code-editor/src/lg/modalityEditors/SpeechModalityEditor.tsx +++ b/Composer/packages/lib/code-editor/src/lg/modalityEditors/SpeechModalityEditor.tsx @@ -79,6 +79,16 @@ const SpeechModalityEditor = React.memo( text: formatMessage('Expecting'), selected: inputHint === 'expectingInput', }, + { + key: 'ignoringSpeechInput', + text: formatMessage('Ignoring Speech'), + selected: inputHint === 'ignoringSpeechInput', + }, + { + key: 'ignoringNonSpeechInput', + text: formatMessage('Ignoring Non Speech'), + selected: inputHint === 'ignoringNonSpeechInput', + }, ], [inputHint] ); diff --git a/Composer/packages/lib/code-editor/src/lg/types.ts b/Composer/packages/lib/code-editor/src/lg/types.ts index 0a5a0766cb..bf8003fb12 100644 --- a/Composer/packages/lib/code-editor/src/lg/types.ts +++ b/Composer/packages/lib/code-editor/src/lg/types.ts @@ -34,7 +34,13 @@ export type CommonModalityEditorProps = { /** * Structured response types. */ -export const acceptedInputHintValues = ['expectingInput', 'ignoringInput', 'acceptingInput'] as const; +export const acceptedInputHintValues = [ + 'expectingInput', + 'ignoringInput', + 'acceptingInput', + 'ignoringSpeechInput', + 'ignoringNonSpeechInput', +] as const; export const acceptedAttachmentLayout = ['carousel', 'list'] as const; export const modalityTypes = ['Text', 'Speak', 'Attachments', 'SuggestedActions'] as const; diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json index a2f53c54b1..955c3f84e9 100644 --- a/Composer/packages/server/src/locales/en-US.json +++ b/Composer/packages/server/src/locales/en-US.json @@ -1955,6 +1955,12 @@ "ignoring_dc76ef87": { "message": "Ignoring" }, + "ignoring_non_speech_d2746d71": { + "message": "Ignoring Non Speech" + }, + "ignoring_speech_fe0a02ce": { + "message": "Ignoring Speech" + }, "import_as_new_35630827": { "message": "Import as new" }, @@ -3404,6 +3410,9 @@ "search_for_extensions_on_npm_c5ca65d9": { "message": "Search for extensions on npm" }, + "search_for_the_query_found_count_plural_1_one_resu_da1e5732": { + "message": "Search for the { query }. Found { count, plural,\n =1 {one result}\n other {# results}\n}" + }, "search_functions_4a1afbc3": { "message": "Search functions" }, @@ -3980,6 +3989,9 @@ "the_trigger_triggername_has_been_created_eed0c973": { "message": "The trigger { triggerName } has been created" }, + "the_trigger_triggername_has_been_deleted_b7d630f8": { + "message": "The trigger { triggerName } has been deleted" + }, "the_user_input_page_is_where_the_language_understa_c9262f3f": { "message": "The User Input page is where the Language Understanding editor locates. From here users can view all the Language Understanding templates and edit them." }, From 33af5d3340bd03c604330070689cf9862799bd89 Mon Sep 17 00:00:00 2001 From: Nahuel Perales Date: Wed, 21 Dec 2022 16:01:36 -0300 Subject: [PATCH 2/6] chore: revert extra changes --- Composer/packages/electron-server/locales/en-US.json | 2 +- Composer/packages/server/src/locales/en-US.json | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/Composer/packages/electron-server/locales/en-US.json b/Composer/packages/electron-server/locales/en-US.json index b05b780bc1..7203f8cfa2 100644 --- a/Composer/packages/electron-server/locales/en-US.json +++ b/Composer/packages/electron-server/locales/en-US.json @@ -122,4 +122,4 @@ "zoom_out_dc7d60d2": { "message": "Zoom Out" } -} \ No newline at end of file +} diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json index 955c3f84e9..8a7d6dc440 100644 --- a/Composer/packages/server/src/locales/en-US.json +++ b/Composer/packages/server/src/locales/en-US.json @@ -3410,9 +3410,6 @@ "search_for_extensions_on_npm_c5ca65d9": { "message": "Search for extensions on npm" }, - "search_for_the_query_found_count_plural_1_one_resu_da1e5732": { - "message": "Search for the { query }. Found { count, plural,\n =1 {one result}\n other {# results}\n}" - }, "search_functions_4a1afbc3": { "message": "Search functions" }, @@ -3989,9 +3986,6 @@ "the_trigger_triggername_has_been_created_eed0c973": { "message": "The trigger { triggerName } has been created" }, - "the_trigger_triggername_has_been_deleted_b7d630f8": { - "message": "The trigger { triggerName } has been deleted" - }, "the_user_input_page_is_where_the_language_understa_c9262f3f": { "message": "The User Input page is where the Language Understanding editor locates. From here users can view all the Language Understanding templates and edit them." }, From d95e70dd7ea6e8e36b7ae67d01124a6816a7e17c Mon Sep 17 00:00:00 2001 From: Nahuel Perales Date: Thu, 22 Dec 2022 11:29:55 -0300 Subject: [PATCH 3/6] add values to util.ts --- .../tools/language-servers/language-generation/src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Composer/packages/tools/language-servers/language-generation/src/utils.ts b/Composer/packages/tools/language-servers/language-generation/src/utils.ts index ecc67c5dce..2044402857 100644 --- a/Composer/packages/tools/language-servers/language-generation/src/utils.ts +++ b/Composer/packages/tools/language-servers/language-generation/src/utils.ts @@ -168,7 +168,7 @@ export const cardPropPossibleValueType = { Text: 'Text | ${Expression}', Speak: 'Text | ${Expression}', Attachments: 'List of attachments', - InputHint: 'accepting | ignoring | expecting', + InputHint: 'accepting | ignoring | expecting | ignoringSpeech | ignoringNonSpeech', AttachmentLayout: 'list | carousel', SuggestedActions: 'Text | ${Expression}', }; From c576d18d6fd80212a0008f1c6ffc066d05f3bbb4 Mon Sep 17 00:00:00 2001 From: Nahuel Perales Date: Thu, 22 Dec 2022 16:03:59 -0300 Subject: [PATCH 4/6] updated yarn-berry.lock --- extensions/azurePublish/yarn-berry.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/azurePublish/yarn-berry.lock b/extensions/azurePublish/yarn-berry.lock index a2ffdcbf41..94d387d4f1 100644 --- a/extensions/azurePublish/yarn-berry.lock +++ b/extensions/azurePublish/yarn-berry.lock @@ -1879,7 +1879,7 @@ __metadata: "@bfc/code-editor@file:../../Composer/packages/lib/code-editor::locator=azurePublish%40workspace%3A.": version: 0.0.0 - resolution: "@bfc/code-editor@file:../../Composer/packages/lib/code-editor#../../Composer/packages/lib/code-editor::hash=cf4a8a&locator=azurePublish%40workspace%3A." + resolution: "@bfc/code-editor@file:../../Composer/packages/lib/code-editor#../../Composer/packages/lib/code-editor::hash=f6a31c&locator=azurePublish%40workspace%3A." dependencies: "@emotion/react": ^11.1.3 "@emotion/styled": ^11.1.3 @@ -1902,7 +1902,7 @@ __metadata: "@bfc/ui-shared": "*" react: 16.13.1 react-dom: 16.13.1 - checksum: f3773eb308e7e1d6db3d13220510b48c7659febca2441213fbc3deeff35abddf559f8cababdea58a5630ae214124f82299ce1d86fe89a5196369adc9ab9234f7 + checksum: 00fb9e29f693be4cfdd4ca930b3d4abd9f79a4ec2e8d98863c6575a708c47bf9209da695cbd7f0711616a9380c5f04e316a90d4f766e63b09b58bc748a0797de languageName: node linkType: hard From ba5a640c6ea5b6d5d5a53cdf7789d5606fd4a312 Mon Sep 17 00:00:00 2001 From: CeciliaAvila Date: Mon, 23 Jan 2023 11:29:51 -0300 Subject: [PATCH 5/6] Update yarn-berry.lock files --- extensions/azurePublish/yarn-berry.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/azurePublish/yarn-berry.lock b/extensions/azurePublish/yarn-berry.lock index 45783b7d61..e08afad851 100644 --- a/extensions/azurePublish/yarn-berry.lock +++ b/extensions/azurePublish/yarn-berry.lock @@ -1879,7 +1879,7 @@ __metadata: "@bfc/code-editor@file:../../Composer/packages/lib/code-editor::locator=azurePublish%40workspace%3A.": version: 0.0.0 - resolution: "@bfc/code-editor@file:../../Composer/packages/lib/code-editor#../../Composer/packages/lib/code-editor::hash=55cec5&locator=azurePublish%40workspace%3A." + resolution: "@bfc/code-editor@file:../../Composer/packages/lib/code-editor#../../Composer/packages/lib/code-editor::hash=721d1e&locator=azurePublish%40workspace%3A." dependencies: "@emotion/react": ^11.1.3 "@emotion/styled": ^11.1.3 @@ -1902,7 +1902,7 @@ __metadata: "@bfc/ui-shared": "*" react: 16.13.1 react-dom: 16.13.1 - checksum: 70f20aaf5321a7de6430f60a31fbb1fd7c43446e36c1b49ba24687522e004d9714975af24b44c2ac8938e7c5c62d921d1dc11efca7306281bfe80dd4094c29e7 + checksum: 0cb518cdd542000bfa39c54e5117d1c006ff55e975adcd9bedb82d1dff40d27796b44fb202a8c4168507120ffb8174ae950682935199480a0683ae70dabb9168 languageName: node linkType: hard From d075fda223d76feafa7d8629d849095871681c5f Mon Sep 17 00:00:00 2001 From: CeciliaAvila Date: Fri, 17 Feb 2023 09:33:16 -0300 Subject: [PATCH 6/6] Update yarn-berry.lock --- extensions/azurePublish/yarn-berry.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/azurePublish/yarn-berry.lock b/extensions/azurePublish/yarn-berry.lock index 5b76520609..b659e091b8 100644 --- a/extensions/azurePublish/yarn-berry.lock +++ b/extensions/azurePublish/yarn-berry.lock @@ -1852,7 +1852,7 @@ __metadata: "@bfc/code-editor@file:../../Composer/packages/lib/code-editor::locator=azurePublish%40workspace%3A.": version: 0.0.0 - resolution: "@bfc/code-editor@file:../../Composer/packages/lib/code-editor#../../Composer/packages/lib/code-editor::hash=721d1e&locator=azurePublish%40workspace%3A." + resolution: "@bfc/code-editor@file:../../Composer/packages/lib/code-editor#../../Composer/packages/lib/code-editor::hash=9daeab&locator=azurePublish%40workspace%3A." dependencies: "@emotion/react": ^11.1.3 "@emotion/styled": ^11.1.3 @@ -1875,7 +1875,7 @@ __metadata: "@bfc/ui-shared": "*" react: 16.13.1 react-dom: 16.13.1 - checksum: 0cb518cdd542000bfa39c54e5117d1c006ff55e975adcd9bedb82d1dff40d27796b44fb202a8c4168507120ffb8174ae950682935199480a0683ae70dabb9168 + checksum: a0df5aa27ed60aa635a93c64c60feaaa3e7709ad306bc923a291616fb639898c2fd35909ee51858637295ee349001cb697ea92bbe86c34b1a7ec2d6038be7cc6 languageName: node linkType: hard