Merge branch 'main' into lg-tablelist-bugfix

microsoft · Aug 20, 2020 · eaa1797 · eaa1797
2 parents 9d2b566 + 53ed501
commit eaa1797
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/Composer/packages/client/src/pages/design/DesignPage.tsx b/Composer/packages/client/src/pages/design/DesignPage.tsx
@@ -172,7 +172,7 @@ const DesignPage: React.FC<RouteComponentProps<{ dialogId: string; projectId: st
 
   useEffect(() => {
     const index = currentDialog.triggers.findIndex(({ type }) => type === SDKKinds.OnBeginDialog);
-    if (index >= 0 && !designPageLocation.selected) {
+    if (index >= 0 && !designPageLocation.selected && designPageLocation.projectId === projectId) {
       selectTo(createSelectedPath(index));
     }
   }, [currentDialog?.id]);

diff --git a/Composer/plugins/samples/assets/projects/AskingQuestionsSample/askingquestionssample.dialog b/Composer/plugins/samples/assets/projects/AskingQuestionsSample/askingquestionssample.dialog
@@ -65,7 +65,10 @@
               "actions": [
                 {
                   "$kind": "Microsoft.SendActivity",
-                  "activity": "${WelcomeUser()}"
+                  "$designer": {
+                    "id": "xh61dm"
+                  },
+                  "activity": "${SendActivity_xh61dm()}"
                 }
               ]
             }

diff --git a/...s/projects/AskingQuestionsSample/language-generation/en-us/askingquestionssample.en-us.lg b/...s/projects/AskingQuestionsSample/language-generation/en-us/askingquestionssample.en-us.lg
@@ -1,7 +1,9 @@
-[import](common.lg)
-
-# SendActivity_068558
--${WelcomeUser()}
-
-# SendActivity_581197
--${WelcomeUser()}
+[import](common.lg)
+
+# SendActivity_068558
+-${WelcomeUser()}
+
+# SendActivity_581197
+-${WelcomeUser()}
+# SendActivity_xh61dm()
+- ${WelcomeUser()}