Fix workload overview status sorting (#3486)

* Sort statuses allowing 'running' to be first

Signed-off-by: Alex Andreev <[email protected]>

* Fix Chart legend badges

Signed-off-by: Alex Andreev <[email protected]>

* Adding getStatus() tests for each store

Signed-off-by: Alex Andreev <[email protected]>

src/renderer/api/kube-json-api.ts

@@ -48,6 +48,7 @@ export interface KubeJsonApiMetadata {
   annotations?: {
     [annotation: string]: string;
   };
+  [key: string]: any;
 }
 
 export interface KubeJsonApiData extends JsonApiData {

src/renderer/components/+workloads-cronjobs/cronjob.store.ts

@@ -34,7 +34,7 @@ export class CronJobStore extends KubeObjectStore<CronJob> {
   }
 
   getStatuses(cronJobs?: CronJob[]) {
-    const status = { suspended: 0, scheduled: 0 };
+    const status = { scheduled: 0, suspended: 0 };
 
     cronJobs.forEach(cronJob => {
       if (cronJob.spec.suspend) {

src/renderer/components/+workloads-daemonsets/daemonsets.store.ts

@@ -41,7 +41,7 @@ export class DaemonSetStore extends KubeObjectStore<DaemonSet> {
   }
 
   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);

src/renderer/components/+workloads-deployments/deployments.store.ts

@@ -43,7 +43,7 @@ export class DeploymentStore extends KubeObjectStore<Deployment> {
   }
 
   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);

src/renderer/components/+workloads-jobs/job.store.ts

@@ -46,7 +46,7 @@ export class JobStore extends KubeObjectStore<Job> {
   }
 
   getStatuses(jobs?: Job[]) {
-    const status = { failed: 0, pending: 0, running: 0, succeeded: 0 };
+    const status = { succeeded: 0, running: 0, failed: 0, pending: 0 };
 
     jobs.forEach(job => {
       const pods = this.getChildPods(job);

src/renderer/components/+workloads-pods/pods.store.ts

@@ -70,7 +70,7 @@ export class PodsStore extends KubeObjectStore<Pod> {
   }
 
   getStatuses(pods: Pod[]) {
-    return countBy(pods.map(pod => pod.getStatus()));
+    return countBy(pods.map(pod => pod.getStatus()).sort().reverse());
   }
 
   getPodKubeMetrics(pod: Pod) {

src/renderer/components/+workloads-replicasets/replicasets.store.ts

@@ -42,7 +42,7 @@ export class ReplicaSetStore extends KubeObjectStore<ReplicaSet> {
   }
 
   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);

src/renderer/components/+workloads-statefulsets/statefulset.store.ts

@@ -41,7 +41,7 @@ export class StatefulSetStore extends KubeObjectStore<StatefulSet> {
   }
 
   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);

src/renderer/components/__tests__/cronjob.store.test.ts

@@ -0,0 +1,115 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+import { cronJobStore } from "../+workloads-cronjobs/cronjob.store";
+import { CronJob } from "../../api/endpoints";
+
+const spec = {
+  schedule: "test",
+  concurrencyPolicy: "test",
+  suspend: true,
+  jobTemplate: {
+    metadata: {},
+    spec: {
+      template: {
+        metadata: {},
+        spec: {
+          containers: [] as any,
+          restartPolicy: "restart",
+          terminationGracePeriodSeconds: 1,
+          dnsPolicy: "no",
+          hostPID: true,
+          schedulerName: "string"
+        }
+      }
+    }
+  },
+  successfulJobsHistoryLimit: 1,
+  failedJobsHistoryLimit: 1
+};
+
+const scheduledCronJob = new CronJob({
+  apiVersion: "foo",
+  kind: "CronJob",
+  metadata: {
+    name: "scheduledCronJob",
+    resourceVersion: "scheduledCronJob",
+    uid: "scheduledCronJob",
+    namespace: "default",
+  },
+});
+
+const suspendedCronJob = new CronJob({
+  apiVersion: "foo",
+  kind: "CronJob",
+  metadata: {
+    name: "suspendedCronJob",
+    resourceVersion: "suspendedCronJob",
+    uid: "suspendedCronJob",
+    namespace: "default",
+  }
+});
+
+const otherSuspendedCronJob = new CronJob({
+  apiVersion: "foo",
+  kind: "CronJob",
+  metadata: {
+    name: "otherSuspendedCronJob",
+    resourceVersion: "otherSuspendedCronJob",
+    uid: "otherSuspendedCronJob",
+    namespace: "default",
+  },
+});
+
+scheduledCronJob.spec = { ...spec };
+suspendedCronJob.spec = { ...spec };
+otherSuspendedCronJob.spec = { ...spec };
+scheduledCronJob.spec.suspend = false;
+
+describe("CronJob Store tests", () => {
+  it("gets CronJob statuses in proper sorting order", () => {
+    const statuses = Object.entries(cronJobStore.getStatuses([
+      suspendedCronJob,
+      otherSuspendedCronJob,
+      scheduledCronJob
+    ]));
+
+    expect(statuses).toEqual([
+      ["scheduled", 1],
+      ["suspended", 2],
+    ]);
+  });
+
+  it("returns 0 for other statuses", () => {
+    let statuses = Object.entries(cronJobStore.getStatuses([scheduledCronJob]));
+
+    expect(statuses).toEqual([
+      ["scheduled", 1],
+      ["suspended", 0],
+    ]);
+
+    statuses = Object.entries(cronJobStore.getStatuses([suspendedCronJob]));
+
+    expect(statuses).toEqual([
+      ["scheduled", 0],
+      ["suspended", 1],
+    ]);
+  });
+});

src/renderer/components/__tests__/daemonset.store.test.ts

@@ -0,0 +1,181 @@
+/**
+ * Copyright (c) 2021 OpenLens Authors
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import { observable } from "mobx";
+import { daemonSetStore } from "../+workloads-daemonsets/daemonsets.store";
+import { podsStore } from "../+workloads-pods/pods.store";
+import { DaemonSet, Pod } from "../../api/endpoints";
+
+const runningDaemonSet = new DaemonSet({
+  apiVersion: "foo",
+  kind: "DaemonSet",
+  metadata: {
+    name: "runningDaemonSet",
+    resourceVersion: "runningDaemonSet",
+    uid: "runningDaemonSet",
+    namespace: "default",
+  },
+});
+
+const failedDaemonSet = new DaemonSet({
+  apiVersion: "foo",
+  kind: "DaemonSet",
+  metadata: {
+    name: "failedDaemonSet",
+    resourceVersion: "failedDaemonSet",
+    uid: "failedDaemonSet",
+    namespace: "default",
+  },
+});
+
+const pendingDaemonSet = new DaemonSet({
+  apiVersion: "foo",
+  kind: "DaemonSet",
+  metadata: {
+    name: "pendingDaemonSet",
+    resourceVersion: "pendingDaemonSet",
+    uid: "pendingDaemonSet",
+    namespace: "default",
+  },
+});
+
+const runningPod = new Pod({
+  apiVersion: "foo",
+  kind: "Pod",
+  metadata: {
+    name: "foobar",
+    resourceVersion: "foobar",
+    uid: "foobar",
+    ownerReferences: [{
+      uid: "runningDaemonSet",
+    }],
+    namespace: "default"
+  },
+});
+
+runningPod.status = {
+  phase: "Running",
+  conditions: [
+    {
+      type: "Initialized",
+      status: "True",
+      lastProbeTime: 1,
+      lastTransitionTime: "1",
+    },
+    {
+      type: "Ready",
+      status: "True",
+      lastProbeTime: 1,
+      lastTransitionTime: "1",
+    }
+  ],
+  hostIP: "10.0.0.1",
+  podIP: "10.0.0.1",
+  startTime: "now",
+  containerStatuses: [],
+  initContainerStatuses: [],
+};
+
+const pendingPod = new Pod({
+  apiVersion: "foo",
+  kind: "Pod",
+  metadata: {
+    name: "foobar-pending",
+    resourceVersion: "foobar",
+    uid: "foobar-pending",
+    ownerReferences: [{
+      uid: "pendingDaemonSet",
+    }],
+    namespace: "default"
+  },
+});
+
+const failedPod = new Pod({
+  apiVersion: "foo",
+  kind: "Pod",
+  metadata: {
+    name: "foobar-failed",
+    resourceVersion: "foobar",
+    uid: "foobar-failed",
+    ownerReferences: [{
+      uid: "failedDaemonSet",
+    }],
+    namespace: "default"
+  },
+});
+
+failedPod.status = {
+  phase: "Failed",
+  conditions: [],
+  hostIP: "10.0.0.1",
+  podIP: "10.0.0.1",
+  startTime: "now",
+};
+
+describe("DaemonSet Store tests", () => {
+  beforeAll(() => {
+    podsStore.items = observable.array([
+      runningPod,
+      failedPod,
+      pendingPod
+    ]);
+  });
+
+  it("gets DaemonSet statuses in proper sorting order", () => {
+    const statuses = Object.entries(daemonSetStore.getStatuses([
+      failedDaemonSet,
+      runningDaemonSet,
+      pendingDaemonSet
+    ]));
+
+    expect(statuses).toEqual([
+      ["running", 1],
+      ["failed", 1],
+      ["pending", 1],
+    ]);
+  });
+
+  it("returns 0 for other statuses", () => {
+    let statuses = Object.entries(daemonSetStore.getStatuses([runningDaemonSet]));
+
+    expect(statuses).toEqual([
+      ["running", 1],
+      ["failed", 0],
+      ["pending", 0],
+    ]);
+
+    statuses = Object.entries(daemonSetStore.getStatuses([failedDaemonSet]));
+
+    expect(statuses).toEqual([
+      ["running", 0],
+      ["failed", 1],
+      ["pending", 0],
+    ]);
+
+    statuses = Object.entries(daemonSetStore.getStatuses([pendingDaemonSet]));
+
+    expect(statuses).toEqual([
+      ["running", 0],
+      ["failed", 0],
+      ["pending", 1],
+    ]);
+  });
+});