feat: Update OnConversationUpdate actions (#1794)

* Update OnConversationUpdate actions * Update dialogFactory.ts * Update some minor issues * handle comments Co-authored-by: liweitian <liweitian93@outlook.com> Co-authored-by: Chris Whitten <christopher.whitten@microsoft.com>
microsoft · Dec 30, 2019 · a55890c · a55890c
1 parent dc935a6
commit a55890c
Show file tree

Hide file tree

Showing 16 changed files with 295 additions and 72 deletions.
diff --git a/Composer/packages/lib/shared/src/dialogFactory.ts b/Composer/packages/lib/shared/src/dialogFactory.ts
@@ -8,7 +8,7 @@ import { appschema } from './appschema';
 import { copyAdaptiveAction } from './copyUtils';
 import { deleteAdaptiveAction, deleteAdaptiveActionList } from './deleteUtils';
 import { MicrosoftIDialog } from './types';
-
+import { SDKTypes } from './types';
 interface DesignerAttributes {
   name: string;
   description: string;
@@ -23,30 +23,48 @@ const initialInputDialog = {
 };
 
 const initialDialogShape = {
-  'Microsoft.AdaptiveDialog': {
-    $type: 'Microsoft.AdaptiveDialog',
+  [SDKTypes.AdaptiveDialog]: {
+    $type: SDKTypes.AdaptiveDialog,
     triggers: [
       {
-        $type: 'Microsoft.OnBeginDialog',
-        $designer: {
-          name: 'BeginDialog',
-        },
+        $type: SDKTypes.OnBeginDialog,
+        ...getNewDesigner('BeginDialog', ''),
       },
     ],
   },
-  'Microsoft.OnConversationUpdateActivity': {
+  [SDKTypes.OnConversationUpdateActivity]: {
     $type: 'Microsoft.OnConversationUpdateActivity',
-    condition: "toLower(turn.Activity.membersAdded[0].name) != 'bot'",
+    actions: [
+      {
+        $type: SDKTypes.Foreach,
+        ...getNewDesigner('Loop: for each item', ''),
+        itemsProperty: 'turn.Activity.membersAdded',
+        actions: [
+          {
+            $type: SDKTypes.IfCondition,
+            ...getNewDesigner('Branch: if/else', ''),
+            condition: 'string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)',
+            actions: [
+              {
+                $type: SDKTypes.SendActivity,
+                ...getNewDesigner('Send a response', ''),
+                activity: '',
+              },
+            ],
+          },
+        ],
+      },
+    ],
   },
-  'Microsoft.SendActivity': {
+  [SDKTypes.SendActivity]: {
     activity: '',
   },
-  'Microsoft.AttachmentInput': initialInputDialog,
-  'Microsoft.ChoiceInput': initialInputDialog,
-  'Microsoft.ConfirmInput': initialInputDialog,
-  'Microsoft.DateTimeInput': initialInputDialog,
-  'Microsoft.NumberInput': initialInputDialog,
-  'Microsoft.TextInput': initialInputDialog,
+  [SDKTypes.AttachmentInput]: initialInputDialog,
+  [SDKTypes.ChoiceInput]: initialInputDialog,
+  [SDKTypes.ConfirmInput]: initialInputDialog,
+  [SDKTypes.DateTimeInput]: initialInputDialog,
+  [SDKTypes.NumberInput]: initialInputDialog,
+  [SDKTypes.TextInput]: initialInputDialog,
 };
 
 export function getNewDesigner(name: string, description: string) {

diff --git a/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/ActionsSample/ComposerDialogs/Main/Main.dialog
@@ -273,14 +273,34 @@
         "name": "Greeting (ConversationUpdate)",
         "id": "954390"
       },
-      "constraint": "toLower(turn.Activity.membersAdded[0].name) != 'bot'",
       "actions": [
         {
-          "$type": "Microsoft.SendActivity",
+          "$type": "Microsoft.Foreach",
           "$designer": {
-            "id": "640616"
+            "id": "518944",
+            "name": "Loop: for each item"
           },
-          "activity": "@{bfdactivity-640616()}"
+          "itemsProperty": "turn.Activity.membersAdded",
+          "actions": [
+            {
+              "$type": "Microsoft.IfCondition",
+              "$designer": {
+                "id": "641773",
+                "name": "Branch: if/else"
+              },
+              "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)",
+              "actions": [
+                {
+                  "$type": "Microsoft.SendActivity",
+                  "$designer": {
+                    "id": "640616",
+                    "name": "Send a response"
+                  },
+                  "activity": "@{bfdactivity-640616()}"
+                }
+              ]
+            }
+          ]
         }
       ]
     }

diff --git a/...ges/server/assets/projects/ActionsSample/ComposerDialogs/RepeatDialog/RepeatDialog.dialog b/...ges/server/assets/projects/ActionsSample/ComposerDialogs/RepeatDialog/RepeatDialog.dialog
@@ -22,7 +22,7 @@
           "unrecognizedPrompt": "I need a yes or no.",
           "maxTurnCount": 3,
           "alwaysPrompt": true,
-          "allowInterruptions": false,
+          "allowInterruptions": "false",
           "defaultLocale": "en-us",
           "style": "Auto",
           "choiceOptions": {

diff --git a/.../assets/projects/AskingQuestionsSample/ComposerDialogs/DateTimeInput/DateTimeInput.dialog b/.../assets/projects/AskingQuestionsSample/ComposerDialogs/DateTimeInput/DateTimeInput.dialog
@@ -22,7 +22,7 @@
           "invalidPrompt": "Please enter a date.",
           "maxTurnCount": 2,
           "alwaysPrompt": true,
-          "allowInterruptions": false,
+          "allowInterruptions": "false",
           "defaultLocale": "en-us"
         },
         {

diff --git a/...er/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/Main/Main.dialog b/...er/packages/server/assets/projects/AskingQuestionsSample/ComposerDialogs/Main/Main.dialog
@@ -54,16 +54,32 @@
   "triggers": [
     {
       "$type": "Microsoft.OnConversationUpdateActivity",
-      "condition": "toLower(turn.Activity.membersAdded[0].name) != 'bot'",
       "actions": [
         {
-          "$type": "Microsoft.SendActivity",
-          "activity": "@{help()}"
+          "$type": "Microsoft.Foreach",
+          "$designer": {
+            "id": "518944",
+            "name": "Loop: for each item"
+          },
+          "itemsProperty": "turn.Activity.membersAdded",
+          "actions": [
+            {
+              "$type": "Microsoft.IfCondition",
+              "$designer": {
+                "id": "641773",
+                "name": "Branch: if/else"
+              },
+              "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)",
+              "actions": [
+                {
+                  "$type": "Microsoft.SendActivity",
+                  "activity": "@{help()}"
+                }
+              ]
+            }
+          ]
         }
-      ],
-      "$designer": {
-        "id": "690456"
-      }
+      ]
     },
     {
       "$type": "Microsoft.OnIntent",

diff --git a/...rver/assets/projects/AskingQuestionsSample/ComposerDialogs/NumberInput/NumberInput.dialog b/...rver/assets/projects/AskingQuestionsSample/ComposerDialogs/NumberInput/NumberInput.dialog
@@ -22,7 +22,7 @@
           "invalidPrompt": "Please input a number.",
           "maxTurnCount": 2,
           "alwaysPrompt": true,
-          "allowInterruptions": false,
+          "allowInterruptions": "false",
           "defaultLocale": "en-us"
         },
         {

diff --git a/...server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/Main/Main.dialog b/...server/assets/projects/ControllingConversationFlowSample/ComposerDialogs/Main/Main.dialog
@@ -173,15 +173,34 @@
         "name": "Greeting (ConversationUpdate)",
         "id": "791275"
       },
-      "condition": "toLower(turn.Activity.membersAdded[0].name) != 'bot'",
       "actions": [
         {
-          "$type": "Microsoft.SendActivity",
+          "$type": "Microsoft.Foreach",
           "$designer": {
-            "name": "Send an Activity",
-            "id": "859266"
+            "id": "518944",
+            "name": "Loop: for each item"
           },
-          "activity": "@{help()}"
+          "itemsProperty": "turn.Activity.membersAdded",
+          "actions": [
+            {
+              "$type": "Microsoft.IfCondition",
+              "$designer": {
+                "id": "641773",
+                "name": "Branch: if/else"
+              },
+              "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)",
+              "actions": [
+                {
+                  "$type": "Microsoft.SendActivity",
+                  "$designer": {
+                    "id": "859266",
+                    "name": "Send a response"
+                  },
+                  "activity": "@{help()}"
+                }
+              ]
+            }
+          ]
         }
       ]
     }

diff --git a/...ojects/ControllingConversationFlowSample/ComposerDialogs/RepeatDialog/RepeatDialog.dialog b/...ojects/ControllingConversationFlowSample/ComposerDialogs/RepeatDialog/RepeatDialog.dialog
@@ -22,7 +22,7 @@
           "unrecognizedPrompt": "I need a yes or no.",
           "maxTurnCount": 3,
           "alwaysPrompt": true,
-          "allowInterruptions": false,
+          "allowInterruptions": "false",
           "defaultLocale": "en-us",
           "style": "Auto",
           "choiceOptions": {

diff --git a/Composer/packages/server/assets/projects/EchoBot/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/EchoBot/ComposerDialogs/Main/Main.dialog
@@ -28,7 +28,26 @@
       "$designer": {
         "id": "376720"
       },
-      "condition": "toLower(turn.Activity.membersAdded[0].name) != 'bot'"
+      "actions": [
+        {
+          "$type": "Microsoft.Foreach",
+          "$designer": {
+            "id": "518944",
+            "name": "Loop: for each item"
+          },
+          "itemsProperty": "turn.Activity.membersAdded",
+          "actions": [
+            {
+              "$type": "Microsoft.IfCondition",
+              "$designer": {
+                "id": "641773",
+                "name": "Branch: if/else"
+              },
+              "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)"
+            }
+          ]
+        }
+      ]
     }
   ]
 }
diff --git a/Composer/packages/server/assets/projects/EmptyBot/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/EmptyBot/ComposerDialogs/Main/Main.dialog
@@ -5,14 +5,32 @@
     "description": "<Fill in the description of your bot here>"
   },
   "generator": "common.lg",
-  "recognizer": "Main.lu",
   "triggers": [
     {
       "$type": "Microsoft.OnConversationUpdateActivity",
       "$designer": {
         "id": "376720"
       },
-      "condition": "toLower(turn.Activity.membersAdded[0].name) != 'bot'"
+      "actions": [
+        {
+          "$type": "Microsoft.Foreach",
+          "$designer": {
+            "id": "518944",
+            "name": "Loop: for each item"
+          },
+          "itemsProperty": "turn.Activity.membersAdded",
+          "actions": [
+            {
+              "$type": "Microsoft.IfCondition",
+              "$designer": {
+                "id": "641773",
+                "name": "Branch: if/else"
+              },
+              "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)"
+            }
+          ]
+        }
+      ]
     }
   ]
 }
