From 7b0521f3b2bb025d729b2b284db24325755269ec Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 16 Jun 2022 07:39:22 +0300 Subject: [PATCH] Rename injection token for clarity (#5636) Signed-off-by: Janne Savolainen --- .../cluster/sidebar-and-tab-navigation-for-core.test.tsx | 4 ++-- .../cluster/visibility-of-sidebar-items.test.tsx | 4 ++-- src/behaviours/navigating-between-routes.test.tsx | 8 ++++---- src/behaviours/preferences/closing-preferences.test.tsx | 6 +++--- ...ection-token.ts => front-end-route-injection-token.ts} | 4 ++-- .../navigate-to-route-injection-token.ts | 2 +- .../routes/add-cluster/add-cluster-route.injectable.ts | 4 ++-- .../routes/catalog/catalog-route.injectable.ts | 6 +++--- .../routes/cluster-view/cluster-view-route.injectable.ts | 4 ++-- .../config/config-maps/config-maps-route.injectable.ts | 4 ++-- .../horizontal-pod-autoscalers-route.injectable.ts | 4 ++-- .../config/limit-ranges/limit-ranges-route.injectable.ts | 4 ++-- .../pod-disruption-budgets-route.injectable.ts | 4 ++-- .../resource-quotas/resource-quotas-route.injectable.ts | 4 ++-- .../cluster/config/secrets/secrets-route.injectable.ts | 4 ++-- .../crd-list/crd-list-route.injectable.ts | 4 ++-- .../custom-resources/custom-resources-route.injectable.ts | 6 +++--- .../routes/cluster/events/events-route.injectable.ts | 4 ++-- .../cluster/helm/charts/helm-charts-route.injectable.ts | 6 +++--- .../helm/releases/helm-releases-route.injectable.ts | 6 +++--- .../cluster/namespaces/namespaces-route.injectable.ts | 4 ++-- .../network/endpoints/endpoints-route.injectable.ts | 4 ++-- .../network/ingresses/ingresses-route.injectable.ts | 4 ++-- .../network-policies/network-policies-route.injectable.ts | 4 ++-- .../port-forwards/port-forwards-route.injectable.ts | 6 +++--- .../cluster/network/services/services-route.injectable.ts | 4 ++-- .../routes/cluster/nodes/nodes-route.injectable.ts | 4 ++-- .../cluster/overview/cluster-overview-route.injectable.ts | 4 ++-- .../persistent-volume-claims-route.injectable.ts | 4 ++-- .../persistent-volumes-route.injectable.ts | 4 ++-- .../storage-classes/storage-classes-route.injectable.ts | 4 ++-- .../cluster-role-bindings-route.injectable.ts | 4 ++-- .../cluster-roles/cluster-roles-route.injectable.ts | 4 ++-- .../pod-security-policies-route.injectable.ts | 4 ++-- .../role-bindings/role-bindings-route.injectable.ts | 4 ++-- .../user-management/roles/roles-route.injectable.ts | 4 ++-- .../service-accounts/service-accounts-route.injectable.ts | 4 ++-- .../workloads/cron-jobs/cron-jobs-route.injectable.ts | 4 ++-- .../workloads/daemonsets/daemonsets-route.injectable.ts | 4 ++-- .../workloads/deployments/deployments-route.injectable.ts | 4 ++-- .../cluster/workloads/jobs/jobs-route.injectable.ts | 4 ++-- .../overview/workloads-overview-route.injectable.ts | 4 ++-- .../cluster/workloads/pods/pods-route.injectable.ts | 4 ++-- .../workloads/replicasets/replicasets-route.injectable.ts | 4 ++-- .../statefulsets/statefulsets-route.injectable.ts | 4 ++-- .../entity-settings/entity-settings-route.injectable.ts | 6 +++--- .../routes/extensions/extensions-route.injectable.ts | 4 ++-- .../preferences/app/app-preferences-route.injectable.ts | 4 ++-- .../editor/editor-preferences-route.injectable.ts | 4 ++-- .../extension/extension-preferences-route.injectable.ts | 4 ++-- .../kubernetes/kubernetes-preferences-route.injectable.ts | 4 ++-- .../proxy/proxy-preferences-route.injectable.ts | 4 ++-- .../telemetry/telemetry-preferences-route.injectable.ts | 4 ++-- .../terminal/terminal-preferences-route.injectable.ts | 4 ++-- .../routes/welcome/welcome-route.injectable.ts | 4 ++-- .../verify-that-all-routes-have-route-component.test.ts | 4 ++-- src/extensions/lens-extension-set-dependencies.ts | 2 +- .../navigate-to-preference-tab.injectable.ts | 2 +- .../__tests__/delete-cluster-dialog.test.tsx | 4 ++-- src/renderer/routes/all-routes.injectable.ts | 6 +++--- .../routes/extension-route-registrator.injectable.tsx | 4 ++-- src/renderer/routes/route-is-active.injectable.ts | 2 +- src/renderer/routes/route-path-parameters.injectable.ts | 2 +- .../routes/route-specific-component-injection-token.ts | 2 +- 64 files changed, 132 insertions(+), 132 deletions(-) rename src/common/front-end-routing/{route-injection-token.ts => front-end-route-injection-token.ts} (82%) diff --git a/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx b/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx index f270b7d13e..a8c26acc2a 100644 --- a/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx +++ b/src/behaviours/cluster/sidebar-and-tab-navigation-for-core.test.tsx @@ -14,7 +14,7 @@ import { sidebarItemsInjectionToken } from "../../renderer/components/layout/sid import { computed } from "mobx"; import { noop } from "lodash/fp"; import routeIsActiveInjectable from "../../renderer/routes/route-is-active.injectable"; -import { routeInjectionToken } from "../../common/front-end-routing/route-injection-token"; +import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import writeJsonFileInjectable from "../../common/fs/write-json-file.injectable"; @@ -337,7 +337,7 @@ const testRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); const testRouteComponentInjectable = getInjectable({ diff --git a/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx b/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx index aa73936470..c0e0cc88f3 100644 --- a/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx +++ b/src/behaviours/cluster/visibility-of-sidebar-items.test.tsx @@ -10,7 +10,7 @@ import { computed } from "mobx"; import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token"; import React from "react"; import isAllowedResourceInjectable from "../../common/utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../common/front-end-routing/route-injection-token"; +import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { navigateToRouteInjectionToken } from "../../common/front-end-routing/navigate-to-route-injection-token"; @@ -83,7 +83,7 @@ const testRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); const testRouteComponentInjectable = getInjectable({ diff --git a/src/behaviours/navigating-between-routes.test.tsx b/src/behaviours/navigating-between-routes.test.tsx index 4def9b383f..ab0240b2a4 100644 --- a/src/behaviours/navigating-between-routes.test.tsx +++ b/src/behaviours/navigating-between-routes.test.tsx @@ -9,8 +9,8 @@ import { computed } from "mobx"; import type { RenderResult } from "@testing-library/react"; import { routeSpecificComponentInjectionToken } from "../renderer/routes/route-specific-component-injection-token"; import { observer } from "mobx-react"; -import type { Route } from "../common/front-end-routing/route-injection-token"; -import { routeInjectionToken } from "../common/front-end-routing/route-injection-token"; +import type { Route } from "../common/front-end-routing/front-end-route-injection-token"; +import { frontEndRouteInjectionToken } from "../common/front-end-routing/front-end-route-injection-token"; import type { ApplicationBuilder } from "../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../renderer/components/test-utils/get-application-builder"; import currentRouteInjectable from "../renderer/routes/current-route.injectable"; @@ -192,7 +192,7 @@ describe("navigating between routes", () => { const testRouteWithoutPathParametersInjectable = getInjectable({ id: "some-route", - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, instantiate: () => ({ path: "/some-path", @@ -214,7 +214,7 @@ const testRouteWithoutPathParametersComponentInjectable = getInjectable({ const routeWithOptionalPathParametersInjectable = getInjectable({ id: "some-route", - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, instantiate: (): Route<{ someParameter?: string; someOtherParameter?: string }> => ({ path: "/some-path/:someParameter?/:someOtherParameter?", diff --git a/src/behaviours/preferences/closing-preferences.test.tsx b/src/behaviours/preferences/closing-preferences.test.tsx index 3d3eaa89dc..0ca2c91da7 100644 --- a/src/behaviours/preferences/closing-preferences.test.tsx +++ b/src/behaviours/preferences/closing-preferences.test.tsx @@ -8,7 +8,7 @@ import type { RenderResult } from "@testing-library/react"; import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; import currentPathInjectable from "../../renderer/routes/current-path.injectable"; -import { routeInjectionToken } from "../../common/front-end-routing/route-injection-token"; +import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token"; import { computed } from "mobx"; import { preferenceNavigationItemInjectionToken } from "../../renderer/components/+preferences/preferences-navigation/preference-navigation-items.injectable"; import routeIsActiveInjectable from "../../renderer/routes/route-is-active.injectable"; @@ -202,7 +202,7 @@ const testPreferencesRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); const testPreferencesRouteComponentInjectable = getInjectable({ @@ -225,7 +225,7 @@ const testFrontPageRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); const testFrontPageRouteComponentInjectable = getInjectable({ diff --git a/src/common/front-end-routing/route-injection-token.ts b/src/common/front-end-routing/front-end-route-injection-token.ts similarity index 82% rename from src/common/front-end-routing/route-injection-token.ts rename to src/common/front-end-routing/front-end-route-injection-token.ts index 7ecdbba635..cf1f9ed87e 100644 --- a/src/common/front-end-routing/route-injection-token.ts +++ b/src/common/front-end-routing/front-end-route-injection-token.ts @@ -6,8 +6,8 @@ import { getInjectionToken } from "@ogre-tools/injectable"; import type { IComputedValue } from "mobx"; import type { LensRendererExtension } from "../../extensions/lens-renderer-extension"; -export const routeInjectionToken = getInjectionToken>({ - id: "route-injection-token", +export const frontEndRouteInjectionToken = getInjectionToken>({ + id: "front-end-route-injection-token", }); export interface Route { diff --git a/src/common/front-end-routing/navigate-to-route-injection-token.ts b/src/common/front-end-routing/navigate-to-route-injection-token.ts index d6321f017e..29fb82867c 100644 --- a/src/common/front-end-routing/navigate-to-route-injection-token.ts +++ b/src/common/front-end-routing/navigate-to-route-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Route } from "./route-injection-token"; +import type { Route } from "./front-end-route-injection-token"; type InferParametersFrom = TRoute extends Route ? TParameters diff --git a/src/common/front-end-routing/routes/add-cluster/add-cluster-route.injectable.ts b/src/common/front-end-routing/routes/add-cluster/add-cluster-route.injectable.ts index ce5bdcebd3..41e165dc59 100644 --- a/src/common/front-end-routing/routes/add-cluster/add-cluster-route.injectable.ts +++ b/src/common/front-end-routing/routes/add-cluster/add-cluster-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token"; const addClusterRouteInjectable = getInjectable({ id: "add-cluster-route", @@ -15,7 +15,7 @@ const addClusterRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default addClusterRouteInjectable; diff --git a/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts b/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts index 203c62e65a..bfe0904073 100644 --- a/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts +++ b/src/common/front-end-routing/routes/catalog/catalog-route.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import type { Route } from "../../route-injection-token"; -import { routeInjectionToken } from "../../route-injection-token"; +import type { Route } from "../../front-end-route-injection-token"; +import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token"; export interface CatalogPathParameters { group?: string; @@ -21,7 +21,7 @@ const catalogRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default catalogRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster-view/cluster-view-route.injectable.ts b/src/common/front-end-routing/routes/cluster-view/cluster-view-route.injectable.ts index 23fea9874b..e912ff63e0 100644 --- a/src/common/front-end-routing/routes/cluster-view/cluster-view-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster-view/cluster-view-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token"; const clusterViewRouteInjectable = getInjectable({ id: "cluster-view-route", @@ -15,7 +15,7 @@ const clusterViewRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default clusterViewRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts index b8c605fc64..3ab2bc515c 100644 --- a/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/config/config-maps/config-maps-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const configMapsRouteInjectable = getInjectable({ id: "config-maps-route", @@ -19,7 +19,7 @@ const configMapsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default configMapsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/horizontal-pod-autoscalers-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/horizontal-pod-autoscalers-route.injectable.ts index d9eff7a026..fe1814734f 100644 --- a/src/common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/horizontal-pod-autoscalers-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/config/horizontal-pod-autoscalers/horizontal-pod-autoscalers-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const horizontalPodAutoscalersRouteInjectable = getInjectable({ id: "horizontal-pod-autoscalers-route", @@ -19,7 +19,7 @@ const horizontalPodAutoscalersRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default horizontalPodAutoscalersRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts index 70f40cb99d..bcf740113b 100644 --- a/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/config/limit-ranges/limit-ranges-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const limitRangesRouteInjectable = getInjectable({ id: "limit-ranges-route", @@ -22,7 +22,7 @@ const limitRangesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default limitRangesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/config/pod-disruption-budgets/pod-disruption-budgets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/pod-disruption-budgets/pod-disruption-budgets-route.injectable.ts index 8d113e6727..df6d89fb06 100644 --- a/src/common/front-end-routing/routes/cluster/config/pod-disruption-budgets/pod-disruption-budgets-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/config/pod-disruption-budgets/pod-disruption-budgets-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const podDisruptionBudgetsRouteInjectable = getInjectable({ id: "pod-disruption-budgets-route", @@ -19,7 +19,7 @@ const podDisruptionBudgetsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default podDisruptionBudgetsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts index ee28deba5e..496a42ed0c 100644 --- a/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/config/resource-quotas/resource-quotas-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const resourceQuotasRouteInjectable = getInjectable({ id: "resource-quotas-route", @@ -19,7 +19,7 @@ const resourceQuotasRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default resourceQuotasRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts index 7806238e0c..f451f51d0c 100644 --- a/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/config/secrets/secrets-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const secretsRouteInjectable = getInjectable({ id: "secrets-route", @@ -19,7 +19,7 @@ const secretsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default secretsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts b/src/common/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts index 3a4865cc53..854b3a8c3a 100644 --- a/src/common/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/custom-resources/crd-list/crd-list-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const crdListRouteInjectable = getInjectable({ id: "crd-list-route", @@ -15,7 +15,7 @@ const crdListRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default crdListRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts b/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts index 8e0709f33e..cc7d9b40be 100644 --- a/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/custom-resources/custom-resources/custom-resources-route.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import type { Route } from "../../../../route-injection-token"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import type { Route } from "../../../../front-end-route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; export interface CustomResourcesPathParameters { group?: string; @@ -21,7 +21,7 @@ const customResourcesRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default customResourcesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts b/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts index 6fb9ff51f9..a53cb5d1f8 100644 --- a/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/events/events-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const eventsRouteInjectable = getInjectable({ id: "events-route", @@ -19,7 +19,7 @@ const eventsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default eventsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts b/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts index 11509867e4..02161b082a 100644 --- a/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/helm/charts/helm-charts-route.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import type { Route } from "../../../../route-injection-token"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import type { Route } from "../../../../front-end-route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; export interface HelmChartsPathParameters { repo?: string; @@ -21,7 +21,7 @@ const helmChartsRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default helmChartsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts b/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts index bdc5a8a164..fb66416c63 100644 --- a/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/helm/releases/helm-releases-route.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import type { Route } from "../../../../route-injection-token"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import type { Route } from "../../../../front-end-route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; export interface HelmReleasesPathParameters { namespace?: string; @@ -21,7 +21,7 @@ const helmReleasesRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default helmReleasesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts b/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts index 361771d575..395c128682 100644 --- a/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/namespaces/namespaces-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const namespacesRouteInjectable = getInjectable({ id: "namespaces-route", @@ -19,7 +19,7 @@ const namespacesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default namespacesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts index cc093f6cf3..e30df3123b 100644 --- a/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/network/endpoints/endpoints-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const endpointsRouteInjectable = getInjectable({ id: "endpoints-route", @@ -19,7 +19,7 @@ const endpointsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default endpointsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/network/ingresses/ingresses-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/ingresses/ingresses-route.injectable.ts index 8c30cefe74..12565deeaf 100644 --- a/src/common/front-end-routing/routes/cluster/network/ingresses/ingresses-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/network/ingresses/ingresses-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const ingressesRouteInjectable = getInjectable({ id: "ingresses-route", @@ -19,7 +19,7 @@ const ingressesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default ingressesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/network/network-policies/network-policies-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/network-policies/network-policies-route.injectable.ts index 99f94d68fe..ead62ee435 100644 --- a/src/common/front-end-routing/routes/cluster/network/network-policies/network-policies-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/network/network-policies/network-policies-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const networkPoliciesRouteInjectable = getInjectable({ id: "network-policies-route", @@ -19,7 +19,7 @@ const networkPoliciesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default networkPoliciesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts index 5b6814ec06..0c8cd5ef2d 100644 --- a/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/network/port-forwards/port-forwards-route.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import type { Route } from "../../../../route-injection-token"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import type { Route } from "../../../../front-end-route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; export interface PortForwardsPathParameters { forwardport?: string; @@ -20,7 +20,7 @@ const portForwardsRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default portForwardsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts b/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts index efd83a3ffa..033c95673b 100644 --- a/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/network/services/services-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const servicesRouteInjectable = getInjectable({ id: "services-route", @@ -19,7 +19,7 @@ const servicesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default servicesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts b/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts index 2713f1cc18..febd733343 100644 --- a/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/nodes/nodes-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const nodesRouteInjectable = getInjectable({ id: "nodes-route", @@ -19,7 +19,7 @@ const nodesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default nodesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts b/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts index 9598666209..209fc113d8 100644 --- a/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const clusterOverviewRouteInjectable = getInjectable({ id: "cluster-overview-route", @@ -19,7 +19,7 @@ const clusterOverviewRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default clusterOverviewRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts b/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts index a451c282e5..8879541355 100644 --- a/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/storage/persistent-volume-claims/persistent-volume-claims-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const persistentVolumeClaimsRouteInjectable = getInjectable({ id: "persistent-volume-claims-route", @@ -19,7 +19,7 @@ const persistentVolumeClaimsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default persistentVolumeClaimsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts b/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts index 68c8fa08f5..e6549ea45b 100644 --- a/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/storage/persistent-volumes/persistent-volumes-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const persistentVolumesRouteInjectable = getInjectable({ id: "persistent-volumes-route", @@ -19,7 +19,7 @@ const persistentVolumesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default persistentVolumesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/storage/storage-classes/storage-classes-route.injectable.ts b/src/common/front-end-routing/routes/cluster/storage/storage-classes/storage-classes-route.injectable.ts index 5499b5ba37..69f2b5d4ee 100644 --- a/src/common/front-end-routing/routes/cluster/storage/storage-classes/storage-classes-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/storage/storage-classes/storage-classes-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const storageClassesRouteInjectable = getInjectable({ id: "storage-classes-route", @@ -19,7 +19,7 @@ const storageClassesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default storageClassesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/user-management/cluster-role-bindings/cluster-role-bindings-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/cluster-role-bindings/cluster-role-bindings-route.injectable.ts index 483397e6e1..f19491ee72 100644 --- a/src/common/front-end-routing/routes/cluster/user-management/cluster-role-bindings/cluster-role-bindings-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/user-management/cluster-role-bindings/cluster-role-bindings-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const clusterRoleBindingsRouteInjectable = getInjectable({ id: "cluster-role-bindings-route", @@ -19,7 +19,7 @@ const clusterRoleBindingsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default clusterRoleBindingsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/user-management/cluster-roles/cluster-roles-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/cluster-roles/cluster-roles-route.injectable.ts index fced712dbf..d21c2c33a4 100644 --- a/src/common/front-end-routing/routes/cluster/user-management/cluster-roles/cluster-roles-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/user-management/cluster-roles/cluster-roles-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const clusterRolesRouteInjectable = getInjectable({ id: "cluster-roles-route", @@ -19,7 +19,7 @@ const clusterRolesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default clusterRolesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/user-management/pod-security-policies/pod-security-policies-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/pod-security-policies/pod-security-policies-route.injectable.ts index 89220511c1..14cfcbedc5 100644 --- a/src/common/front-end-routing/routes/cluster/user-management/pod-security-policies/pod-security-policies-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/user-management/pod-security-policies/pod-security-policies-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const podSecurityPoliciesRouteInjectable = getInjectable({ id: "pod-security-policies-route", @@ -19,7 +19,7 @@ const podSecurityPoliciesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default podSecurityPoliciesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/user-management/role-bindings/role-bindings-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/role-bindings/role-bindings-route.injectable.ts index 24e03d5cd9..0f908e5876 100644 --- a/src/common/front-end-routing/routes/cluster/user-management/role-bindings/role-bindings-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/user-management/role-bindings/role-bindings-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const roleBindingsRouteInjectable = getInjectable({ id: "role-bindings-route", @@ -19,7 +19,7 @@ const roleBindingsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default roleBindingsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/user-management/roles/roles-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/roles/roles-route.injectable.ts index 097cbb1cf5..94db156fa4 100644 --- a/src/common/front-end-routing/routes/cluster/user-management/roles/roles-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/user-management/roles/roles-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const rolesRouteInjectable = getInjectable({ id: "roles-route", @@ -19,7 +19,7 @@ const rolesRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default rolesRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts b/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts index f3424f1d8c..4d79258c54 100644 --- a/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/user-management/service-accounts/service-accounts-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const serviceAccountsRouteInjectable = getInjectable({ id: "service-accounts-route", @@ -19,7 +19,7 @@ const serviceAccountsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default serviceAccountsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/workloads/cron-jobs/cron-jobs-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/cron-jobs/cron-jobs-route.injectable.ts index a99e13ea1f..735ea94642 100644 --- a/src/common/front-end-routing/routes/cluster/workloads/cron-jobs/cron-jobs-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/workloads/cron-jobs/cron-jobs-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const cronJobsRouteInjectable = getInjectable({ id: "cron-jobs-route", @@ -19,7 +19,7 @@ const cronJobsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default cronJobsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/workloads/daemonsets/daemonsets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/daemonsets/daemonsets-route.injectable.ts index be54e18c91..55729813e8 100644 --- a/src/common/front-end-routing/routes/cluster/workloads/daemonsets/daemonsets-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/workloads/daemonsets/daemonsets-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const daemonsetsRouteInjectable = getInjectable({ id: "daemonsets-route", @@ -19,7 +19,7 @@ const daemonsetsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default daemonsetsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/workloads/deployments/deployments-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/deployments/deployments-route.injectable.ts index 65eed20f7a..b9ff072e66 100644 --- a/src/common/front-end-routing/routes/cluster/workloads/deployments/deployments-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/workloads/deployments/deployments-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const deploymentsRouteInjectable = getInjectable({ id: "deployments-route", @@ -19,7 +19,7 @@ const deploymentsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default deploymentsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/workloads/jobs/jobs-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/jobs/jobs-route.injectable.ts index 5b2f087dc9..d9190a7ea8 100644 --- a/src/common/front-end-routing/routes/cluster/workloads/jobs/jobs-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/workloads/jobs/jobs-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const jobsRouteInjectable = getInjectable({ id: "jobs-route", @@ -19,7 +19,7 @@ const jobsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default jobsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/workloads/overview/workloads-overview-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/overview/workloads-overview-route.injectable.ts index 00441c2ce9..188bd9f1de 100644 --- a/src/common/front-end-routing/routes/cluster/workloads/overview/workloads-overview-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/workloads/overview/workloads-overview-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const workloadsOverviewRouteInjectable = getInjectable({ id: "workloads-overview-route", @@ -15,7 +15,7 @@ const workloadsOverviewRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default workloadsOverviewRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts index b7c036cb65..e9fb2a2b16 100644 --- a/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/workloads/pods/pods-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const podsRouteInjectable = getInjectable({ id: "pods-route", @@ -19,7 +19,7 @@ const podsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default podsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/workloads/replicasets/replicasets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/replicasets/replicasets-route.injectable.ts index c1822339f7..0319d27550 100644 --- a/src/common/front-end-routing/routes/cluster/workloads/replicasets/replicasets-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/workloads/replicasets/replicasets-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const replicasetsRouteInjectable = getInjectable({ id: "replicasets-route", @@ -19,7 +19,7 @@ const replicasetsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default replicasetsRouteInjectable; diff --git a/src/common/front-end-routing/routes/cluster/workloads/statefulsets/statefulsets-route.injectable.ts b/src/common/front-end-routing/routes/cluster/workloads/statefulsets/statefulsets-route.injectable.ts index ca271a22c5..a3089fa62f 100644 --- a/src/common/front-end-routing/routes/cluster/workloads/statefulsets/statefulsets-route.injectable.ts +++ b/src/common/front-end-routing/routes/cluster/workloads/statefulsets/statefulsets-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import isAllowedResourceInjectable from "../../../../../utils/is-allowed-resource.injectable"; -import { routeInjectionToken } from "../../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../front-end-route-injection-token"; const statefulsetsRouteInjectable = getInjectable({ id: "statefulsets-route", @@ -19,7 +19,7 @@ const statefulsetsRouteInjectable = getInjectable({ }; }, - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default statefulsetsRouteInjectable; diff --git a/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts b/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts index d4ff30603f..e7d3ac5f46 100644 --- a/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts +++ b/src/common/front-end-routing/routes/entity-settings/entity-settings-route.injectable.ts @@ -4,8 +4,8 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import type { Route } from "../../route-injection-token"; -import { routeInjectionToken } from "../../route-injection-token"; +import type { Route } from "../../front-end-route-injection-token"; +import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token"; export interface EntitySettingsPathParameters { entityId: string; @@ -20,7 +20,7 @@ const entitySettingsRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default entitySettingsRouteInjectable; diff --git a/src/common/front-end-routing/routes/extensions/extensions-route.injectable.ts b/src/common/front-end-routing/routes/extensions/extensions-route.injectable.ts index 9459260412..5992355022 100644 --- a/src/common/front-end-routing/routes/extensions/extensions-route.injectable.ts +++ b/src/common/front-end-routing/routes/extensions/extensions-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token"; const extensionsRouteInjectable = getInjectable({ id: "extensions-route", @@ -15,7 +15,7 @@ const extensionsRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default extensionsRouteInjectable; diff --git a/src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts index f19321f800..b4dfe5c05b 100644 --- a/src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts +++ b/src/common/front-end-routing/routes/preferences/app/app-preferences-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const appPreferencesRouteInjectable = getInjectable({ id: "app-preferences-route", @@ -15,7 +15,7 @@ const appPreferencesRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default appPreferencesRouteInjectable; diff --git a/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts index 485a5a1e18..ca6cbf8a70 100644 --- a/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts +++ b/src/common/front-end-routing/routes/preferences/editor/editor-preferences-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const editorPreferencesRouteInjectable = getInjectable({ id: "editor-preferences-route", @@ -15,7 +15,7 @@ const editorPreferencesRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default editorPreferencesRouteInjectable; diff --git a/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts index 92a97675b0..01a87fa3c2 100644 --- a/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts +++ b/src/common/front-end-routing/routes/preferences/extension/extension-preferences-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const extensionPreferencesRouteInjectable = getInjectable({ id: "extension-preferences-route", @@ -15,7 +15,7 @@ const extensionPreferencesRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default extensionPreferencesRouteInjectable; diff --git a/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts index 7a84a965b6..7b3479c7fa 100644 --- a/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts +++ b/src/common/front-end-routing/routes/preferences/kubernetes/kubernetes-preferences-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const kubernetesPreferencesRouteInjectable = getInjectable({ id: "kubernetes-preferences-route", @@ -15,7 +15,7 @@ const kubernetesPreferencesRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default kubernetesPreferencesRouteInjectable; diff --git a/src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts index b07925bab5..322e711225 100644 --- a/src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts +++ b/src/common/front-end-routing/routes/preferences/proxy/proxy-preferences-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const proxyPreferencesRouteInjectable = getInjectable({ id: "proxy-preferences-route", @@ -15,7 +15,7 @@ const proxyPreferencesRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default proxyPreferencesRouteInjectable; diff --git a/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts index f42cb83717..2ae9f14acd 100644 --- a/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts +++ b/src/common/front-end-routing/routes/preferences/telemetry/telemetry-preferences-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const telemetryPreferencesRouteInjectable = getInjectable({ id: "telemetry-preferences-route", @@ -15,7 +15,7 @@ const telemetryPreferencesRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default telemetryPreferencesRouteInjectable; diff --git a/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts b/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts index 8f530b2b9d..c077c45bab 100644 --- a/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts +++ b/src/common/front-end-routing/routes/preferences/terminal/terminal-preferences-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../front-end-route-injection-token"; const terminalPreferencesRouteInjectable = getInjectable({ id: "terminal-preferences-route", @@ -15,7 +15,7 @@ const terminalPreferencesRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default terminalPreferencesRouteInjectable; diff --git a/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts b/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts index 516ee6cca4..75d722ab46 100644 --- a/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts +++ b/src/common/front-end-routing/routes/welcome/welcome-route.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../route-injection-token"; +import { frontEndRouteInjectionToken } from "../../front-end-route-injection-token"; const welcomeRouteInjectable = getInjectable({ id: "welcome-route", @@ -15,7 +15,7 @@ const welcomeRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); export default welcomeRouteInjectable; diff --git a/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts b/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts index 369fb6eb8c..4b6776bdaa 100644 --- a/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts +++ b/src/common/front-end-routing/verify-that-all-routes-have-route-component.test.ts @@ -4,7 +4,7 @@ */ import { getDiForUnitTesting } from "../../renderer/getDiForUnitTesting"; import { routeSpecificComponentInjectionToken } from "../../renderer/routes/route-specific-component-injection-token"; -import { routeInjectionToken } from "./route-injection-token"; +import { frontEndRouteInjectionToken } from "./front-end-route-injection-token"; import { filter, map, matches } from "lodash/fp"; import clusterStoreInjectable from "../cluster-store/cluster-store.injectable"; import type { ClusterStore } from "../cluster-store/cluster-store"; @@ -18,7 +18,7 @@ describe("verify-that-all-routes-have-component", () => { getById: () => null, } as unknown as ClusterStore)); - const routes = rendererDi.injectMany(routeInjectionToken); + const routes = rendererDi.injectMany(frontEndRouteInjectionToken); const routeComponents = rendererDi.injectMany( routeSpecificComponentInjectionToken, ); diff --git a/src/extensions/lens-extension-set-dependencies.ts b/src/extensions/lens-extension-set-dependencies.ts index 42848f7859..0f06103af2 100644 --- a/src/extensions/lens-extension-set-dependencies.ts +++ b/src/extensions/lens-extension-set-dependencies.ts @@ -6,7 +6,7 @@ import type { IComputedValue } from "mobx"; import type { CatalogCategoryRegistry } from "../common/catalog"; import type { NavigateToRoute } from "../common/front-end-routing/navigate-to-route-injection-token"; -import type { Route } from "../common/front-end-routing/route-injection-token"; +import type { Route } from "../common/front-end-routing/front-end-route-injection-token"; import type { CatalogEntityRegistry as MainCatalogEntityRegistry } from "../main/catalog"; import type { CatalogEntityRegistry as RendererCatalogEntityRegistry } from "../renderer/api/catalog/entity/registry"; import type { GetExtensionPageParameters } from "../renderer/routes/get-extension-page-parameters.injectable"; diff --git a/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts b/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts index 05a20dab29..70b5da347c 100644 --- a/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts +++ b/src/renderer/components/+preferences/preferences-navigation/navigate-to-preference-tab.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { Route } from "../../../../common/front-end-routing/route-injection-token"; +import type { Route } from "../../../../common/front-end-routing/front-end-route-injection-token"; import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token"; const navigateToPreferenceTabInjectable = getInjectable({ diff --git a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx index ded5cf8098..02d1c7e96c 100644 --- a/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx +++ b/src/renderer/components/delete-cluster-dialog/__tests__/delete-cluster-dialog.test.tsx @@ -20,7 +20,7 @@ import storesAndApisCanBeCreatedInjectable from "../../../stores-apis-can-be-cre import createKubeconfigManagerInjectable from "../../../../main/kubeconfig-manager/create-kubeconfig-manager.injectable"; import type { ApplicationBuilder } from "../../test-utils/get-application-builder"; import { getApplicationBuilder } from "../../test-utils/get-application-builder"; -import { routeInjectionToken } from "../../../../common/front-end-routing/route-injection-token"; +import { frontEndRouteInjectionToken } from "../../../../common/front-end-routing/front-end-route-injection-token"; import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import { routeSpecificComponentInjectionToken } from "../../../routes/route-specific-component-injection-token"; @@ -319,7 +319,7 @@ const testRouteInjectable = getInjectable({ isEnabled: computed(() => true), }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); const testRouteComponentInjectable = getInjectable({ diff --git a/src/renderer/routes/all-routes.injectable.ts b/src/renderer/routes/all-routes.injectable.ts index 1c3c72cb94..4ba0eb4d0e 100644 --- a/src/renderer/routes/all-routes.injectable.ts +++ b/src/renderer/routes/all-routes.injectable.ts @@ -7,8 +7,8 @@ import { overSome } from "lodash/fp"; import { computed } from "mobx"; import rendererExtensionsInjectable from "../../extensions/renderer-extensions.injectable"; import type { LensRendererExtension } from "../../extensions/lens-renderer-extension"; -import type { Route } from "../../common/front-end-routing/route-injection-token"; -import { routeInjectionToken } from "../../common/front-end-routing/route-injection-token"; +import type { Route } from "../../common/front-end-routing/front-end-route-injection-token"; +import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token"; const allRoutesInjectable = getInjectable({ id: "all-routes", @@ -20,7 +20,7 @@ const allRoutesInjectable = getInjectable({ const enabledExtensions = extensions.get(); return di - .injectMany(routeInjectionToken) + .injectMany(frontEndRouteInjectionToken) .filter((route) => overSome([ isNonExtensionRoute, diff --git a/src/renderer/routes/extension-route-registrator.injectable.tsx b/src/renderer/routes/extension-route-registrator.injectable.tsx index e3ce5cbd6d..de2c4a2838 100644 --- a/src/renderer/routes/extension-route-registrator.injectable.tsx +++ b/src/renderer/routes/extension-route-registrator.injectable.tsx @@ -15,7 +15,7 @@ import { SiblingsInTabLayout } from "../components/layout/siblings-in-tab-layout import extensionPageParametersInjectable from "./extension-page-parameters.injectable"; import { routeSpecificComponentInjectionToken } from "./route-specific-component-injection-token"; import { computed } from "mobx"; -import { routeInjectionToken } from "../../common/front-end-routing/route-injection-token"; +import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token"; import { getExtensionRoutePath } from "./for-extension"; const extensionRouteRegistratorInjectable = getInjectable({ @@ -62,7 +62,7 @@ const toRouteInjectableFor = extension, }), - injectionToken: routeInjectionToken, + injectionToken: frontEndRouteInjectionToken, }); const normalizedParams = di.inject(extensionPageParametersInjectable, { diff --git a/src/renderer/routes/route-is-active.injectable.ts b/src/renderer/routes/route-is-active.injectable.ts index 0bf4eb8f4b..b5218c0a6a 100644 --- a/src/renderer/routes/route-is-active.injectable.ts +++ b/src/renderer/routes/route-is-active.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { computed } from "mobx"; import currentRouteInjectable from "./current-route.injectable"; -import type { Route } from "../../common/front-end-routing/route-injection-token"; +import type { Route } from "../../common/front-end-routing/front-end-route-injection-token"; const routeIsActiveInjectable = getInjectable({ id: "route-is-active", diff --git a/src/renderer/routes/route-path-parameters.injectable.ts b/src/renderer/routes/route-path-parameters.injectable.ts index e99c48314a..8b2ac9a755 100644 --- a/src/renderer/routes/route-path-parameters.injectable.ts +++ b/src/renderer/routes/route-path-parameters.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; import { computed } from "mobx"; import { matchPath } from "react-router"; import currentPathInjectable from "./current-path.injectable"; -import type { Route } from "../../common/front-end-routing/route-injection-token"; +import type { Route } from "../../common/front-end-routing/front-end-route-injection-token"; const routePathParametersInjectable = getInjectable({ id: "route-path-parameters", diff --git a/src/renderer/routes/route-specific-component-injection-token.ts b/src/renderer/routes/route-specific-component-injection-token.ts index 3419a4bafb..b1cf3d858a 100644 --- a/src/renderer/routes/route-specific-component-injection-token.ts +++ b/src/renderer/routes/route-specific-component-injection-token.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectionToken } from "@ogre-tools/injectable"; -import type { Route } from "../../common/front-end-routing/route-injection-token"; +import type { Route } from "../../common/front-end-routing/front-end-route-injection-token"; export const routeSpecificComponentInjectionToken = getInjectionToken<{ route: Route;