Skip to content

feat: expand SQL manage export columns with rule_name #892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Seechi-Yolo merged 5 commits into from
Sep 2, 2026
Merged

feat: expand SQL manage export columns with rule_name #892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2d008c8
feat: expand SQL manage export columns with rule_name
LordofAvernus Sep 1, 2026
4efe2a2
test: stabilize AuditResultList pagination mock for CI
LordofAvernus Sep 1, 2026
9fd0206
chore: sync UI_VERSION to dms-ui/feat-3127 tip
LordofAvernus Sep 1, 2026
9e4430d
test: drop unrelated AuditResultList rule_template mock from export PR
LordofAvernus Sep 2, 2026
7ad2d75
chore: sync UI_VERSION to dms-ui/feat-3127 tip
LordofAvernus Sep 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...v/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/BasicVersionModal.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
</article>
</div>
<div
Expand Down Expand Up @@ -345,7 +345,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
</article>
</div>
<div
Expand Down
4 changes: 2 additions & 2 deletions ...c/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/index.ce.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ exports[`base/Nav/SideMenu/UserMenu/VersionModal-ce render snap when open is tru
class="ant-typography css-dev-only-do-not-override-txh9fw"
>
UI:
dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3
dms-ui/feat-3127 9e4430d27
</article>
</div>
<div
Expand Down Expand Up @@ -1312,7 +1312,7 @@ exports[`base/Nav/SideMenu/UserMenu/VersionModal-ce render snap when open is tru
class="ant-typography css-dev-only-do-not-override-txh9fw"
>
UI:
dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3
dms-ui/feat-3127 9e4430d27
</article>
</div>
<div
Expand Down
4 changes: 2 additions & 2 deletions .../src/page/Nav/SideMenu/UserMenu/Modal/VersionModal/test/__snapshots__/index.test.tsx.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ exports[`base/Nav/SideMenu/UserMenu/VersionModal-ee render snap when open is tru
class="ant-typography css-dev-only-do-not-override-txh9fw"
>
UI:
dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3
dms-ui/feat-3127 9e4430d27
</article>
</div>
<div
Expand Down Expand Up @@ -352,7 +352,7 @@ exports[`base/Nav/SideMenu/UserMenu/VersionModal-ee render snap when open is tru
class="ant-typography css-dev-only-do-not-override-txh9fw"
>
UI:
dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3
dms-ui/feat-3127 9e4430d27
</article>
</div>
<div
Expand Down
3 changes: 1 addition & 2 deletions packages/base/src/scripts/version.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
export const UI_VERSION =
'dev-zjrc-sql-manage-rule-filter-memberof bdf1f7ff3';
export const UI_VERSION = 'dms-ui/feat-3127 9e4430d27';
6 changes: 4 additions & 2 deletions packages/sqle/src/page/SqlExecWorkflow/Common/AuditResultList/__tests__/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,11 @@ describe('sqle/ExecWorkflow/Common/AuditResultList', () => {
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,
Expand Down Expand Up @@ -170,5 +172,5 @@ describe('sqle/ExecWorkflow/Common/AuditResultList', () => {
page_size: '20',
task_id: '1'
});
});
}, 120000);
});
15 changes: 14 additions & 1 deletion packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ describe('page/SqlManagement/SQLEEIndex/exportColumnKeys', () => {
'sql',
'source',
'audit_level',
'rule_name',
'rule_desc',
'object_name',
'instance_name',
Expand Down Expand Up @@ -68,6 +69,7 @@ describe('page/SqlManagement/SQLEEIndex/exportColumnKeys', () => {
'sql',
'sql_fingerprint',
'audit_level',
'rule_name',
'rule_desc',
'object_name',
'instance_name',
Expand Down Expand Up @@ -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')
);
});

Expand Down
4 changes: 3 additions & 1 deletion packages/sqle/src/page/SqlManagement/component/SQLEEIndex/exportColumnKeys.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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',
Expand Down Expand Up @@ -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];
Expand Down
4 changes: 2 additions & 2 deletions packages/sqle/src/page/SqlManagement/component/SQLEEIndex/index.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
Loading