mirror of
https://github.com/windmill-labs/windmill.git
synced 2026-09-11 08:07:15 +00:00
fix: canceled jobs button reporting 0 jobs cancelled (#4534)
This commit is contained in:
@@ -1469,6 +1469,8 @@ async fn cancel_jobs(
|
||||
}
|
||||
}
|
||||
|
||||
uuids.extend(trivial_jobs);
|
||||
|
||||
Ok(Json(uuids))
|
||||
}
|
||||
|
||||
|
||||
@@ -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}
|
||||
|
||||
@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user