Merge pull request #419 from actiontech/fix/issue-2572

[fix]: SQL Management and scanning tasks add auditing status
actiontech · Sep 6, 2024 · 962d354 · 962d354
2 parents 5631431 + 80339f2
commit 962d354
Show file tree

Hide file tree

Showing 14 changed files with 810 additions and 50 deletions.
diff --git a/packages/shared/lib/api/sqle/service/common.d.ts b/packages/shared/lib/api/sqle/service/common.d.ts
@@ -33,6 +33,7 @@ import {
   RuleResV1LevelEnum,
   SQLQueryConfigResV1AllowQueryWhenLessThanAuditLevelEnum,
   ScheduleTaskDefaultOptionDefaultSelectorEnum,
+  SqlManageAuditStatusEnum,
   SqlManageStatusEnum,
   TestFeishuConfigurationReqV1AccountTypeEnum,
   UpdateAuditPlanNotifyConfigReqV1NotifyLevelEnum,
@@ -58,9 +59,9 @@ import {
   pipelineNodeDetailAuditMethodEnum,
   pipelineNodeDetailObjectTypeEnum,
   pipelineNodeDetailTypeEnum,
-  pipelineNodeToBeUpdatedAuditMethodEnum,
-  pipelineNodeToBeUpdatedObjectTypeEnum,
-  pipelineNodeToBeUpdatedTypeEnum,
+  updatePipelineNodeAuditMethodEnum,
+  updatePipelineNodeObjectTypeEnum,
+  updatePipelineNodeTypeEnum,
   AuditResDataV2AuditLevelEnum,
   DirectAuditFileReqV2SqlTypeEnum,
   DirectAuditReqV2SqlTypeEnum,
@@ -2344,6 +2345,8 @@ export interface ISqlManage {
 
   audit_result?: IAuditResult[];
 
+  audit_status?: SqlManageAuditStatusEnum;
+
   endpoints?: string;
 
   first_appear_timestamp?: string;
@@ -2630,7 +2633,7 @@ export interface IUpdatePipelineReqV1 {
 
   name?: string;
 
-  nodes?: IPipelineNodeToBeUpdated[];
+  nodes?: IUpdatePipelineNode[];
 }
 
 export interface IUpdateProjectRuleTemplateReqV1 {
@@ -2989,8 +2992,8 @@ export interface IPipelineNodeDetail {
   type?: pipelineNodeDetailTypeEnum;
 }
 
-export interface IPipelineNodeToBeUpdated {
-  audit_method?: pipelineNodeToBeUpdatedAuditMethodEnum;
+export interface IUpdatePipelineNode {
+  audit_method?: updatePipelineNodeAuditMethodEnum;
 
   id?: number;
 
@@ -3002,11 +3005,11 @@ export interface IPipelineNodeToBeUpdated {
 
   object_path?: string;
 
-  object_type?: pipelineNodeToBeUpdatedObjectTypeEnum;
+  object_type?: updatePipelineNodeObjectTypeEnum;
 
   rule_template_name?: string;
 
-  type?: pipelineNodeToBeUpdatedTypeEnum;
+  type?: updatePipelineNodeTypeEnum;
 }
 
 export interface IAuditFileExecStatistic {

diff --git a/packages/shared/lib/api/sqle/service/common.enum.ts b/packages/shared/lib/api/sqle/service/common.enum.ts
@@ -300,6 +300,10 @@ export enum ScheduleTaskDefaultOptionDefaultSelectorEnum {
   'feishu' = 'feishu'
 }
 
+export enum SqlManageAuditStatusEnum {
+  'being_audited' = 'being_audited'
+}
+
 export enum SqlManageStatusEnum {
   'unhandled' = 'unhandled',
 
@@ -504,19 +508,19 @@ export enum pipelineNodeDetailTypeEnum {
   'release' = 'release'
 }
 
-export enum pipelineNodeToBeUpdatedAuditMethodEnum {
+export enum updatePipelineNodeAuditMethodEnum {
   'offline' = 'offline',
 
   'online' = 'online'
 }
 
-export enum pipelineNodeToBeUpdatedObjectTypeEnum {
+export enum updatePipelineNodeObjectTypeEnum {
   'sql' = 'sql',
 
   'mybatis' = 'mybatis'
 }
 
-export enum pipelineNodeToBeUpdatedTypeEnum {
+export enum updatePipelineNodeTypeEnum {
   'audit' = 'audit',
 
   'release' = 'release'

diff --git a/packages/sqle/src/components/AuditResultMessage/ResultIconRender.tsx b/packages/sqle/src/components/AuditResultMessage/ResultIconRender.tsx
@@ -7,13 +7,19 @@ import {
   InfoHexagonFilled,
   CloseCircleFilled
 } from '@actiontech/icons';
+import { EmptyBox } from '@actiontech/shared';
+import { useTranslation } from 'react-i18next';
+import { ResultIconTagStyleWrapper } from './style';
 
 export type IResultIconRender = {
   iconLevels?: string[];
+  isAuditing?: boolean;
 };
 
 const ResultIconRender = (props: IResultIconRender) => {
-  const { iconLevels } = props;
+  const { iconLevels, isAuditing } = props;
+
+  const { t } = useTranslation();
 
   const iconData = useMemo(() => {
     return Array.from(new Set(iconLevels?.filter((icon: string) => icon)));
@@ -29,17 +35,26 @@ const ResultIconRender = (props: IResultIconRender) => {
   }, []);
 
   return (
-    <Space size={8}>
-      {!!iconData.length
-        ? iconData.map((icon) => {
-            return (
-              <React.Fragment key={icon}>
-                {renderIcon[icon as keyof typeof renderIcon] ?? null}
-              </React.Fragment>
-            );
-          })
-        : renderIcon.normal}
-    </Space>
+    <EmptyBox
+      if={!isAuditing}
+      defaultNode={
+        <ResultIconTagStyleWrapper size="small" color="geekblue">
+          {t(`sqlAudit.list.status.auditStatus.auditing`)}
+        </ResultIconTagStyleWrapper>
+      }
+    >
+      <Space size={8}>
+        {!!iconData.length
+          ? iconData.map((icon) => {
+              return (
+                <React.Fragment key={icon}>
+                  {renderIcon[icon as keyof typeof renderIcon] ?? null}
+                </React.Fragment>
+              );
+            })
+          : renderIcon.normal}
+      </Space>
+    </EmptyBox>
   );
 };
 

diff --git a/packages/sqle/src/components/AuditResultMessage/style.ts b/packages/sqle/src/components/AuditResultMessage/style.ts
@@ -1,6 +1,11 @@
 import { styled } from '@mui/material/styles';
 
 import { AuditResultMessageProps } from './index.type';
+import { BasicTag } from '@actiontech/shared';
+
+export const ResultIconTagStyleWrapper = styled(BasicTag)`
+  width: fit-content;
+`;
 
 export const AuditResultMessageStyleWrapper = styled('div')`
   display: flex;

diff --git a/packages/sqle/src/components/AuditResultMessage/test/ResultIconRender.test.tsx b/packages/sqle/src/components/AuditResultMessage/test/ResultIconRender.test.tsx
@@ -41,4 +41,9 @@ describe('sqle/components/AuditResultMessage/ResultIconRender', () => {
     const { baseElement } = customRender({});
     expect(baseElement).toMatchSnapshot();
   });
+
+  it('render auditing tag when isAuditing is truthy', async () => {
+    const { baseElement } = customRender({ isAuditing: true });
+    expect(baseElement).toMatchSnapshot();
+  });
 });
diff --git a/.../sqle/src/components/AuditResultMessage/test/__snapshots__/ResultIconRender.test.tsx.snap b/.../sqle/src/components/AuditResultMessage/test/__snapshots__/ResultIconRender.test.tsx.snap
@@ -1,5 +1,17 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`sqle/components/AuditResultMessage/ResultIconRender render auditing tag when isAuditing is truthy 1`] = `
+<body>
+  <div>
+    <span
+      class="ant-tag ant-tag-geekblue basic-tag-wrapper basic-small-tag-wrapper css-sdwkac css-dev-only-do-not-override-txh9fw"
+    >
+      审核中
+    </span>
+  </div>
+</body>
+`;
+
 exports[`sqle/components/AuditResultMessage/ResultIconRender render icon when has diff icon 1`] = `
 <body>
   <div>

diff --git a/packages/sqle/src/page/PipelineConfiguration/Update/index.tsx b/packages/sqle/src/page/PipelineConfiguration/Update/index.tsx
@@ -22,9 +22,9 @@ import { useRequest } from 'ahooks';
 import { ResponseCode } from '@actiontech/shared/lib/enum';
 import { omit } from 'lodash';
 import {
-  pipelineNodeToBeUpdatedAuditMethodEnum,
-  pipelineNodeToBeUpdatedObjectTypeEnum,
-  pipelineNodeToBeUpdatedTypeEnum
+  updatePipelineNodeAuditMethodEnum,
+  updatePipelineNodeObjectTypeEnum,
+  updatePipelineNodeTypeEnum
 } from '@actiontech/shared/lib/api/sqle/service/common.enum';
 import usePipelineConfigurationFormState from '../Common/ConfigurationForm/hooks/usePipelineConfigurationFormState';
 
@@ -81,10 +81,10 @@ const CreatePipelineConfiguration = () => {
             ...i,
             id: isNaN(parseInt(i?.id)) ? undefined : parseInt(i?.id),
             audit_method:
-              i.audit_method as unknown as pipelineNodeToBeUpdatedAuditMethodEnum,
+              i.audit_method as unknown as updatePipelineNodeAuditMethodEnum,
             object_type:
-              i.object_type as unknown as pipelineNodeToBeUpdatedObjectTypeEnum,
-            type: i.type as unknown as pipelineNodeToBeUpdatedTypeEnum
+              i.object_type as unknown as updatePipelineNodeObjectTypeEnum,
+            type: i.type as unknown as updatePipelineNodeTypeEnum
           })) ?? []
       })
       .then((res) => {