always show "create from scratch" button in "from url modal" (#4662)

Co-authored-by: Dong Lei <donglei@microsoft.com>
microsoft · Nov 4, 2020 · 365d837 · 365d837
1 parent 22882eb
commit 365d837
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 35 deletions.
diff --git a/Composer/packages/client/__tests__/components/createQnAModal.test.tsx b/Composer/packages/client/__tests__/components/createQnAModal.test.tsx
@@ -6,7 +6,7 @@ import { fireEvent } from '@botframework-composer/test-utils';
 
 import { renderWithRecoil } from '../testUtils/renderWithRecoil';
 import CreateQnAFromUrlModal from '../../src/components/QnA/CreateQnAFromUrlModal';
-import { showCreateQnAFromUrlDialogState, showCreateQnAFromUrlDialogWithScratchState } from '../../src/recoilModel';
+import { showCreateQnAFromUrlDialogState } from '../../src/recoilModel';
 
 describe('<CreateQnAFromUrlModal />', () => {
   const onDismiss = jest.fn(() => {});
@@ -24,7 +24,6 @@ describe('<CreateQnAFromUrlModal />', () => {
       />,
       ({ set }) => {
         set(showCreateQnAFromUrlDialogState(projectId), true);
-        set(showCreateQnAFromUrlDialogWithScratchState(projectId), true);
       }
     );
 

diff --git a/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx b/Composer/packages/client/src/components/QnA/CreateQnAFromUrlModal.tsx
@@ -14,11 +14,7 @@ import { PrimaryButton, DefaultButton } from 'office-ui-fabric-react/lib/Button'
 import { Link } from 'office-ui-fabric-react/lib/Link';
 
 import { FieldConfig, useForm } from '../../hooks/useForm';
-import {
-  dispatcherState,
-  onCreateQnAFromUrlDialogCompleteState,
-  showCreateQnAFromUrlDialogWithScratchState,
-} from '../../recoilModel';
+import { dispatcherState, onCreateQnAFromUrlDialogCompleteState } from '../../recoilModel';
 
 import {
   knowledgeBaseSourceUrl,
@@ -67,7 +63,6 @@ export const CreateQnAFromUrlModal: React.FC<CreateQnAFromModalProps> = (props)
   const { onDismiss, onSubmit, dialogId, projectId, qnaFiles } = props;
   const actions = useRecoilValue(dispatcherState);
   const onComplete = useRecoilValue(onCreateQnAFromUrlDialogCompleteState(projectId));
-  const showWithScratch = useRecoilValue(showCreateQnAFromUrlDialogWithScratchState(projectId));
 
   formConfig.name.validate = validateName(qnaFiles);
   const { formData, updateField, hasErrors, formErrors } = useForm(formConfig);
@@ -123,17 +118,15 @@ export const CreateQnAFromUrlModal: React.FC<CreateQnAFromModalProps> = (props)
         </Stack>
       </div>
       <DialogFooter>
-        {showWithScratch && (
-          <DefaultButton
-            data-testid={'createKnowledgeBaseFromScratch'}
-            styles={{ root: { float: 'left' } }}
-            text={formatMessage('Create knowledge base from scratch')}
-            onClick={() => {
-              // switch to create from scratch flow, pass onComplete callback.
-              actions.createQnAFromScratchDialogBegin({ projectId, onComplete: onComplete?.func });
-            }}
-          />
-        )}
+        <DefaultButton
+          data-testid={'createKnowledgeBaseFromScratch'}
+          styles={{ root: { float: 'left' } }}
+          text={formatMessage('Create knowledge base from scratch')}
+          onClick={() => {
+            // switch to create from scratch flow, pass onComplete callback.
+            actions.createQnAFromScratchDialogBegin({ projectId, onComplete: onComplete?.func });
+          }}
+        />
         <DefaultButton
           text={formatMessage('Cancel')}
           onClick={() => {

diff --git a/Composer/packages/client/src/pages/design/DesignPage.tsx b/Composer/packages/client/src/pages/design/DesignPage.tsx
@@ -329,7 +329,6 @@ const DesignPage: React.FC<RouteComponentProps<{ dialogId: string; projectId: st
             onClick: () => {
               createQnAFromUrlDialogBegin({
                 projectId,
-                showFromScratch: true,
               });
             },
           },

diff --git a/Composer/packages/client/src/pages/knowledge-base/QnAPage.tsx b/Composer/packages/client/src/pages/knowledge-base/QnAPage.tsx
@@ -66,7 +66,7 @@ const QnAPage: React.FC<QnAPageProps> = (props) => {
             key: 'Create KB from URL or file',
             onClick: () => {
               setCreateOnDialogId(dialog.id);
-              actions.createQnAFromUrlDialogBegin({ projectId, showFromScratch: false });
+              actions.createQnAFromUrlDialogBegin({ projectId });
             },
           },
         ],

diff --git a/Composer/packages/client/src/pages/knowledge-base/table-view.tsx b/Composer/packages/client/src/pages/knowledge-base/table-view.tsx
@@ -769,7 +769,7 @@ const TableView: React.FC<TableViewProps> = (props) => {
             data-testid={'createKnowledgeBase'}
             text={formatMessage('Create new KB')}
             onClick={() => {
-              actions.createQnAFromUrlDialogBegin({ projectId, showFromScratch: true });
+              actions.createQnAFromUrlDialogBegin({ projectId });
             }}
           />
         </div>

diff --git a/Composer/packages/client/src/recoilModel/atoms/botState.ts b/Composer/packages/client/src/recoilModel/atoms/botState.ts
@@ -295,11 +295,6 @@ export const showCreateQnAFromUrlDialogState = atomFamily<boolean, string>({
   default: false,
 });
 
-export const showCreateQnAFromUrlDialogWithScratchState = atomFamily<boolean, string>({
-  key: getFullyQualifiedKey('showCreateQnAFromUrlDialogWithScratch'),
-  default: false,
-});
-
 export const showCreateQnAFromScratchDialogState = atomFamily<boolean, string>({
   key: getFullyQualifiedKey('showCreateQnAFromScratchDialog'),
   default: false,

diff --git a/Composer/packages/client/src/recoilModel/dispatchers/qna.ts b/Composer/packages/client/src/recoilModel/dispatchers/qna.ts
@@ -12,7 +12,6 @@ import {
   settingsState,
   showCreateQnAFromScratchDialogState,
   showCreateQnAFromUrlDialogState,
-  showCreateQnAFromUrlDialogWithScratchState,
   onCreateQnAFromScratchDialogCompleteState,
   onCreateQnAFromUrlDialogCompleteState,
 } from '../atoms/botState';
@@ -203,18 +202,11 @@ export const qnaDispatcher = () => {
     ({ set }: CallbackInterface) => async ({
       onComplete,
       projectId,
-      showFromScratch,
     }: {
       onComplete?: () => void;
-      showFromScratch: boolean;
       projectId: string;
     }) => {
       set(showCreateQnAFromUrlDialogState(projectId), true);
-      if (showFromScratch) {
-        set(showCreateQnAFromUrlDialogWithScratchState(projectId), true);
-      } else {
-        set(showCreateQnAFromUrlDialogWithScratchState(projectId), false);
-      }
       set(onCreateQnAFromUrlDialogCompleteState(projectId), { func: onComplete });
     }
   );