From 753c8bfa85ccc74980553bb512b5038ff18767a2 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 23 May 2023 09:09:13 -0400 Subject: [PATCH] Revert "chore: Fix IDs for some sidebar items" This reverts commit a267c0ee7d0fb159977e8a5963e22e0b57c73f46. --- ...ctable.tsx => config-maps-sidebar-item.injectable.tsx} | 2 +- ...jectable.tsx => cron-jobs-sidebar-item.injectable.tsx} | 2 +- ...ectable.tsx => daemonsets-sidebar-item.injectable.tsx} | 8 ++++---- ...ctable.tsx => replicasets-sidebar-item.injectable.tsx} | 8 ++++---- ...table.tsx => statefulsets-sidebar-item.injectable.tsx} | 8 ++++---- 5 files changed, 14 insertions(+), 14 deletions(-) rename packages/core/src/renderer/components/config-maps/{sidebar-item.injectable.tsx => config-maps-sidebar-item.injectable.tsx} (97%) rename packages/core/src/renderer/components/workloads-cronjobs/{sidebar-item.injectable.tsx => cron-jobs-sidebar-item.injectable.tsx} (97%) rename packages/core/src/renderer/components/workloads-daemonsets/{sidebar-item.injectable.tsx => daemonsets-sidebar-item.injectable.tsx} (87%) rename packages/core/src/renderer/components/workloads-replicasets/{sidebar-item.injectable.tsx => replicasets-sidebar-item.injectable.tsx} (86%) rename packages/core/src/renderer/components/workloads-statefulsets/{sidebar-item.injectable.tsx => statefulsets-sidebar-item.injectable.tsx} (86%) diff --git a/packages/core/src/renderer/components/config-maps/sidebar-item.injectable.tsx b/packages/core/src/renderer/components/config-maps/config-maps-sidebar-item.injectable.tsx similarity index 97% rename from packages/core/src/renderer/components/config-maps/sidebar-item.injectable.tsx rename to packages/core/src/renderer/components/config-maps/config-maps-sidebar-item.injectable.tsx index 76ad40575d..f6540ece63 100644 --- a/packages/core/src/renderer/components/config-maps/sidebar-item.injectable.tsx +++ b/packages/core/src/renderer/components/config-maps/config-maps-sidebar-item.injectable.tsx @@ -18,7 +18,7 @@ const configMapsSidebarItemInjectable = getInjectable({ return { parentId: configSidebarItemInjectable.id, - title: "Config Maps", + title: "ConfigMaps", onClick: di.inject(navigateToConfigMapsInjectable), isActive: di.inject(routeIsActiveInjectable, route), isVisible: route.isEnabled, diff --git a/packages/core/src/renderer/components/workloads-cronjobs/sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-cronjobs/cron-jobs-sidebar-item.injectable.tsx similarity index 97% rename from packages/core/src/renderer/components/workloads-cronjobs/sidebar-item.injectable.tsx rename to packages/core/src/renderer/components/workloads-cronjobs/cron-jobs-sidebar-item.injectable.tsx index f2dd86e2b7..ea3f6c56f2 100644 --- a/packages/core/src/renderer/components/workloads-cronjobs/sidebar-item.injectable.tsx +++ b/packages/core/src/renderer/components/workloads-cronjobs/cron-jobs-sidebar-item.injectable.tsx @@ -17,7 +17,7 @@ const cronJobsSidebarItemInjectable = getInjectable({ return { parentId: workloadsSidebarItemInjectable.id, - title: "Cron Jobs", + title: "CronJobs", onClick: di.inject(navigateToCronJobsInjectable), isActive: di.inject(routeIsActiveInjectable, route), isVisible: route.isEnabled, diff --git a/packages/core/src/renderer/components/workloads-daemonsets/sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-daemonsets/daemonsets-sidebar-item.injectable.tsx similarity index 87% rename from packages/core/src/renderer/components/workloads-daemonsets/sidebar-item.injectable.tsx rename to packages/core/src/renderer/components/workloads-daemonsets/daemonsets-sidebar-item.injectable.tsx index 294bc633c9..34e1b89764 100644 --- a/packages/core/src/renderer/components/workloads-daemonsets/sidebar-item.injectable.tsx +++ b/packages/core/src/renderer/components/workloads-daemonsets/daemonsets-sidebar-item.injectable.tsx @@ -10,15 +10,15 @@ import { sidebarItemInjectionToken } from "@k8slens/cluster-sidebar"; import routeIsActiveInjectable from "../../routes/route-is-active.injectable"; import navigateToDaemonsetsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/daemonsets/navigate-to-daemonsets.injectable"; -const daemonSetsSidebarItemInjectable = getInjectable({ - id: "sidebar-item-daemon-sets", +const daemonsetsSidebarItemInjectable = getInjectable({ + id: "sidebar-item-daemonsets", instantiate: (di) => { const route = di.inject(daemonsetsRouteInjectable); return { parentId: workloadsSidebarItemInjectable.id, - title: "Daemon Sets", + title: "DaemonSets", onClick: di.inject(navigateToDaemonsetsInjectable), isActive: di.inject(routeIsActiveInjectable, route), isVisible: route.isEnabled, @@ -29,4 +29,4 @@ const daemonSetsSidebarItemInjectable = getInjectable({ injectionToken: sidebarItemInjectionToken, }); -export default daemonSetsSidebarItemInjectable; +export default daemonsetsSidebarItemInjectable; diff --git a/packages/core/src/renderer/components/workloads-replicasets/sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-replicasets/replicasets-sidebar-item.injectable.tsx similarity index 86% rename from packages/core/src/renderer/components/workloads-replicasets/sidebar-item.injectable.tsx rename to packages/core/src/renderer/components/workloads-replicasets/replicasets-sidebar-item.injectable.tsx index e74ac145d5..67b17c776a 100644 --- a/packages/core/src/renderer/components/workloads-replicasets/sidebar-item.injectable.tsx +++ b/packages/core/src/renderer/components/workloads-replicasets/replicasets-sidebar-item.injectable.tsx @@ -10,15 +10,15 @@ import { sidebarItemInjectionToken } from "@k8slens/cluster-sidebar"; import routeIsActiveInjectable from "../../routes/route-is-active.injectable"; import navigateToReplicasetsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/replicasets/navigate-to-replicasets.injectable"; -const replicaSetsSidebarItemInjectable = getInjectable({ - id: "sidebar-item-replica-sets", +const replicasetsSidebarItemInjectable = getInjectable({ + id: "sidebar-item-replicasets", instantiate: (di) => { const route = di.inject(replicasetsRouteInjectable); return { parentId: workloadsSidebarItemInjectable.id, - title: "Replica Sets", + title: "ReplicaSets", onClick: di.inject(navigateToReplicasetsInjectable), isActive: di.inject(routeIsActiveInjectable, route), isVisible: route.isEnabled, @@ -29,4 +29,4 @@ const replicaSetsSidebarItemInjectable = getInjectable({ injectionToken: sidebarItemInjectionToken, }); -export default replicaSetsSidebarItemInjectable; +export default replicasetsSidebarItemInjectable; diff --git a/packages/core/src/renderer/components/workloads-statefulsets/sidebar-item.injectable.tsx b/packages/core/src/renderer/components/workloads-statefulsets/statefulsets-sidebar-item.injectable.tsx similarity index 86% rename from packages/core/src/renderer/components/workloads-statefulsets/sidebar-item.injectable.tsx rename to packages/core/src/renderer/components/workloads-statefulsets/statefulsets-sidebar-item.injectable.tsx index 01eecebb66..d9f23fb35e 100644 --- a/packages/core/src/renderer/components/workloads-statefulsets/sidebar-item.injectable.tsx +++ b/packages/core/src/renderer/components/workloads-statefulsets/statefulsets-sidebar-item.injectable.tsx @@ -10,15 +10,15 @@ import { sidebarItemInjectionToken } from "@k8slens/cluster-sidebar"; import routeIsActiveInjectable from "../../routes/route-is-active.injectable"; import navigateToStatefulsetsInjectable from "../../../common/front-end-routing/routes/cluster/workloads/statefulsets/navigate-to-statefulsets.injectable"; -const statefulSetsSidebarItemInjectable = getInjectable({ - id: "sidebar-item-stateful-sets", +const statefulsetsSidebarItemInjectable = getInjectable({ + id: "sidebar-item-statefulsets", instantiate: (di) => { const route = di.inject(statefulsetsRouteInjectable); return { parentId: workloadsSidebarItemInjectable.id, - title: "Stateful Sets", + title: "StatefulSets", onClick: di.inject(navigateToStatefulsetsInjectable), isActive: di.inject(routeIsActiveInjectable, route), isVisible: route.isEnabled, @@ -29,4 +29,4 @@ const statefulSetsSidebarItemInjectable = getInjectable({ injectionToken: sidebarItemInjectionToken, }); -export default statefulSetsSidebarItemInjectable; +export default statefulsetsSidebarItemInjectable;