From 895b81fd726066b16f6fd1cdfcde473a7f0dd5c2 Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Thu, 22 Jul 2021 11:24:25 +0300 Subject: [PATCH] Sort statuses allowing 'running' to be first Signed-off-by: Alex Andreev --- src/renderer/components/+workloads-cronjobs/cronjob.store.ts | 2 +- .../components/+workloads-daemonsets/daemonsets.store.ts | 2 +- .../components/+workloads-deployments/deployments.store.ts | 2 +- src/renderer/components/+workloads-jobs/job.store.ts | 2 +- src/renderer/components/+workloads-pods/pods.store.ts | 2 +- .../components/+workloads-replicasets/replicasets.store.ts | 2 +- .../components/+workloads-statefulsets/statefulset.store.ts | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/renderer/components/+workloads-cronjobs/cronjob.store.ts b/src/renderer/components/+workloads-cronjobs/cronjob.store.ts index 422cc7b69d..90ea0e0c2c 100644 --- a/src/renderer/components/+workloads-cronjobs/cronjob.store.ts +++ b/src/renderer/components/+workloads-cronjobs/cronjob.store.ts @@ -34,7 +34,7 @@ export class CronJobStore extends KubeObjectStore { } getStatuses(cronJobs?: CronJob[]) { - const status = { suspended: 0, scheduled: 0 }; + const status = { scheduled: 0, suspended: 0 }; cronJobs.forEach(cronJob => { if (cronJob.spec.suspend) { diff --git a/src/renderer/components/+workloads-daemonsets/daemonsets.store.ts b/src/renderer/components/+workloads-daemonsets/daemonsets.store.ts index 210e6bdcdd..8a1958767a 100644 --- a/src/renderer/components/+workloads-daemonsets/daemonsets.store.ts +++ b/src/renderer/components/+workloads-daemonsets/daemonsets.store.ts @@ -49,7 +49,7 @@ export class DaemonSetStore extends KubeObjectStore { } getStatuses(daemonSets?: DaemonSet[]) { - const status = { failed: 0, pending: 0, running: 0 }; + const status = { running: 0, failed: 0, pending: 0 }; daemonSets.forEach(daemonSet => { const pods = this.getChildPods(daemonSet); diff --git a/src/renderer/components/+workloads-deployments/deployments.store.ts b/src/renderer/components/+workloads-deployments/deployments.store.ts index 8d99731d4f..bf60ee6663 100644 --- a/src/renderer/components/+workloads-deployments/deployments.store.ts +++ b/src/renderer/components/+workloads-deployments/deployments.store.ts @@ -50,7 +50,7 @@ export class DeploymentStore extends KubeObjectStore { } getStatuses(deployments?: Deployment[]) { - const status = { failed: 0, pending: 0, running: 0 }; + const status = { running: 0, failed: 0, pending: 0 }; deployments.forEach(deployment => { const pods = this.getChildPods(deployment); diff --git a/src/renderer/components/+workloads-jobs/job.store.ts b/src/renderer/components/+workloads-jobs/job.store.ts index 754c8562c8..0d0d381c90 100644 --- a/src/renderer/components/+workloads-jobs/job.store.ts +++ b/src/renderer/components/+workloads-jobs/job.store.ts @@ -46,7 +46,7 @@ export class JobStore extends KubeObjectStore { } getStatuses(jobs?: Job[]) { - const status = { failed: 0, pending: 0, running: 0, succeeded: 0 }; + const status = { running: 0, succeeded: 0, failed: 0, pending: 0 }; jobs.forEach(job => { const pods = this.getChildPods(job); diff --git a/src/renderer/components/+workloads-pods/pods.store.ts b/src/renderer/components/+workloads-pods/pods.store.ts index 62a6a720af..0c744e60f3 100644 --- a/src/renderer/components/+workloads-pods/pods.store.ts +++ b/src/renderer/components/+workloads-pods/pods.store.ts @@ -80,7 +80,7 @@ export class PodsStore extends KubeObjectStore { } getStatuses(pods: Pod[]) { - return countBy(pods.map(pod => pod.getStatus())); + return countBy(pods.map(pod => pod.getStatus()).sort().reverse()); } getPodKubeMetrics(pod: Pod) { diff --git a/src/renderer/components/+workloads-replicasets/replicasets.store.ts b/src/renderer/components/+workloads-replicasets/replicasets.store.ts index 66794bc7ad..275b62aaaa 100644 --- a/src/renderer/components/+workloads-replicasets/replicasets.store.ts +++ b/src/renderer/components/+workloads-replicasets/replicasets.store.ts @@ -49,7 +49,7 @@ export class ReplicaSetStore extends KubeObjectStore { } getStatuses(replicaSets: ReplicaSet[]) { - const status = { failed: 0, pending: 0, running: 0 }; + const status = { running: 0, failed: 0, pending: 0 }; replicaSets.forEach(replicaSet => { const pods = this.getChildPods(replicaSet); diff --git a/src/renderer/components/+workloads-statefulsets/statefulset.store.ts b/src/renderer/components/+workloads-statefulsets/statefulset.store.ts index 572e39447a..0f08993174 100644 --- a/src/renderer/components/+workloads-statefulsets/statefulset.store.ts +++ b/src/renderer/components/+workloads-statefulsets/statefulset.store.ts @@ -49,7 +49,7 @@ export class StatefulSetStore extends KubeObjectStore { } getStatuses(statefulSets: StatefulSet[]) { - const status = { failed: 0, pending: 0, running: 0 }; + const status = { running: 0, failed: 0, pending: 0 }; statefulSets.forEach(statefulSet => { const pods = this.getChildPods(statefulSet);