Merge pull request #331 from actiontech/fix/sql-order

Fix/sql order
actiontech · Nov 7, 2023 · 7fa7720 · 7fa7720
2 parents 80d9869 + c2cb6b9
commit 7fa7720
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 3 deletions.
diff --git a/src/page/Order/AuditResult/__test__/__snapshots__/AuditResultCollection.test.tsx.snap b/src/page/Order/AuditResult/__test__/__snapshots__/AuditResultCollection.test.tsx.snap
@@ -125,6 +125,7 @@ exports[`test AuditResultCollection should be show overview tab when showOvervie
             >
               <div
                 class="ant-card ant-card-bordered"
+                id="audit-result-task-card"
               >
                 <div
                   class="ant-card-head"
@@ -2504,6 +2505,7 @@ exports[`test AuditResultCollection should match snapshot when getSummaryOfInsta
             >
               <div
                 class="ant-card ant-card-bordered"
+                id="audit-result-task-card"
               >
                 <div
                   class="ant-card-head"
@@ -4316,6 +4318,7 @@ exports[`test AuditResultCollection should match snapshot when showOverview is e
             >
               <div
                 class="ant-card ant-card-bordered"
+                id="audit-result-task-card"
               >
                 <div
                   class="ant-card-head"

diff --git a/src/page/Order/AuditResult/__test__/__snapshots__/index.test.tsx.snap b/src/page/Order/AuditResult/__test__/__snapshots__/index.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`Order/Detail/AuditResult should get task sql info when pass task id int
 <div>
   <div
     class="ant-card ant-card-bordered"
+    id="audit-result-task-card"
   >
     <div
       class="ant-card-head"
@@ -629,6 +630,7 @@ exports[`Order/Detail/AuditResult should get task sql info when pass task id int
 <div>
   <div
     class="ant-card ant-card-bordered"
+    id="audit-result-task-card"
   >
     <div
       class="ant-card-head"

diff --git a/src/page/Order/AuditResult/index.tsx b/src/page/Order/AuditResult/index.tsx
@@ -159,7 +159,7 @@ const AuditResult: React.FC<AuditResultProps> = (props) => {
   }, [pagination, filterInfo, duplicate, props.taskId, getAuditTaskSql]);
 
   return (
-    <Card {...cardProps}>
+    <Card {...cardProps} id="audit-result-task-card">
       <AuditResultFilterForm
         form={filterForm}
         submit={submitFilter}

diff --git a/src/page/Order/Create/__snapshots__/index.test.tsx.snap b/src/page/Order/Create/__snapshots__/index.test.tsx.snap
@@ -925,6 +925,7 @@ exports[`Order/Create should audit sql when user click audit button 1`] = `
                   >
                     <div
                       class="ant-card ant-card-bordered"
+                      id="audit-result-task-card"
                     >
                       <div
                         class="ant-card-head"
@@ -3693,6 +3694,7 @@ exports[`Order/Create should audit sql when user click audit button 2`] = `
                   >
                     <div
                       class="ant-card ant-card-bordered"
+                      id="audit-result-task-card"
                     >
                       <div
                         class="ant-card-head"

diff --git a/src/page/Order/Create/index.test.tsx b/src/page/Order/Create/index.test.tsx
@@ -352,6 +352,8 @@ describe('Order/Create', () => {
 
     await act(async () => jest.advanceTimersByTime(3000));
 
+    await act(async () => jest.advanceTimersByTime(3000));
+
     fireEvent.input(screen.getByLabelText('order.sqlInfo.sql'), {
       target: { value: 'select * from table3' },
     });

diff --git a/src/page/Order/Create/index.tsx b/src/page/Order/Create/index.tsx
@@ -83,9 +83,13 @@ const CreateOrder = () => {
       currentTabKey: string
     ) => {
       if (values.isSameSqlOrder) {
-        auditOrderWithSameSql(values);
+        return auditOrderWithSameSql(values);
       } else {
-        auditOrderWthDifferenceSql(values, currentTabIndex, currentTabKey);
+        return auditOrderWthDifferenceSql(
+          values,
+          currentTabIndex,
+          currentTabKey
+        );
       }
     },
     [auditOrderWithSameSql, auditOrderWthDifferenceSql]

diff --git a/src/page/Order/Detail/__snapshots__/index.test.tsx.snap b/src/page/Order/Detail/__snapshots__/index.test.tsx.snap
@@ -992,6 +992,7 @@ exports[`Order/Detail should get new sql audit result when update audit sql 1`]
                       >
                         <div
                           class="ant-card ant-card-bordered"
+                          id="audit-result-task-card"
                         >
                           <div
                             class="ant-card-head"
@@ -3947,6 +3948,7 @@ exports[`Order/Detail should update order when click update order button 1`] = `
                       >
                         <div
                           class="ant-card ant-card-bordered"
+                          id="audit-result-task-card"
                         >
                           <div
                             class="ant-card-head"

diff --git a/src/page/SqlAuditRecord/Create/index.tsx b/src/page/SqlAuditRecord/Create/index.tsx
@@ -33,6 +33,16 @@ const SQLAuditCreate: React.FC = () => {
   const baseRef = useRef<BaseInfoFormRef>(null);
   const sqlInfoRef = useRef<SQLInfoFormRef>(null);
 
+  const scrollToAuditResult = () => {
+    const auditResultCardElement = document.getElementById(
+      'audit-result-task-card'
+    );
+    auditResultCardElement?.scrollIntoView({
+      behavior: 'smooth',
+      block: 'end',
+    });
+  };
+
   const auditSQL: SQLInfoFormProps['submit'] = async (values) => {
     const baseValues = await baseForm.validateFields();
     const params: ICreateSQLAuditRecordV1Params = {
@@ -56,6 +66,7 @@ const SQLAuditCreate: React.FC = () => {
         } else {
           setTask(res.data.data.task);
           message.success(t('sqlAudit.create.SQLInfo.successTips'));
+          scrollToAuditResult();
         }
       }
     });
@@ -75,13 +86,15 @@ const SQLAuditCreate: React.FC = () => {
         if (res.data.code === ResponseCode.SUCCESS) {
           setTask(record.task);
           message.success(t('sqlAudit.create.SQLInfo.successTips'));
+          scrollToAuditResult();
         }
       });
   };
 
   const resetForm = () => {
     baseRef.current?.reset();
     sqlInfoRef.current?.reset();
+    setTask(undefined);
   };
 
   return (