diff --git a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/BasicVersionModal.test.tsx.snap b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/BasicVersionModal.test.tsx.snap index d860f4107..eb95d5253 100644 --- a/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/BasicVersionModal.test.tsx.snap +++ b/packages/base/src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/BasicVersionModal.test.tsx.snap @@ -110,7 +110,7 @@ exports[`base/Nav/SideMenu/UserMenu/BasicVersionModal render snap when open is t class="ant-typography css-dev-only-do-not-override-txh9fw" > UI: - dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3 + dms-ui/feat-3127 9e4430d27
UI: - dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3 + dms-ui/feat-3127 9e4430d27
UI: - dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3 + dms-ui/feat-3127 9e4430d27
UI: - dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3 + dms-ui/feat-3127 9e4430d27
UI: - dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3 + dms-ui/feat-3127 9e4430d27
UI: - dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3 + dms-ui/feat-3127 9e4430d27
{ expect(baseElement).toMatchSnapshot(); }); + // Full CI serial/maxWorkers=2 can exceed Jest 60s default (~70s observed). it('render expect page index set 1 when change exec status & duplicate', async () => { const taskSQLsData: IAuditTaskSQLResV2[] = []; - for (let i = 0; i < 50; i++) { + // page_size=20 → need >40 rows for 3 pagination items + for (let i = 0; i < 41; i++) { const index = i + 1; taskSQLsData.push({ number: index, @@ -170,5 +172,5 @@ describe('sqle/ExecWorkflow/Common/AuditResultList', () => { page_size: '20', task_id: '1' }); - }); + }, 120000); }); diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.test.ts b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.test.ts index bef38c670..515f95478 100644 --- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.test.ts +++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.test.ts @@ -33,6 +33,7 @@ describe('page/SqlManagement/SQLEEIndex/exportColumnKeys', () => { 'sql', 'source', 'audit_level', + 'rule_name', 'rule_desc', 'object_name', 'instance_name', @@ -68,6 +69,7 @@ describe('page/SqlManagement/SQLEEIndex/exportColumnKeys', () => { 'sql', 'sql_fingerprint', 'audit_level', + 'rule_name', 'rule_desc', 'object_name', 'instance_name', @@ -116,7 +118,18 @@ describe('page/SqlManagement/SQLEEIndex/exportColumnKeys', () => { const keys = getSqlManagementExportColumnKeys(columns, 'admin'); expect(keys).not.toContain('audit_result'); expect(keys).toEqual( - expect.arrayContaining(['audit_level', 'rule_desc', 'object_name']) + expect.arrayContaining([ + 'audit_level', + 'rule_name', + 'rule_desc', + 'object_name' + ]) + ); + expect(keys.indexOf('rule_name')).toBeGreaterThan( + keys.indexOf('audit_level') + ); + expect(keys.indexOf('rule_desc')).toBeGreaterThan( + keys.indexOf('rule_name') ); }); diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.ts b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.ts index 22f6e8f07..1b2204727 100644 --- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.ts +++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.ts @@ -7,6 +7,7 @@ export const SQL_MANAGEMENT_TABLE_NAME = 'sql_management_list'; const LIST_AUDIT_RESULT_COLUMN_KEY = 'audit_result'; const AUDIT_LEVEL_EXPORT_KEY = 'audit_level'; +const RULE_NAME_EXPORT_KEY = 'rule_name'; const RULE_DESC_EXPORT_KEY = 'rule_desc'; const OBJECT_NAME_EXPORT_KEY = 'object_name'; @@ -15,6 +16,7 @@ const SQL_MANAGEMENT_EXPORT_COLUMN_KEYS = [ 'sql', 'source', AUDIT_LEVEL_EXPORT_KEY, + RULE_NAME_EXPORT_KEY, RULE_DESC_EXPORT_KEY, OBJECT_NAME_EXPORT_KEY, 'instance_name', @@ -83,7 +85,7 @@ const isExportableColumnKey = ( const expandListColumnKeyToExportKeys = (columnKey: string): string[] => { if (columnKey === LIST_AUDIT_RESULT_COLUMN_KEY) { - return [AUDIT_LEVEL_EXPORT_KEY, RULE_DESC_EXPORT_KEY]; + return [AUDIT_LEVEL_EXPORT_KEY, RULE_NAME_EXPORT_KEY, RULE_DESC_EXPORT_KEY]; } return [columnKey]; diff --git a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.test.tsx b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.test.tsx index 2a18affce..fc0c9b35f 100644 --- a/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.test.tsx +++ b/packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.test.tsx @@ -283,7 +283,7 @@ describe('page/SqlManagement/SQLEEIndex', () => { filter_assignee: mockCurrentUserReturn.uid, filter_priority: exportSqlManageV1FilterPriorityEnum.high, export_column_keys: - 'sql_fingerprint,sql,source,audit_level,rule_desc,object_name,instance_name,schema_name,priority,fp_count,first_appear_timestamp,last_receive_timestamp,assignees,endpoints,status,remark' + 'sql_fingerprint,sql,source,audit_level,rule_name,rule_desc,object_name,instance_name,schema_name,priority,fp_count,first_appear_timestamp,last_receive_timestamp,assignees,endpoints,status,remark' }, { responseType: 'blob' @@ -345,7 +345,7 @@ describe('page/SqlManagement/SQLEEIndex', () => { filter_status: 'unhandled', fuzzy_search_sql_fingerprint: searchText, export_column_keys: - 'sql,sql_fingerprint,audit_level,rule_desc,object_name,instance_name,schema_name,priority,endpoints,status,fp_count,first_appear_timestamp,last_receive_timestamp' + 'sql,sql_fingerprint,audit_level,rule_name,rule_desc,object_name,instance_name,schema_name,priority,endpoints,status,fp_count,first_appear_timestamp,last_receive_timestamp' }), { responseType: 'blob'