From 7915e04354bdc496fb223d575eece28e34bf4bec Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 31 Mar 2022 10:24:11 +0300 Subject: [PATCH] Remove redundant enum Signed-off-by: Janne Savolainen --- src/common/rbac.ts | 10 ---------- .../implementations/cron-jobs-workload.injectable.ts | 3 +-- .../implementations/daemonsets-workload.injectable.ts | 3 +-- .../implementations/deployments-workload.injectable.ts | 3 +-- .../implementations/jobs-workload.injectable.ts | 3 +-- .../implementations/pods-workload.injectable.ts | 3 +-- .../implementations/replicasets-workload.injectable.ts | 3 +-- .../statefulsets-workload.injectable.ts | 3 +-- .../workloads/workload-injection-token.ts | 3 +-- .../workloads/workloads.injectable.ts | 3 +-- 10 files changed, 9 insertions(+), 28 deletions(-) diff --git a/src/common/rbac.ts b/src/common/rbac.ts index 35760adf57..6f5a282262 100644 --- a/src/common/rbac.ts +++ b/src/common/rbac.ts @@ -10,16 +10,6 @@ export type KubeResource = "endpoints" | "customresourcedefinitions" | "horizontalpodautoscalers" | "podsecuritypolicies" | "poddisruptionbudgets" | "roles" | "clusterroles" | "rolebindings" | "clusterrolebindings" | "serviceaccounts"; -export enum KubeResourceEnum { - pods = "pods", - deployments = "deployments", - cronJobs = "cronjobs", - jobs = "jobs", - replicasets = "replicasets", - daemonsets = "daemonsets", - statefulsets = "statefulsets", -} - export interface KubeApiResource extends KubeApiResourceData { apiName: KubeResource; // valid api resource name (e.g. "namespaces") } diff --git a/src/renderer/components/+workloads-overview/workloads/implementations/cron-jobs-workload.injectable.ts b/src/renderer/components/+workloads-overview/workloads/implementations/cron-jobs-workload.injectable.ts index a9327ddca2..8171c17625 100644 --- a/src/renderer/components/+workloads-overview/workloads/implementations/cron-jobs-workload.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads/implementations/cron-jobs-workload.injectable.ts @@ -6,7 +6,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { workloadInjectionToken } from "../workload-injection-token"; import { ResourceNames } from "../../../../utils/rbac"; import navigateToPodsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/deployments/navigate-to-deployments.injectable"; -import { KubeResourceEnum } from "../../../../../common/rbac"; import namespaceStoreInjectable from "../../../+namespaces/namespace-store/namespace-store.injectable"; import cronJobsStoreInjectable from "../../../+workloads-cronjobs/cron-jobs-store.injectable"; import { computed } from "mobx"; @@ -20,7 +19,7 @@ const cronJobsWorkloadInjectable = getInjectable({ const store = di.inject(cronJobsStoreInjectable); return { - resourceName: KubeResourceEnum.cronJobs, + resourceName: "cronjobs", open: navigate, amountOfItems: computed( diff --git a/src/renderer/components/+workloads-overview/workloads/implementations/daemonsets-workload.injectable.ts b/src/renderer/components/+workloads-overview/workloads/implementations/daemonsets-workload.injectable.ts index afdc061b0e..3d94bed421 100644 --- a/src/renderer/components/+workloads-overview/workloads/implementations/daemonsets-workload.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads/implementations/daemonsets-workload.injectable.ts @@ -5,7 +5,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { workloadInjectionToken } from "../workload-injection-token"; import { ResourceNames } from "../../../../utils/rbac"; -import { KubeResourceEnum } from "../../../../../common/rbac"; import namespaceStoreInjectable from "../../../+namespaces/namespace-store/namespace-store.injectable"; import daemonsetsStoreInjectable from "../../../+workloads-daemonsets/daemonsets-store.injectable"; import navigateToDaemonsetsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/daemonsets/navigate-to-daemonsets.injectable"; @@ -20,7 +19,7 @@ const daemonsetsWorkloadInjectable = getInjectable({ const store = di.inject(daemonsetsStoreInjectable); return { - resourceName: KubeResourceEnum.daemonsets, + resourceName: "daemonsets", open: navigate, amountOfItems: computed( diff --git a/src/renderer/components/+workloads-overview/workloads/implementations/deployments-workload.injectable.ts b/src/renderer/components/+workloads-overview/workloads/implementations/deployments-workload.injectable.ts index d4ded7c5ef..8bd680a88e 100644 --- a/src/renderer/components/+workloads-overview/workloads/implementations/deployments-workload.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads/implementations/deployments-workload.injectable.ts @@ -5,7 +5,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { workloadInjectionToken } from "../workload-injection-token"; import { ResourceNames } from "../../../../utils/rbac"; -import { KubeResourceEnum } from "../../../../../common/rbac"; import namespaceStoreInjectable from "../../../+namespaces/namespace-store/namespace-store.injectable"; import deploymentsStoreInjectable from "../../../+workloads-deployments/deployments-store.injectable"; import navigateToDeploymentsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/deployments/navigate-to-deployments.injectable"; @@ -20,7 +19,7 @@ const deploymentsWorkloadInjectable = getInjectable({ const store = di.inject(deploymentsStoreInjectable); return { - resourceName: KubeResourceEnum.deployments, + resourceName: "deployments", open: navigate, amountOfItems: computed( diff --git a/src/renderer/components/+workloads-overview/workloads/implementations/jobs-workload.injectable.ts b/src/renderer/components/+workloads-overview/workloads/implementations/jobs-workload.injectable.ts index 8a14c9c4f1..19966b952b 100644 --- a/src/renderer/components/+workloads-overview/workloads/implementations/jobs-workload.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads/implementations/jobs-workload.injectable.ts @@ -5,7 +5,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { workloadInjectionToken } from "../workload-injection-token"; import { ResourceNames } from "../../../../utils/rbac"; -import { KubeResourceEnum } from "../../../../../common/rbac"; import namespaceStoreInjectable from "../../../+namespaces/namespace-store/namespace-store.injectable"; import jobsStoreInjectable from "../../../+workloads-jobs/jobs-store.injectable"; import navigateToJobsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/jobs/navigate-to-jobs.injectable"; @@ -20,7 +19,7 @@ const jobsWorkloadInjectable = getInjectable({ const store = di.inject(jobsStoreInjectable); return { - resourceName: KubeResourceEnum.jobs, + resourceName: "jobs", open: navigate, amountOfItems: computed( diff --git a/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts b/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts index 1a800f70d2..334c20ba44 100644 --- a/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads/implementations/pods-workload.injectable.ts @@ -6,7 +6,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { workloadInjectionToken } from "../workload-injection-token"; import { ResourceNames } from "../../../../utils/rbac"; import navigateToPodsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/pods/navigate-to-pods.injectable"; -import { KubeResourceEnum } from "../../../../../common/rbac"; import podsStoreInjectable from "../../../+workloads-pods/pods-store.injectable"; import namespaceStoreInjectable from "../../../+namespaces/namespace-store/namespace-store.injectable"; import { computed } from "mobx"; @@ -20,7 +19,7 @@ const podsWorkloadInjectable = getInjectable({ const store = di.inject(podsStoreInjectable); return { - resourceName: KubeResourceEnum.pods, + resourceName: "pods", open: navigate, amountOfItems: computed( diff --git a/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts b/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts index ce94017fef..71eed58284 100644 --- a/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads/implementations/replicasets-workload.injectable.ts @@ -6,7 +6,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { workloadInjectionToken } from "../workload-injection-token"; import { ResourceNames } from "../../../../utils/rbac"; import navigateToPodsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/deployments/navigate-to-deployments.injectable"; -import { KubeResourceEnum } from "../../../../../common/rbac"; import namespaceStoreInjectable from "../../../+namespaces/namespace-store/namespace-store.injectable"; import replicasetsStoreInjectable from "../../../+workloads-replicasets/replicasets-store.injectable"; import { computed } from "mobx"; @@ -20,7 +19,7 @@ const replicasetsWorkloadInjectable = getInjectable({ const store = di.inject(replicasetsStoreInjectable); return { - resourceName: KubeResourceEnum.replicasets, + resourceName: "replicasets", open: navigate, amountOfItems: computed( diff --git a/src/renderer/components/+workloads-overview/workloads/implementations/statefulsets-workload.injectable.ts b/src/renderer/components/+workloads-overview/workloads/implementations/statefulsets-workload.injectable.ts index 04a9482fc4..d7908990bf 100644 --- a/src/renderer/components/+workloads-overview/workloads/implementations/statefulsets-workload.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads/implementations/statefulsets-workload.injectable.ts @@ -6,7 +6,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { workloadInjectionToken } from "../workload-injection-token"; import { ResourceNames } from "../../../../utils/rbac"; import navigateToPodsInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/deployments/navigate-to-deployments.injectable"; -import { KubeResourceEnum } from "../../../../../common/rbac"; import namespaceStoreInjectable from "../../../+namespaces/namespace-store/namespace-store.injectable"; import statefulsetsStoreInjectable from "../../../+workloads-statefulsets/statefulsets-store.injectable"; import { computed } from "mobx"; @@ -20,7 +19,7 @@ const statefulsetsWorkloadInjectable = getInjectable({ const store = di.inject(statefulsetsStoreInjectable); return { - resourceName: KubeResourceEnum.statefulsets, + resourceName: "statefulsets", open: navigate, amountOfItems: computed( diff --git a/src/renderer/components/+workloads-overview/workloads/workload-injection-token.ts b/src/renderer/components/+workloads-overview/workloads/workload-injection-token.ts index 9055f11bf0..6e7bfcd74a 100644 --- a/src/renderer/components/+workloads-overview/workloads/workload-injection-token.ts +++ b/src/renderer/components/+workloads-overview/workloads/workload-injection-token.ts @@ -4,10 +4,9 @@ */ import { getInjectionToken } from "@ogre-tools/injectable"; import type { IComputedValue } from "mobx"; -import type { KubeResourceEnum } from "../../../../common/rbac"; export interface Workload { - resourceName: KubeResourceEnum; + resourceName: string; open: () => void; amountOfItems: IComputedValue; status: IComputedValue>; diff --git a/src/renderer/components/+workloads-overview/workloads/workloads.injectable.ts b/src/renderer/components/+workloads-overview/workloads/workloads.injectable.ts index 3354fe85bc..330c9ae8ae 100644 --- a/src/renderer/components/+workloads-overview/workloads/workloads.injectable.ts +++ b/src/renderer/components/+workloads-overview/workloads/workloads.injectable.ts @@ -8,7 +8,6 @@ import { filter, sortBy as sortByWithBadTyping } from "lodash/fp"; import { computed } from "mobx"; import { Workload, workloadInjectionToken } from "./workload-injection-token"; import isAllowedResourceInjectable from "../../../../common/utils/is-allowed-resource.injectable"; -import type { KubeResourceEnum } from "../../../../common/rbac"; const sortBy = (propertyPath: string) => @@ -21,7 +20,7 @@ const workloadsInjectable = getInjectable({ instantiate: (di) => { const workloads = di.injectMany(workloadInjectionToken); - const isAllowedResource = (resourceName: KubeResourceEnum) => + const isAllowedResource = (resourceName: string) => di.inject(isAllowedResourceInjectable, resourceName); return computed(() =>