From fd78d308bbe5b484386a664f37cfddadc076beb0 Mon Sep 17 00:00:00 2001
From: carrythemountain <liftandthink@gmail.com>
Date: Wed, 28 Aug 2024 15:31:32 -0500
Subject: [PATCH] Bugfix/t UI 357 cancel job button (#422)

* Fix boolean logic for Cancel Job disabled

* Run npm run prettier
---
 .github/workflows/main.yml                           | 2 +-
 src/app/Jobs/_components/JobsToolbar/JobsToolbar.tsx | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 078a07ea3..ee3121f21 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -6,7 +6,7 @@ on:
   pull_request:
     branches: [dev, staging, test, release-**]
   workflow_dispatch:
-    
+
 jobs:
   Client_Side_Unit_Tests:
     runs-on: ubuntu-20.04
diff --git a/src/app/Jobs/_components/JobsToolbar/JobsToolbar.tsx b/src/app/Jobs/_components/JobsToolbar/JobsToolbar.tsx
index 393fa4328..c1946a1ea 100644
--- a/src/app/Jobs/_components/JobsToolbar/JobsToolbar.tsx
+++ b/src/app/Jobs/_components/JobsToolbar/JobsToolbar.tsx
@@ -60,7 +60,7 @@ const JobsToolbar: React.FC<{ jobUuid: string }> = ({ jobUuid }) => {
   };
   // Check if the job is in a non-terminal state
   const isCancelable =
-    job && !['FINISHED', 'FAILED'].includes(job.status ?? '');
+    job && !['FINISHED', 'FAILED', 'CANCELLED'].includes(job.status ?? '');
 
   return (
     <div id="file-operation-toolbar">
@@ -76,7 +76,7 @@ const JobsToolbar: React.FC<{ jobUuid: string }> = ({ jobUuid }) => {
           <ToolbarButton
             text="Cancel Job"
             icon="trash"
-            disabled={false}
+            disabled={isCancelable ? false : true}
             onClick={() => setModal('ConfirmModal')}
             aria-label="cancelJob" // Updated aria-label to be more descriptive
           />