From 8892cf2622a4b5597292902b199c1f64e56f22d1 Mon Sep 17 00:00:00 2001 From: Alex Corey Date: Mon, 8 Aug 2022 16:26:54 -0400 Subject: [PATCH] Adds toast to workflow approval on cancel --- awx/ui/src/components/JobCancelButton/JobCancelButton.js | 7 ++++++- .../WorkflowApprovalDetail/WorkflowApprovalDetail.js | 6 ++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/awx/ui/src/components/JobCancelButton/JobCancelButton.js b/awx/ui/src/components/JobCancelButton/JobCancelButton.js index 30bea62eab..eec42b4241 100644 --- a/awx/ui/src/components/JobCancelButton/JobCancelButton.js +++ b/awx/ui/src/components/JobCancelButton/JobCancelButton.js @@ -18,13 +18,18 @@ function JobCancelButton({ isDisabled, tooltip, cancelationMessage, + onCancelWorkflow, }) { const [isOpen, setIsOpen] = useState(false); const { error: cancelError, request: cancelJob } = useRequest( useCallback(async () => { setIsOpen(false); await getJobModel(job.type).cancel(job.id); - }, [job.id, job.type]), + + if (onCancelWorkflow) { + onCancelWorkflow(); + } + }, [job.id, job.type, onCancelWorkflow]), {} ); const { error, dismissError: dismissCancelError } = diff --git a/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js b/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js index 75dd963b3a..be2987221f 100644 --- a/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js +++ b/awx/ui/src/screens/WorkflowApproval/WorkflowApprovalDetail/WorkflowApprovalDetail.js @@ -313,6 +313,12 @@ function WorkflowApprovalDetail({ workflowApproval, fetchWorkflowApproval }) { onHandleToast={handleToast} /> + handleToast( + workflowApproval.summary_fields.source_workflow_job.id, + 'Workflow Cancelled ' + ) + } title={t`Cancel Workflow`} job={{ ...workflowApproval.summary_fields.source_workflow_job,