Merge pull request #751 from actiontech/feature/issue-3145

Feature/issue 3145

Author: LZS911

packages/base/src/page/System/GlobalSetting/components/CBOperationLogsExpiredHours.tsx

@@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next';
 import { ConfigItem } from '@actiontech/dms-kit';
 import { EditInputNumber, LabelContent } from '@actiontech/dms-kit';
 import useValidatorNumber from './useValidatorNumber';
-import { IUpdateSystemVariablesReqV1 } from '@actiontech/shared/lib/api/sqle/service/common';
+import { IUpdateSystemVariablesReqV1 } from '@actiontech/shared/lib/api/base/service/common';
 import { PERMISSIONS, usePermission } from '@actiontech/shared/lib/features';
 export interface CBOperationLogsExpiredHoursProps {
   expiredHours: number | undefined;

packages/base/src/page/System/GlobalSetting/components/OperationRecordExpiredHours.tsx

@@ -2,7 +2,7 @@ import { useTranslation } from 'react-i18next';
 import { ConfigItem } from '@actiontech/dms-kit';
 import { EditInputNumber, LabelContent } from '@actiontech/dms-kit';
 import useValidatorNumber from './useValidatorNumber';
-import { IUpdateSystemVariablesReqV1 } from '@actiontech/shared/lib/api/sqle/service/common';
+import { IUpdateSystemVariablesReqV1 } from '@actiontech/shared/lib/api/base/service/common';
 import { PERMISSIONS, usePermission } from '@actiontech/shared/lib/features';
 export interface OperationRecordExpiredHoursProps {
   expiredHours: number | undefined;

packages/base/src/page/System/GlobalSetting/components/UrlAddressPrefixTips.tsx

@@ -1,7 +1,7 @@
 import { useTranslation } from 'react-i18next';
 import { ConfigItem } from '@actiontech/dms-kit';
 import { EditInput, LabelContent } from '@actiontech/dms-kit';
-import { IUpdateSystemVariablesReqV1 } from '@actiontech/shared/lib/api/sqle/service/common';
+import { IUpdateSystemVariablesReqV1 } from '@actiontech/shared/lib/api/base/service/common';
 import { PERMISSIONS, usePermission } from '@actiontech/shared/lib/features';
 export interface UrlAddressPrefixTipsProps {
   url: string | undefined;

packages/base/src/page/System/GlobalSetting/index.tsx

@@ -4,7 +4,7 @@ import { useBoolean, useRequest } from 'ahooks';
 import useHideConfigInputNode from '@actiontech/dms-kit/es/components/ConfigItem/hooks/useHideConfigInputNode';
 import { DmsApi } from '@actiontech/shared/lib/api';
 import { ResponseCode, ConfigFieldMapMeta } from '@actiontech/dms-kit';
-import { IUpdateSystemVariablesReqV1 } from '@actiontech/shared/lib/api/sqle/service/common';
+import { IUpdateSystemVariablesReqV1 } from '@actiontech/shared/lib/api/base/service/common';
 import { Spin } from 'antd';
 import SystemBasicTitle from '../components/BasicTitle';
 import OperationRecordExpiredHours from './components/OperationRecordExpiredHours';

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

@@ -387,7 +387,7 @@ exports[`base/router-base-ee render base route data snap 1`] = `
                   workflowSqlFileStatementOverview
                 </div>,
                 "key": "workflowSqlFileStatementOverview",
-                "path": ":taskId/files/:fileId/sqls",
+                "path": ":workflowId/task/:taskId/files/:fileId/sqls",
               },
             ],
             "element": <div

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

@@ -251,7 +251,7 @@ exports[`base/router-base-ce render base route data snap 1`] = `
               workflowSqlFileStatementOverview
             </div>,
             "key": "workflowSqlFileStatementOverview",
-            "path": ":taskId/files/:fileId/sqls",
+            "path": ":workflowId/task/:taskId/files/:fileId/sqls",
           },
         ],
         "element": <div

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

@@ -170,7 +170,7 @@ describe('base/router-sqle-ce', () => {
 
         it('render SQLFileStatementOverview', async () => {
           const { baseElement } = customRender([
-            `/sqle/project/${projectID}/exec-workflow/123/files/434/sqls`
+            `/sqle/project/${projectID}/exec-workflow/789/task/123/files/434/sqls`
           ]);
 
           await act(async () => jest.advanceTimersByTime(300));

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

@@ -194,7 +194,7 @@ describe('base/router-sqle-ee', () => {
 
         it('render SQLFileStatementOverview', async () => {
           const { baseElement } = customRender([
-            `/sqle/project/${projectID}/exec-workflow/123/files/434/sqls`
+            `/sqle/project/${projectID}/exec-workflow/789/task/123/files/434/sqls`
           ]);
 
           await act(async () => jest.advanceTimersByTime(300));

packages/dms-kit/src/data/routePaths.ts

@@ -207,7 +207,7 @@ export const ROUTE_PATHS = {
       },
       sql_files_overview: {
         prefix: '/sqle/project/:projectID/exec-workflow',
-        path: ':taskId/files/:fileId/sqls',
+        path: ':workflowId/task/:taskId/files/:fileId/sqls',
         query: 'instance_name&schema'
       }
     },

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

@@ -2069,14 +2069,6 @@ export interface IGetSystemModuleRedDotsRes {
   message?: string;
 }
 
-export interface IGetSystemVariablesResV1 {
-  code?: number;
-
-  data?: ISystemVariablesResV1;
-
-  message?: string;
-}
-
 export interface IGetTableMetadataResV1 {
   code?: number;
 
@@ -2740,6 +2732,8 @@ export interface IOptimizationsummary {
 }
 
 export interface IOptimizeSQLReq {
+  db_type?: string;
+
   explain_info?: string;
 
   instance_name?: string;
@@ -2813,6 +2807,10 @@ export interface IProjectScore {
   score?: number;
 }
 
+export interface IReExecuteTaskOnWorkflowReq {
+  exec_sql_ids?: number[];
+}
+
 export interface IRecordSource {
   name?: RecordSourceNameEnum;
 
@@ -3445,14 +3443,6 @@ export interface IStatisticsAuditedSQLResV1 {
   risk_rate?: number;
 }
 
-export interface ISystemVariablesResV1 {
-  cb_operation_logs_expired_hours?: number;
-
-  operation_record_expired_hours?: number;
-
-  url?: string;
-}
-
 export interface ITable {
   name?: string;
 }
@@ -3853,14 +3843,6 @@ export interface IUpdateStagesInstanceDep {
   stage_instance_id?: string;
 }
 
-export interface IUpdateSystemVariablesReqV1 {
-  cb_operation_logs_expired_hours?: number;
-
-  operation_record_expired_hours?: number;
-
-  url?: string;
-}
-
 export interface IUpdateTaskBackupStrategyReq {
   strategy?: UpdateTaskBackupStrategyReqStrategyEnum;
 }