From 9db9d4f977aef8957f978f306fe57d1423af4c4e Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 9 Mar 2023 14:59:11 -0500 Subject: [PATCH] Use new getStatus in CronJobStore's getStatuses Signed-off-by: Sebastian Malton --- .../components/+workloads-cronjobs/store.ts | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/packages/core/src/renderer/components/+workloads-cronjobs/store.ts b/packages/core/src/renderer/components/+workloads-cronjobs/store.ts index fe6c765723..011c9d3620 100644 --- a/packages/core/src/renderer/components/+workloads-cronjobs/store.ts +++ b/packages/core/src/renderer/components/+workloads-cronjobs/store.ts @@ -6,6 +6,7 @@ import type { KubeObjectStoreDependencies, KubeObjectStoreOptions } from "../../../common/k8s-api/kube-object.store"; import { KubeObjectStore } from "../../../common/k8s-api/kube-object.store"; import type { CronJob, CronJobApi } from "../../../common/k8s-api/endpoints/cron-job.api"; +import { CronJobStatusPhase } from "../../../common/k8s-api/endpoints/cron-job.api"; import type { GetJobsByOwner } from "../+workloads-jobs/get-jobs-by-owner.injectable"; interface Dependencies extends KubeObjectStoreDependencies { @@ -18,18 +19,19 @@ export class CronJobStore extends KubeObjectStore { } getStatuses(cronJobs?: CronJob[]) { - const status = { scheduled: 0, suspended: 0 }; + const statuses = { scheduled: 0, suspended: 0 }; cronJobs?.forEach(cronJob => { - if (cronJob.spec.suspend) { - status.suspended++; - } - else { - status.scheduled++; + const status = cronJob.getStatus(); + + if (status === CronJobStatusPhase.SUSPENDED) { + statuses.suspended++; + } else { + statuses.scheduled++; } }); - return status; + return statuses; } getActiveJobsNum(cronJob: CronJob) {