Skip to content

Commit 15f61ed

Browse files
LZS911LZS911
authored
Merge pull request #388 from actiontech/feature/sql-management-conf-audit
Feature/sql management conf audit
2 parents afbd1af + 5ef38a8 commit 15f61ed

File tree

43 files changed

+1753
-883
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1753
-883
lines changed

‎packages/base/src/router/test/__snapshots__/router.ce.sqle.test.tsx.snap‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,20 @@ exports[`base/router-sqle-ce render sqle project detail router render sqle proje
134134
</body>
135135
`;
136136

137+
exports[`base/router-sqle-ce render sqle project detail router render sqle project detail router when version is ce render route plan render route SqlManagementConfAnalyze 1`] = `
138+
<body>
139+
<div>
140+
<div
141+
data-test-parent-id="sqlManagementConf"
142+
>
143+
<div>
144+
SqlManagementConfAnalyze
145+
</div>
146+
</div>
147+
</div>
148+
</body>
149+
`;
150+
137151
exports[`base/router-sqle-ce render sqle project detail router render sqle project detail router when version is ce render route plan render route auditPlanCreate 1`] = `
138152
<body>
139153
<div>
@@ -730,6 +744,13 @@ exports[`base/router-sqle-ce render sqle route data snap 1`] = `
730744
"key": "SqlManagementConfDetail",
731745
"path": ":id",
732746
},
747+
{
748+
"element": <div>
749+
SqlManagementConfAnalyze
750+
</div>,
751+
"key": "SqlManagementConfAnalyze",
752+
"path": ":instanceAuditPlanId/analyze/:id",
753+
},
733754
],
734755
"element": <div
735756
data-test-parent-id="sqlManagementConf"

‎packages/base/src/router/test/__snapshots__/router.sqle.test.tsx.snap‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -322,6 +322,20 @@ exports[`base/router-sqle-ee render sqle project detail router render sqle proje
322322
</body>
323323
`;
324324

325+
exports[`base/router-sqle-ee render sqle project detail router render sqle project detail router when version is ce render route sqlManagementConf render route SqlManagementConfAnalyze 1`] = `
326+
<body>
327+
<div>
328+
<div
329+
data-test-parent-id="sqlManagementConf"
330+
>
331+
<div>
332+
SqlManagementConfAnalyze
333+
</div>
334+
</div>
335+
</div>
336+
</body>
337+
`;
338+
325339
exports[`base/router-sqle-ee render sqle project detail router render sqle project detail router when version is ce render route sqlManagementConf render route auditPlanDetail 1`] = `
326340
<body>
327341
<div>
@@ -927,6 +941,13 @@ exports[`base/router-sqle-ee render sqle route data snap 1`] = `
927941
"key": "SqlManagementConfDetail",
928942
"path": ":id",
929943
},
944+
{
945+
"element": <div>
946+
SqlManagementConfAnalyze
947+
</div>,
948+
"key": "SqlManagementConfAnalyze",
949+
"path": ":instanceAuditPlanId/analyze/:id",
950+
},
930951
],
931952
"element": <div
932953
data-test-parent-id="sqlManagementConf"

‎packages/base/src/router/test/router.ce.sqle.test.tsx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,17 @@ describe('base/router-sqle-ce', () => {
287287
screen.getByText('SqlManagementConfDetail')
288288
).toBeInTheDocument();
289289
});
290+
291+
it('render route SqlManagementConfAnalyze', () => {
292+
const { baseElement } = customRender([
293+
`/sqle/project/${projectID}/sql-management-conf/1/analyze/:id`
294+
]);
295+
296+
expect(baseElement).toMatchSnapshot();
297+
expect(
298+
screen.getByText('SqlManagementConfAnalyze')
299+
).toBeInTheDocument();
300+
});
290301
});
291302

292303
describe('render route ruleTemplate', () => {

‎packages/base/src/router/test/router.sqle.test.tsx‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,17 @@ describe('base/router-sqle-ee', () => {
329329
screen.getByText('SqlManagementConfDetail')
330330
).toBeInTheDocument();
331331
});
332+
333+
it('render route SqlManagementConfAnalyze', () => {
334+
const { baseElement } = customRender([
335+
`/sqle/project/${projectID}/sql-management-conf/1/analyze/:id`
336+
]);
337+
338+
expect(baseElement).toMatchSnapshot();
339+
expect(
340+
screen.getByText('SqlManagementConfAnalyze')
341+
).toBeInTheDocument();
342+
});
332343
});
333344

