From 53c26bbd15ee45e4922c848cfcdf59211394e21a Mon Sep 17 00:00:00 2001
From: LZS911 <932177767@qq.com>
Date: Tue, 20 Aug 2024 15:46:51 +0800
Subject: [PATCH 1/2] [chore]: modify table row key and remove redundant
 components

---
 .../SqlStatusFilterContainer/index.tsx        | 36 ---------
 .../SqlStatusFilterContainer/index.type.ts    |  6 --
 .../SqlStatusFilterContainer/style.ts         | 77 -------------------
 .../__snapshots__/index.test.tsx.snap         | 32 ++++----
 .../Detail/ScanTypeSqlCollection/indx.tsx     |  2 +-
 .../mockApi/instanceAuditPlan/data.ts         |  6 ++
 6 files changed, 20 insertions(+), 139 deletions(-)
 delete mode 100644 packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/index.tsx
 delete mode 100644 packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/index.type.ts
 delete mode 100644 packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/style.ts

diff --git a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/index.tsx b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/index.tsx
deleted file mode 100644
index 15af3347f..000000000
--- a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/index.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-import { BasicButton, CustomSegmentedFilter } from '@actiontech/shared';
-import { SqlStatusFilterContainerStyleWrapper } from './style';
-import { SqlStatusFilterContainerProps } from './index.type';
-import { useTranslation } from 'react-i18next';
-import { formatTime } from '@actiontech/shared/lib/utils/Common';
-
-const SqlStatusFilterContainer: React.FC<SqlStatusFilterContainerProps> = ({
-  auditAction,
-  lastAuditTime,
-  ...filterProps
-}) => {
-  const { t } = useTranslation();
-  return (
-    <SqlStatusFilterContainerStyleWrapper>
-      <CustomSegmentedFilter
-        {...filterProps}
-        noStyle
-        className="sql-status-filter-option"
-      />
-
-      <div className="sql-status-filter-extra">
-        <BasicButton onClick={auditAction} type="primary">
-          {t('managementConf.detail.scanTypeSqlCollection.action.urgentAudit')}
-        </BasicButton>
-        <div className="sql-status-filter-extra-tips">
-          {t(
-            'managementConf.detail.scanTypeSqlCollection.action.lastAuditTime',
-            { time: formatTime(lastAuditTime, '-') }
-          )}
-        </div>
-      </div>
-    </SqlStatusFilterContainerStyleWrapper>
-  );
-};
-
-export default SqlStatusFilterContainer;
diff --git a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/index.type.ts b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/index.type.ts
deleted file mode 100644
index 884483e6f..000000000
--- a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/index.type.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { CustomSegmentedFilterProps } from '@actiontech/shared/lib/components/CustomSegmentedFilter/index.type';
-
-export type SqlStatusFilterContainerProps = {
-  auditAction: () => void;
-  lastAuditTime: string;
-} & CustomSegmentedFilterProps<string>;
diff --git a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/style.ts b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/style.ts
deleted file mode 100644
index 030fa12fe..000000000
--- a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/SqlStatusFilterContainer/style.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import { styled } from '@mui/material';
-
-export const SqlStatusFilterContainerStyleWrapper = styled('div')`
-  padding: 24px 40px;
-  border-bottom: 1px solid
-    ${({ theme }) => theme.sharedTheme.uiToken.colorBorderSecondary};
-  display: flex;
-  justify-content: space-between;
-  align-items: center;
-
-  & .sql-status-filter-option {
-    display: flex;
-
-    .custom-segmented-filter-item {
-      &:not(:last-of-type) {
-        margin-right: 8px;
-      }
-
-      cursor: pointer;
-      display: flex;
-      padding: 8px 16px;
-      justify-content: center;
-      border-radius: 4px;
-      background: ${({ theme }) => theme.sharedTheme.uiToken.colorFillTertiary};
-      transition: background-color 0.3s ease-out;
-      transition: color 0.3s ease-out;
-      min-width: 100px;
-
-      .sql-status-filter-item-wrapper {
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-
-        .sql-status-filter-number {
-          font-weight: 900;
-          font-size: 16px;
-          color: ${({ theme }) => theme.sharedTheme.uiToken.colorTextSecondary};
-          margin-bottom: 8px;
-          text-align: center;
-        }
-
-        .sql-status-filter-text {
-          font-size: 12px;
-          color: ${({ theme }) => theme.sharedTheme.uiToken.colorTextTertiary};
-        }
-      }
-    }
-
-    .custom-segmented-filter-item-checked {
-      background: ${({ theme }) =>
-        theme.sharedTheme.basic.colorPrimaryBgActive};
-
-      .sql-status-filter-item-wrapper {
-        .sql-status-filter-number {
-          color: ${({ theme }) => theme.sharedTheme.uiToken.colorPrimary};
-        }
-
-        .sql-status-filter-text {
-          color: ${({ theme }) => theme.sharedTheme.uiToken.colorPrimary};
-        }
-      }
-    }
-  }
-
-  & .sql-status-filter-extra {
-    display: flex;
-    flex-direction: column;
-    align-items: end;
-
-    .sql-status-filter-extra-tips {
-      position: relative;
-      margin-top: 8px;
-      font-size: 12px;
-      color: ${({ theme }) => theme.sharedTheme.uiToken.colorTextTertiary};
-    }
-  }
-`;
diff --git a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/__tests__/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/__tests__/__snapshots__/index.test.tsx.snap
index 5bbfe4581..3a9742731 100644
--- a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/__tests__/__snapshots__/index.test.tsx.snap
+++ b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/__tests__/__snapshots__/index.test.tsx.snap
@@ -1077,8 +1077,7 @@ exports[`test ScanTypeSqlCollection should match snapshot 2`] = `
                     </tr>
                     <tr
                       class="ant-table-row ant-table-row-level-0"
-                      data-row-key="/* ApplicationName=DBeaver 24.1.2 - SQLEditor <Console> */ select 1,SLEEP(11)
-LIMIT 0, 200"
+                      data-row-key="1"
                     >
                       <td
                         class="ant-table-cell ellipsis-column-large-width"
@@ -1266,8 +1265,7 @@ LIMIT
                     </tr>
                     <tr
                       class="ant-table-row ant-table-row-level-0"
-                      data-row-key="/* ApplicationName=DBeaver 24.1.2 - SQLEditor <Console> */ select 1,1,1,1,1,SLEEP(11)
-LIMIT 0, 200"
+                      data-row-key="12"
                     >
                       <td
                         class="ant-table-cell ellipsis-column-large-width"
@@ -1479,8 +1477,7 @@ LIMIT
                     </tr>
                     <tr
                       class="ant-table-row ant-table-row-level-0"
-                      data-row-key="/* ApplicationName=DBeaver 24.1.2 - SQLEditor <Console> */ SELECT SLEEP(11) 
-LIMIT 0, 200"
+                      data-row-key="123"
                     >
                       <td
                         class="ant-table-cell ellipsis-column-large-width"
@@ -1662,7 +1659,7 @@ LIMIT
                     </tr>
                     <tr
                       class="ant-table-row ant-table-row-level-0"
-                      data-row-key="Prepare"
+                      data-row-key="1234"
                     >
                       <td
                         class="ant-table-cell ellipsis-column-large-width"
@@ -1823,7 +1820,7 @@ LIMIT
                     </tr>
                     <tr
                       class="ant-table-row ant-table-row-level-0"
-                      data-row-key="COMMIT"
+                      data-row-key="12345"
                     >
                       <td
                         class="ant-table-cell ellipsis-column-large-width"
@@ -1979,7 +1976,7 @@ LIMIT
                     </tr>
                     <tr
                       class="ant-table-row ant-table-row-level-0"
-                      data-row-key="INSERT INTO \`audit_plan_sqls_v2\` (\`audit_plan_id\`,\`fingerprint_md5\`, \`fingerprint\`, \`sql_content\`, \`info\`, \`schema\`) VALUES (3, 'a62860c563df5399c2acb800673ae715', 'CREATE TABLE \`audit_files\` (\\n  \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT,\\n  \`created_at\` datetime DEFAULT CURRENT_TIMESTAMP,\\n  \`updated_at\` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\\n  \`deleted_at\` datetime DEFAULT NULL,\\n  \`task_id\` int(10) unsigned DEFAULT NULL,\\n  \`unique_name\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,\\n  \`file_host\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,\\n  \`file_name\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,\\n  PRIMARY KEY (\`id\`)"
+                      data-row-key="123456"
                     >
                       <td
                         class="ant-table-cell ellipsis-column-large-width"
@@ -3230,8 +3227,7 @@ exports[`test ScanTypeSqlCollection should open report drawer and set current au
                       </tr>
                       <tr
                         class="ant-table-row ant-table-row-level-0"
