From a51cbc9e084696509ca0f319ba78dd7da9fea403 Mon Sep 17 00:00:00 2001
From: wendrul <53628737+wendrul@users.noreply.github.com>
Date: Wed, 16 Oct 2024 16:15:25 +0200
Subject: [PATCH] fix: canceled jobs button reporting 0 jobs cancelled (#4534)

---
 backend/windmill-api/src/jobs.rs                           | 2 ++
 frontend/src/lib/components/runs/RunRow.svelte             | 7 +++++++
 .../src/routes/(root)/(logged)/runs/[...path]/+page.svelte | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/backend/windmill-api/src/jobs.rs b/backend/windmill-api/src/jobs.rs
index 859c8721a8..e975b5a655 100644
--- a/backend/windmill-api/src/jobs.rs
+++ b/backend/windmill-api/src/jobs.rs
@@ -1469,6 +1469,8 @@ async fn cancel_jobs(
         }
     }
 
+    uuids.extend(trivial_jobs);
+
     Ok(Json(uuids))
 }
 
diff --git a/frontend/src/lib/components/runs/RunRow.svelte b/frontend/src/lib/components/runs/RunRow.svelte
index 54c45d1f72..2a024c318c 100644
--- a/frontend/src/lib/components/runs/RunRow.svelte
+++ b/frontend/src/lib/components/runs/RunRow.svelte
@@ -94,6 +94,10 @@
 			<Badge color="blue" baseClass="!px-1.5">
 				<Calendar size={14} />
 			</Badge>
+		{:else if job.canceled}
+			<Badge color="red" baseClass="!px-1.5">
+				<Hourglass size={14} />
+			</Badge>
 		{:else}
 			<Badge baseClass="!px-1.5">
 				<Hourglass size={14} />
@@ -120,6 +124,9 @@
 					{/if}
 				{:else if `scheduled_for` in job && job.scheduled_for && forLater(job.scheduled_for)}
 					Scheduled for {displayDate(job.scheduled_for)}
+				{:else if job.canceled}
+					Cancelling job... (created <TimeAgo agoOnlyIfRecent date={job.created_at || ''} />)
+
 				{:else}
 					Waiting for executor (created <TimeAgo agoOnlyIfRecent date={job.created_at || ''} />)
 				{/if}
diff --git a/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
index d7a2601df0..31c2423029 100644
--- a/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/runs/[...path]/+page.svelte
@@ -497,7 +497,7 @@
 	}
 
 	function isJobCancelable(j: Job): boolean {
-		return j.type === 'QueuedJob' && !j.schedule_path
+		return j.type === 'QueuedJob' && !j.schedule_path && !j.canceled
 	}
 
 	function jobCountString(count: number) {