From 07e945687493771ba349eec1297fb2cd42c322de Mon Sep 17 00:00:00 2001 From: Jim Ehrismann <40840436+jim-docker@users.noreply.github.com> Date: Mon, 30 May 2022 09:41:37 -0400 Subject: [PATCH] ensure the start url is the workloads overview when the cluster overview is not available due to rbac restrictions (#5488) Signed-off-by: Jim Ehrismann --- src/renderer/frames/cluster-frame/start-url.injectable.ts | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/renderer/frames/cluster-frame/start-url.injectable.ts b/src/renderer/frames/cluster-frame/start-url.injectable.ts index cd88250174..7176917863 100644 --- a/src/renderer/frames/cluster-frame/start-url.injectable.ts +++ b/src/renderer/frames/cluster-frame/start-url.injectable.ts @@ -4,8 +4,6 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import type { KubeResource } from "../../../common/rbac"; -import isAllowedResourceInjectable from "../../../common/utils/is-allowed-resource.injectable"; import clusterOverviewRouteInjectable from "../../../common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable"; import workloadsOverviewRouteInjectable from "../../../common/front-end-routing/routes/cluster/workloads/overview/workloads-overview-route.injectable"; import { buildURL } from "../../../common/utils/buildUrl"; @@ -14,17 +12,13 @@ const startUrlInjectable = getInjectable({ id: "start-url", instantiate: (di) => { - const isAllowedResource = (resourceName: any) => di.inject(isAllowedResourceInjectable, resourceName); - const clusterOverviewRoute = di.inject(clusterOverviewRouteInjectable); const workloadOverviewRoute = di.inject(workloadsOverviewRouteInjectable); const clusterOverviewUrl = buildURL(clusterOverviewRoute.path); const workloadOverviewUrl = buildURL(workloadOverviewRoute.path); return computed(() => { - const resources: KubeResource[] = ["events", "nodes", "pods"]; - - return resources.every((resourceName) => isAllowedResource(resourceName)) + return clusterOverviewRoute.isEnabled.get() ? clusterOverviewUrl : workloadOverviewUrl; });