From eacbbd17f97c87e8f28b26de8c4ef35644086b8a Mon Sep 17 00:00:00 2001
From: Soroush <sorgh@microsoft.com>
Date: Tue, 3 Nov 2020 11:01:56 -0800
Subject: [PATCH] Fix: form dialog view dialog action

---
 .../client/src/components/ProjectTree/ProjectTree.tsx       | 2 +-
 .../client/src/pages/form-dialog/FormDialogPage.tsx         | 6 +++---
 .../client/src/recoilModel/dispatchers/formDialogs.ts       | 5 +++--
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
index 038e2df623..31426a057c 100644
--- a/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
+++ b/Composer/packages/client/src/components/ProjectTree/ProjectTree.tsx
@@ -217,7 +217,7 @@ export const ProjectTree: React.FC<Props> = ({
   const doesLinkMatch = (linkInTree?: Partial<TreeLink>, selectedLink?: Partial<TreeLink>) => {
     if (linkInTree == null || selectedLink == null) return false;
     return (
-      linkInTree.skillId === selectedLink.skillId &&
+      (selectedLink.projectId === selectedLink.skillId || linkInTree.skillId === selectedLink.skillId) &&
       linkInTree.dialogId === selectedLink.dialogId &&
       linkInTree.trigger === selectedLink.trigger
     );
diff --git a/Composer/packages/client/src/pages/form-dialog/FormDialogPage.tsx b/Composer/packages/client/src/pages/form-dialog/FormDialogPage.tsx
index 943f073b14..ef7fb1f8e7 100644
--- a/Composer/packages/client/src/pages/form-dialog/FormDialogPage.tsx
+++ b/Composer/packages/client/src/pages/form-dialog/FormDialogPage.tsx
@@ -27,10 +27,10 @@ const EmptyView = styled(Stack)({
   opacity: 0.5,
 });
 
-type Props = RouteComponentProps<{ projectId: string; schemaId: string }>;
+type Props = RouteComponentProps<{ projectId: string; skillId: string; schemaId: string }>;
 
 const FormDialogPage: React.FC<Props> = React.memo((props: Props) => {
-  const { projectId = '', schemaId = '' } = props;
+  const { projectId = '', skillId = '', schemaId = '' } = props;
   const formDialogSchemaIds = useRecoilValue(formDialogSchemaIdsState(projectId));
   const formDialogLibraryTemplates = useRecoilValue(formDialogLibraryTemplatesState);
   const formDialogGenerationProgressing = useRecoilValue(formDialogGenerationProgressingState);
@@ -90,7 +90,7 @@ const FormDialogPage: React.FC<Props> = React.memo((props: Props) => {
   const viewDialog = React.useCallback(
     (schemaId: string) => {
       if (schemaId) {
-        navigateToGeneratedDialog({ projectId, schemaId });
+        navigateToGeneratedDialog({ projectId, skillId, schemaId });
       }
     },
     [navigateToGeneratedDialog, projectId]
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/formDialogs.ts b/Composer/packages/client/src/recoilModel/dispatchers/formDialogs.ts
index 65830803ab..5c6625bd00 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/formDialogs.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/formDialogs.ts
@@ -110,8 +110,9 @@ export const formDialogsDispatcher = () => {
     }
   );
 
-  const navigateToGeneratedDialog = ({ projectId, schemaId }) => {
-    navigate(`/bot/${projectId}/dialogs/${schemaId}`);
+  const navigateToGeneratedDialog = ({ projectId, skillId, schemaId }) => {
+    skillId = skillId || projectId;
+    navigate(`/bot/${projectId}/skill/${skillId}/dialogs/${schemaId}`);
   };
 
   const navigateToFormDialogSchema = ({ projectId, schemaId }) => {