Merge pull request #334 from actiontech/fix/issue-2031

fix: fix uploadType reset bug
actiontech · Nov 16, 2023 · d049e9b · d049e9b
2 parents 3f5613a + b5774ba
commit d049e9b
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/src/data/EmitterKey.ts b/src/data/EmitterKey.ts
@@ -10,6 +10,8 @@ enum EmitterKey {
 
   Reset_Create_Order_Form = 'RESET_CREATE_ORDER_FORM',
 
+  Reset_Upload_Type_Content = 'RESET_UPLOAD_TYPE_CONTENT',
+
   Reset_Test_Data_Source_Connect = 'RESET_TEST_DATA_SOURCE_CONNECT',
 
   Reset_Workflow_Template_Form = 'RESET_WORKFLOW_TEMPLATE_FORM',

diff --git a/src/page/Order/Create/SqlInfoForm/index.tsx b/src/page/Order/Create/SqlInfoForm/index.tsx
@@ -54,7 +54,7 @@ const SqlInfoForm: React.FC<SqlInfoFormProps> = (props) => {
     useBoolean();
   const [connectErrorMessage, setConnectErrorMessage] = useState<string[]>([]);
   const [changeSqlModeDisabled, setChangeSqlModeDisabled] = useState(false);
-
+  
   const instanceNameList = useMemo(() => {
     return Array.from(instanceNames).map(([_, name]) => name ?? '');
   }, [instanceNames]);
@@ -231,6 +231,7 @@ const SqlInfoForm: React.FC<SqlInfoFormProps> = (props) => {
       setInstanceNames(new Map([[0, '']]));
       setConnectInitHideTrue();
       setCurrentSqlMode(WorkflowResV2ModeEnum.same_sqls);
+      EventEmitter.emit(EmitterKey.Reset_Upload_Type_Content);
     };
     EventEmitter.subscribe(
       EmitterKey.Reset_Create_Order_Form,

diff --git a/src/page/Order/Create/index.test.tsx b/src/page/Order/Create/index.test.tsx
@@ -304,8 +304,9 @@ describe('Order/Create', () => {
     const emitSpy = jest.spyOn(EventEmitter, 'emit');
     fireEvent.click(screen.getByText('common.resetAndClose'));
 
-    expect(emitSpy).toBeCalledTimes(1);
+    expect(emitSpy).toBeCalledTimes(2);
     expect(emitSpy).toBeCalledWith(EmitterKey.Reset_Create_Order_Form);
+    expect(emitSpy).toBeCalledWith(EmitterKey.Reset_Upload_Type_Content);
     expect(getBySelector('.ant-modal-wrap')).toHaveStyle('display: none');
     expect(screen.getByLabelText('order.baseInfo.name')).toHaveValue('');
   });

diff --git a/src/page/Order/SqlStatementFormTabs/SqlStatementForm.tsx b/src/page/Order/SqlStatementFormTabs/SqlStatementForm.tsx
@@ -9,6 +9,8 @@ import useChangeTheme from '../../../hooks/useChangeTheme';
 import useMonacoEditor from '../../../hooks/useMonacoEditor';
 import useStyles from '../../../theme';
 import { getFileFromUploadChangeEvent } from '../../../utils/Common';
+import EmitterKey from '../../../data/EmitterKey';
+import EventEmitter from '../../../utils/EventEmitter';
 
 const MonacoEditorFunComponent =
   MonacoEditor as ComponentType<MonacoEditorProps>;
@@ -54,6 +56,10 @@ const SqlStatementForm: React.FC<SqlStatementFormProps> = ({
     return [fieldName ?? '0', name];
   };
 
+  const resetUploadTypeContent = () => {
+    setCurrentSQLInputTYpe(SQLInputType.manualInput);
+  }
+
   const { editorDidMount } = useMonacoEditor(form, {
     formName: generateFieldName('sql'),
   });
@@ -68,6 +74,22 @@ const SqlStatementForm: React.FC<SqlStatementFormProps> = ({
     }
   }, [fieldName, form, sqlStatement]);
 
+  useEffect(() => {
+    EventEmitter.subscribe(
+      EmitterKey.Reset_Upload_Type_Content,
+      resetUploadTypeContent
+    );
+
+    return () => {
+      EventEmitter.unsubscribe(
+        EmitterKey.Reset_Upload_Type_Content,
+        resetUploadTypeContent
+      );
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [])
+
+
   return (
     <>
       <Form.Item