[feature](SQLManagement): Add scan name filter item and display format

actiontech · Feb 23, 2024 · 742a345 · 742a345
1 parent 6a8de82
commit 742a345
Show file tree

Hide file tree

Showing 8 changed files with 45 additions and 4 deletions.
diff --git a/src/api/SqlManage/index.d.ts b/src/api/SqlManage/index.d.ts
@@ -73,6 +73,8 @@ export interface IExportSqlManageV1Params {
 
   fuzzy_search_sql_fingerprint?: string;
 
+  fuzzy_search_audit_plan_name?: string;
+
   filter_assignee?: string;
 
   filter_instance_name?: string;
@@ -127,6 +129,8 @@ export interface IGetSqlManageListV2Params {
 
   filter_source?: GetSqlManageListV2FilterSourceEnum;
 
+  fuzzy_search_audit_plan_name?: string;
+
   filter_audit_level?: GetSqlManageListV2FilterAuditLevelEnum;
 
   filter_last_audit_start_time_from?: string;

diff --git a/src/api/common.d.ts b/src/api/common.d.ts
@@ -3211,6 +3211,8 @@ export interface IAuditTaskSQLResV2 {
   number?: number;
 
   rollback_sql?: string;
+
+  sql_source_file?: string;
 }
 
 export interface IBatchCancelWorkflowsReqV2 {

diff --git a/src/locale/zh-CN/sqlManagement.ts b/src/locale/zh-CN/sqlManagement.ts
@@ -38,6 +38,7 @@ export default {
     rule: '审核规则',
     endpoint: '端点信息',
     endpointSearchPlaceHolder: '请输入端点信息',
+    auditPlanName: '智能扫描名',
   },
 
   table: {

diff --git a/src/page/SQLManagement/SQLPanel/FilterForm.tsx b/src/page/SQLManagement/SQLPanel/FilterForm.tsx
@@ -187,6 +187,18 @@ const FilterForm: React.FC<SQLPanelFilterFormProps> = ({
             />
           </Form.Item>
         </Col>
+        <Col {...FilterFormColLayout}>
+          <Form.Item
+            label={t('sqlManagement.filterForm.auditPlanName')}
+            name="fuzzy_search_audit_plan_name"
+          >
+            <Input
+              placeholder={t('common.form.placeholder.input', {
+                name: t('sqlManagement.filterForm.auditPlanName'),
+              })}
+            />
+          </Form.Item>
+        </Col>
 
         <Col
           {...{

diff --git a/src/page/SQLManagement/SQLPanel/column.tsx b/src/page/SQLManagement/SQLPanel/column.tsx
@@ -84,14 +84,29 @@ export const SQLPanelColumns: (params: {
     {
       dataIndex: 'source',
       title: () => t('sqlManagement.table.source'),
+      className: 'table-column-source',
       render: (source: ISource) => {
         if (source.type && source.type === SourceTypeEnum.audit_plan) {
           return (
-            <Link
-              to={`project/${projectName}/auditPlan/detail/${source.audit_plan_name}`}
+            <Typography.Paragraph
+              ellipsis={{
+                expandable: false,
+                tooltip: (
+                  <div>
+                    {t(sourceDictionary[source.type])}:
+                    {source.audit_plan_name || '--'}
+                  </div>
+                ),
+              }}
+              className="margin-bottom-0"
             >
-              {t(sourceDictionary[source.type])}
-            </Link>
+              <Link
+                to={`project/${projectName}/auditPlan/detail/${source.audit_plan_name}`}
+              >
+                {t(sourceDictionary[source.type])}:
+                {source.audit_plan_name || '--'}
+              </Link>
+            </Typography.Paragraph>
           );
         } else if (
           source.type &&

diff --git a/src/page/SQLManagement/SQLPanel/index.less b/src/page/SQLManagement/SQLPanel/index.less
@@ -8,4 +8,7 @@
   .table-column-sql {
     max-width: 420px;
   }
+  .table-column-source {
+    max-width: 200px;
+  }
 }
diff --git a/src/page/SQLManagement/SQLPanel/index.tsx b/src/page/SQLManagement/SQLPanel/index.tsx
@@ -125,6 +125,7 @@ const SQLPanel: React.FC = () => {
           DB_TYPE_RULE_NAME_SEPARATOR
         )?.[1],
         fuzzy_search_endpoint: filterInfo.fuzzy_search_endpoint,
+        fuzzy_search_audit_plan_name: filterInfo.fuzzy_search_audit_plan_name,
         sort_field: getSortField(),
         sort_order: getSortOrder(),
       }).then((res) => {
@@ -351,6 +352,7 @@ const SQLPanel: React.FC = () => {
         DB_TYPE_RULE_NAME_SEPARATOR
       )?.[1],
       fuzzy_search_endpoint: filterValues.fuzzy_search_endpoint,
+      fuzzy_search_audit_plan_name: filterValues.fuzzy_search_audit_plan_name
     };
 
     SqlManage.exportSqlManageV1(params, { responseType: 'blob' })

diff --git a/src/page/SQLManagement/SQLPanel/index.type.ts b/src/page/SQLManagement/SQLPanel/index.type.ts
@@ -25,6 +25,8 @@ export type SQLPanelFilterFormFields = {
   fuzzy_search_endpoint?: string;
 
   fuzzy_search_schema_name?: string;
+
+  fuzzy_search_audit_plan_name?: string;
 };
 
 export type SQLPanelFilterFormProps = {