Merge pull request #742 from actiontech/fix/issue-3143-2505.x

[fix](SqlExecWorkflow): Process optimization after workflow execute failed

Author: Rain-1214

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

@@ -79,7 +79,7 @@ export default {
   stageNode: {
     workflowDesc: '工单描述',
     executeTime: '上线时间',
-    retry: '重试',
+    updateInfo: '修改工单',
     offlineExecuted: '已线下执行',
     addExistingWorkflow: '添加已有工单',
     createWorkflow: '创建新工单'

packages/sqle/src/page/SqlExecWorkflow/Detail/__tests__/__snapshots__/index.test.tsx.snap

@@ -75,7 +75,7 @@ exports[`sqle/ExecWorkflow/Detail render current workflow status is wait for exe
                     type="button"
                   >
                     <span>
-                      重 试
+                      修改工单
                     </span>
                   </button>
                   <button
@@ -829,7 +829,7 @@ exports[`sqle/ExecWorkflow/Detail render snap detail 1`] = `
                     type="button"
                   >
                     <span>
-                      重 试
+                      修改工单
                     </span>
                   </button>
                   <button
@@ -1385,7 +1385,7 @@ exports[`sqle/ExecWorkflow/Detail render snap detail 2`] = `
                     type="button"
                   >
                     <span>
-                      重 试
+                      修改工单
                     </span>
                   </button>
                   <button
@@ -2262,7 +2262,7 @@ exports[`sqle/ExecWorkflow/Detail render snap detail 3`] = `
                     type="button"
                   >
                     <span>
-                      重 试
+                      修改工单
                     </span>
                   </button>
                   <button
@@ -3185,7 +3185,7 @@ exports[`sqle/ExecWorkflow/Detail render snap detail when have multiple states 1
                     type="button"
                   >
                     <span>
-                      重 试
+                      修改工单
                     </span>
                   </button>
                   <button

packages/sqle/src/page/SqlExecWorkflow/Detail/components/PageHeaderExtra/__test__/__snapshots__/index.ce.test.tsx.snap

@@ -28,7 +28,7 @@ exports[`sqle/SqlExecWorkflow/Detail/WorkflowDetailPageHeaderExtra ce render rol
         type="button"
       >
         <span>
-          重 试
+          修改工单
         </span>
       </button>
       <button

packages/sqle/src/page/SqlExecWorkflow/Detail/components/PageHeaderExtra/__test__/__snapshots__/index.test.tsx.snap

@@ -26,7 +26,7 @@ exports[`sqle/SqlExecWorkflow/Detail/WorkflowDetailPageHeaderExtra render batch
         type="button"
       >
         <span>
-          重 试
+          修改工单
         </span>
       </button>
       <button
@@ -75,6 +75,7 @@ exports[`sqle/SqlExecWorkflow/Detail/WorkflowDetailPageHeaderExtra render batch
       </button>
       <button
         class="ant-btn ant-btn-primary basic-button-wrapper css-geipcv"
+        hidden=""
         tooltip="[object Object]"
         type="button"
       >
@@ -246,7 +247,7 @@ exports[`sqle/SqlExecWorkflow/Detail/WorkflowDetailPageHeaderExtra render batch
         type="button"
       >
         <span>
-          重 试
+          修改工单
         </span>
       </button>
       <button
@@ -312,6 +313,7 @@ exports[`sqle/SqlExecWorkflow/Detail/WorkflowDetailPageHeaderExtra render batch
             class="ant-btn ant-btn-primary basic-button-wrapper css-geipcv"
             confirm="[object Object]"
             disabled=""
+            hidden=""
             type="button"
           >
             <span>
@@ -420,7 +422,7 @@ exports[`sqle/SqlExecWorkflow/Detail/WorkflowDetailPageHeaderExtra render execut
         type="button"
       >
         <span>
-          重 试
+          修改工单
         </span>
       </button>
       <button
@@ -558,7 +560,7 @@ exports[`sqle/SqlExecWorkflow/Detail/WorkflowDetailPageHeaderExtra render snap 1
         type="button"
       >
         <span>
-          重 试
+          修改工单
         </span>
       </button>
       <button
@@ -694,7 +696,7 @@ exports[`sqle/SqlExecWorkflow/Detail/WorkflowDetailPageHeaderExtra render snap w
         type="button"
       >
         <span>
-          重 试
+          修改工单
         </span>
       </button>
       <button

packages/sqle/src/page/SqlExecWorkflow/Detail/components/PageHeaderExtra/__test__/index.test.tsx

@@ -348,7 +348,47 @@ describe('sqle/SqlExecWorkflow/Detail/WorkflowDetailPageHeaderExtra', () => {
           workflow_step_list: [
             {
               number: 1,
-              type: WorkflowStepResV2TypeEnum.create_workflow,
+              type: WorkflowStepResV2TypeEnum.sql_execute,
+              assignee_user_name_list: ['admin'],
+              operation_time: '2024-02-22T18:08:00+08:00'
+            }
+          ]
+        }
+      },
+      maintenanceTimeInfo: []
+    });
+    expect(
+      screen.getByText('标记为人工上线').closest('button')
+    ).not.toHaveAttribute('hidden');
+    await act(async () => {
+      fireEvent.click(screen.getByText('标记为人工上线'));
+      await jest.advanceTimersByTime(100);
+    });
+    expect(
+      screen.getByText(
+        '当前操作仅修改工单状态，而不对数据源产生操作，是否确认标记为人工上线?'
+      )
+    ).toBeInTheDocument();
+    await act(async () => {
+      fireEvent.click(screen.getByText('确 认'));
+      await jest.advanceTimersByTime(100);
+    });
+  });
+
+  it('render manual execute button when status is exec_failed and executable is false', async () => {
+    mockUseCurrentProject({ projectArchive: false });
+
+    customRender({
+      workflowStepsVisibility: true,
+      workflowInfo: {
+        workflow_id: '1',
+        record: {
+          status: WorkflowRecordResV2StatusEnum.exec_failed,
+          executable: false,
+          workflow_step_list: [
+            {
+              number: 1,
+              type: WorkflowStepResV2TypeEnum.sql_execute,
               assignee_user_name_list: ['admin'],
               operation_time: '2024-02-22T18:08:00+08:00'
             }
@@ -511,8 +551,8 @@ describe('sqle/SqlExecWorkflow/Detail/WorkflowDetailPageHeaderExtra', () => {
         }
       }
     });
-    expect(screen.getByText('重 试')).toBeVisible();
-    fireEvent.click(screen.getByText('重 试'));
+    expect(screen.getByText('修改工单')).toBeVisible();
+    fireEvent.click(screen.getByText('修改工单'));
     await act(async () => jest.advanceTimersByTime(0));
     expect(showModifySqlStatementStep).toHaveBeenCalledTimes(1);
   });

packages/sqle/src/page/SqlExecWorkflow/Detail/components/PageHeaderExtra/action.tsx

@@ -200,7 +200,7 @@ export const RetryWorkflowAction = (
       permission={PERMISSIONS.ACTIONS.SQLE.SQL_EXEC_WORKFLOW.RETRY}
     >
       <ActionButton
-        text={t('execWorkflow.detail.operator.retry')}
+        text={t('execWorkflow.create.auditResult.updateInfo')}
         hidden={retryWorkflowButtonMeta.hidden}
         onClick={() => retryWorkflowButtonMeta.action()}
         loading={retryWorkflowButtonMeta.loading}

packages/sqle/src/page/SqlExecWorkflow/Detail/components/PageHeaderExtra/hooks/useWorkflowDetailAction.tsx

@@ -203,6 +203,23 @@ const useWorkflowDetailAction = ({
     username
   ]);
 
+  const manualExecuteButtonVisibility = useMemo(() => {
+    if (!workflowInfo?.record?.status) {
+      return false;
+    }
+    const isAssigneeUser = workflowInfo.record.workflow_step_list
+      ?.find((v) => v.type === WorkflowStepResV2TypeEnum.sql_execute)
+      ?.assignee_user_name_list?.includes(username);
+    return (
+      [
+        WorkflowRecordResV2StatusEnum.wait_for_execution,
+        WorkflowRecordResV2StatusEnum.exec_failed
+      ].includes(workflowInfo.record.status) &&
+      isAssigneeUser &&
+      checkInTimeWithMaintenanceTimeInfo(dayjs())
+    );
+  }, [checkInTimeWithMaintenanceTimeInfo, workflowInfo, username]);
+
   const executingWorkflow = () => {
     if (!executingButtonVisibility) {
       return;
@@ -219,7 +236,7 @@ const useWorkflowDetailAction = ({
   ] = useBoolean();
 
   const completeWorkflow = () => {
-    if (!executingButtonVisibility) {
+    if (!manualExecuteButtonVisibility) {
       return;
     }
     completeStart();
@@ -333,7 +350,7 @@ const useWorkflowDetailAction = ({
     manualExecuteWorkflowButtonMeta: {
       action: completeWorkflow,
       loading: completeLoading,
-      hidden: !executingButtonVisibility
+      hidden: !manualExecuteButtonVisibility
     },
     terminateWorkflowButtonMeta: {
       action: terminateWorkflow,

packages/sqle/src/page/SqlExecWorkflow/Detail/components/PageHeaderExtra/index.tsx

@@ -19,6 +19,7 @@ import {
   RollbackWorkflowAction,
   RetryWorkflowAction
 } from './action';
+import { WorkflowRecordResV2StatusEnum } from '@actiontech/shared/lib/api/sqle/service/common.enum';
 
 const WorkflowDetailPageHeaderExtra: React.FC<
   WorkflowDetailPageHeaderExtraProps
@@ -45,7 +46,10 @@ const WorkflowDetailPageHeaderExtra: React.FC<
     executable,
     executable_reason
   } = useWorkflowDetailAction({ projectName, ...props });
-
+  // console.log(
+  //   'manualExecuteWorkflowButtonMeta',
+  //   manualExecuteWorkflowButtonMeta
+  // );
   return (
     <WorkflowPageHeaderExtraStyleWrapper>
       {messageContextHolder}
@@ -72,7 +76,8 @@ const WorkflowDetailPageHeaderExtra: React.FC<
       )}
       {MarkManuallyExecWorkflowAction(
         manualExecuteWorkflowButtonMeta,
-        executable,
+        props.workflowInfo?.record?.status ===
+          WorkflowRecordResV2StatusEnum.exec_failed || executable,
         executable_reason
       )}
 

packages/sqle/src/page/VersionManagement/Detail/__tests__/__snapshots__/index.test.tsx.snap

@@ -537,7 +537,7 @@ exports[`sqle/VersionManagement/Detail render init snap 1`] = `
                                       type="button"
                                     >
                                       <span>
-                                        重 试
+                                        修改工单
                                       </span>
                                     </button>
                                   </div>
@@ -714,7 +714,7 @@ exports[`sqle/VersionManagement/Detail render init snap 1`] = `
                                       type="button"
                                     >
                                       <span>
-                                        重 试
+                                        修改工单
                                       </span>
                                     </button>
                                   </div>
@@ -1551,7 +1551,7 @@ exports[`sqle/VersionManagement/Detail render offline executed 1`] = `
                                       type="button"
                                     >
                                       <span>
-                                        重 试
+                                        修改工单
                                       </span>
                                     </button>
                                   </div>

packages/sqle/src/page/VersionManagement/Detail/__tests__/index.test.tsx

@@ -150,7 +150,7 @@ describe('sqle/VersionManagement/Detail', () => {
     await act(async () => jest.advanceTimersByTime(3000));
     expect(baseElement).toMatchSnapshot();
     expect(screen.getByText('上线失败')).toBeInTheDocument();
-    expect(screen.getByText('重 试')).toBeInTheDocument();
+    expect(screen.getByText('修改工单')).toBeInTheDocument();
     expect(screen.getByText('已线下执行')).toBeInTheDocument();
 
     fireEvent.click(screen.getByText('已线下执行'));
@@ -178,7 +178,7 @@ describe('sqle/VersionManagement/Detail', () => {
     );
     const { baseElement } = sqleSuperRender(<VersionDetail />);
     await act(async () => jest.advanceTimersByTime(3000));
-    fireEvent.click(screen.getByText('重 试'));
+    fireEvent.click(screen.getByText('修改工单'));
     await act(async () => jest.advanceTimersByTime(0));
     expect(dispatchSpy).toHaveBeenCalledTimes(2);
     expect(dispatchSpy).toHaveBeenNthCalledWith(2, {