-                        data-row-key="/* ApplicationName=DBeaver 24.1.2 - SQLEditor <Console> */ select 1,SLEEP(11)
-LIMIT 0, 200"
+                        data-row-key="1"
                       >
                         <td
                           class="ant-table-cell ellipsis-column-large-width"
@@ -3419,8 +3415,7 @@ LIMIT
                       </tr>
                       <tr
                         class="ant-table-row ant-table-row-level-0"
-                        data-row-key="/* ApplicationName=DBeaver 24.1.2 - SQLEditor <Console> */ select 1,1,1,1,1,SLEEP(11)
-LIMIT 0, 200"
+                        data-row-key="12"
                       >
                         <td
                           class="ant-table-cell ellipsis-column-large-width"
@@ -3632,8 +3627,7 @@ LIMIT
                       </tr>
                       <tr
                         class="ant-table-row ant-table-row-level-0"
-                        data-row-key="/* ApplicationName=DBeaver 24.1.2 - SQLEditor <Console> */ SELECT SLEEP(11) 
-LIMIT 0, 200"
+                        data-row-key="123"
                       >
                         <td
                           class="ant-table-cell ellipsis-column-large-width"
@@ -3815,7 +3809,7 @@ LIMIT
                       </tr>
                       <tr
                         class="ant-table-row ant-table-row-level-0"
