diff --git a/packages/core/src/features/namespaces/__snapshots__/route-with-sub-namespaces.test.tsx.snap b/packages/core/src/features/namespaces/__snapshots__/route-with-sub-namespaces.test.tsx.snap new file mode 100644 index 0000000000..47dccc6ef5 --- /dev/null +++ b/packages/core/src/features/namespaces/__snapshots__/route-with-sub-namespaces.test.tsx.snap @@ -0,0 +1,2682 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`namespaces route when viewed with some subNamespaces when navigating to namespaces view renders 1`] = ` + +
+
+
+
+
+ +
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Workloads + + + + keyboard_arrow_down + + + +
+
+ + + + list + + + + Config + + +
+
+ + + + device_hub + + + + Network + + + + keyboard_arrow_down + + + +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ + + + + + Helm + + + + keyboard_arrow_down + + + +
+
+ + + + security + + + + Access Control + + +
+
+ + + + extension + + + + Custom Resources + + + + keyboard_arrow_down + + + +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 3 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+ +
+
+ default +
+
+
+
+ <unknown> +
+
+ - +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ foobar +
+
+
+
+ <unknown> +
+
+ - +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ my-sub-namespace + + S + +
+
+
+
+ default.tree.hnc.x-k8s.io/depth=1 +
+
+
+ <unknown> +
+
+ - +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_up + + +
+ Open +
+
+
+
+
+
+
+ +`; + +exports[`namespaces route when viewed with some subNamespaces when navigating to namespaces view when clicking on the default namespace context menu button renders 1`] = ` + +
+
+
+
+
+ +
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Workloads + + + + keyboard_arrow_down + + + +
+
+ + + + list + + + + Config + + +
+
+ + + + device_hub + + + + Network + + + + keyboard_arrow_down + + + +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ + + + + + Helm + + + + keyboard_arrow_down + + + +
+
+ + + + security + + + + Access Control + + +
+
+ + + + extension + + + + Custom Resources + + + + keyboard_arrow_down + + + +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 3 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+ +
+
+ default +
+
+
+
+ <unknown> +
+
+ - +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ foobar +
+
+
+
+ <unknown> +
+
+ - +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ my-sub-namespace + + S + +
+
+
+
+ default.tree.hnc.x-k8s.io/depth=1 +
+
+
+ <unknown> +
+
+ - +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_up + + +
+ Open +
+
+
+
+
+
+
+ + +`; + +exports[`namespaces route when viewed with some subNamespaces when navigating to namespaces view when clicking on the my-sub-namespace namespace context menu button renders 1`] = ` + +
+
+
+
+
+ +
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Workloads + + + + keyboard_arrow_down + + + +
+
+ + + + list + + + + Config + + +
+
+ + + + device_hub + + + + Network + + + + keyboard_arrow_down + + + +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ + + + + + Helm + + + + keyboard_arrow_down + + + +
+
+ + + + security + + + + Access Control + + +
+
+ + + + extension + + + + Custom Resources + + + + keyboard_arrow_down + + + +
+
+
+
+
+
+
+
+
+
+
+ Namespaces +
+
+ 3 items +
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+
+
+
+ Labels +
+ + + arrow_drop_down + + +
+
+
+ Age +
+ + + arrow_drop_down + + +
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+ +
+
+ default +
+
+
+
+ <unknown> +
+
+ - +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ foobar +
+
+
+
+ <unknown> +
+
+ - +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ my-sub-namespace + + S + +
+
+
+
+ default.tree.hnc.x-k8s.io/depth=1 +
+
+
+ <unknown> +
+
+ - +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+ +
+ Add Namespace +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_up + + +
+ Open +
+
+
+
+
+
+
+ + +`; diff --git a/packages/core/src/features/namespaces/route-with-sub-namespaces.test.tsx b/packages/core/src/features/namespaces/route-with-sub-namespaces.test.tsx new file mode 100644 index 0000000000..af3142ab67 --- /dev/null +++ b/packages/core/src/features/namespaces/route-with-sub-namespaces.test.tsx @@ -0,0 +1,127 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; +import type { RenderResult } from "@testing-library/react"; +import navigateToNamespacesInjectable from "../../common/front-end-routing/routes/cluster/namespaces/navigate-to-namespaces.injectable"; +import type { RequestDeleteNormalNamespace } from "../../renderer/components/+namespaces/request-delete-normal-namespace.injectable"; +import requestDeleteNormalNamespaceInjectable from "../../renderer/components/+namespaces/request-delete-normal-namespace.injectable"; +import type { RequestDeleteSubNamespaceAnchor } from "../../renderer/components/+namespaces/request-delete-sub-namespace.injectable"; +import requestDeleteSubNamespaceAnchorInjectable from "../../renderer/components/+namespaces/request-delete-sub-namespace.injectable"; +import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; + +describe("namespaces route when viewed with some subNamespaces", () => { + let builder: ApplicationBuilder; + let result: RenderResult; + let requestDeleteNormalNamespaceMock: AsyncFnMock; + let requestDeleteSubNamespaceAnchorMock: AsyncFnMock; + + beforeEach(async () => { + builder = getApplicationBuilder(); + + builder.setEnvironmentToClusterFrame(); + + builder.namespaces.add("default"); + builder.namespaces.add("foobar"); + builder.namespaces.addSubNamespace("my-sub-namespace", "default"); + + requestDeleteNormalNamespaceMock = asyncFn(); + requestDeleteSubNamespaceAnchorMock = asyncFn(); + + builder.beforeWindowStart(({ windowDi }) => { + builder.allowKubeResource({ group: "", apiName: "namespaces" }); + windowDi.override(requestDeleteNormalNamespaceInjectable, () => requestDeleteNormalNamespaceMock); + windowDi.override(requestDeleteSubNamespaceAnchorInjectable, () => requestDeleteSubNamespaceAnchorMock); + }); + + result = await builder.render(); + }); + + describe("when navigating to namespaces view", () => { + beforeEach(() => { + builder.navigateWith(navigateToNamespacesInjectable); + }); + + it("renders", () => { + expect(result.baseElement).toMatchSnapshot(); + }); + + it("shows the default namespace", () => { + expect(result.queryByText("default")).toBeInTheDocument(); + }); + + it("shows the foobar namespace", () => { + expect(result.queryByText("foobar")).toBeInTheDocument(); + }); + + it("shows the my-sub-namespace namespace", () => { + expect(result.queryByText("my-sub-namespace")).toBeInTheDocument(); + }); + + describe("when clicking on the default namespace context menu button", () => { + beforeEach(() => { + result.getByTestId("icon-for-menu-actions-for-kube-object-menu-for-namespace-default").click(); + }); + + it("renders", () => { + expect(result.baseElement).toMatchSnapshot(); + }); + + it("shows the context menu", () => { + expect(result.getByTestId("menu-actions-for-kube-object-menu-for-namespace-default")).toBeInTheDocument(); + }); + + describe("when clicking the delete action in the context menu", () => { + beforeEach(() => { + result.getByTestId("menu-action-delete-for-/api/v1/namespaces/default").click(); + }); + + it("should not call requestDeleteSubNamespaceAnchor", () => { + expect(requestDeleteSubNamespaceAnchorMock).not.toBeCalled(); + }); + + it("should call requestDeleteNormalNamespace", () => { + expect(requestDeleteNormalNamespaceMock).toBeCalled(); + }); + }); + }); + + describe("when clicking on the my-sub-namespace namespace context menu button", () => { + beforeEach(() => { + result.getByTestId("icon-for-menu-actions-for-kube-object-menu-for-namespace-my-sub-namespace").click(); + }); + + it("renders", () => { + expect(result.baseElement).toMatchSnapshot(); + }); + + it("shows the context menu", () => { + expect(result.getByTestId("menu-actions-for-kube-object-menu-for-namespace-my-sub-namespace")).toBeInTheDocument(); + }); + + describe("when clicking the delete action in the context menu", () => { + beforeEach(() => { + result.getByTestId("menu-action-delete-for-/api/v1/namespaces/my-sub-namespace").click(); + }); + + it("should call requestDeleteSubNamespaceAnchor", () => { + expect(requestDeleteSubNamespaceAnchorMock).toBeCalled(); + }); + + describe("when requestDeleteSubNamespaceAnchor resolves", () => { + beforeEach(async () => { + await requestDeleteSubNamespaceAnchorMock.resolve(); + }); + + it("should call requestDeleteNormalNamespace", () => { + expect(requestDeleteNormalNamespaceMock).toBeCalled(); + }); + }); + }); + }); + }); +}); diff --git a/packages/core/src/renderer/components/kube-object-menu/kube-object-menu.tsx b/packages/core/src/renderer/components/kube-object-menu/kube-object-menu.tsx index 119ef011fa..6e6037f2ac 100644 --- a/packages/core/src/renderer/components/kube-object-menu/kube-object-menu.tsx +++ b/packages/core/src/renderer/components/kube-object-menu/kube-object-menu.tsx @@ -162,7 +162,7 @@ class NonInjectedKubeObjectMenu extends React.Component item.onClick(object)} - data-testid={`menu-action-${item.title.toLowerCase().replace(/\s+/, "-")}`} + data-testid={`menu-action-${item.title.toLowerCase().replace(/\s+/, "-")}-for-${object.selfLink}`} > extends React.Component return ( this.emitOnContextMenuOpen(object) : undefined} {...menuProps} diff --git a/packages/core/src/renderer/components/test-utils/get-application-builder.tsx b/packages/core/src/renderer/components/test-utils/get-application-builder.tsx index f05ee416a9..cee9ddc0f2 100644 --- a/packages/core/src/renderer/components/test-utils/get-application-builder.tsx +++ b/packages/core/src/renderer/components/test-utils/get-application-builder.tsx @@ -77,18 +77,33 @@ type WindowDiCallback = (container: { windowDi: DiContainer }) => void | Promise type LensWindowWithHelpers = LensWindow & { rendered: RenderResult; di: DiContainer }; -const createNamespacesFor = (namespaces: Set): Namespace[] => ( - Array.from(namespaces, (namespace) => new Namespace({ - apiVersion: "v1", - kind: "Namespace", - metadata: { - name: namespace, - resourceVersion: "1", - selfLink: `/api/v1/namespaces/${namespace}`, - uid: `namespace-${namespace}`, +const createNamespace = (namespace: string) => new Namespace({ + apiVersion: "v1", + kind: "Namespace", + metadata: { + name: namespace, + resourceVersion: "1", + selfLink: `/api/v1/namespaces/${namespace}`, + uid: `namespace-${namespace}`, + }, +}); + +const createSubNamespace = (namespace: string, parent: Namespace) => new Namespace({ + apiVersion: "v1", + kind: "Namespace", + metadata: { + name: namespace, + resourceVersion: "1", + selfLink: `/api/v1/namespaces/${namespace}`, + uid: `namespace-${namespace}`, + annotations: { + "hnc.x-k8s.io/subnamespace-of": parent.getName(), }, - })) -); + labels: { + [`${parent.getName()}.tree.hnc.x-k8s.io/depth`]: "1", + }, + }, +}); export interface ApplicationBuilder { mainDi: DiContainer; @@ -144,6 +159,7 @@ export interface ApplicationBuilder { }; namespaces: { add: (namespace: string) => void; + addSubNamespace: (namespace: string, parent: string) => void; select: (namespace: string) => void; }; helmCharts: { @@ -303,7 +319,6 @@ export const getApplicationBuilder = () => { let applicationHasStarted = false; - const namespaces = observable.set(); const namespaceItems = observable.array(); const selectedNamespaces = observable.set(); const startApplication = mainDi.inject(startApplicationInjectionToken); @@ -385,8 +400,14 @@ export const getApplicationBuilder = () => { }, namespaces: { add: action((namespace) => { - namespaces.add(namespace); - namespaceItems.replace(createNamespacesFor(namespaces)); + namespaceItems.push(createNamespace(namespace)); + }), + addSubNamespace: action((namespace, parent) => { + const parentNamespace = namespaceItems.find((n) => n.getName() === parent); + + assert(parentNamespace, `Cannot find namespace with name="${parent}"`); + + namespaceItems.push(createSubNamespace(namespace, parentNamespace)); }), select: action((namespace) => { const selectedNamespacesStorage = builder.applicationWindow.only.di.inject(selectedNamespacesStorageInjectable); @@ -545,7 +566,7 @@ export const getApplicationBuilder = () => { return Array.from(selectedNamespaces); }, get allowedNamespaces() { - return Array.from(namespaces); + return Array.from(namespaceItems, n => n.getName()); }, contextItems: namespaceItems, api: windowDi.inject(namespaceApiInjectable), @@ -556,6 +577,7 @@ export const getApplicationBuilder = () => { pickOnlySelected: () => [], isSelectedAll: () => false, getTotalCount: () => namespaceItems.length, + isSelected: () => false, } as Partial as NamespaceStore)); });