334345
describe('render route ruleTemplate', () => {

‎packages/shared/lib/api/sqle/service/common.d.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2227,6 +2227,8 @@ export interface ISqlManage {
22272227

22282228
last_receive_timestamp?: string;
22292229

2230+
priority?: string;
2231+
22302232
remark?: string;
22312233

22322234
schema_name?: string;

‎packages/shared/lib/api/sqle/service/instance_audit_plan/index.d.ts‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import {
1313
IGetAuditPlanSQLExportReqV1,
1414
IGetAuditPlanSQLMetaResV1,
1515
IGetAuditPlanSQLsResV1,
16+
IGetSqlManageSqlAnalysisResp,
1617
IUploadInstanceAuditPlanSQLsReqV2
1718
} from '../common.d';
1819

@@ -112,6 +113,16 @@ export interface IUpdateAuditPlanStatusV1Params
112113

113114
export interface IUpdateAuditPlanStatusV1Return extends IBaseRes {}
114115

116+
export interface IAuditPlanTriggerSqlAuditV1Params {
117+
project_name: string;
118+
119+
instance_audit_plan_id: string;
120+
121+
audit_plan_id: string;
122+
}
123+
124+
export interface IAuditPlanTriggerSqlAuditV1Return extends IBaseRes {}
125+
115126
export interface IGetInstanceAuditPlanSQLDataV1Params
116127
extends IGetAuditPlanSQLDataReqV1 {
117128
project_name: string;
@@ -159,6 +170,17 @@ export interface IGetInstanceAuditPlanSQLsV1Params {
159170
export interface IGetInstanceAuditPlanSQLsV1Return
160171
extends IGetAuditPlanSQLsResV1 {}
161172

173+
export interface IGetAuditPlanSqlAnalysisDataV1Params {
174+
project_name: string;
175+
176+
instance_audit_plan_id: string;
177+
178+
id: string;
179+
}
180+
181+
export interface IGetAuditPlanSqlAnalysisDataV1Return
182+
extends IGetSqlManageSqlAnalysisResp {}
183+
162184
export interface IUploadInstanceAuditPlanSQLsV2Params
163185
extends IUploadInstanceAuditPlanSQLsReqV2 {
164186
project_name: string;

‎packages/shared/lib/api/sqle/service/instance_audit_plan/index.ts‎

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,17 @@ import {
2525
IDeleteAuditPlanByTypeV1Return,
2626
IUpdateAuditPlanStatusV1Params,
2727
IUpdateAuditPlanStatusV1Return,
28+
IAuditPlanTriggerSqlAuditV1Params,
29+
IAuditPlanTriggerSqlAuditV1Return,
2830
IGetInstanceAuditPlanSQLDataV1Params,
2931
IGetInstanceAuditPlanSQLDataV1Return,
3032
IGetInstanceAuditPlanSQLExportV1Params,
3133
IGetInstanceAuditPlanSQLMetaV1Params,
3234
IGetInstanceAuditPlanSQLMetaV1Return,
3335
IGetInstanceAuditPlanSQLsV1Params,
3436
IGetInstanceAuditPlanSQLsV1Return,
37+
IGetAuditPlanSqlAnalysisDataV1Params,
38+
IGetAuditPlanSqlAnalysisDataV1Return,
3539
IUploadInstanceAuditPlanSQLsV2Params,
3640
IUploadInstanceAuditPlanSQLsV2Return
3741
} from './index.d';
@@ -199,6 +203,27 @@ class InstanceAuditPlanService extends ServiceBase {
199203
);
200204
}
201205

206+
public auditPlanTriggerSqlAuditV1(
207+
params: IAuditPlanTriggerSqlAuditV1Params,
208+
options?: AxiosRequestConfig
209+
) {
210+
const paramsData = this.cloneDeep(params);
211+
const project_name = paramsData.project_name;
212+
delete paramsData.project_name;
213+
214+
const instance_audit_plan_id = paramsData.instance_audit_plan_id;
215+
delete paramsData.instance_audit_plan_id;
216+
217+
const audit_plan_id = paramsData.audit_plan_id;
218+
delete paramsData.audit_plan_id;
219+
220+
return this.post<IAuditPlanTriggerSqlAuditV1Return>(
221+
`/v1/projects/${project_name}/instance_audit_plans/${instance_audit_plan_id}/audit_plans/${audit_plan_id}/audit`,
222+
paramsData,
223+
options
224+
);
225+
}
226+
202227
public getInstanceAuditPlanSQLDataV1(
203228
params: IGetInstanceAuditPlanSQLDataV1Params,
204229
options?: AxiosRequestConfig
@@ -283,6 +308,27 @@ class InstanceAuditPlanService extends ServiceBase {
283308
);
284309
}
285310

311+
public getAuditPlanSqlAnalysisDataV1(
312+
params: IGetAuditPlanSqlAnalysisDataV1Params,
313+
options?: AxiosRequestConfig
314+
) {
315+
const paramsData = this.cloneDeep(params);
316+
const project_name = paramsData.project_name;
317+
delete paramsData.project_name;
318+
319+
const instance_audit_plan_id = paramsData.instance_audit_plan_id;
320+
delete paramsData.instance_audit_plan_id;
321+
322+
const id = paramsData.id;
323+
delete paramsData.id;
324+
325+
return this.get<IGetAuditPlanSqlAnalysisDataV1Return>(
326+
`/v1/projects/${project_name}/instance_audit_plans/${instance_audit_plan_id}/sqls/${id}/analysis`,
327+
paramsData,
328+
options
329+
);
330+
}
331+
286332
public UploadInstanceAuditPlanSQLsV2(
287333
params: IUploadInstanceAuditPlanSQLsV2Params,
288334
options?: AxiosRequestConfig

‎packages/shared/lib/components/ActiontechTable/hooks/useTableSettings.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const useTableSettings = <
3131

3232
const catchDefaultColumnsInfo = useCallback(
3333
(defaultColumns: ActiontechTableColumn<T, F, OtherColumnKeys>) => {
34-
if (tableName && username) {
34+
if (tableName && username && !!defaultColumns.length) {
3535
try {
3636
const localStr = LocalStorageWrapper.get(tableName);
3737
const localData = localStr ? JSON.parse(localStr) : undefined;

0 commit comments

Comments
 (0)