-                        data-row-key="Prepare"
+                        data-row-key="1234"
                       >
                         <td
                           class="ant-table-cell ellipsis-column-large-width"
@@ -3976,7 +3970,7 @@ LIMIT
                       </tr>
                       <tr
                         class="ant-table-row ant-table-row-level-0"
-                        data-row-key="COMMIT"
+                        data-row-key="12345"
                       >
                         <td
                           class="ant-table-cell ellipsis-column-large-width"
@@ -4132,7 +4126,7 @@ LIMIT
                       </tr>
                       <tr
                         class="ant-table-row ant-table-row-level-0"
-                        data-row-key="INSERT INTO \`audit_plan_sqls_v2\` (\`audit_plan_id\`,\`fingerprint_md5\`, \`fingerprint\`, \`sql_content\`, \`info\`, \`schema\`) VALUES (3, 'a62860c563df5399c2acb800673ae715', 'CREATE TABLE \`audit_files\` (\\n  \`id\` int(10) unsigned NOT NULL AUTO_INCREMENT,\\n  \`created_at\` datetime DEFAULT CURRENT_TIMESTAMP,\\n  \`updated_at\` datetime DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,\\n  \`deleted_at\` datetime DEFAULT NULL,\\n  \`task_id\` int(10) unsigned DEFAULT NULL,\\n  \`unique_name\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,\\n  \`file_host\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,\\n  \`file_name\` varchar(255) COLLATE utf8mb4_unicode_ci DEFAULT NULL,\\n  PRIMARY KEY (\`id\`)"
+                        data-row-key="123456"
                       >
                         <td
                           class="ant-table-cell ellipsis-column-large-width"
@@ -4531,7 +4525,7 @@ LIMIT
                 class="ant-drawer-extra"
               >
                 <a
-                  href="/sqle/project/700300/sql-management-conf/1/analyze/undefined"
+                  href="/sqle/project/700300/sql-management-conf/1/analyze/1"
                   target="blank"
                 >
                   <button
