Merge pull request #399 from actiontech/feature/issue-1754

Feature/issue 1754

Author: LZS911

packages/base/src/locale/zh-CN/dmsCloudBeaver.ts

@@ -28,6 +28,7 @@ export default {
       execResult: '执行结果',
       execTime: '执行时间（毫秒）',
       rowCount: '结果集返回行数'
-    }
+    },
+    createWhitelist: '添加为审核SQL例外'
   }
 };

packages/base/src/locale/zh-CN/dmsDataExport.ts

@@ -172,7 +172,8 @@ export default {
         number: '序号',
         execSql: '执行语句',
         sqlType: '语句类型',
-        auditResult: '审核结果'
+        auditResult: '审核结果',
+        createWhitelist: '添加为审核SQL例外'
       }
     }
   }

packages/base/src/locale/zh-CN/dmsMenu.ts

@@ -11,7 +11,8 @@ export default {
   inspectionAndDiagnosis: '巡检与诊断',
   SQLWorkbench: 'SQL工作台',
   ruleTemplate: '审核规则模板',
-  whitelist: '白名单',
+  whitelist: '审核SQL例外',
+  sqlManagementExcept: '管控SQL例外',
   workflowTemplate: '审批流程模板',
   sqlAudit: '快捷审核',
   pluginAudit: 'IDE审核',

packages/base/src/page/CloudBeaver/List/__snapshots__/index.test.tsx.snap

@@ -1,6 +1,7 @@
 import {
   ActiontechTableColumn,
-  PageInfoWithoutIndexAndSize
+  PageInfoWithoutIndexAndSize,
+  ActiontechTableActionMeta
 } from '@actiontech/shared/lib/components/ActiontechTable';
 import { IListCBOperationLogsParams } from '@actiontech/shared/lib/api/base/service/CBOperationLogs/index.d';
 import { ICBOperationLog } from '@actiontech/shared/lib/api/base/service/common';
@@ -150,3 +151,24 @@ export const CBOperationListColumns = (
     }
   ];
 };
+
+export const CBOperationListAction = (
+  onCreateWhitelist: (record?: ICBOperationLog) => void
+): ActiontechTableActionMeta<ICBOperationLog>[] => {
+  return [
+    {
+      key: 'create-exception',
+      text: t('dmsCloudBeaver.operationList.createWhitelist'),
+      buttonProps: (record) => {
+        return {
+          onClick: (e) => {
+            e.stopPropagation();
+            onCreateWhitelist(record);
+          }
+        };
+      },
+      permissions: (record) =>
+        record?.operation?.operation_type === OperationOperationTypeEnum.SQL
+    }
+  ];
+};

packages/base/src/page/CloudBeaver/List/column.tsx

@@ -17,6 +17,7 @@ import { driverMeta } from 'sqle/src/hooks/useDatabaseType/index.test.data';
 import { createSpyFailResponse } from '@actiontech/shared/lib/testUtil/mockApi';
 import { listCBOperationLogsMockData } from '../../../testUtils/mockApi/cloudBeaver/data';
 import { ModalName } from '../../../data/ModalName';
+import { ModalName as SqleModalName } from 'sqle/src/data/ModalName';
 
 jest.mock('react-redux', () => {
   return {
@@ -50,7 +51,8 @@ describe('test base/CloudBeaver/List', () => {
         database: { driverMeta: driverMeta },
         cloudBeaver: {
           modalStatus: {}
-        }
+        },
+        whitelist: { modalStatus: {} }
       });
     });
   });
@@ -174,4 +176,22 @@ describe('test base/CloudBeaver/List', () => {
       }
     });
   });
+
+  it('render create whitelist', async () => {
+    superRender(<CBOperationLogsList />);
+    await act(async () => jest.advanceTimersByTime(3000));
+    await act(async () => jest.advanceTimersByTime(3000));
+    expect(screen.queryAllByText('添加为审核SQL例外')[0]).toBeInTheDocument();
+    fireEvent.click(screen.queryAllByText('添加为审核SQL例外')[0]);
+    await act(async () => jest.advanceTimersByTime(100));
+    expect(mockDispatch).toHaveBeenCalledTimes(4);
+    expect(mockDispatch).toHaveBeenNthCalledWith(3, {
+      payload: { modalName: SqleModalName.Add_Whitelist, status: true },
+      type: 'whitelist/updateModalStatus'
+    });
+    expect(mockDispatch).toHaveBeenNthCalledWith(4, {
+      payload: { selectRow: { value: 'SELECT 1;' } },
+      type: 'whitelist/updateSelectWhitelist'
+    });
+  });
 });

packages/base/src/page/CloudBeaver/List/index.test.tsx

