Feature/issue 3145

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;
 }

packages/shared/lib/api/sqle/service/configuration/index.d.ts

@@ -17,8 +17,6 @@ import {
   IGetLicenseResV1,
   ICheckLicenseResV1,
   ISSHPublicKeyInfoV1Rsp,
-  IGetSystemVariablesResV1,
-  IUpdateSystemVariablesReqV1,
   IGetWechatAuditConfigurationResV1,
   IUpdateWechatConfigurationReqV1,
   ITestWechatConfigurationReqV1,
@@ -87,13 +85,6 @@ export interface IGetSSHPublicKeyReturn extends ISSHPublicKeyInfoV1Rsp {}
 
 export interface IGenSSHPublicKeyReturn extends IBaseRes {}
 
-export interface IGetSystemVariablesV1Return extends IGetSystemVariablesResV1 {}
-
-export interface IUpdateSystemVariablesV1Params
-  extends IUpdateSystemVariablesReqV1 {}
-
-export interface IUpdateSystemVariablesV1Return extends IBaseRes {}
-
 export interface IGetWechatAuditConfigurationV1Return
   extends IGetWechatAuditConfigurationResV1 {}
 

packages/shared/lib/api/sqle/service/configuration/index.ts

@@ -31,9 +31,6 @@ import {
   ICheckSQLELicenseV1Return,
   IGetSSHPublicKeyReturn,
   IGenSSHPublicKeyReturn,
-  IGetSystemVariablesV1Return,
-  IUpdateSystemVariablesV1Params,
-  IUpdateSystemVariablesV1Return,
   IGetWechatAuditConfigurationV1Return,
   IUpdateWechatAuditConfigurationV1Params,
   IUpdateWechatAuditConfigurationV1Return,
@@ -233,26 +230,6 @@ class ConfigurationService extends ServiceBase {
     );
   }
 
-  public getSystemVariablesV1(options?: AxiosRequestConfig) {
-    return this.get<IGetSystemVariablesV1Return>(
-      '/v1/configurations/system_variables',
-      undefined,
-      options
-    );
-  }
-
-  public updateSystemVariablesV1(
-    params: IUpdateSystemVariablesV1Params,
-    options?: AxiosRequestConfig
-  ) {
-    const paramsData = this.cloneDeep(params);
-    return this.patch<IUpdateSystemVariablesV1Return>(
-      '/v1/configurations/system_variables',
-      paramsData,
-      options
-    );
-  }
-
   public getWechatAuditConfigurationV1(options?: AxiosRequestConfig) {
     return this.get<IGetWechatAuditConfigurationV1Return>(
       '/v1/configurations/wechat_audit',

packages/shared/lib/api/sqle/service/sql_optimization/index.d.ts

@@ -138,7 +138,7 @@ export interface ISQLOptimizeV2Params extends IOptimizeSQLReq {
 
   schema_name?: string;
 
-  db_type?: string;
+  db_type: string;
 
   optimization_name: string;
 

packages/shared/lib/api/sqle/service/workflow/index.d.ts

@@ -11,6 +11,7 @@ import {
   IBackupSqlListRes,
   ICreateRollbackWorkflowReq,
   ICreateRollbackWorkflowRes,
+  IReExecuteTaskOnWorkflowReq,
   IGetWorkflowResV1,
   IUpdateWorkflowReqV1,
   IRejectWorkflowReqV1,
@@ -215,6 +216,17 @@ export interface IGetWorkflowAttachmentParams {
   task_id: string;
 }
 
+export interface IReExecuteTaskOnWorkflowV1Params
+  extends IReExecuteTaskOnWorkflowReq {
+  project_name: string;
+
+  workflow_id: string;
+
+  task_id: string;
+}
+
+export interface IReExecuteTaskOnWorkflowV1Return extends IBaseRes {}
+
 export interface ITerminateSingleTaskByWorkflowV1Params {
   workflow_id: string;
 

packages/shared/lib/api/sqle/service/workflow/index.ts

@@ -32,6 +32,8 @@ import {
   ITerminateMultipleTaskByWorkflowV1Params,
   ITerminateMultipleTaskByWorkflowV1Return,
   IGetWorkflowAttachmentParams,
+  IReExecuteTaskOnWorkflowV1Params,
+  IReExecuteTaskOnWorkflowV1Return,
   ITerminateSingleTaskByWorkflowV1Params,
   ITerminateSingleTaskByWorkflowV1Return,
   IGetWorkflowV1Params,
@@ -299,6 +301,27 @@ class WorkflowService extends ServiceBase {
     );
   }
 
+  public reExecuteTaskOnWorkflowV1(
+    params: IReExecuteTaskOnWorkflowV1Params,
+    options?: AxiosRequestConfig
+  ) {
+    const paramsData = this.cloneDeep(params);
+    const project_name = paramsData.project_name;
+    delete paramsData.project_name;
+
+    const workflow_id = paramsData.workflow_id;
+    delete paramsData.workflow_id;
+
+    const task_id = paramsData.task_id;
+    delete paramsData.task_id;
+
+    return this.post<IReExecuteTaskOnWorkflowV1Return>(
+      `/v1/projects/${project_name}/workflows/${workflow_id}/tasks/${task_id}/re_execute`,
+      paramsData,
+      options
+    );
+  }
+
   public terminateSingleTaskByWorkflowV1(
     params: ITerminateSingleTaskByWorkflowV1Params,
     options?: AxiosRequestConfig

packages/shared/lib/testUtil/mockApi/sqle/execWorkflow/index.ts

@@ -47,6 +47,7 @@ class MockWorkflowApi implements MockSpyApy {
     this.createRollbackWorkflow();
     this.updateTaskBackupStrategy();
     this.getBackupSqlList();
+    this.reExecuteTaskOnWorkflow();
   }
 
   public getWorkflows() {
@@ -349,6 +350,12 @@ VALUES ('1234567890', '[email protected]', '123456789012345678', '9876543210', '
     );
     return spy;
   }
+
+  public reExecuteTaskOnWorkflow() {
+    const spy = jest.spyOn(workflow, 'reExecuteTaskOnWorkflowV1');
+    spy.mockImplementation(() => createSpySuccessResponse({}));
+    return spy;
+  }
 }
 
 export default new MockWorkflowApi();

packages/sqle/src/data/EmitterKey.ts

@@ -41,7 +41,9 @@ enum EmitterKey {
   Refresh_Sql_Exec_workflow_Audit_Result_List = 'Refresh_Sql_Exec_workflow_Audit_Result_List',
 
   Refresh_Sql_Audit_List = 'Refresh_Sql_Audit_List',
-  Refresh_Sql_Optimization_List = 'Refresh_Sql_Optimization_List'
+  Refresh_Sql_Optimization_List = 'Refresh_Sql_Optimization_List',
+
+  Sql_Retry_Execute_Done = 'Sql_Retry_Execute_Done'
 }
 
 export default EmitterKey;

packages/sqle/src/data/ModalName.ts

@@ -45,5 +45,8 @@ export enum ModalName {
   Sql_Optimization_Result_Modal = 'SQL_OPTIMIZATION_RESULT_MODAL',
   Sql_Optimization_Query_Plan_Flow_Modal = 'SQL_OPTIMIZATION_QUERY_PLAN_FLOW_MODAL',
   Sql_Optimization_Query_Plan_Diff_Modal = 'SQL_OPTIMIZATION_QUERY_PLAN_DIFF_MODAL',
-  Sql_Optimization_Result_Drawer = 'SQL_OPTIMIZATION_RESULT_DRAWER'
+  Sql_Optimization_Result_Drawer = 'SQL_OPTIMIZATION_RESULT_DRAWER',
+
+  // sql exec workflow
+  Sql_Exec_Workflow_Retry_Execute_Modal = 'SQL_EXEC_WORKFLOW_RETRY_EXECUTE_MODAL'
 }

packages/sqle/src/locale/zh-CN/execWorkflow.ts

@@ -259,7 +259,12 @@ export default {
         cancelExecScheduled: '取消定时上线',
         cancelExecScheduledTips: '取消定时上线成功',
         sqlExecuteConfirmTips:
-          '当前操作将立即执行该数据源上的SQL语句, 是否确认立即上线'
+          '当前操作将立即执行该数据源上的SQL语句, 是否确认立即上线',
+        retryExecute: '再次执行',
+        retryExecuteSuccess: '再次执行成功',
+        pleaseSelectSql: '请选择需要再次执行的SQL',
+        selectRetryExecuteSqlDesc: '已执行成功的SQL无法再次执行',
+        selectRetryExecuteSql: '选择再次执行的SQL'
       }
     },
     taskResult: {},