From 0ded9893384d5cccc0778fa503b07a9769985bcd Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Wed, 4 Jan 2023 05:15:37 -0800 Subject: [PATCH] Fix namespace details not opening (#6865) * Fix namespace details not opening Signed-off-by: Sebastian Malton * Update tests Signed-off-by: Sebastian Malton Signed-off-by: Sebastian Malton --- src/common/k8s-api/kube-api.ts | 2 +- ...when-cluster-is-not-relevant.test.tsx.snap | 6 +- ...hide-kube-object-detail-item.test.tsx.snap | 994 ++++++++++++++++++ ...tems-when-cluster-is-not-relevant.test.tsx | 23 +- ...vely-hide-kube-object-detail-item.test.tsx | 46 +- ...ails-when-cluster-is-not-relevant.test.tsx | 6 - src/renderer/getDiForUnitTesting.tsx | 6 +- 7 files changed, 1049 insertions(+), 34 deletions(-) create mode 100644 src/features/cluster/kube-object-details/extension-api/__snapshots__/reactively-hide-kube-object-detail-item.test.tsx.snap diff --git a/src/common/k8s-api/kube-api.ts b/src/common/k8s-api/kube-api.ts index 6e3ad4a72a..ea0bc26d4e 100644 --- a/src/common/k8s-api/kube-api.ts +++ b/src/common/k8s-api/kube-api.ts @@ -249,7 +249,7 @@ function legacyRegisterApi(api: KubeApi): void { const di = getEnvironmentSpecificLegacyGlobalDiForExtensionApi(Environments.renderer); const autoRegistrationEmitter = di.inject(autoRegistrationEmitterInjectable); - autoRegistrationEmitter.emit("kubeApi", api); + setImmediate(() => autoRegistrationEmitter.emit("kubeApi", api)); } catch { // ignore error } diff --git a/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap b/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap index fb177c820c..2e20387adc 100644 --- a/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap +++ b/src/features/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap @@ -252,7 +252,7 @@ exports[`disable kube object detail items when cluster is not relevant given ext class="contents" >
+
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Workloads + + + + keyboard_arrow_down + + + +
+
+ + + + list + + + + Config + + +
+
+ + + + device_hub + + + + Network + + + + keyboard_arrow_down + + + +
+
+ + + + storage + + + + Storage + + +
+
+ + + + + + Helm + + + + keyboard_arrow_down + + + +
+
+ + + + security + + + + Access Control + + +
+
+ + + + extension + + + + Custom Resources + + + + keyboard_arrow_down + + + +
+
+
+
+
+
+
+
+
+
+ some-kind: some-name + + + content_copy + + +
+ Copy +
+
+
+
+
+ + Created + + + <unknown> + ago + +
+
+ + Name + + + some-name + +
+
+ + Namespace + + + some-namespace + +
+
+
+ + Events + +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_up + + +
+ Open +
+
+
+
+
+
+
+ +`; + +exports[`reactively hide kube object detail item when the item is shown renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Workloads + + + + keyboard_arrow_down + + + +
+
+ + + + list + + + + Config + + +
+
+ + + + device_hub + + + + Network + + + + keyboard_arrow_down + + + +
+
+ + + + storage + + + + Storage + + +
+
+ + + + + + Helm + + + + keyboard_arrow_down + + + +
+
+ + + + security + + + + Access Control + + +
+
+ + + + extension + + + + Custom Resources + + + + keyboard_arrow_down + + + +
+
+
+
+
+
+
+
+
+
+ some-kind: some-name + + + content_copy + + +
+ Copy +
+
+
+
+
+ + Created + + + <unknown> + ago + +
+
+ + Name + + + some-name + +
+
+ + Namespace + + + some-namespace + +
+
+ Some detail +
+
+
+ + Events + +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_up + + +
+ Open +
+
+
+
+
+
+
+ +`; diff --git a/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx b/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx index c4bfa8f008..d6ee52a664 100644 --- a/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx +++ b/src/features/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx @@ -18,8 +18,9 @@ import { KubeObject } from "../../../../common/k8s-api/kube-object"; import extensionShouldBeEnabledForClusterFrameInjectable from "../../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; import apiManagerInjectable from "../../../../common/k8s-api/api-manager/manager.injectable"; import { KubeObjectDetails } from "../../../../renderer/components/kube-object-details"; -import type { ApiManager } from "../../../../common/k8s-api/api-manager"; import type { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store"; +import type { KubeApi } from "../../../../common/k8s-api/kube-api"; +import showDetailsInjectable from "../../../../renderer/components/kube-detail-params/show-details.injectable"; describe("disable kube object detail items when cluster is not relevant", () => { let builder: ApplicationBuilder; @@ -32,12 +33,18 @@ describe("disable kube object detail items when cluster is not relevant", () => builder = getApplicationBuilder(); builder.setEnvironmentToClusterFrame(); - builder.beforeWindowStart((windowDi) => { - windowDi.override(apiManagerInjectable, () => ({ - getStore: () => ({ - loadFromPath: async () => getKubeObjectStub("some-kind", "some-api-version"), - }) as Partial as KubeObjectStore, - }) as Partial as ApiManager); + builder.afterWindowStart((windowDi) => { + const apiManager = windowDi.inject(apiManagerInjectable); + const api = { + apiBase: "/apis/some-api-version/some-kind", + } as Partial> as KubeApi; + const store = { + api, + loadFromPath: async () => getKubeObjectStub("some-kind", "some-api-version"), + } as Partial> as KubeObjectStore; + + apiManager.registerApi(api); + apiManager.registerStore(store); windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable); @@ -76,9 +83,11 @@ describe("disable kube object detail items when cluster is not relevant", () => const windowDi = builder.applicationWindow.only.di; const navigateToRoute = windowDi.inject(navigateToRouteInjectionToken); + const showDetails = windowDi.inject(showDetailsInjectable); const testRoute = windowDi.inject(testRouteInjectable); navigateToRoute(testRoute); + showDetails("/apis/some-api-version/namespaces/some-namespace/some-kind/some-name"); builder.extensions.enable(testExtension); }); diff --git a/src/features/cluster/kube-object-details/extension-api/reactively-hide-kube-object-detail-item.test.tsx b/src/features/cluster/kube-object-details/extension-api/reactively-hide-kube-object-detail-item.test.tsx index e78fb05783..b046dc8ee8 100644 --- a/src/features/cluster/kube-object-details/extension-api/reactively-hide-kube-object-detail-item.test.tsx +++ b/src/features/cluster/kube-object-details/extension-api/reactively-hide-kube-object-detail-item.test.tsx @@ -15,8 +15,9 @@ import { routeSpecificComponentInjectionToken } from "../../../../renderer/route import { KubeObject } from "../../../../common/k8s-api/kube-object"; import apiManagerInjectable from "../../../../common/k8s-api/api-manager/manager.injectable"; import { KubeObjectDetails } from "../../../../renderer/components/kube-object-details"; -import type { ApiManager } from "../../../../common/k8s-api/api-manager"; import type { KubeObjectStore } from "../../../../common/k8s-api/kube-object.store"; +import type { KubeApi } from "../../../../common/k8s-api/kube-api"; +import showDetailsInjectable from "../../../../renderer/components/kube-detail-params/show-details.injectable"; describe("reactively hide kube object detail item", () => { let builder: ApplicationBuilder; @@ -28,12 +29,18 @@ describe("reactively hide kube object detail item", () => { builder.setEnvironmentToClusterFrame(); - builder.beforeWindowStart((windowDi) => { - windowDi.override(apiManagerInjectable, () => ({ - getStore: () => ({ - loadFromPath: async () => getKubeObjectStub("some-kind", "some-api-version"), - }) as Partial as KubeObjectStore, - }) as Partial as ApiManager); + builder.afterWindowStart((windowDi) => { + const apiManager = windowDi.inject(apiManagerInjectable); + const api = { + apiBase: "/apis/some-api-version/some-kind", + } as Partial> as KubeApi; + const store = { + api, + loadFromPath: async () => getKubeObjectStub("some-kind", "some-api-version"), + } as Partial> as KubeObjectStore; + + apiManager.registerApi(api); + apiManager.registerStore(store); runInAction(() => { windowDi.register(testRouteInjectable, testRouteComponentInjectable); @@ -71,28 +78,43 @@ describe("reactively hide kube object detail item", () => { const windowDi = builder.applicationWindow.only.di; const navigateToRoute = windowDi.inject(navigateToRouteInjectionToken); + const showDetails = windowDi.inject(showDetailsInjectable); const testRoute = windowDi.inject(testRouteInjectable); navigateToRoute(testRoute); + showDetails("/apis/some-api-version/namespaces/some-namespace/some-kind/some-name"); builder.extensions.enable(testExtension); }); + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + it("does not show the kube object detail item", () => { const actual = rendered.queryByTestId("some-kube-object-detail-item"); expect(actual).not.toBeInTheDocument(); }); - it("given item should be shown, shows the kube object detail item", () => { - runInAction(() => { - someObservable.set(true); + describe("when the item is shown", () => { + beforeEach(() => { + runInAction(() => { + someObservable.set(true); + }); }); - const actual = rendered.queryByTestId("some-kube-object-detail-item"); + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); - expect(actual).toBeInTheDocument(); + it("shows the kube object detail item", () => { + const actual = rendered.queryByTestId("some-kube-object-detail-item"); + + expect(actual).toBeInTheDocument(); + }); }); + }); const testRouteInjectable = getInjectable({ diff --git a/src/features/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx b/src/features/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx index 4b19be2cb5..1ac5a2d17c 100644 --- a/src/features/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx +++ b/src/features/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx @@ -9,7 +9,6 @@ import type { ApplicationBuilder } from "../../../../../renderer/components/test import type { KubernetesCluster } from "../../../../../common/catalog-entities"; import { getApplicationBuilder } from "../../../../../renderer/components/test-utils/get-application-builder"; import extensionShouldBeEnabledForClusterFrameInjectable from "../../../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; -import apiManagerInjectable from "../../../../../common/k8s-api/api-manager/manager.injectable"; import navigateToWorkloadsOverviewInjectable from "../../../../../common/front-end-routing/routes/cluster/workloads/overview/navigate-to-workloads-overview.injectable"; import React from "react"; @@ -24,11 +23,6 @@ describe("disable workloads overview details when cluster is not relevant", () = builder = getApplicationBuilder(); builder.setEnvironmentToClusterFrame(); - - builder.beforeApplicationStart((mainDi) => { - mainDi.override(apiManagerInjectable, () => ({})); - }); - builder.beforeWindowStart((windowDi) => { windowDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable); }); diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx index a2d7f30e0d..2710435cf2 100644 --- a/src/renderer/getDiForUnitTesting.tsx +++ b/src/renderer/getDiForUnitTesting.tsx @@ -15,10 +15,8 @@ import focusWindowInjectable from "./navigation/focus-window.injectable"; import terminalSpawningPoolInjectable from "./components/dock/terminal/terminal-spawning-pool.injectable"; import hostedClusterIdInjectable from "./cluster-frame-context/hosted-cluster-id.injectable"; import historyInjectable from "./navigation/history.injectable"; -import { ApiManager } from "../common/k8s-api/api-manager"; import lensResourcesDirInjectable from "../common/vars/lens-resources-dir.injectable"; import broadcastMessageInjectable from "../common/ipc/broadcast-message.injectable"; -import apiManagerInjectable from "../common/k8s-api/api-manager/manager.injectable"; import { computed, runInAction } from "mobx"; import requestAnimationFrameInjectable from "./components/animate/request-animation-frame.injectable"; import getRandomIdInjectable from "../common/utils/get-random-id.injectable"; @@ -72,7 +70,7 @@ export const getDiForUnitTesting = ( runInAction(() => { registerMobX(di); di.register(applicationInformationInjectable); - + chunk(100)(injectables).forEach((chunkInjectables) => { di.register(...chunkInjectables); }); @@ -143,8 +141,6 @@ export const getDiForUnitTesting = ( requestPublicHelmRepositoriesInjectable, ]); - di.override(apiManagerInjectable, () => new ApiManager()); - di.override(requestFromChannelInjectable, () => () => Promise.resolve(undefined as never)); getOverrideFsWithFakes()(di);