From 20d115a1112b271cd1791a23379ecc8cf7edf111 Mon Sep 17 00:00:00 2001
From: zhixzhan <zhixzhan@microsoft.com>
Date: Wed, 21 Oct 2020 10:12:50 +0800
Subject: [PATCH 1/2] fix create from QnA maker

---
 .../client/src/components/CreationFlow/CreationFlow.tsx    | 6 ------
 .../client/src/recoilModel/dispatchers/utils/project.ts    | 7 +------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/Composer/packages/client/src/components/CreationFlow/CreationFlow.tsx b/Composer/packages/client/src/components/CreationFlow/CreationFlow.tsx
index 7a8bba7b38..49901cbf34 100644
--- a/Composer/packages/client/src/components/CreationFlow/CreationFlow.tsx
+++ b/Composer/packages/client/src/components/CreationFlow/CreationFlow.tsx
@@ -129,12 +129,6 @@ const CreationFlow: React.FC<CreationFlowProps> = () => {
   };
 
   const handleDefineConversationSubmit = async (formData, templateId: string) => {
-    // If selected template is qnaSample then route to QNA import modal
-    if (templateId === 'QnASample') {
-      setFormData(formData);
-      navigate(`./QnASample/importQnA`);
-      return;
-    }
     // If selected template is vaCore then route to VA Customization modal
     if (templateId === 'va-core') {
       setFormData(formData);
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts b/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts
index e0bffa6dd2..3ee3e45253 100644
--- a/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts
+++ b/Composer/packages/client/src/recoilModel/dispatchers/utils/project.ts
@@ -145,12 +145,7 @@ export const navigateToBot = (
   if (projectId) {
     const { set } = callbackHelpers;
     set(currentProjectIdState, projectId);
-    let url = `/bot/${projectId}/dialogs/${mainDialog}`;
-    if (templateId === QnABotTemplateId) {
-      url = `/bot/${projectId}/knowledge-base/${mainDialog}`;
-      navigateTo(url, { state: { qnaKbUrls } });
-      return;
-    }
+    const url = `/bot/${projectId}/dialogs/${mainDialog}`;
     navigateTo(url);
   }
 };

From ddbfcb47881623c952f517dbac6e5a4fab03233c Mon Sep 17 00:00:00 2001
From: zhixzhan <zhixzhan@microsoft.com>
Date: Wed, 21 Oct 2020 10:56:21 +0800
Subject: [PATCH 2/2] typo

---
 Composer/packages/client/src/pages/design/DesignPage.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Composer/packages/client/src/pages/design/DesignPage.tsx b/Composer/packages/client/src/pages/design/DesignPage.tsx
index 9947337650..5ce9e9cf5f 100644
--- a/Composer/packages/client/src/pages/design/DesignPage.tsx
+++ b/Composer/packages/client/src/pages/design/DesignPage.tsx
@@ -690,7 +690,7 @@ const DesignPage: React.FC<RouteComponentProps<{ dialogId: string; projectId: st
             onSubmit={onTriggerCreationSubmit}
           />
         )}
-        <CreateQnAModal dialogId={dialogId} projectId={projectId} qnaFiles={qnaFiles} onSubmit={handleCreateQnA} />)
+        <CreateQnAModal dialogId={dialogId} projectId={projectId} qnaFiles={qnaFiles} onSubmit={handleCreateQnA} />
         {displaySkillManifest && (
           <DisplayManifestModal
             manifestId={displaySkillManifest}