diff --git a/packages/shared/lib/api/sqle/service/common.d.ts b/packages/shared/lib/api/sqle/service/common.d.ts index 51e375f51..c16458386 100644 --- a/packages/shared/lib/api/sqle/service/common.d.ts +++ b/packages/shared/lib/api/sqle/service/common.d.ts @@ -2225,7 +2225,7 @@ export interface IScheduledTaskDefaultOptionV1Rsp { export interface ISource { sql_source_desc?: string; - sql_source_id?: string; + sql_source_ids?: string[]; sql_source_type?: string; } diff --git a/packages/sqle/src/page/SqlAudit/List/index.test.tsx b/packages/sqle/src/page/SqlAudit/List/index.test.tsx index fc03f8ee9..196b03db4 100644 --- a/packages/sqle/src/page/SqlAudit/List/index.test.tsx +++ b/packages/sqle/src/page/SqlAudit/List/index.test.tsx @@ -138,7 +138,7 @@ describe('sqle/SqlAudit/List', () => { fuzzy_search_tags: 'test', page_index: 1, page_size: 20, - filter_sql_audit_record_ids: '' + filter_sql_audit_record_ids: undefined }); }); diff --git a/packages/sqle/src/page/SqlAudit/List/index.tsx b/packages/sqle/src/page/SqlAudit/List/index.tsx index 2fa57a4fd..ba78973ec 100644 --- a/packages/sqle/src/page/SqlAudit/List/index.tsx +++ b/packages/sqle/src/page/SqlAudit/List/index.tsx @@ -57,10 +57,10 @@ const SqlAuditList = () => { const searchStr = new URLSearchParams(location.search); if (searchStr.has(SQLAuditRecordListUrlParamsKey.SQLAuditRecordID)) { return ( - searchStr.get(SQLAuditRecordListUrlParamsKey.SQLAuditRecordID) ?? '' + searchStr.get(SQLAuditRecordListUrlParamsKey.SQLAuditRecordID) ?? + undefined ); } - return ''; }, [location.search]); const [filterStatus, setFilterStatus] = useState< getSQLAuditRecordsV1FilterSqlAuditStatusEnum | 'all' diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap index f6669fdb1..3743a80dc 100644 --- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap +++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/__snapshots__/index.test.tsx.snap @@ -3505,7 +3505,8 @@ exports[`page/SqlManagement/SQLEEIndex render table data 1`] = ` class="ant-table-cell" > 慢日志 @@ -3896,7 +3897,8 @@ exports[`page/SqlManagement/SQLEEIndex render table data 1`] = ` class="ant-table-cell" > 慢日志 @@ -4256,7 +4258,8 @@ exports[`page/SqlManagement/SQLEEIndex render table data 1`] = ` class="ant-table-cell" > 慢日志 @@ -4422,6 +4425,326 @@ exports[`page/SqlManagement/SQLEEIndex render table data 1`] = ` + + + + + +
+
+ + + SELECT + + ? + +
+
+ + + +
+
+ + +
+
+ + + SELECT + + + + 1 + + ; + +
+
+ + + +
+
+ + + + SQL审核 + + + +
+
+
+ + + + + + + 白名单 + +
+
+
+ + + MYSQL_3307 + + + db1 + + + - + + +
+
+
+ + + T + + +
+
+
+
+ + + T + + +
+
+
+ + + - + + + + 未处理 + + + + + + +
+
+
+ +
+
+ +
+
+ +
+ + diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx index f8dfae156..212c8651b 100644 --- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx +++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/column.tsx @@ -18,6 +18,7 @@ import { Avatar } from 'antd'; import StatusTag from './StatusTag'; import { BasicTag, BasicTypographyEllipsis } from '@actiontech/shared'; import { ACTIONTECH_TABLE_ACTION_BUTTON_WIDTH } from '@actiontech/shared/lib/components/ActiontechTable/hooks/useTableAction'; +import { SQLAuditRecordListUrlParamsKey } from './index.data'; export type SqlManagementTableFilterParamType = PageInfoWithoutIndexAndSize< IGetSqlManageListV2Params, @@ -230,11 +231,28 @@ const SqlManagementColumn: ( dataIndex: 'source', title: () => t('sqlManagement.table.column.source'), render: (source) => { - //todo 本期只支持跳转至 sql管控配置，后续调整 - if (source && source.sql_source_id && source.sql_source_type) { + if ( + !!source && + !!source.sql_source_ids && + source.sql_source_ids.length > 0 && + !!source.sql_source_type + ) { + if (source.sql_source_type === 'sql_audit_record') { + return ( + + {source.sql_source_desc} + + ); + } return ( {source.sql_source_desc ?? source.sql_source_type} diff --git a/packages/sqle/src/testUtils/mockApi/sqlManage/data.ts b/packages/sqle/src/testUtils/mockApi/sqlManage/data.ts index 144b1b2a9..fde559a79 100644 --- a/packages/sqle/src/testUtils/mockApi/sqlManage/data.ts +++ b/packages/sqle/src/testUtils/mockApi/sqlManage/data.ts @@ -56,7 +56,7 @@ export const sqlManageListData = { source: { sql_source_type: 'mysql_slow_log', sql_source_desc: '慢日志', - sql_source_id: '123' + sql_source_ids: ['123'] }, first_appear_timestamp: '', last_receive_timestamp: '', @@ -74,7 +74,7 @@ export const sqlManageListData = { source: { sql_source_type: 'mysql_slow_log', sql_source_desc: '慢日志', - sql_source_id: '123' + sql_source_ids: ['123'] }, instance_name: 'mysql', schema_name: 'dms', @@ -101,7 +101,7 @@ export const sqlManageListData = { source: { sql_source_type: 'mysql_slow_log', sql_source_desc: '慢日志', - sql_source_id: '123' + sql_source_ids: ['123'] }, instance_name: 'mysql', schema_name: 'dms', @@ -119,6 +119,33 @@ export const sqlManageListData = { status: 'unhandled', remark: '', endpoints: '34' + }, + { + id: 1150087, + sql_fingerprint: 'SELECT ?', + sql: 'SELECT 1;', + source: { + sql_source_type: 'sql_audit_record', + sql_source_desc: 'SQL审核', + sql_source_ids: ['123'] + }, + instance_name: 'MYSQL_3307', + schema_name: 'db1', + audit_result: [ + { + level: 'normal', + message: '白名单', + rule_name: '' + } + ], + first_appear_timestamp: '', + last_receive_timestamp: '', + fp_count: 0, + assignees: ['t3', 't2'], + status: 'unhandled', + remark: '', + endpoints: '', + priority: '' } ], sql_manage_bad_num: 1,