diff --git a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/indx.tsx b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/indx.tsx
index 74980d49b..abac3af65 100644
--- a/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/indx.tsx
+++ b/packages/sqle/src/page/SqlManagementConf/Detail/ScanTypeSqlCollection/indx.tsx
@@ -281,7 +281,7 @@ const ScanTypeSqlCollection: React.FC<ScanTypeSqlCollectionProps> = ({
 
       {messageContextHolder}
       <ActiontechTable
-        rowKey={(record) => record.sql}
+        rowKey="id"
         setting={tableSetting}
         errorMessage={getTableRowError && getErrorMessage(getTableRowError)}
         loading={getFilterMetaListLoading || getTableRowLoading}
diff --git a/packages/sqle/src/testUtils/mockApi/instanceAuditPlan/data.ts b/packages/sqle/src/testUtils/mockApi/instanceAuditPlan/data.ts
index c1a0149f1..98f0dc1bd 100644
--- a/packages/sqle/src/testUtils/mockApi/instanceAuditPlan/data.ts
+++ b/packages/sqle/src/testUtils/mockApi/instanceAuditPlan/data.ts
@@ -723,6 +723,7 @@ export const mockAuditPlanSQLMeta: IAuditPlanSQLMetaResV1 = {
 export const mockAuditPlanSQLData: IAuditPlanSQLDataResV1 = {
   rows: [
     {
+      id: '1',
       audit_results: 'null',
       counter: '598',
       db_user: '',
@@ -735,6 +736,7 @@ export const mockAuditPlanSQLData: IAuditPlanSQLDataResV1 = {
       sql: '/* ApplicationName=DBeaver 24.1.2 - SQLEditor \u003cConsole\u003e */ select 1,SLEEP(11)\nLIMIT 0, 200'
     },
     {
+      id: '12',
       audit_results: 'null',
       counter: '299',
       db_user: '',
@@ -747,6 +749,7 @@ export const mockAuditPlanSQLData: IAuditPlanSQLDataResV1 = {
       sql: '/* ApplicationName=DBeaver 24.1.2 - SQLEditor \u003cConsole\u003e */ select 1,1,1,1,1,SLEEP(11)\nLIMIT 0, 200'
     },
     {
+      id: '123',
       audit_results: 'null',
       counter: '299',
       db_user: '',
@@ -759,6 +762,7 @@ export const mockAuditPlanSQLData: IAuditPlanSQLDataResV1 = {
       sql: '/* ApplicationName=DBeaver 24.1.2 - SQLEditor \u003cConsole\u003e */ SELECT SLEEP(11) \nLIMIT 0, 200'
     },
     {
+      id: '1234',
       audit_results:
         '[{"level": "warn", "message": "语法错误或者解析器不支持，请人工确认SQL正确性", "rule_name": ""}]',
       counter: '2388',
@@ -772,6 +776,7 @@ export const mockAuditPlanSQLData: IAuditPlanSQLDataResV1 = {
       sql: 'Prepare'
     },
     {
+      id: '12345',
       audit_results: 'null',
       counter: '8559',
       db_user: '',
@@ -784,6 +789,7 @@ export const mockAuditPlanSQLData: IAuditPlanSQLDataResV1 = {
       sql: 'COMMIT'
     },
     {
+      id: '123456',
       audit_results: 'null',
       counter: '299',
       db_user: '',

From fbfd65eba67e4500adefa641f41da2320ce77637 Mon Sep 17 00:00:00 2001
From: LZS911 <932177767@qq.com>
Date: Tue, 20 Aug 2024 16:22:59 +0800
Subject: [PATCH 2/2] [test]: update unit tests

---
 .../Update/__tests__/index.test.tsx           | 90 +++++++------------
 1 file changed, 32 insertions(+), 58 deletions(-)

diff --git a/packages/sqle/src/page/SqlManagementConf/Update/__tests__/index.test.tsx b/packages/sqle/src/page/SqlManagementConf/Update/__tests__/index.test.tsx
index 5efa6824b..49f3d31c7 100644
--- a/packages/sqle/src/page/SqlManagementConf/Update/__tests__/index.test.tsx
+++ b/packages/sqle/src/page/SqlManagementConf/Update/__tests__/index.test.tsx
@@ -119,13 +119,7 @@ describe('test sqle/SqlManagementConf/Update', () => {
   it('render update audit plan', async () => {
     const { baseElement } = superRender(<UpdateSqlManagementConf />);
     await act(async () => jest.advanceTimersByTime(3000));
-    expect(getInstanceAuditPlanDetailSpy).toHaveBeenCalledTimes(1);
-    expect(getDriversSpy).toHaveBeenCalled();
-    expect(getProjectRuleTemplateTipSpy).toHaveBeenCalled();
-    expect(getGlobalRuleTemplateTipSpy).toHaveBeenCalled();
-    expect(getInstanceTipListSpy).toHaveBeenCalled();
-    expect(getAuditPlanMetaSpy).toHaveBeenCalled();
-    expect(getInstanceSpy).toHaveBeenCalled();
+
     await act(async () => jest.advanceTimersByTime(3000));
     // cancel default
     fireEvent.click(screen.getByText('自定义'));
@@ -134,59 +128,39 @@ describe('test sqle/SqlManagementConf/Update', () => {
 
     const aliMysqlLog = mockAuditPlanMetaData[3];
     const planType = aliMysqlLog.audit_plan_type;
-    await act(async () => {
-      fireEvent.input(
-        getBySelector(`#${planType}_${aliMysqlLog.audit_plan_params?.[0].key}`),
-        {
-          target: { value: 'test' }
-        }
-      );
-      await jest.advanceTimersByTime(100);
-    });
-    await act(async () => {
-      fireEvent.input(getAllBySelector('input[type="password"]')[0], {
-        target: { value: '123' }
-      });
-      await jest.advanceTimersByTime(100);
-    });
-    await act(async () => {
-      fireEvent.input(getAllBySelector('input[type="password"]')[1], {
-        target: { value: '456' }
-      });
-      await jest.advanceTimersByTime(100);
-    });
-    await act(async () => {
-      fireEvent.input(
-        getBySelector(`#${planType}_${aliMysqlLog.audit_plan_params?.[3].key}`),
-        {
-          target: { value: '100' }
-        }
-      );
-      await jest.advanceTimersByTime(100);
-    });
-    await act(async () => {
-      fireEvent.input(
-        getBySelector(`#${planType}_${aliMysqlLog.audit_plan_params?.[4].key}`),
-        {
-          target: { value: '200' }
-        }
-      );
-      await jest.advanceTimersByTime(100);
+    fireEvent.input(
+      getBySelector(`#${planType}_${aliMysqlLog.audit_plan_params?.[0].key}`),
+      {
+        target: { value: 'test' }
+      }
+    );
+    fireEvent.input(getAllBySelector('input[type="password"]')[0], {
+      target: { value: '123' }
     });
-    await act(async () => {
-      fireEvent.input(
-        getBySelector(`#${planType}_${aliMysqlLog.audit_plan_params?.[5].key}`),
-        {
-          target: { value: 'test.com' }
-        }
-      );
-      await jest.advanceTimersByTime(100);
+    fireEvent.input(getAllBySelector('input[type="password"]')[1], {
+      target: { value: '456' }
     });
+    fireEvent.input(
+      getBySelector(`#${planType}_${aliMysqlLog.audit_plan_params?.[3].key}`),
+      {
+        target: { value: '100' }
+      }
+    );
+    fireEvent.input(
+      getBySelector(`#${planType}_${aliMysqlLog.audit_plan_params?.[4].key}`),
+      {
+        target: { value: '200' }
+      }
+    );
+    fireEvent.input(
+      getBySelector(`#${planType}_${aliMysqlLog.audit_plan_params?.[5].key}`),
+      {
+        target: { value: 'test.com' }
+      }
+    );
     fireEvent.mouseDown(getBySelector(`#${planType}_ruleTemplateName`));
-    await act(async () => {
-      fireEvent.click(getBySelector('div[title="default_MySQL1"]'));
-      await jest.advanceTimersByTime(100);
-    });
+    fireEvent.click(getBySelector('div[title="default_MySQL1"]'));
+    await act(async () => jest.advanceTimersByTime(0));
 
     expect(screen.getByTestId('audit_level_switch')).not.toBeChecked();
     expect(screen.getByTestId('row_examined_avg_switch')).toBeChecked();
@@ -197,7 +171,7 @@ describe('test sqle/SqlManagementConf/Update', () => {
 
     expect(baseElement).toMatchSnapshot();
     fireEvent.click(screen.getByText('提 交'));
-    await act(async () => jest.advanceTimersByTime(300));
+    await act(async () => jest.advanceTimersByTime(0));
     expect(updateInstanceAuditPlanSpy).toHaveBeenCalledTimes(1);
     expect(updateInstanceAuditPlanSpy).toHaveBeenNthCalledWith(1, {
       instance_audit_plan_id: auditPlanId,