From 7d46cb845d0f1748c0f83a8dc34bbe783270ca2c Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 23 May 2023 09:09:13 -0400 Subject: [PATCH] Revert "fix: Custom Resource Definitions sidebar item should navigate to the correct route" This reverts commit 897e289514b6c02831bf16bf691f31920a40f841. --- .../navigate-to-custom-resource-definitions.injectable.ts | 6 +++--- .../custom-resource-definitions-sidebar-item.injectable.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resource-definitions.injectable.ts b/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resource-definitions.injectable.ts index fcba8fbcbb..adf22eff34 100644 --- a/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resource-definitions.injectable.ts +++ b/packages/core/src/common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resource-definitions.injectable.ts @@ -6,8 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import { navigateToRouteInjectionToken } from "../../../navigate-to-route-injection-token"; import crdListRouteInjectable from "./custom-resource-definitions.injectable"; -const navigateToCustomResourceDefinitionsInjectable = getInjectable({ - id: "navigate-to-custom-resource-definitions", +const navigateToCrdListInjectable = getInjectable({ + id: "navigate-to-crd-list", instantiate: (di) => { const navigateToRoute = di.inject(navigateToRouteInjectionToken); @@ -17,4 +17,4 @@ const navigateToCustomResourceDefinitionsInjectable = getInjectable({ }, }); -export default navigateToCustomResourceDefinitionsInjectable; +export default navigateToCrdListInjectable; diff --git a/packages/core/src/renderer/components/custom-resources/custom-resource-definitions-sidebar-item.injectable.ts b/packages/core/src/renderer/components/custom-resources/custom-resource-definitions-sidebar-item.injectable.ts index 6b61e1dd1d..00aa519eee 100644 --- a/packages/core/src/renderer/components/custom-resources/custom-resource-definitions-sidebar-item.injectable.ts +++ b/packages/core/src/renderer/components/custom-resources/custom-resource-definitions-sidebar-item.injectable.ts @@ -5,7 +5,7 @@ import { sidebarItemInjectionToken } from "@k8slens/cluster-sidebar"; import { getInjectable } from "@ogre-tools/injectable"; import customResourceDefinitionsRouteInjectable from "../../../common/front-end-routing/routes/cluster/custom-resources/custom-resource-definitions.injectable"; -import navigateToCustomResourceDefinitionsInjectable from "../../../common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resource-definitions.injectable"; +import navigateToCustomResourcesInjectable from "../../../common/front-end-routing/routes/cluster/custom-resources/navigate-to-custom-resources.injectable"; import routeIsActiveInjectable from "../../routes/route-is-active.injectable"; import customResourcesSidebarItemInjectable from "./custom-resources-sidebar-item.injectable"; @@ -17,7 +17,7 @@ const customResourceDefinitionsSidebarItemInjectable = getInjectable({ return { parentId: customResourcesSidebarItemInjectable.id, title: "Definitions", - onClick: di.inject(navigateToCustomResourceDefinitionsInjectable), + onClick: di.inject(navigateToCustomResourcesInjectable), isActive: di.inject(routeIsActiveInjectable, customResourceDefinitionsRoute), isVisible: customResourceDefinitionsRoute.isEnabled, orderNumber: 0,