Merge branch 'dev' of https://github.com/tapis-project/tapis-ui into dev

tapis-project · Aug 28, 2024 · cf36ed3 · cf36ed3
2 parents 35c8967 + fd78d30
commit cf36ed3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git 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
           />