fix: Updates regular expressions formatting and naming convention (#4398

)
microsoft · Oct 16, 2020 · 64b4070 · 64b4070
1 parent 27345fe
commit 64b4070
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/Composer/cypress/integration/TriggerCreation.spec.ts b/Composer/cypress/integration/TriggerCreation.spec.ts
@@ -10,7 +10,7 @@ context('Creating a new trigger', () => {
   it('can create different kinds of triggers ', () => {
     cy.visitPage('Design');
     cy.findByTestId('recognizerTypeDropdown').click();
-    cy.findByText('Regular Expression').click();
+    cy.findByText('Regular expression recognizer').click();
 
     //onintent trigger
     cy.findByTestId('AddFlyout').click();

diff --git a/...er/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/todoBot.main.json b/...er/packages/adaptive-flow/__tests__/adaptive-flow-renderer/transformers/todoBot.main.json
@@ -4,7 +4,7 @@
       "createdAt": "2019-07-04T08:14:01.139Z",
       "updatedAt": "2019-08-01T23:45:38.308Z",
       "id": "288769",
-      "description": "This is a bot that demonstrates how to manage a ToDo list using Regular Expressions."
+      "description": "This is a bot that demonstrates how to manage a ToDo list using regular expressions."
     },
     "autoEndDialog": false,
     "recognizer": {

diff --git a/Composer/packages/adaptive-flow/demo/src/samples/todo/ToDoBot.main.json b/Composer/packages/adaptive-flow/demo/src/samples/todo/ToDoBot.main.json
@@ -4,44 +4,44 @@
       "createdAt": "2019-07-04T08:14:01.139Z",
       "updatedAt": "2019-08-01T23:45:38.308Z",
       "id": "288769",
-      "description": "This is a bot that demonstrates how to manage a ToDo list using Regular Expressions."
+      "description": "This is a bot that demonstrates how to manage a ToDo list using regular expressions."
     },
     "autoEndDialog": false,
     "recognizer": {
       "$kind": "Microsoft.RegexRecognizer",
       "intents": [
         {
-  
+
             "$kind": "Microsoft.IntentPattern",
             "intent": "AddIntent",
-            "pattern": "(?i)(?:add|create) .*(?:to-do|todo|task)(?: )?(?:named (?<title>.*))?" 
+            "pattern": "(?i)(?:add|create) .*(?:to-do|todo|task)(?: )?(?:named (?<title>.*))?"
         },
         {
-  
+
             "$kind": "Microsoft.IntentPattern",
             "intent": "ClearIntent",
-            "pattern": "(?i)(?:delete|remove|clear) (?:all|every) (?:to-dos|todos|tasks)" 
+            "pattern": "(?i)(?:delete|remove|clear) (?:all|every) (?:to-dos|todos|tasks)"
         },
         {
-  
+
             "$kind": "Microsoft.IntentPattern",
             "intent": "DeleteIntent",
-            "pattern": "(?i)(?:delete|remove|clear) .*(?:to-do|todo|task)(?: )?(?:named (?<title>.*))?" 
+            "pattern": "(?i)(?:delete|remove|clear) .*(?:to-do|todo|task)(?: )?(?:named (?<title>.*))?"
         },
         {
-  
+
             "$kind": "Microsoft.IntentPattern",
             "intent": "ShowIntent",
-            "pattern": "(?i)(?:show|see|view) .*(?:to-do|todo|task)" 
+            "pattern": "(?i)(?:show|see|view) .*(?:to-do|todo|task)"
         },
         {
-  
+
             "$kind": "Microsoft.IntentPattern",
             "intent": "HelpIntent",
-            "pattern": "(?i)help" 
+            "pattern": "(?i)help"
         },
         {
-  
+
             "$kind": "Microsoft.IntentPattern",
             "intent": "CancelIntent",
             "pattern": "(?i)cancel|never mind"
@@ -190,4 +190,3 @@
     ],
     "$schema": "../../app.schema"
   }
-
diff --git a/Composer/packages/client/__tests__/constants.json b/Composer/packages/client/__tests__/constants.json
@@ -96,7 +96,7 @@
           "$kind": "Microsoft.AdaptiveDialog",
           "$designer": {
               "id": "288769",
-              "description": "This is a bot that demonstrates how to manage a ToDo list using Regular Expressions."
+              "description": "This is a bot that demonstrates how to manage a ToDo list using regular expressions."
           },
           "rules": [
               {

diff --git a/Composer/packages/server/src/__mocks__/asset/projects/SampleBot/bot1.dialog b/Composer/packages/server/src/__mocks__/asset/projects/SampleBot/bot1.dialog
@@ -2,7 +2,7 @@
   "old": "value",
   "$designer": {
     "id": "288769",
-    "description": "This is a bot that demonstrates how to manage a ToDo list using Regular Expressions."
+    "description": "This is a bot that demonstrates how to manage a ToDo list using regular expressions."
   },
   "steps": [
     {

diff --git a/Composer/packages/server/src/locales/en-US.json b/Composer/packages/server/src/locales/en-US.json
@@ -2028,7 +2028,7 @@
     "message": "RegEx { intent } is already defined"
   },
   "regular_expression_855557bf": {
-    "message": "Regular Expression"
+    "message": "Regular expression recognizer"
   },
   "release_1af20f26": {
     "message": "Release: "

diff --git a/Composer/packages/ui-plugins/composer/src/defaultRecognizerSchema.ts b/Composer/packages/ui-plugins/composer/src/defaultRecognizerSchema.ts
@@ -14,7 +14,7 @@ const FallbackRecognizerJsonEditor: RecognizerOptions = {
 
 export const DefaultRecognizerSchema: RecognizerUISchema = {
   [SDKKinds.RegexRecognizer]: {
-    displayName: () => formatMessage('Regular Expression'),
+    displayName: () => formatMessage('Regular expression recognizer'),
     intentEditor: RegexIntentField,
     renameIntent: (intentName, newIntentName, shellData, shellApi) => {
       const { currentDialog } = shellData;

diff --git a/Composer/plugins/samples/assets/projects/TodoSample/todosample.dialog b/Composer/plugins/samples/assets/projects/TodoSample/todosample.dialog
@@ -2,7 +2,7 @@
   "$kind": "Microsoft.AdaptiveDialog",
   "$designer": {
     "id": "288769",
-    "description": "This is a bot that demonstrates how to manage a ToDo list using Regular Expressions."
+    "description": "This is a bot that demonstrates how to manage a ToDo list using regular expressions."
   },
   "autoEndDialog": false,
   "defaultResultProperty": "dialog.result",