@@ -17,7 +17,8 @@ import {
 import { ICBOperationLog } from '@actiontech/shared/lib/api/base/service/common';
 import {
   CBOperationListFilterParamType,
-  CBOperationListColumns
+  CBOperationListColumns,
+  CBOperationListAction
 } from './column';
 import { IListCBOperationLogsParams } from '@actiontech/shared/lib/api/base/service/CBOperationLogs/index.d';
 import CBOperationLogs from '@actiontech/shared/lib/api/base/service/CBOperationLogs';
@@ -35,6 +36,8 @@ import {
 import { ModalName } from '../../../data/ModalName';
 import { CloudBeaverOperationLogsListStyleWrapper } from '../style';
 import { useTranslation } from 'react-i18next';
+import CreateWhitelistModal from 'sqle/src/page/Whitelist/Drawer/AddWhitelist';
+import useWhitelistRedux from 'sqle/src/page/Whitelist/hooks/useWhitelistRedux';
 
 const CBOperationLogsList: React.FC<{ enableSqlQuery?: boolean }> = () => {
   const { t } = useTranslation();
@@ -59,6 +62,12 @@ const CBOperationLogsList: React.FC<{ enableSqlQuery?: boolean }> = () => {
   const { requestErrorMessage, handleTableRequestError } =
     useTableRequestError();
 
+  const {
+    openCreateWhitelistModal,
+    updateSelectWhitelistRecord,
+    actionPermission
+  } = useWhitelistRedux();
+
   const {
     tableFilterInfo,
     updateTableFilterInfo,
@@ -161,6 +170,13 @@ const CBOperationLogsList: React.FC<{ enableSqlQuery?: boolean }> = () => {
   const { filterButtonMeta, filterContainerMeta, updateAllSelectedFilterItem } =
     useTableFilterContainer(columns, updateTableFilterInfo);
 
+  const onCreateWhitelist = (record?: ICBOperationLog) => {
+    openCreateWhitelistModal();
+    updateSelectWhitelistRecord({
+      value: record?.operation?.operation_detail
+    });
+  };
+
   useEffect(() => {
     updateDbServiceList({
       project_uid: projectID
@@ -170,59 +186,67 @@ const CBOperationLogsList: React.FC<{ enableSqlQuery?: boolean }> = () => {
   }, [projectID, updateDbServiceList, updateMemberTips, updateCBOperationList]);
 
   return (
-    <CloudBeaverOperationLogsListStyleWrapper>
-      {contextHolder}
-      <Spin spinning={loading}>
-        <OperationStatistics
-          total={data?.otherData?.exec_sql_total}
-          succeedRate={data?.otherData?.exec_success_rate}
-          interceptedTotal={data?.otherData?.audit_intercepted_sql_count}
-          failedTotal={data?.otherData?.exec_failed_sql_count}
-        />
-        <TableToolbar
-          refreshButton={{ refresh }}
-          actions={[
-            {
-              key: 'modifyPassword',
-              text: t('dmsCloudBeaver.operationList.exportButton'),
-              buttonProps: {
-                onClick: onExport,
-                loading: exporting
+    <>
+      <CloudBeaverOperationLogsListStyleWrapper>
+        {contextHolder}
+        <Spin spinning={loading}>
+          <OperationStatistics
+            total={data?.otherData?.exec_sql_total}
+            succeedRate={data?.otherData?.exec_success_rate}
+            interceptedTotal={data?.otherData?.audit_intercepted_sql_count}
+            failedTotal={data?.otherData?.exec_failed_sql_count}
+          />
+          <TableToolbar
+            refreshButton={{ refresh }}
+            actions={[
+              {
+                key: 'modifyPassword',
+                text: t('dmsCloudBeaver.operationList.exportButton'),
+                buttonProps: {
+                  onClick: onExport,
+                  loading: exporting
+                }
               }
+            ]}
+            filterButton={{
+              filterButtonMeta,
+              updateAllSelectedFilterItem
+            }}
+            setting={tableSetting}
+            searchInput={{
+              onChange: setSearchKeyword,
+              onSearch: () => {
+                refreshBySearchKeyword();
+              }
+            }}
+          />
+          <TableFilterContainer
+            filterContainerMeta={filterContainerMeta}
+            updateTableFilterInfo={updateTableFilterInfo}
+            disabled={loading}
+            filterCustomProps={filterCustomProps}
+          />
+          <ActiontechTable
+            rowKey="uid"
+            setting={tableSetting}
+            dataSource={data?.list ?? []}
+            pagination={{
+              total: data?.total || 0
+            }}
+            columns={columns}
+            onChange={tableChange}
+            errorMessage={requestErrorMessage}
+            actions={
+              actionPermission
+                ? CBOperationListAction(onCreateWhitelist)
+                : undefined
             }
-          ]}
-          filterButton={{
-            filterButtonMeta,
-            updateAllSelectedFilterItem
-          }}
-          setting={tableSetting}
-          searchInput={{
-            onChange: setSearchKeyword,
-            onSearch: () => {
-              refreshBySearchKeyword();
-            }
-          }}
-        />
-        <TableFilterContainer
-          filterContainerMeta={filterContainerMeta}
-          updateTableFilterInfo={updateTableFilterInfo}
-          disabled={loading}
-          filterCustomProps={filterCustomProps}
-        />
-        <ActiontechTable
-          rowKey="uid"
-          setting={tableSetting}
-          dataSource={data?.list ?? []}
-          pagination={{
-            total: data?.total || 0
-          }}
-          columns={columns}
-          onChange={tableChange}
-          errorMessage={requestErrorMessage}
-        />
-        <CBSqlOperationAuditDetailDrawer />
-      </Spin>
-    </CloudBeaverOperationLogsListStyleWrapper>
+          />
+          <CBSqlOperationAuditDetailDrawer />
+        </Spin>
+      </CloudBeaverOperationLogsListStyleWrapper>
+      <CreateWhitelistModal onCreated={refresh} />
+    </>
   );
 };
 export default CBOperationLogsList;