From 382efcaace9f546059349b7f8c306bd62036855c Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 2 Jul 2023 00:22:54 +0200 Subject: [PATCH] continue step from pause --- .../Overview/GroupTasksTableList.js | 2 + .../Overview/GroupTasksViewModal.js | 39 ++++++++++++++++--- src/utils.js | 2 + 3 files changed, 37 insertions(+), 6 deletions(-) diff --git a/src/Pages/GroupTasks/Overview/GroupTasksTableList.js b/src/Pages/GroupTasks/Overview/GroupTasksTableList.js index 51c7a7c..735bbe4 100644 --- a/src/Pages/GroupTasks/Overview/GroupTasksTableList.js +++ b/src/Pages/GroupTasks/Overview/GroupTasksTableList.js @@ -133,6 +133,8 @@ export default function GroupTaskTableList({ text={t("groupTasks.groupTasksTableList.statusBadge.inputRequired")} /> ); + case Constants.GROUP_TASKS_STATUS.PAUSED: + return ; default: return ; } diff --git a/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js b/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js index c66262f..e3d34af 100644 --- a/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js +++ b/src/Pages/GroupTasks/Overview/GroupTasksViewModal.js @@ -74,14 +74,13 @@ export default function GroupTasksViewModal({ isOpen }) { switch (status) { case Constants.GROUP_TASKS_STATUS.FINISHED: return "success"; - case Constants.GROUP_TASKS_STATUS.RUNNING: - return "info"; - case Constants.GROUP_TASKS_STATUS.CANCELED: - return "warning"; case Constants.GROUP_TASKS_STATUS.FAILED: return "error"; + case Constants.GROUP_TASKS_STATUS.CANCELED: + case Constants.GROUP_TASKS_STATUS.PAUSED: + return "warning"; case Constants.GROUP_TASKS_STATUS.INPUT_REQUIRED: - return "info"; + case Constants.GROUP_TASKS_STATUS.RUNNING: default: return "info"; } @@ -101,6 +100,8 @@ export default function GroupTasksViewModal({ isOpen }) { return t( "groupTasks.groupTasksViewModal.alertMessage.taskInputRequired" ); + case Constants.GROUP_TASKS_STATUS.PAUSED: + return "Paused"; default: return "Alert message not found"; } @@ -116,7 +117,7 @@ export default function GroupTasksViewModal({ isOpen }) { case Constants.GROUP_TASKS_STATUS.FAILED: return "error"; case Constants.GROUP_TASKS_STATUS.INPUT_REQUIRED: - return "wait"; + case Constants.GROUP_TASKS_STATUS.PAUSED: default: return "wait"; } @@ -210,6 +211,19 @@ export default function GroupTasksViewModal({ isOpen }) { ); }; + const handleTaskResumeFromPauseTaskStep = (taskStepId, step) => { + webSocketContext.SendSocketMessage( + SentMessagesCommands.TaskResumeFromPauseTaskStep, + { + groupTaskId: currentGroupTask.Id, + category: currentGroupTask.Category, + groupId: currentGroupTask.GroupId, + step: step, + taskStepId: taskStepId, + } + ); + }; + const alertActionHandler = (status, taskStepId, index, taskLocked) => { switch (status) { case Constants.GROUP_TASKS_STATUS.FAILED: @@ -235,6 +249,19 @@ export default function GroupTasksViewModal({ isOpen }) { {t("groupTasks.groupTasksViewModal.button.continue")} ); + case Constants.GROUP_TASKS_STATUS.PAUSED: + return ( + + ); + default: return <>; } diff --git a/src/utils.js b/src/utils.js index 1b205e2..aeba3c9 100644 --- a/src/utils.js +++ b/src/utils.js @@ -28,6 +28,7 @@ export const Constants = { CANCELED: 3, FAILED: 4, INPUT_REQUIRED: 5, + PAUSED: 6, }, GLOBALS: { MIN_USERNAME_LENGTH: 2, @@ -210,6 +211,7 @@ export const SentMessagesCommands = { ScannersUseScanners: 15, ScannersDisconnectScanner: 16, GroupTasksCheckingForCategoryGroupChanges: 17, + TaskResumeFromPauseTaskStep: 18, }; export function WebSocketProvider({