diff --git a/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/InterruptionSample/ComposerDialogs/Main/Main.dialog
@@ -15,15 +15,34 @@
         "id": "376720",
         "name": "Welcome user"
       },
-      "condition": "toLower(turn.Activity.membersAdded[0].name) != 'bot'",
       "actions": [
         {
-          "$type": "Microsoft.SendActivity",
+          "$type": "Microsoft.Foreach",
           "$designer": {
-            "name": "Send an Activity",
-            "id": "753396"
+            "id": "518944",
+            "name": "Loop: for each item"
           },
-          "activity": "@{bfdactivity-753396()}"
+          "itemsProperty": "turn.Activity.membersAdded",
+          "actions": [
+            {
+              "$type": "Microsoft.IfCondition",
+              "$designer": {
+                "id": "641773",
+                "name": "Branch: if/else"
+              },
+              "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)",
+              "actions": [
+                {
+                  "$type": "Microsoft.SendActivity",
+                  "$designer": {
+                    "id": "753396",
+                    "name": "Send a response"
+                  },
+                  "activity": "@{bfdactivity-753396()}"
+                }
+              ]
+            }
+          ]
         }
       ]
     },

diff --git a/Composer/packages/server/assets/projects/QnAMakerLUISSample/ComposerDialogs/Main/Main.dialog b/Composer/packages/server/assets/projects/QnAMakerLUISSample/ComposerDialogs/Main/Main.dialog
@@ -13,15 +13,34 @@
         "id": "376720",
         "name": "Welcome message"
       },
-      "condition": "toLower(turn.Activity.membersAdded[0].name) != 'bot'",
       "actions": [
         {
-          "$type": "Microsoft.SendActivity",
+          "$type": "Microsoft.Foreach",
           "$designer": {
-            "id": "266608",
-            "name": "Send a response"
+            "id": "518944",
+            "name": "Loop: for each item"
           },
-          "activity": "@{bfdactivity-266608()}"
+          "itemsProperty": "turn.Activity.membersAdded",
+          "actions": [
+            {
+              "$type": "Microsoft.IfCondition",
+              "$designer": {
+                "id": "641773",
+                "name": "Branch: if/else"
+              },
+              "condition": "string(dialog.foreach.value.id) != string(turn.Activity.Recipient.id)",
+              "actions": [
+                {
+                  "$type": "Microsoft.SendActivity",
+                  "$designer": {
+                    "id": "266608",
+                    "name": "Send a response"
+                  },
+                  "activity": "@{bfdactivity-266608()}"
+                }
+              ]
+            }
+          ]
         }
       ]
     },