From cf697e96f7175f5de789712f64a08f6c9af15272 Mon Sep 17 00:00:00 2001 From: Jesper Noordsij Date: Tue, 1 Jul 2025 12:58:01 +0200 Subject: [PATCH] Update job status display to actually use job status --- .../web/src/common/components/resourcelist/job/component.ts | 6 +++--- modules/web/src/common/components/resourcelist/statuses.ts | 1 + modules/web/src/typings/root.api.ts | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/web/src/common/components/resourcelist/job/component.ts b/modules/web/src/common/components/resourcelist/job/component.ts index cf3f69fdc652..deb889d9d33d 100644 --- a/modules/web/src/common/components/resourcelist/job/component.ts +++ b/modules/web/src/common/components/resourcelist/job/component.ts @@ -46,9 +46,9 @@ export class JobListComponent extends ResourceListWithStatuses { this.groupId = ListGroupIdentifier.workloads; // Register status icon handlers - this.registerBinding('kd-success', r => r.podInfo.warnings.length === 0 && r.podInfo.pending === 0, Status.Running); - this.registerBinding('kd-warning', r => r.podInfo.warnings.length === 0 && r.podInfo.pending > 0, Status.Pending); - this.registerBinding('kd-error', r => r.podInfo.warnings.length > 0, Status.Error); + this.registerBinding('kd-success', r => r.jobStatus.status === Status.Complete, Status.Complete); + this.registerBinding('kd-warning', r => r.jobStatus.status === Status.Running, Status.Running); + this.registerBinding('kd-error', r => r.jobStatus.status === Status.Failed, Status.Failed); // Register action columns. this.registerActionColumn('menu', MenuComponent); diff --git a/modules/web/src/common/components/resourcelist/statuses.ts b/modules/web/src/common/components/resourcelist/statuses.ts index b2fa8d68de67..85503ad3f61a 100644 --- a/modules/web/src/common/components/resourcelist/statuses.ts +++ b/modules/web/src/common/components/resourcelist/statuses.ts @@ -16,6 +16,7 @@ export enum Status { Active = 'Active', Available = 'Available', Bound = 'Bound', + Complete = 'Complete', Completed = 'Completed', ContainerCreating = 'ContainerCreating', Error = 'Error', diff --git a/modules/web/src/typings/root.api.ts b/modules/web/src/typings/root.api.ts index ad36f2b5f9e1..b2b983b0a1ba 100644 --- a/modules/web/src/typings/root.api.ts +++ b/modules/web/src/typings/root.api.ts @@ -338,6 +338,7 @@ export interface Job extends Resource { containerImages: string[]; initContainerImages: string[]; parallelism: number; + jobStatus: JobStatus; } export interface Namespace extends Resource {