From ca40c5111769f8a8afdefd33077ac79e1f95595b Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Wed, 13 Jul 2022 08:36:51 +0300 Subject: [PATCH] Introduce kludge to make "isEnabledForCluster" work again for cluster pages PART 1 (#5800) * Kludge "isEnabledForCluster" work again for cluster pages Signed-off-by: Janne Savolainen * Introduce kludge to make "isEnabledForCluster" work again for cluster page menus PART 2 (#5801) * Kludge "isEnabledForCluster" work again for cluster page menus (sidebar items) Signed-off-by: Janne Savolainen * Introduce kludge to make "isEnabledForCluster" work again for kube object status texts PART 3 (#5802) * Kludge "isEnabledForCluster" work again for kube object status texts Signed-off-by: Janne Savolainen * Kludge "isEnabledForCluster" work again for kube object menu items (#5803) Signed-off-by: Janne Savolainen * Introduce kludge to make "isEnabledForCluster" work again for workload overview details PART 5 (#5804) * Kludge "isEnabledForCluster" work again for cluster page menus (sidebar items) Signed-off-by: Janne Savolainen * Kludge "isEnabledForCluster" work again for kube object status texts Signed-off-by: Janne Savolainen * Kludge "isEnabledForCluster" work again for kube object menu items Signed-off-by: Janne Savolainen * Kludge "isEnabledForCluster" work again for workload overview details Signed-off-by: Janne Savolainen * Kludge "isEnabledForCluster" work again for kube object details (#5805) Signed-off-by: Janne Savolainen --- ...when-cluster-is-not-relevant.test.tsx.snap | 1424 +++++++++++++++ ...when-cluster-is-not-relevant.test.tsx.snap | 1563 +++++++++++++++++ ...ages-when-cluster-is-not-relevant.test.tsx | 106 ++ ...tems-when-cluster-is-not-relevant.test.tsx | 111 ++ ...when-cluster-is-not-relevant.test.tsx.snap | 1427 +++++++++++++++ ...tems-when-cluster-is-not-relevant.test.tsx | 172 ++ ...when-cluster-is-not-relevant.test.tsx.snap | 1189 +++++++++++++ ...tems-when-cluster-is-not-relevant.test.tsx | 165 ++ ...when-cluster-is-not-relevant.test.tsx.snap | 1181 +++++++++++++ ...uses-when-cluster-is-not-relevant.test.tsx | 160 ++ ...when-cluster-is-not-relevant.test.tsx.snap | 1548 ++++++++++++++++ ...ails-when-cluster-is-not-relevant.test.tsx | 114 ++ ...rder-of-workload-overview-details.test.tsx | 147 ++ src/extensions/common-api/registrations.ts | 2 +- ...nsion-is-enabled-for-cluster.injectable.ts | 30 + .../extension-loader/extension-loader.ts | 27 +- src/extensions/lens-renderer-extension.ts | 3 +- src/extensions/registries/index.ts | 1 - .../registries/kube-object-detail-registry.ts | 37 - .../api/kube-object-detail-registry.ts | 6 - src/renderer/bootstrap.tsx | 3 - .../active-kubernetes-cluster.injectable.ts | 28 + .../detail-components.injectable.ts | 68 - .../+workloads-overview/overview.tsx | 6 +- .../overview-statuses.injectable.ts | 22 + .../workload-events.injectable.ts | 22 + ...orkload-overview-detail-injection-token.ts | 18 + ...-overview-detail-registrator.injectable.ts | 58 + .../workload-overview-details.injectable.ts | 30 + .../details/volumes/variants/flex-volume.tsx | 2 +- ...rrent-kube-object-in-details.injectable.ts | 35 + ...ter-role-binding-detail-item.injectable.ts | 33 + .../cluster-role-detail-item.injectable.ts | 33 + .../config-map-detail-item.injectable.ts | 30 + .../cron-job-detail-item.injectable.ts | 32 + ...urce-definitions-detail-item.injectable.ts | 33 + .../daemon-set-detail-item.injectable.ts | 32 + .../deployment-detail-item.injectable.ts | 32 + .../endpoints-detail-item.injectable.ts | 32 + .../events-detail-item.injectable.ts | 30 + ...l-pod-autoscaler-detail-item.injectable.ts | 33 + .../ingress-detail-item.injectable.ts | 33 + .../job-detail-item.injectable.ts | 30 + .../kube-event-detail-item.injectable.ts | 84 + .../limit-range-detail-item.injectable.ts | 30 + .../namespaces-detail-item.injectable.ts | 30 + .../network-policy-detail-item.injectable.ts | 33 + .../node-detail-item.injectable.ts | 30 + ...ent-volume-claim-detail-item.injectable.ts | 33 + ...ersistent-volume-detail-item.injectable.ts | 33 + .../pod-detail-item.injectable.ts | 30 + ...isruption-budget-detail-item.injectable.ts | 33 + ...-security-policy-detail-item.injectable.ts | 33 + .../replica-set-detail-item.injectable.ts | 32 + .../resource-quota-detail-item.injectable.ts | 32 + .../role-binding-detail-item.injectable.ts | 33 + .../role-detail-item.injectable.ts | 32 + .../secrets-detail-item.injectable.ts | 30 + .../service-account-detail-item.injectable.ts | 33 + .../service-detail-item.injectable.ts | 32 + .../stateful-set-detail-item.injectable.ts | 33 + .../storage-class-detail-item.injectable.ts | 33 + ...kube-object-detail-item-injection-token.ts | 18 + ...ject-detail-item-registrator.injectable.ts | 76 + .../kube-object-detail-items.injectable.ts | 31 + ...-object-matches-to-kind-and-api-version.ts | 10 + .../kube-object-detail-registration.ts | 18 + .../kube-object-details.tsx | 62 +- .../get-kube-object-menu-items.ts | 31 - .../kube-object-menu-items.injectable.ts | 22 - .../static-kube-object-menu-items.ts | 39 - .../kube-object-menu-item-injection-token.ts | 25 + ...object-menu-item-registrator.injectable.ts | 59 + .../kube-object-menu-items.injectable.ts | 43 + .../cron-job-menu.injectable.ts | 25 + .../deployment-menu.injectable.ts | 25 + .../replica-set-menu.injectable.ts | 25 + .../service-account-menu.injectable.ts | 25 + .../kube-object-menu.test.tsx | 102 +- .../kube-object-menu/kube-object-menu.tsx | 11 +- .../kube-object-status-icon.test.tsx | 126 +- .../kube-object-status-icon.tsx | 11 +- ...kube-object-status-text-injection-token.ts | 20 + ...ject-status-text-registrator.injectable.ts | 55 + ...ject-status-texts-for-object.injectable.ts | 42 + .../kube-object-status-texts.injectable.ts | 23 + .../status-registrations.injectable.ts | 21 - .../statuses-for-kube-object.injectable.ts | 35 - ...on-sidebar-item-registrator.injectable.tsx | 16 +- .../test-utils/get-application-builder.tsx | 6 + ...be-enabled-for-cluster-frame.injectable.ts | 49 + src/renderer/getDiForUnitTesting.tsx | 7 + src/renderer/initializers/index.ts | 1 - .../kube-object-detail-registry.tsx | 441 ----- src/renderer/initializers/registries.ts | 1 - ...extension-route-registrator.injectable.tsx | 27 +- 96 files changed, 11371 insertions(+), 904 deletions(-) create mode 100644 src/behaviours/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap create mode 100644 src/behaviours/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap create mode 100644 src/behaviours/cluster/extension-api/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx create mode 100644 src/behaviours/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx create mode 100644 src/behaviours/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap create mode 100644 src/behaviours/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx create mode 100644 src/behaviours/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap create mode 100644 src/behaviours/cluster/kube-object-menu/extension-api/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx create mode 100644 src/behaviours/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap create mode 100644 src/behaviours/cluster/kube-object-status-icon/extension-api/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx create mode 100644 src/behaviours/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap create mode 100644 src/behaviours/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx create mode 100644 src/behaviours/cluster/workloads/overview/extension-api/order-of-workload-overview-details.test.tsx create mode 100644 src/extensions/extension-loader/extension-is-enabled-for-cluster.injectable.ts delete mode 100644 src/extensions/registries/kube-object-detail-registry.ts delete mode 100644 src/renderer/api/kube-object-detail-registry.ts create mode 100644 src/renderer/cluster-frame-context/active-kubernetes-cluster.injectable.ts delete mode 100644 src/renderer/components/+workloads-overview/detail-components.injectable.ts create mode 100644 src/renderer/components/+workloads-overview/workload-overview-details/implementations/overview-statuses.injectable.ts create mode 100644 src/renderer/components/+workloads-overview/workload-overview-details/implementations/workload-events.injectable.ts create mode 100644 src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-injection-token.ts create mode 100644 src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-registrator.injectable.ts create mode 100644 src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-details.injectable.ts create mode 100644 src/renderer/components/kube-object-details/current-kube-object-in-details.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-binding-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/config-map-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cron-job-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/custom-resource-definitions-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/daemon-set-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/deployment-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/endpoints-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/events-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/horizontal-pod-autoscaler-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/ingress-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/job-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/kube-event-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/limit-range-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/namespaces-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/network-policy-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/node-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-claim-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-disruption-budget-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-security-policy-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replica-set-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/resource-quota-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-binding-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/secrets-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-account-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/stateful-set-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/implementations/storage-class-detail-item.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-injection-token.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-registrator.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-items.injectable.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-matches-to-kind-and-api-version.ts create mode 100644 src/renderer/components/kube-object-details/kube-object-detail-registration.ts delete mode 100644 src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts delete mode 100644 src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-items.injectable.ts delete mode 100644 src/renderer/components/kube-object-menu/dependencies/static-kube-object-menu-items.ts create mode 100644 src/renderer/components/kube-object-menu/kube-object-menu-item-injection-token.ts create mode 100644 src/renderer/components/kube-object-menu/kube-object-menu-item-registrator.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/kube-object-menu-items.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/kube-object-menu-items/cron-job-menu.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/kube-object-menu-items/deployment-menu.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/kube-object-menu-items/replica-set-menu.injectable.ts create mode 100644 src/renderer/components/kube-object-menu/kube-object-menu-items/service-account-menu.injectable.ts create mode 100644 src/renderer/components/kube-object-status-icon/kube-object-status-text-injection-token.ts create mode 100644 src/renderer/components/kube-object-status-icon/kube-object-status-text-registrator.injectable.ts create mode 100644 src/renderer/components/kube-object-status-icon/kube-object-status-texts-for-object.injectable.ts create mode 100644 src/renderer/components/kube-object-status-icon/kube-object-status-texts.injectable.ts delete mode 100644 src/renderer/components/kube-object-status-icon/status-registrations.injectable.ts delete mode 100644 src/renderer/components/kube-object-status-icon/statuses-for-kube-object.injectable.ts create mode 100644 src/renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable.ts delete mode 100644 src/renderer/initializers/kube-object-detail-registry.tsx diff --git a/src/behaviours/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap b/src/behaviours/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap new file mode 100644 index 0000000000..186f7a42e7 --- /dev/null +++ b/src/behaviours/cluster/extension-api/__snapshots__/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx.snap @@ -0,0 +1,1424 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension should be enabled for the cluster, when navigating renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+ Some page +
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable-cluster-pages-when-cluster-is-not-relevant given extension shouldn't be enabled for the cluster, when navigating renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable-cluster-pages-when-cluster-is-not-relevant given not yet known if extension should be enabled for the cluster, when navigating renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; diff --git a/src/behaviours/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap b/src/behaviours/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap new file mode 100644 index 0000000000..c350b67280 --- /dev/null +++ b/src/behaviours/cluster/extension-api/__snapshots__/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx.snap @@ -0,0 +1,1563 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`disable sidebar items when cluster is not relevant given extension should be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+ +
+ Some icon +
+ + Some sidebar item + + +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable sidebar items when cluster is not relevant given extension shouldn't be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable sidebar items when cluster is not relevant given not yet known if extension should be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; diff --git a/src/behaviours/cluster/extension-api/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx b/src/behaviours/cluster/extension-api/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx new file mode 100644 index 0000000000..c6c3cd7fab --- /dev/null +++ b/src/behaviours/cluster/extension-api/disable-cluster-pages-when-cluster-is-not-relevant.test.tsx @@ -0,0 +1,106 @@ +/** + * 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 type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import type { TestExtensionRenderer } from "../../../renderer/components/test-utils/get-extension-fake"; +import { getExtensionFakeFor } from "../../../renderer/components/test-utils/get-extension-fake"; +import type { KubernetesCluster } from "../../../common/catalog-entities"; +import React from "react"; +import extensionShouldBeEnabledForClusterFrameInjectable from "../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; + +describe("disable-cluster-pages-when-cluster-is-not-relevant", () => { + let builder: ApplicationBuilder; + let rendered: RenderResult; + let rendererTestExtension: TestExtensionRenderer; + let isEnabledForClusterMock: AsyncFnMock<(cluster: KubernetesCluster) => Promise>; + + beforeEach(async () => { + builder = getApplicationBuilder(); + + builder.setEnvironmentToClusterFrame(); + + builder.dis.rendererDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable); + + const getExtensionFake = getExtensionFakeFor(builder); + + isEnabledForClusterMock = asyncFn(); + + const testExtension = getExtensionFake({ + id: "test-extension-id", + name: "test-extension", + + rendererOptions: { + isEnabledForCluster: isEnabledForClusterMock, + + clusterPages: [{ + components: { + Page: () =>
Some page
, + }, + }], + }, + }); + + rendererTestExtension = testExtension.renderer; + + rendered = await builder.render(); + + builder.extensions.enable(testExtension); + }); + + describe("given not yet known if extension should be enabled for the cluster, when navigating", () => { + beforeEach(() => { + rendererTestExtension.navigate(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show the page", () => { + const actual = rendered.queryByTestId("some-test-page"); + + expect(actual).not.toBeInTheDocument(); + }); + }); + + describe("given extension shouldn't be enabled for the cluster, when navigating", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(false); + + rendererTestExtension.navigate(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show the page", () => { + const actual = rendered.queryByTestId("some-test-page"); + + expect(actual).not.toBeInTheDocument(); + }); + }); + + describe("given extension should be enabled for the cluster, when navigating", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(true); + + rendererTestExtension.navigate(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows the page", () => { + const actual = rendered.getByTestId("some-test-page"); + + expect(actual).toBeInTheDocument(); + }); + }); +}); diff --git a/src/behaviours/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx b/src/behaviours/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx new file mode 100644 index 0000000000..28007355b1 --- /dev/null +++ b/src/behaviours/cluster/extension-api/disable-sidebar-items-when-cluster-is-not-relevant.test.tsx @@ -0,0 +1,111 @@ +/** + * 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 type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import { getExtensionFakeFor } from "../../../renderer/components/test-utils/get-extension-fake"; +import type { KubernetesCluster } from "../../../common/catalog-entities"; +import React from "react"; +import extensionShouldBeEnabledForClusterFrameInjectable from "../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; + +describe("disable sidebar items when cluster is not relevant", () => { + let builder: ApplicationBuilder; + let rendered: RenderResult; + let isEnabledForClusterMock: AsyncFnMock<(cluster: KubernetesCluster) => Promise>; + + beforeEach(async () => { + builder = getApplicationBuilder(); + + builder.setEnvironmentToClusterFrame(); + + builder.dis.rendererDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable); + + const getExtensionFake = getExtensionFakeFor(builder); + + isEnabledForClusterMock = asyncFn(); + + const testExtension = getExtensionFake({ + id: "test-extension-id", + name: "test-extension", + + rendererOptions: { + isEnabledForCluster: isEnabledForClusterMock, + + clusterPages: [{ + components: { + Page: () =>
Some page
, + }, + }], + + clusterPageMenus: [ + { + id: "some-sidebar-item", + title: "Some sidebar item", + + components: { + Icon: () =>
Some icon
, + }, + }, + ], + }, + }); + + rendered = await builder.render(); + + builder.extensions.enable(testExtension); + }); + + describe("given not yet known if extension should be enabled for the cluster", () => { + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show the sidebar item", () => { + const actual = rendered.queryByTestId( + "sidebar-item-some-extension-name-some-sidebar-item", + ); + + expect(actual).not.toBeInTheDocument(); + }); + }); + + describe("given extension shouldn't be enabled for the cluster", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(false); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show the sidebar item", () => { + const actual = rendered.queryByTestId( + "sidebar-item-some-extension-name-some-sidebar-item", + ); + + expect(actual).not.toBeInTheDocument(); + }); + }); + + describe("given extension should be enabled for the cluster", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(true); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows the sidebar item", () => { + const actual = rendered.getByTestId( + "sidebar-item-test-extension-some-sidebar-item", + ); + + expect(actual).toBeInTheDocument(); + }); + }); +}); diff --git a/src/behaviours/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap b/src/behaviours/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap new file mode 100644 index 0000000000..d31c03beeb --- /dev/null +++ b/src/behaviours/cluster/kube-object-details/extension-api/__snapshots__/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx.snap @@ -0,0 +1,1427 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`disable kube object detail items when cluster is not relevant given extension should be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+ some-kind: some-name + + + content_copy + +
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable kube object detail items when cluster is not relevant given extension shouldn't be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+ some-kind: some-name + + + content_copy + +
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable kube object detail items when cluster is not relevant given not yet known if extension should be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+ some-kind: some-name + + + content_copy + +
+ +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; diff --git a/src/behaviours/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx b/src/behaviours/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx new file mode 100644 index 0000000000..a81071ad3e --- /dev/null +++ b/src/behaviours/cluster/kube-object-details/extension-api/disable-kube-object-detail-items-when-cluster-is-not-relevant.test.tsx @@ -0,0 +1,172 @@ +/** + * 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 type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import type { KubernetesCluster } from "../../../../common/catalog-entities"; +import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import { getExtensionFakeFor } from "../../../../renderer/components/test-utils/get-extension-fake"; +import { getInjectable } from "@ogre-tools/injectable"; +import { frontEndRouteInjectionToken } from "../../../../common/front-end-routing/front-end-route-injection-token"; +import { computed } from "mobx"; +import React from "react"; +import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token"; +import { routeSpecificComponentInjectionToken } from "../../../../renderer/routes/route-specific-component-injection-token"; +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"; + +describe("disable kube object detail items when cluster is not relevant", () => { + let builder: ApplicationBuilder; + let rendered: RenderResult; + let isEnabledForClusterMock: AsyncFnMock< + (cluster: KubernetesCluster) => Promise + >; + + beforeEach(async () => { + builder = getApplicationBuilder(); + + builder.beforeApplicationStart(({ rendererDi }) => { + rendererDi.override( + apiManagerInjectable, + () => + ({ + getStore: () => ({ + getByPath: () => + getKubeObjectStub("some-kind", "some-api-version"), + }), + } as unknown as ApiManager), + ); + }); + + const rendererDi = builder.dis.rendererDi; + + rendererDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable); + + rendererDi.register(testRouteInjectable, testRouteComponentInjectable); + + builder.setEnvironmentToClusterFrame(); + + const getExtensionFake = getExtensionFakeFor(builder); + + isEnabledForClusterMock = asyncFn(); + + const testExtension = getExtensionFake({ + id: "test-extension-id", + name: "test-extension", + + rendererOptions: { + isEnabledForCluster: isEnabledForClusterMock, + + kubeObjectDetailItems: [ + { + kind: "some-kind", + apiVersions: ["some-api-version"], + components: { + Details: () => ( +
+ Some detail +
+ ), + }, + }, + ], + }, + }); + + rendered = await builder.render(); + + const navigateToRoute = rendererDi.inject(navigateToRouteInjectionToken); + const testRoute = rendererDi.inject(testRouteInjectable); + + navigateToRoute(testRoute); + + builder.extensions.enable(testExtension); + }); + + describe("given not yet known if extension should be enabled for the cluster", () => { + 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(); + }); + }); + + describe("given extension shouldn't be enabled for the cluster", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(false); + }); + + 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(); + }); + }); + + describe("given extension should be enabled for the cluster", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(true); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows the kube object detail item", () => { + const actual = rendered.getByTestId("some-kube-object-detail-item"); + + expect(actual).toBeInTheDocument(); + }); + }); +}); + +const testRouteInjectable = getInjectable({ + id: "test-route", + + instantiate: () => ({ + path: "/test-route", + clusterFrame: true, + isEnabled: computed(() => true), + }), + + injectionToken: frontEndRouteInjectionToken, +}); + +const testRouteComponentInjectable = getInjectable({ + id: "test-route-component", + + instantiate: (di) => ({ + route: di.inject(testRouteInjectable), + + Component: () => , + }), + + injectionToken: routeSpecificComponentInjectionToken, +}); + +const getKubeObjectStub = (kind: string, apiVersion: string) => + KubeObject.create({ + apiVersion, + kind, + metadata: { + uid: "some-uid", + name: "some-name", + resourceVersion: "some-resource-version", + namespace: "some-namespace", + selfLink: "", + }, + }); diff --git a/src/behaviours/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap b/src/behaviours/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap new file mode 100644 index 0000000000..9d116616fd --- /dev/null +++ b/src/behaviours/cluster/kube-object-menu/extension-api/__snapshots__/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx.snap @@ -0,0 +1,1189 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`disable kube object menu items when cluster is not relevant given extension should be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable kube object menu items when cluster is not relevant given extension shouldn't be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable kube object menu items when cluster is not relevant given not yet known if extension should be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; diff --git a/src/behaviours/cluster/kube-object-menu/extension-api/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx b/src/behaviours/cluster/kube-object-menu/extension-api/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx new file mode 100644 index 0000000000..98ec08aa8d --- /dev/null +++ b/src/behaviours/cluster/kube-object-menu/extension-api/disable-kube-object-menu-items-when-cluster-is-not-relevant.test.tsx @@ -0,0 +1,165 @@ +/** + * 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 type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import type { KubernetesCluster } from "../../../../common/catalog-entities"; +import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import { getExtensionFakeFor } from "../../../../renderer/components/test-utils/get-extension-fake"; +import { getInjectable } from "@ogre-tools/injectable"; +import { frontEndRouteInjectionToken } from "../../../../common/front-end-routing/front-end-route-injection-token"; +import { computed } from "mobx"; +import React from "react"; +import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token"; +import { routeSpecificComponentInjectionToken } from "../../../../renderer/routes/route-specific-component-injection-token"; +import { KubeObject } from "../../../../common/k8s-api/kube-object"; +import extensionShouldBeEnabledForClusterFrameInjectable from "../../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; +import { KubeObjectMenu } from "../../../../renderer/components/kube-object-menu"; +import apiManagerInjectable from "../../../../common/k8s-api/api-manager/manager.injectable"; + +describe("disable kube object menu items when cluster is not relevant", () => { + let builder: ApplicationBuilder; + let rendered: RenderResult; + let isEnabledForClusterMock: AsyncFnMock< + (cluster: KubernetesCluster) => Promise + >; + + beforeEach(async () => { + builder = getApplicationBuilder(); + + builder.beforeApplicationStart(({ mainDi }) => { + mainDi.override(apiManagerInjectable, () => ({})); + }); + + const rendererDi = builder.dis.rendererDi; + + rendererDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable); + + rendererDi.register(testRouteInjectable, testRouteComponentInjectable); + + builder.setEnvironmentToClusterFrame(); + + const getExtensionFake = getExtensionFakeFor(builder); + + isEnabledForClusterMock = asyncFn(); + + const testExtension = getExtensionFake({ + id: "test-extension-id", + name: "test-extension", + + rendererOptions: { + isEnabledForCluster: isEnabledForClusterMock, + + kubeObjectMenuItems: [ + { + kind: "some-kind", + apiVersions: ["some-api-version"], + components: { + MenuItem: () => ( +
Some menu item
+ ), + }, + }, + ], + }, + }); + + rendered = await builder.render(); + + const navigateToRoute = rendererDi.inject(navigateToRouteInjectionToken); + const testRoute = rendererDi.inject(testRouteInjectable); + + navigateToRoute(testRoute); + + builder.extensions.enable(testExtension); + }); + + describe("given not yet known if extension should be enabled for the cluster", () => { + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show the kube object menu item", () => { + const actual = rendered.queryByTestId("some-test-id"); + + expect(actual).not.toBeInTheDocument(); + }); + }); + + describe("given extension shouldn't be enabled for the cluster", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(false); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show the kube object menu item", () => { + const actual = rendered.queryByTestId("some-test-id"); + + expect(actual).not.toBeInTheDocument(); + }); + }); + + describe("given extension should be enabled for the cluster", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(true); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows the kube object menu item", () => { + const actual = rendered.getByTestId("some-test-id"); + + expect(actual).toBeInTheDocument(); + }); + }); +}); + +const testRouteInjectable = getInjectable({ + id: "test-route", + + instantiate: () => ({ + path: "/test-route", + clusterFrame: true, + isEnabled: computed(() => true), + }), + + injectionToken: frontEndRouteInjectionToken, +}); + +const testRouteComponentInjectable = getInjectable({ + id: "test-route-component", + + instantiate: (di) => ({ + route: di.inject(testRouteInjectable), + + Component: () => ( + + ), + }), + + injectionToken: routeSpecificComponentInjectionToken, +}); + +const getKubeObjectStub = (kind: string, apiVersion: string) => + KubeObject.create({ + apiVersion, + kind, + metadata: { + uid: "some-uid", + name: "some-name", + resourceVersion: "some-resource-version", + namespace: "some-namespace", + selfLink: "", + }, + }); diff --git a/src/behaviours/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap b/src/behaviours/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap new file mode 100644 index 0000000000..2fb124eb28 --- /dev/null +++ b/src/behaviours/cluster/kube-object-status-icon/extension-api/__snapshots__/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx.snap @@ -0,0 +1,1181 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`disable kube object statuses when cluster is not relevant given extension should be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+ + + error + +
+ +
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable kube object statuses when cluster is not relevant given extension shouldn't be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable kube object statuses when cluster is not relevant given not yet known if extension should be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; diff --git a/src/behaviours/cluster/kube-object-status-icon/extension-api/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx b/src/behaviours/cluster/kube-object-status-icon/extension-api/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx new file mode 100644 index 0000000000..da3ac641a9 --- /dev/null +++ b/src/behaviours/cluster/kube-object-status-icon/extension-api/disable-kube-object-statuses-when-cluster-is-not-relevant.test.tsx @@ -0,0 +1,160 @@ +/** + * 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 type { ApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import type { KubernetesCluster } from "../../../../common/catalog-entities"; +import { getApplicationBuilder } from "../../../../renderer/components/test-utils/get-application-builder"; +import { getExtensionFakeFor } from "../../../../renderer/components/test-utils/get-extension-fake"; +import { getInjectable } from "@ogre-tools/injectable"; +import { frontEndRouteInjectionToken } from "../../../../common/front-end-routing/front-end-route-injection-token"; +import { computed } from "mobx"; +import React from "react"; +import { navigateToRouteInjectionToken } from "../../../../common/front-end-routing/navigate-to-route-injection-token"; +import { routeSpecificComponentInjectionToken } from "../../../../renderer/routes/route-specific-component-injection-token"; +import { KubeObjectStatusIcon } from "../../../../renderer/components/kube-object-status-icon/kube-object-status-icon"; +import { KubeObject } from "../../../../common/k8s-api/kube-object"; +import { KubeObjectStatusLevel } from "../../../../common/k8s-api/kube-object-status"; +import extensionShouldBeEnabledForClusterFrameInjectable from "../../../../renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; + +describe("disable kube object statuses when cluster is not relevant", () => { + let builder: ApplicationBuilder; + let rendered: RenderResult; + let isEnabledForClusterMock: AsyncFnMock< + (cluster: KubernetesCluster) => Promise + >; + + beforeEach(async () => { + builder = getApplicationBuilder(); + + const rendererDi = builder.dis.rendererDi; + + rendererDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable); + + rendererDi.register(testRouteInjectable, testRouteComponentInjectable); + + builder.setEnvironmentToClusterFrame(); + + const getExtensionFake = getExtensionFakeFor(builder); + + isEnabledForClusterMock = asyncFn(); + + const testExtension = getExtensionFake({ + id: "test-extension-id", + name: "test-extension", + + rendererOptions: { + isEnabledForCluster: isEnabledForClusterMock, + + kubeObjectStatusTexts: [ + { + kind: "some-kind", + apiVersions: ["some-api-version"], + + resolve: () => ({ + level: KubeObjectStatusLevel.CRITICAL, + text: "some-kube-object-status-text", + }), + }, + ], + }, + }); + + rendered = await builder.render(); + + const navigateToRoute = rendererDi.inject(navigateToRouteInjectionToken); + const testRoute = rendererDi.inject(testRouteInjectable); + + navigateToRoute(testRoute); + + builder.extensions.enable(testExtension); + }); + + describe("given not yet known if extension should be enabled for the cluster", () => { + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show the status", () => { + const actual = rendered.baseElement.querySelectorAll(".KubeObjectStatusIcon"); + + expect(actual).toHaveLength(0); + }); + }); + + describe("given extension shouldn't be enabled for the cluster", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(false); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show the status", () => { + const actual = rendered.baseElement.querySelectorAll(".KubeObjectStatusIcon"); + + expect(actual).toHaveLength(0); + }); + }); + + describe("given extension should be enabled for the cluster", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(true); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows the status", () => { + const actual = rendered.baseElement.querySelectorAll(".KubeObjectStatusIcon"); + + expect(actual).toHaveLength(1); + }); + }); +}); + +const testRouteInjectable = getInjectable({ + id: "test-route", + + instantiate: () => ({ + path: "/test-route", + clusterFrame: true, + isEnabled: computed(() => true), + }), + + injectionToken: frontEndRouteInjectionToken, +}); + +const testRouteComponentInjectable = getInjectable({ + id: "test-route-component", + + instantiate: (di) => ({ + route: di.inject(testRouteInjectable), + + Component: () => ( + + ), + }), + + injectionToken: routeSpecificComponentInjectionToken, +}); + +const getKubeObjectStub = (kind: string, apiVersion: string) => + KubeObject.create({ + apiVersion, + kind, + metadata: { + uid: "some-uid", + name: "some-name", + resourceVersion: "some-resource-version", + namespace: "some-namespace", + selfLink: "/foo", + }, + }); diff --git a/src/behaviours/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap b/src/behaviours/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap new file mode 100644 index 0000000000..d7eac0cbb6 --- /dev/null +++ b/src/behaviours/cluster/workloads/overview/extension-api/__snapshots__/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx.snap @@ -0,0 +1,1548 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`disable workloads overview details when cluster is not relevant given extension should be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+ Some detail component +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable workloads overview details when cluster is not relevant given extension shouldn't be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; + +exports[`disable workloads overview details when cluster is not relevant given not yet known if extension should be enabled for the cluster renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+ +`; diff --git a/src/behaviours/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx b/src/behaviours/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx new file mode 100644 index 0000000000..35a108dde9 --- /dev/null +++ b/src/behaviours/cluster/workloads/overview/extension-api/disable-workloads-overview-details-when-cluster-is-not-relevant.test.tsx @@ -0,0 +1,114 @@ +/** + * 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 type { ApplicationBuilder } from "../../../../../renderer/components/test-utils/get-application-builder"; +import type { KubernetesCluster } from "../../../../../common/catalog-entities"; +import { getApplicationBuilder } from "../../../../../renderer/components/test-utils/get-application-builder"; +import { getExtensionFakeFor } from "../../../../../renderer/components/test-utils/get-extension-fake"; +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"; + +describe("disable workloads overview details when cluster is not relevant", () => { + let builder: ApplicationBuilder; + let rendered: RenderResult; + let isEnabledForClusterMock: AsyncFnMock< + (cluster: KubernetesCluster) => Promise + >; + + beforeEach(async () => { + builder = getApplicationBuilder(); + + builder.beforeApplicationStart(({ mainDi }) => { + mainDi.override(apiManagerInjectable, () => ({})); + }); + + const rendererDi = builder.dis.rendererDi; + + rendererDi.unoverride(extensionShouldBeEnabledForClusterFrameInjectable); + + builder.setEnvironmentToClusterFrame(); + + const getExtensionFake = getExtensionFakeFor(builder); + + isEnabledForClusterMock = asyncFn(); + + const testExtension = getExtensionFake({ + id: "test-extension-id", + name: "test-extension", + + rendererOptions: { + isEnabledForCluster: isEnabledForClusterMock, + + kubeWorkloadsOverviewItems: [ + { + components: { + Details: () => ( +
Some detail component
+ ), + }, + }, + ], + }, + }); + + rendered = await builder.render(); + + const navigateToWorkloadsOverview = rendererDi.inject( + navigateToWorkloadsOverviewInjectable, + ); + + navigateToWorkloadsOverview(); + + builder.extensions.enable(testExtension); + }); + + describe("given not yet known if extension should be enabled for the cluster", () => { + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show the detail", () => { + const actual = rendered.queryByTestId("some-detail-component"); + + expect(actual).not.toBeInTheDocument(); + }); + }); + + describe("given extension shouldn't be enabled for the cluster", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(false); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show the detail", () => { + const actual = rendered.queryByTestId("some-detail-component"); + + expect(actual).not.toBeInTheDocument(); + }); + }); + + describe("given extension should be enabled for the cluster", () => { + beforeEach(async () => { + await isEnabledForClusterMock.resolve(true); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows the detail", () => { + const actual = rendered.getByTestId("some-detail-component"); + + expect(actual).toBeInTheDocument(); + }); + }); +}); diff --git a/src/behaviours/cluster/workloads/overview/extension-api/order-of-workload-overview-details.test.tsx b/src/behaviours/cluster/workloads/overview/extension-api/order-of-workload-overview-details.test.tsx new file mode 100644 index 0000000000..eb19bbd400 --- /dev/null +++ b/src/behaviours/cluster/workloads/overview/extension-api/order-of-workload-overview-details.test.tsx @@ -0,0 +1,147 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { RenderResult } from "@testing-library/react"; +import { getApplicationBuilder } from "../../../../../renderer/components/test-utils/get-application-builder"; +import { getExtensionFakeFor } from "../../../../../renderer/components/test-utils/get-extension-fake"; +import React from "react"; +import getRandomIdInjectable from "../../../../../common/utils/get-random-id.injectable"; +import { workloadOverviewDetailInjectionToken } from "../../../../../renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-injection-token"; +import { getInjectable } from "@ogre-tools/injectable"; +import { computed } from "mobx"; + +describe("order of workload overview details", () => { + let rendered: RenderResult; + + beforeEach(async () => { + const builder = getApplicationBuilder(); + + builder.beforeApplicationStart(({ rendererDi }) => { + rendererDi.unoverride(getRandomIdInjectable); + rendererDi.permitSideEffects(getRandomIdInjectable); + }); + + builder.setEnvironmentToClusterFrame(); + + rendered = await builder.render(); + + const testExtension = getExtensionFakeFor(builder)({ + id: "some-extension-id", + name: "some-extension", + + rendererOptions: { + kubeWorkloadsOverviewItems: [ + { + components: { + Details: () => ( +
+ ), + }, + }, + { + priority: 70, + components: { + Details: () => ( +
+ ), + }, + }, + { + priority: 10, + components: { + Details: () => ( +
+ ), + }, + }, + ], + }, + }); + + builder.extensions.enable(testExtension); + + + builder.dis.rendererDi.register( + someCoreItemWithLowOrderNumberInjectable, + someCoreItemWithHighOrderNumberInjectable, + someCoreItemWithDefaultOrderNumberInjectable, + ); + }); + + it("shows items in correct order", () => { + const actual = rendered.queryAllByTestId("workload-overview-detail").map(x => x.id); + + expect(actual).toEqual([ + "some-core-item-with-low-order-number", + "some-extension-item-with-high-priority", + "some-core-item-with-default-order-number", + "some-extension-item-without-priority", + "some-core-item-with-high-order-number", + "some-extension-item-with-low-priority", + ]); + }); +}); + +const someCoreItemWithLowOrderNumberInjectable = getInjectable({ + id: "some-core-item-with-low-order-number", + + instantiate: () => ({ + orderNumber: 30, + enabled: computed(() => true), + + Component: () => ( +
+ ), + }), + + injectionToken: workloadOverviewDetailInjectionToken, +}); + +const someCoreItemWithDefaultOrderNumberInjectable = getInjectable({ + id: "some-core-item-with-default-order-number", + + instantiate: () => ({ + orderNumber: 50, + enabled: computed(() => true), + + Component: () => ( +
+ ), + }), + + injectionToken: workloadOverviewDetailInjectionToken, +}); + +const someCoreItemWithHighOrderNumberInjectable = getInjectable({ + id: "some-core-item-high-order-number", + + instantiate: () => ({ + orderNumber: 60, + enabled: computed(() => true), + + Component: () => ( +
+ ), + }), + + injectionToken: workloadOverviewDetailInjectionToken, +}); diff --git a/src/extensions/common-api/registrations.ts b/src/extensions/common-api/registrations.ts index acb78ad2c9..5f19ec495d 100644 --- a/src/extensions/common-api/registrations.ts +++ b/src/extensions/common-api/registrations.ts @@ -5,7 +5,7 @@ export type { StatusBarRegistration } from "../../renderer/components/status-bar/status-bar-registration"; export type { KubeObjectMenuRegistration, KubeObjectMenuComponents } from "../../renderer/components/kube-object-menu/kube-object-menu-registration"; export type { AppPreferenceRegistration, AppPreferenceComponents } from "../../renderer/components/+preferences/app-preferences/app-preference-registration"; -export type { KubeObjectDetailRegistration, KubeObjectDetailComponents } from "../registries/kube-object-detail-registry"; +export type { KubeObjectDetailRegistration, KubeObjectDetailComponents } from "../../renderer/components/kube-object-details/kube-object-detail-registration"; export type { KubeObjectStatusRegistration } from "../../renderer/components/kube-object-status-icon/kube-object-status-registration"; export type { PageRegistration, RegisteredPage, PageParams, PageComponentProps, PageComponents, PageTarget } from "../registries/page-registry"; export type { ClusterPageMenuRegistration, ClusterPageMenuComponents } from "../registries/page-menu-registry"; diff --git a/src/extensions/extension-loader/extension-is-enabled-for-cluster.injectable.ts b/src/extensions/extension-loader/extension-is-enabled-for-cluster.injectable.ts new file mode 100644 index 0000000000..23e1c87561 --- /dev/null +++ b/src/extensions/extension-loader/extension-is-enabled-for-cluster.injectable.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import type { KubernetesCluster } from "../../common/catalog-entities"; +import type { LensRendererExtension } from "../lens-renderer-extension"; + +interface ExtensionIsEnabledForCluster { + extension: LensRendererExtension; + cluster: KubernetesCluster; +} + +const extensionIsEnabledForClusterInjectable = getInjectable({ + id: "extension-is-enabled-for-cluster", + + instantiate: async ( + di, + { extension, cluster }: ExtensionIsEnabledForCluster, + ) => (await extension.isEnabledForCluster(cluster)) as boolean, + + lifecycle: lifecycleEnum.keyedSingleton({ + getInstanceKey: ( + di, + { extension, cluster }: ExtensionIsEnabledForCluster, + ) => `${extension.sanitizedExtensionId}-${cluster.getId()}`, + }), +}); + +export default extensionIsEnabledForClusterInjectable; diff --git a/src/extensions/extension-loader/extension-loader.ts b/src/extensions/extension-loader/extension-loader.ts index 0b0db85819..d26fd92d7c 100644 --- a/src/extensions/extension-loader/extension-loader.ts +++ b/src/extensions/extension-loader/extension-loader.ts @@ -12,7 +12,6 @@ import { broadcastMessage, ipcMainOn, ipcRendererOn, ipcMainHandle } from "../.. import type { Disposer } from "../../common/utils"; import { isDefined, toJS } from "../../common/utils"; import logger from "../../main/logger"; -import type { CatalogEntity, KubernetesCluster } from "../common-api/catalog"; import type { InstalledExtension } from "../extension-discovery/extension-discovery"; import type { LensExtension, LensExtensionConstructor, LensExtensionId } from "../lens-extension"; import type { LensRendererExtension } from "../lens-renderer-extension"; @@ -274,32 +273,10 @@ export class ExtensionLoader { }); }; - loadOnClusterRenderer = (getCluster: () => CatalogEntity) => { + loadOnClusterRenderer = () => { logger.debug(`${logModule}: load on cluster renderer (dashboard)`); - this.autoInitExtensions(async (ext) => { - const entity = getCluster() as KubernetesCluster; - const extension = ext as LensRendererExtension; - - // getCluster must be a callback, as the entity might be available only after an extension has been loaded - if ((await extension.isEnabledForCluster(entity)) === false) { - return []; - } - - const removeItems = [ - registries.KubeObjectDetailRegistry.getInstance().add(extension.kubeObjectDetailItems), - ]; - - this.onRemoveExtensionId.addListener((removedExtensionId) => { - if (removedExtensionId === extension.id) { - removeItems.forEach(remove => { - remove(); - }); - } - }); - - return removeItems; - }); + this.autoInitExtensions(async () => []); }; protected async loadExtensions(installedExtensions: Map, register: (ext: LensExtension) => Promise) { diff --git a/src/extensions/lens-renderer-extension.ts b/src/extensions/lens-renderer-extension.ts index 25b1e15061..0a65a12bae 100644 --- a/src/extensions/lens-renderer-extension.ts +++ b/src/extensions/lens-renderer-extension.ts @@ -27,6 +27,7 @@ import { getExtensionRoutePath } from "../renderer/routes/for-extension"; import type { LensRendererExtensionDependencies } from "./lens-extension-set-dependencies"; import type { KubeObjectHandlerRegistration } from "../renderer/kube-object/handler"; import type { AppPreferenceTabRegistration } from "../renderer/components/+preferences/app-preference-tab/app-preference-tab-registration"; +import type { KubeObjectDetailRegistration } from "../renderer/components/kube-object-details/kube-object-detail-registration"; export class LensRendererExtension extends LensExtension { globalPages: registries.PageRegistration[] = []; @@ -37,7 +38,7 @@ export class LensRendererExtension extends LensExtension { - Details: React.ComponentType>; -} - -export interface KubeObjectDetailRegistration { - kind: string; - apiVersions: string[]; - components: KubeObjectDetailComponents; - priority?: number; -} - -export class KubeObjectDetailRegistry extends BaseRegistry { - add(items: KubeObjectDetailRegistration[]): Disposer; - add(item: KubeObjectDetailRegistration): Disposer; - add(items: KubeObjectDetailRegistration | KubeObjectDetailRegistration[]): Disposer { - return super.add(items); - } - - getItemsForKind(kind: string, apiVersion: string) { - const items = this.getItems().filter((item) => { - return item.kind === kind && item.apiVersions.includes(apiVersion); - }); - - return items.sort((a, b) => (b.priority ?? 50) - (a.priority ?? 50)); - } -} diff --git a/src/renderer/api/kube-object-detail-registry.ts b/src/renderer/api/kube-object-detail-registry.ts deleted file mode 100644 index b3efd96562..0000000000 --- a/src/renderer/api/kube-object-detail-registry.ts +++ /dev/null @@ -1,6 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -export { KubeObjectDetailRegistry } from "../../extensions/registries/kube-object-detail-registry"; diff --git a/src/renderer/bootstrap.tsx b/src/renderer/bootstrap.tsx index d0f671d20a..5573dbdbd2 100644 --- a/src/renderer/bootstrap.tsx +++ b/src/renderer/bootstrap.tsx @@ -102,9 +102,6 @@ export async function bootstrap(di: DiContainer) { logger.info(`${logPrefix} initializing EntitySettingsRegistry`); initializers.initEntitySettingsRegistry(); - logger.info(`${logPrefix} initializing KubeObjectDetailRegistry`); - initializers.initKubeObjectDetailRegistry(); - logger.info(`${logPrefix} initializing CatalogEntityDetailRegistry`); initializers.initCatalogEntityDetailRegistry(); diff --git a/src/renderer/cluster-frame-context/active-kubernetes-cluster.injectable.ts b/src/renderer/cluster-frame-context/active-kubernetes-cluster.injectable.ts new file mode 100644 index 0000000000..db6e109767 --- /dev/null +++ b/src/renderer/cluster-frame-context/active-kubernetes-cluster.injectable.ts @@ -0,0 +1,28 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import catalogEntityRegistryInjectable from "../api/catalog/entity/registry.injectable"; +import { computed } from "mobx"; +import { isKubernetesCluster } from "../../common/catalog-entities"; + +const activeKubernetesClusterInjectable = getInjectable({ + id: "active-kubernetes-cluster", + + instantiate: (di) => { + const catalogEntityRegistry = di.inject(catalogEntityRegistryInjectable); + + return computed(() => { + const activeEntity = catalogEntityRegistry.activeEntity; + + if (!isKubernetesCluster(activeEntity)) { + return null; + } + + return activeEntity; + }); + }, +}); + +export default activeKubernetesClusterInjectable; diff --git a/src/renderer/components/+workloads-overview/detail-components.injectable.ts b/src/renderer/components/+workloads-overview/detail-components.injectable.ts deleted file mode 100644 index cdb625a03c..0000000000 --- a/src/renderer/components/+workloads-overview/detail-components.injectable.ts +++ /dev/null @@ -1,68 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import { computed } from "mobx"; -import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; -import { OverviewStatuses } from "./overview-statuses"; -import { WorkloadEvents } from "../../initializers/workload-events"; -import { orderBy } from "lodash/fp"; -import type { WorkloadsOverviewDetailRegistration } from "./workloads-overview-detail-registration"; - -const detailComponentsInjectable = getInjectable({ - id: "workload-detail-components", - - instantiate: (di) => { - const extensions = di.inject(rendererExtensionsInjectable); - - return computed(() => { - const extensionRegistrations = extensions - .get() - .flatMap((extension) => extension.kubeWorkloadsOverviewItems); - - const allRegistrations = [ - ...coreRegistrations, - ...extensionRegistrations, - ]; - - return getRegistrationsInPriorityOrder(allRegistrations).map( - (item) => item.components.Details, - ); - }); - }, -}); - -const coreRegistrations = [ - { - components: { - Details: OverviewStatuses, - }, - }, - { - priority: 5, - components: { - Details: WorkloadEvents, - }, - }, -]; - -const toRegistrationWithDefaultPriority = ({ - priority = 50, - ...rest -}: WorkloadsOverviewDetailRegistration) => ({ - priority, - ...rest, -}); - -const getRegistrationsInPriorityOrder = ( - allRegistrations: WorkloadsOverviewDetailRegistration[], -) => - orderBy( - "priority", - "desc", - - allRegistrations.map(toRegistrationWithDefaultPriority), - ); - -export default detailComponentsInjectable; diff --git a/src/renderer/components/+workloads-overview/overview.tsx b/src/renderer/components/+workloads-overview/overview.tsx index 1d26ed8b67..0510c96bc9 100644 --- a/src/renderer/components/+workloads-overview/overview.tsx +++ b/src/renderer/components/+workloads-overview/overview.tsx @@ -20,7 +20,7 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import clusterFrameContextInjectable from "../../cluster-frame-context/cluster-frame-context.injectable"; import type { ClusterFrameContext } from "../../cluster-frame-context/cluster-frame-context"; import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api"; -import detailComponentsInjectable from "./detail-components.injectable"; +import workloadOverviewDetailsInjectable from "./workload-overview-details/workload-overview-details.injectable"; import { SiblingsInTabLayout } from "../layout/siblings-in-tab-layout"; import type { PodStore } from "../+workloads-pods/store"; import type { DaemonSetStore } from "../+workloads-daemonsets/store"; @@ -37,7 +37,7 @@ import type { EventStore } from "../+events/store"; import eventStoreInjectable from "../+events/store.injectable"; interface Dependencies { - detailComponents: IComputedValue[]>; + detailComponents: IComputedValue[]>; clusterFrameContext: ClusterFrameContext; subscribeStores: SubscribeStores; podStore: PodStore; @@ -122,7 +122,7 @@ class NonInjectedWorkloadsOverview extends React.Component { export const WorkloadsOverview = withInjectables(NonInjectedWorkloadsOverview, { getProps: (di) => ({ - detailComponents: di.inject(detailComponentsInjectable), + detailComponents: di.inject(workloadOverviewDetailsInjectable), clusterFrameContext: di.inject(clusterFrameContextInjectable), subscribeStores: di.inject(subscribeStoresInjectable), daemonSetStore: di.inject(daemonSetStoreInjectable), diff --git a/src/renderer/components/+workloads-overview/workload-overview-details/implementations/overview-statuses.injectable.ts b/src/renderer/components/+workloads-overview/workload-overview-details/implementations/overview-statuses.injectable.ts new file mode 100644 index 0000000000..e456bce595 --- /dev/null +++ b/src/renderer/components/+workloads-overview/workload-overview-details/implementations/overview-statuses.injectable.ts @@ -0,0 +1,22 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { workloadOverviewDetailInjectionToken } from "../workload-overview-detail-injection-token"; +import { OverviewStatuses } from "../../overview-statuses"; +import { computed } from "mobx"; + +const overviewStatusesInjectable = getInjectable({ + id: "overview-statuses", + + instantiate: () => ({ + Component: OverviewStatuses, + enabled: computed(() => true), + orderNumber: 50, + }), + + injectionToken: workloadOverviewDetailInjectionToken, +}); + +export default overviewStatusesInjectable; diff --git a/src/renderer/components/+workloads-overview/workload-overview-details/implementations/workload-events.injectable.ts b/src/renderer/components/+workloads-overview/workload-overview-details/implementations/workload-events.injectable.ts new file mode 100644 index 0000000000..7c76d2b829 --- /dev/null +++ b/src/renderer/components/+workloads-overview/workload-overview-details/implementations/workload-events.injectable.ts @@ -0,0 +1,22 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { workloadOverviewDetailInjectionToken } from "../workload-overview-detail-injection-token"; +import { computed } from "mobx"; +import { WorkloadEvents } from "../../../../initializers/workload-events"; + +const workloadEventsInjectable = getInjectable({ + id: "workload-events", + + instantiate: () => ({ + Component: WorkloadEvents, + enabled: computed(() => true), + orderNumber: 300, + }), + + injectionToken: workloadOverviewDetailInjectionToken, +}); + +export default workloadEventsInjectable; diff --git a/src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-injection-token.ts b/src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-injection-token.ts new file mode 100644 index 0000000000..746b815fd2 --- /dev/null +++ b/src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-injection-token.ts @@ -0,0 +1,18 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectionToken } from "@ogre-tools/injectable"; +import type { IComputedValue } from "mobx"; +import type React from "react"; + +interface WorkloadOverviewDetail { + orderNumber: number; + Component: React.ElementType<{}>; + enabled: IComputedValue; +} + +export const workloadOverviewDetailInjectionToken = + getInjectionToken({ + id: "workload-overview-detail-injection-token", + }); diff --git a/src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-registrator.injectable.ts b/src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-registrator.injectable.ts new file mode 100644 index 0000000000..f591c5a200 --- /dev/null +++ b/src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-detail-registrator.injectable.ts @@ -0,0 +1,58 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { computed } from "mobx"; +import getRandomIdInjectable from "../../../../common/utils/get-random-id.injectable"; +import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension"; +import extensionShouldBeEnabledForClusterFrameInjectable from "../../../extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; +import { workloadOverviewDetailInjectionToken } from "./workload-overview-detail-injection-token"; +import { extensionRegistratorInjectionToken } from "../../../../extensions/extension-loader/extension-registrator-injection-token"; + +const workloadOverviewDetailRegistratorInjectable = getInjectable({ + id: "workload-overview-detail-registrator", + + instantiate: (di) => { + const getRandomId = di.inject(getRandomIdInjectable); + + const getExtensionShouldBeEnabledForClusterFrame = ( + extension: LensRendererExtension, + ) => + di.inject(extensionShouldBeEnabledForClusterFrameInjectable, extension); + + return (ext) => { + const extension = ext as LensRendererExtension; + + const extensionShouldBeEnabledForClusterFrame = + getExtensionShouldBeEnabledForClusterFrame(extension); + + return extension.kubeWorkloadsOverviewItems.map((registration) => { + const id = `workload-overview-detail-from-${ + extension.sanitizedExtensionId + }-${getRandomId()}`; + + return getInjectable({ + id, + + instantiate: () => ({ + Component: registration.components.Details, + + enabled: computed(() => + extensionShouldBeEnabledForClusterFrame.value.get(), + ), + + orderNumber: + 0.5 + (registration.priority ? 100 - registration.priority : 50), + }), + + injectionToken: workloadOverviewDetailInjectionToken, + }); + }); + }; + }, + + injectionToken: extensionRegistratorInjectionToken, +}); + +export default workloadOverviewDetailRegistratorInjectable; diff --git a/src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-details.injectable.ts b/src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-details.injectable.ts new file mode 100644 index 0000000000..205dddec0a --- /dev/null +++ b/src/renderer/components/+workloads-overview/workload-overview-details/workload-overview-details.injectable.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { computed } from "mobx"; +import { filter, map, sortBy } from "lodash/fp"; +import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx"; +import { workloadOverviewDetailInjectionToken } from "./workload-overview-detail-injection-token"; +import { pipeline } from "@ogre-tools/fp"; + +const workloadOverviewDetailsInjectable = getInjectable({ + id: "workload-overview-details", + + instantiate: (di) => { + const computedInjectMany = di.inject(computedInjectManyInjectable); + const details = computedInjectMany(workloadOverviewDetailInjectionToken); + + return computed(() => + pipeline( + details.get(), + filter((detail) => detail.enabled.get()), + sortBy((detail) => detail.orderNumber), + map((detail) => detail.Component), + ), + ); + }, +}); + +export default workloadOverviewDetailsInjectable; diff --git a/src/renderer/components/+workloads-pods/details/volumes/variants/flex-volume.tsx b/src/renderer/components/+workloads-pods/details/volumes/variants/flex-volume.tsx index 16d8597c54..afdb08b380 100644 --- a/src/renderer/components/+workloads-pods/details/volumes/variants/flex-volume.tsx +++ b/src/renderer/components/+workloads-pods/details/volumes/variants/flex-volume.tsx @@ -28,7 +28,7 @@ export const FlexVolume: VolumeVariantComponent<"flexVolume"> = ( {readOnly.toString()} { - ...Object.entries(options) + Object.entries(options) .map(([key, value]) => ( {value} diff --git a/src/renderer/components/kube-object-details/current-kube-object-in-details.injectable.ts b/src/renderer/components/kube-object-details/current-kube-object-in-details.injectable.ts new file mode 100644 index 0000000000..3727c90395 --- /dev/null +++ b/src/renderer/components/kube-object-details/current-kube-object-in-details.injectable.ts @@ -0,0 +1,35 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { computed } from "mobx"; +import kubeDetailsUrlParamInjectable from "../kube-detail-params/kube-details-url.injectable"; +import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; +import loggerInjectable from "../../../common/logger.injectable"; + +const currentKubeObjectInDetailsInjectable = getInjectable({ + id: "current-kube-object-in-details", + + instantiate: (di) => { + const urlParam = di.inject(kubeDetailsUrlParamInjectable); + const apiManager = di.inject(apiManagerInjectable); + const logger = di.inject(loggerInjectable); + + return computed(() => { + const path = urlParam.get(); + + try { + return apiManager.getStore(path)?.getByPath(path); + } catch (error) { + logger.error( + `[KUBE-OBJECT-DETAILS]: failed to get store or object ${path}: ${error}`, + ); + + return undefined; + } + }); + }, +}); + +export default currentKubeObjectInDetailsInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-binding-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-binding-detail-item.injectable.ts new file mode 100644 index 0000000000..ad70d9245a --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-binding-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { ClusterRoleBindingDetails } from "../../../+user-management/+cluster-role-bindings"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; + +const clusterRoleBindingDetailItemInjectable = getInjectable({ + id: "cluster-role-binding-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: ClusterRoleBindingDetails, + enabled: computed(() => isClusterRoleBinding(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default clusterRoleBindingDetailItemInjectable; + +export const isClusterRoleBinding = kubeObjectMatchesToKindAndApiVersion( + "ClusterRoleBinding", + ["rbac.authorization.k8s.io/v1"], +); diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-detail-item.injectable.ts new file mode 100644 index 0000000000..11c0769e58 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cluster-role-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { ClusterRoleDetails } from "../../../+user-management/+cluster-roles"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; + +const clusterRoleDetailItemInjectable = getInjectable({ + id: "cluster-role-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: ClusterRoleDetails, + enabled: computed(() => isClusterRole(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default clusterRoleDetailItemInjectable; + +export const isClusterRole = kubeObjectMatchesToKindAndApiVersion( + "ClusterRole", + ["rbac.authorization.k8s.io/v1"], +); diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/config-map-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/config-map-detail-item.injectable.ts new file mode 100644 index 0000000000..7f0f37a589 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/config-map-detail-item.injectable.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { ConfigMapDetails } from "../../../+config-maps"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const configMapDetailItemInjectable = getInjectable({ + id: "config-map-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: ConfigMapDetails, + enabled: computed(() => isConfigMap(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default configMapDetailItemInjectable; + +const isConfigMap = kubeObjectMatchesToKindAndApiVersion("ConfigMap", ["v1"]); diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cron-job-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cron-job-detail-item.injectable.ts new file mode 100644 index 0000000000..1d268b4b0d --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/cron-job-detail-item.injectable.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { CronJobDetails } from "../../../+workloads-cronjobs"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; + +const cronJobDetailItemInjectable = getInjectable({ + id: "cron-job-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: CronJobDetails, + enabled: computed(() => isCronJob(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default cronJobDetailItemInjectable; + +export const isCronJob = kubeObjectMatchesToKindAndApiVersion("CronJob", [ + "batch/v1beta1", +]); diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/custom-resource-definitions-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/custom-resource-definitions-detail-item.injectable.ts new file mode 100644 index 0000000000..b459408ed3 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/custom-resource-definitions-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { CRDDetails } from "../../../+custom-resources"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const customResourceDefinitionsDetailItemInjectable = getInjectable({ + id: "custom-resource-definitions-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: CRDDetails, + enabled: computed(() => isCustomResourceDefinition(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default customResourceDefinitionsDetailItemInjectable; + +const isCustomResourceDefinition = kubeObjectMatchesToKindAndApiVersion( + "CustomResourceDefinition", + ["apiextensions.k8s.io/v1", "apiextensions.k8s.io/v1beta1"], +); diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/daemon-set-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/daemon-set-detail-item.injectable.ts new file mode 100644 index 0000000000..32ca10f938 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/daemon-set-detail-item.injectable.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { DaemonSetDetails } from "../../../+workloads-daemonsets"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const daemonSetDetailItemInjectable = getInjectable({ + id: "daemon-set-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: DaemonSetDetails, + enabled: computed(() => isDaemonSet(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default daemonSetDetailItemInjectable; + +export const isDaemonSet = kubeObjectMatchesToKindAndApiVersion("DaemonSet", [ + "apps/v1", +]); diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/deployment-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/deployment-detail-item.injectable.ts new file mode 100644 index 0000000000..6ecb291702 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/deployment-detail-item.injectable.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { DeploymentDetails } from "../../../+workloads-deployments"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; + +const deploymentDetailItemInjectable = getInjectable({ + id: "deployment-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: DeploymentDetails, + enabled: computed(() => isDeployment(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isDeployment = kubeObjectMatchesToKindAndApiVersion("Deployment", [ + "apps/v1", +]); + +export default deploymentDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/endpoints-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/endpoints-detail-item.injectable.ts new file mode 100644 index 0000000000..c8b0e149e3 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/endpoints-detail-item.injectable.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { EndpointsDetails } from "../../../+network-endpoints"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const endpointsDetailItemInjectable = getInjectable({ + id: "endpoints-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: EndpointsDetails, + enabled: computed(() => isEndpoint(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isEndpoint = kubeObjectMatchesToKindAndApiVersion("Endpoints", [ + "v1", +]); + +export default endpointsDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/events-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/events-detail-item.injectable.ts new file mode 100644 index 0000000000..9263a5796f --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/events-detail-item.injectable.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { EventDetails } from "../../../+events"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const eventsDetailItemInjectable = getInjectable({ + id: "events-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: EventDetails, + enabled: computed(() => isEvent(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +const isEvent = kubeObjectMatchesToKindAndApiVersion("Event", ["v1"]); + +export default eventsDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/horizontal-pod-autoscaler-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/horizontal-pod-autoscaler-detail-item.injectable.ts new file mode 100644 index 0000000000..85566eedf7 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/horizontal-pod-autoscaler-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { HpaDetails } from "../../../+config-autoscalers"; +import { computed } from "mobx"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const horizontalPodAutoscalerDetailItemInjectable = getInjectable({ + id: "horizontal-pod-autoscaler-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: HpaDetails, + enabled: computed(() => isHorizontalPodAutoscaler(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isHorizontalPodAutoscaler = kubeObjectMatchesToKindAndApiVersion( + "HorizontalPodAutoscaler", + ["autoscaling/v2beta1"], +); + +export default horizontalPodAutoscalerDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/ingress-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/ingress-detail-item.injectable.ts new file mode 100644 index 0000000000..86d4103197 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/ingress-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { IngressDetails } from "../../../+network-ingresses"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const ingressDetailItemInjectable = getInjectable({ + id: "ingress-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: IngressDetails, + enabled: computed(() => isIngress(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isIngress = kubeObjectMatchesToKindAndApiVersion("Ingress", [ + "networking.k8s.io/v1", + "extensions/v1beta1", +]); + +export default ingressDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/job-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/job-detail-item.injectable.ts new file mode 100644 index 0000000000..7c32c726e9 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/job-detail-item.injectable.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { JobDetails } from "../../../+workloads-jobs"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const jobDetailItemInjectable = getInjectable({ + id: "job-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: JobDetails, + enabled: computed(() => isJob(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isJob = kubeObjectMatchesToKindAndApiVersion("Job", ["batch/v1"]); + +export default jobDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/kube-event-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/kube-event-detail-item.injectable.ts new file mode 100644 index 0000000000..1ca98ad704 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/kube-event-detail-item.injectable.ts @@ -0,0 +1,84 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { computed } from "mobx"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { KubeEventDetails } from "../../../+events/kube-event-details"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; +import { isClusterRole } from "./cluster-role-detail-item.injectable"; +import { isClusterRoleBinding } from "./cluster-role-binding-detail-item.injectable"; +import { isCronJob } from "./cron-job-detail-item.injectable"; +import { isDaemonSet } from "./daemon-set-detail-item.injectable"; +import { isDeployment } from "./deployment-detail-item.injectable"; +import { isEndpoint } from "./endpoints-detail-item.injectable"; +import { isHorizontalPodAutoscaler } from "./horizontal-pod-autoscaler-detail-item.injectable"; +import { isIngress } from "./ingress-detail-item.injectable"; +import { isJob } from "./job-detail-item.injectable"; +import { isNetworkPolicy } from "./network-policy-detail-item.injectable"; +import { isPersistentVolume } from "./persistent-volume-detail-item.injectable"; +import { isPersistentVolumeClaim } from "./persistent-volume-claim-detail-item.injectable"; +import { isNode } from "./node-detail-item.injectable"; +import { isPod } from "./pod-detail-item.injectable"; +import { isReplicaSet } from "./replica-set-detail-item.injectable"; +import { isRole } from "./role-detail-item.injectable"; +import { isRoleBinding } from "./role-binding-detail-item.injectable"; +import { isService } from "./service-detail-item.injectable"; +import { isServiceAccount } from "./service-account-detail-item.injectable"; +import { isStatefulSet } from "./stateful-set-detail-item.injectable"; +import { isStorageClass } from "./storage-class-detail-item.injectable"; + +const kubeEventDetailItemInjectable = getInjectable({ + id: "kube-event-detail-item", + + instantiate: (di) => { + const currentKubeObjectInDetails = di.inject( + currentKubeObjectInDetailsInjectable, + ); + + return { + Component: KubeEventDetails, + + enabled: computed(() => { + const kubeObject = currentKubeObjectInDetails.get(); + + if (!kubeObject) { + return false; + } + + const predicates = [ + isClusterRole, + isClusterRoleBinding, + isCronJob, + isDaemonSet, + isDeployment, + isEndpoint, + isHorizontalPodAutoscaler, + isIngress, + isJob, + isNetworkPolicy, + isNode, + isPersistentVolume, + isPersistentVolumeClaim, + isPod, + isReplicaSet, + isRole, + isRoleBinding, + isService, + isServiceAccount, + isStatefulSet, + isStorageClass, + ]; + + return predicates.some((predicate) => predicate(kubeObject)); + }), + + orderNumber: 355, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export default kubeEventDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/limit-range-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/limit-range-detail-item.injectable.ts new file mode 100644 index 0000000000..209bb86dde --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/limit-range-detail-item.injectable.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { LimitRangeDetails } from "../../../+config-limit-ranges"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const limitRangeDetailItemInjectable = getInjectable({ + id: "limit-range-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: LimitRangeDetails, + enabled: computed(() => isLimitRange(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +const isLimitRange = kubeObjectMatchesToKindAndApiVersion("LimitRange", ["v1"]); + +export default limitRangeDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/namespaces-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/namespaces-detail-item.injectable.ts new file mode 100644 index 0000000000..180a05805c --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/namespaces-detail-item.injectable.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { NamespaceDetails } from "../../../+namespaces"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const namespacesDetailItemInjectable = getInjectable({ + id: "namespaces-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: NamespaceDetails, + enabled: computed(() => isNamespace(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +const isNamespace = kubeObjectMatchesToKindAndApiVersion("Namespace", ["v1"]); + +export default namespacesDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/network-policy-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/network-policy-detail-item.injectable.ts new file mode 100644 index 0000000000..ff7d7f4a7f --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/network-policy-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { NetworkPolicyDetails } from "../../../+network-policies"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const networkPolicyDetailItemInjectable = getInjectable({ + id: "network-policy-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: NetworkPolicyDetails, + enabled: computed(() => isNetworkPolicy(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isNetworkPolicy = kubeObjectMatchesToKindAndApiVersion( + "NetworkPolicy", + ["networking.k8s.io/v1"], +); + +export default networkPolicyDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/node-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/node-detail-item.injectable.ts new file mode 100644 index 0000000000..254187d01e --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/node-detail-item.injectable.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { NodeDetails } from "../../../+nodes/details"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; + +const nodeDetailItemInjectable = getInjectable({ + id: "node-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: NodeDetails, + enabled: computed(() => isNode(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isNode = kubeObjectMatchesToKindAndApiVersion("Node", ["v1"]); + +export default nodeDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-claim-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-claim-detail-item.injectable.ts new file mode 100644 index 0000000000..52283738dd --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-claim-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { PersistentVolumeClaimDetails } from "../../../+storage-volume-claims"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const persistentVolumeClaimDetailItemInjectable = getInjectable({ + id: "persistent-volume-claim-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: PersistentVolumeClaimDetails, + enabled: computed(() => isPersistentVolumeClaim(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isPersistentVolumeClaim = kubeObjectMatchesToKindAndApiVersion( + "PersistentVolumeClaim", + ["v1"], +); + +export default persistentVolumeClaimDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-detail-item.injectable.ts new file mode 100644 index 0000000000..dd85502c05 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/persistent-volume-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { PersistentVolumeDetails } from "../../../+storage-volumes"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const persistentVolumeDetailItemInjectable = getInjectable({ + id: "persistent-volume-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: PersistentVolumeDetails, + enabled: computed(() => isPersistentVolume(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isPersistentVolume = kubeObjectMatchesToKindAndApiVersion( + "PersistentVolume", + ["v1"], +); + +export default persistentVolumeDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-detail-item.injectable.ts new file mode 100644 index 0000000000..7f98c6a9b7 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-detail-item.injectable.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { PodDetails } from "../../../+workloads-pods"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const podDetailItemInjectable = getInjectable({ + id: "pod-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: PodDetails, + enabled: computed(() => isPod(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isPod = kubeObjectMatchesToKindAndApiVersion("Pod", ["v1"]); + +export default podDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-disruption-budget-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-disruption-budget-detail-item.injectable.ts new file mode 100644 index 0000000000..f320ba5be6 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-disruption-budget-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { PodDisruptionBudgetDetails } from "../../../+config-pod-disruption-budgets"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const podDisruptionBudgetDetailItemInjectable = getInjectable({ + id: "pod-disruption-budget-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: PodDisruptionBudgetDetails, + enabled: computed(() => isPodDisruptionBudget(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +const isPodDisruptionBudget = kubeObjectMatchesToKindAndApiVersion( + "PodDisruptionBudget", + ["policy/v1beta1"], +); + +export default podDisruptionBudgetDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-security-policy-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-security-policy-detail-item.injectable.ts new file mode 100644 index 0000000000..177745e5bb --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/pod-security-policy-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { PodSecurityPolicyDetails } from "../../../+pod-security-policies"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const podSecurityPolicyDetailItemInjectable = getInjectable({ + id: "pod-security-policy-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: PodSecurityPolicyDetails, + enabled: computed(() => isPodSecurityPolicy(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +const isPodSecurityPolicy = kubeObjectMatchesToKindAndApiVersion( + "PodSecurityPolicy", + ["policy/v1beta1"], +); + +export default podSecurityPolicyDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replica-set-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replica-set-detail-item.injectable.ts new file mode 100644 index 0000000000..9091507ed5 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/replica-set-detail-item.injectable.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { ReplicaSetDetails } from "../../../+workloads-replicasets"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const replicaSetDetailItemInjectable = getInjectable({ + id: "replica-set-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: ReplicaSetDetails, + enabled: computed(() => isReplicaSet(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isReplicaSet = kubeObjectMatchesToKindAndApiVersion("ReplicaSet", [ + "apps/v1", +]); + +export default replicaSetDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/resource-quota-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/resource-quota-detail-item.injectable.ts new file mode 100644 index 0000000000..fd495285b5 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/resource-quota-detail-item.injectable.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { ResourceQuotaDetails } from "../../../+config-resource-quotas"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const resourceQuotaDetailItemInjectable = getInjectable({ + id: "resource-quota-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: ResourceQuotaDetails, + enabled: computed(() => isResourceQuota(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +const isResourceQuota = kubeObjectMatchesToKindAndApiVersion("ResourceQuota", [ + "v1", +]); + +export default resourceQuotaDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-binding-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-binding-detail-item.injectable.ts new file mode 100644 index 0000000000..a64e727926 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-binding-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { RoleBindingDetails } from "../../../+user-management/+role-bindings"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const roleBindingDetailItemInjectable = getInjectable({ + id: "role-binding-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: RoleBindingDetails, + enabled: computed(() => isRoleBinding(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isRoleBinding = kubeObjectMatchesToKindAndApiVersion( + "RoleBinding", + ["rbac.authorization.k8s.io/v1"], +); + +export default roleBindingDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-detail-item.injectable.ts new file mode 100644 index 0000000000..c6acc8aa9f --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/role-detail-item.injectable.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { RoleDetails } from "../../../+user-management/+roles"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const roleDetailItemInjectable = getInjectable({ + id: "role-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: RoleDetails, + enabled: computed(() => isRole(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isRole = kubeObjectMatchesToKindAndApiVersion("Role", [ + "rbac.authorization.k8s.io/v1", +]); + +export default roleDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/secrets-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/secrets-detail-item.injectable.ts new file mode 100644 index 0000000000..7cd57f98b1 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/secrets-detail-item.injectable.ts @@ -0,0 +1,30 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { SecretDetails } from "../../../+config-secrets"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const secretsDetailItemInjectable = getInjectable({ + id: "secrets-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: SecretDetails, + enabled: computed(() => isSecret(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +const isSecret = kubeObjectMatchesToKindAndApiVersion("Secret", ["v1"]); + +export default secretsDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-account-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-account-detail-item.injectable.ts new file mode 100644 index 0000000000..3d7ecdffef --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-account-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { ServiceAccountsDetails } from "../../../+user-management/+service-accounts"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const serviceAccountDetailItemInjectable = getInjectable({ + id: "service-account-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: ServiceAccountsDetails, + enabled: computed(() => isServiceAccount(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isServiceAccount = kubeObjectMatchesToKindAndApiVersion( + "ServiceAccount", + ["v1"], +); + +export default serviceAccountDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-detail-item.injectable.ts new file mode 100644 index 0000000000..dad93b0064 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/service-detail-item.injectable.ts @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { ServiceDetails } from "../../../+network-services"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const serviceDetailItemInjectable = getInjectable({ + id: "service-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: ServiceDetails, + enabled: computed(() => isService(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isService = kubeObjectMatchesToKindAndApiVersion("Service", [ + "v1", +]); + +export default serviceDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/stateful-set-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/stateful-set-detail-item.injectable.ts new file mode 100644 index 0000000000..f206a48aad --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/stateful-set-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { StatefulSetDetails } from "../../../+workloads-statefulsets"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const statefulSetDetailItemInjectable = getInjectable({ + id: "stateful-set-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: StatefulSetDetails, + enabled: computed(() => isStatefulSet(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isStatefulSet = kubeObjectMatchesToKindAndApiVersion( + "StatefulSet", + ["apps/v1"], +); + +export default statefulSetDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/storage-class-detail-item.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/storage-class-detail-item.injectable.ts new file mode 100644 index 0000000000..2493b0eb8d --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/implementations/storage-class-detail-item.injectable.ts @@ -0,0 +1,33 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { kubeObjectDetailItemInjectionToken } from "../kube-object-detail-item-injection-token"; +import { computed } from "mobx"; +import { StorageClassDetails } from "../../../+storage-classes"; +import { kubeObjectMatchesToKindAndApiVersion } from "../kube-object-matches-to-kind-and-api-version"; +import currentKubeObjectInDetailsInjectable from "../../current-kube-object-in-details.injectable"; + +const storageClassDetailItemInjectable = getInjectable({ + id: "storage-class-detail-item", + + instantiate: (di) => { + const kubeObject = di.inject(currentKubeObjectInDetailsInjectable); + + return { + Component: StorageClassDetails, + enabled: computed(() => isStorageClass(kubeObject.get())), + orderNumber: 10, + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, +}); + +export const isStorageClass = kubeObjectMatchesToKindAndApiVersion( + "StorageClass", + ["storage.k8s.io/v1"], +); + +export default storageClassDetailItemInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-injection-token.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-injection-token.ts new file mode 100644 index 0000000000..8ccb9bb302 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-injection-token.ts @@ -0,0 +1,18 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectionToken } from "@ogre-tools/injectable"; +import type { IComputedValue } from "mobx"; +import type { KubeObjectDetailsProps } from "../kube-object-details"; +import type React from "react"; + +export interface KubeObjectDetailItem { + Component: React.ElementType>; + enabled: IComputedValue; + orderNumber: number; +} + +export const kubeObjectDetailItemInjectionToken = getInjectionToken({ + id: "kube-object-detail-item-injection-token", +}); diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-registrator.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-registrator.injectable.ts new file mode 100644 index 0000000000..74d7adf894 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-item-registrator.injectable.ts @@ -0,0 +1,76 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { computed } from "mobx"; +import getRandomIdInjectable from "../../../../common/utils/get-random-id.injectable"; +import type { LensRendererExtension } from "../../../../extensions/lens-renderer-extension"; +import extensionShouldBeEnabledForClusterFrameInjectable from "../../../extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; +import { kubeObjectDetailItemInjectionToken } from "./kube-object-detail-item-injection-token"; +import { extensionRegistratorInjectionToken } from "../../../../extensions/extension-loader/extension-registrator-injection-token"; +import currentKubeObjectInDetailsInjectable from "../current-kube-object-in-details.injectable"; +import { + kubeObjectMatchesToKindAndApiVersion, +} from "./kube-object-matches-to-kind-and-api-version"; + +const kubeObjectDetailItemRegistratorInjectable = getInjectable({ + id: "kube-object-detail-item-registrator", + + instantiate: (di) => { + const getRandomId = di.inject(getRandomIdInjectable); + + const getExtensionShouldBeEnabledForClusterFrame = ( + extension: LensRendererExtension, + ) => + di.inject(extensionShouldBeEnabledForClusterFrameInjectable, extension); + + return (ext) => { + const extension = ext as LensRendererExtension; + + const extensionShouldBeEnabledForClusterFrame = + getExtensionShouldBeEnabledForClusterFrame(extension); + + return extension.kubeObjectDetailItems.map((registration) => { + const id = `kube-object-detail-item-registration-from-${ + extension.sanitizedExtensionId + }-${getRandomId()}`; + + const isRelevantKubeObject = kubeObjectMatchesToKindAndApiVersion( + registration.kind, + registration.apiVersions, + ); + + return getInjectable({ + id, + + instantiate: (di) => { + const kubeObject = di.inject( + currentKubeObjectInDetailsInjectable, + ); + + return { + kind: registration.kind, + apiVersions: registration.apiVersions, + Component: registration.components.Details, + + enabled: computed( + () => + extensionShouldBeEnabledForClusterFrame.value.get() && + isRelevantKubeObject(kubeObject.get()), + ), + + orderNumber: 300 - (registration.priority || 50), + }; + }, + + injectionToken: kubeObjectDetailItemInjectionToken, + }); + }); + }; + }, + + injectionToken: extensionRegistratorInjectionToken, +}); + +export default kubeObjectDetailItemRegistratorInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-items.injectable.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-items.injectable.ts new file mode 100644 index 0000000000..1fa11b6826 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-detail-items.injectable.ts @@ -0,0 +1,31 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; + +import { computed } from "mobx"; +import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx"; +import { filter, map, sortBy } from "lodash/fp"; +import { pipeline } from "@ogre-tools/fp"; +import { kubeObjectDetailItemInjectionToken } from "./kube-object-detail-item-injection-token"; + +const kubeObjectDetailItemsInjectable = getInjectable({ + id: "kube-object-detail-items", + + instantiate: (di) => { + const computedInjectMany = di.inject(computedInjectManyInjectable); + const items = computedInjectMany(kubeObjectDetailItemInjectionToken); + + return computed(() => { + return pipeline( + items.get(), + filter((item) => item.enabled.get()), + sortBy((item) => item.orderNumber), + map((item) => item.Component), + ); + }); + }, +}); + +export default kubeObjectDetailItemsInjectable; diff --git a/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-matches-to-kind-and-api-version.ts b/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-matches-to-kind-and-api-version.ts new file mode 100644 index 0000000000..3728bda9e5 --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-items/kube-object-matches-to-kind-and-api-version.ts @@ -0,0 +1,10 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { KubeObject } from "../../../../common/k8s-api/kube-object"; + +export const kubeObjectMatchesToKindAndApiVersion = + (kind: string, apiVersions: string[]) => + (item: TKubeObject | undefined) => + !!item && item.kind === kind && apiVersions.includes(item.apiVersion); diff --git a/src/renderer/components/kube-object-details/kube-object-detail-registration.ts b/src/renderer/components/kube-object-details/kube-object-detail-registration.ts new file mode 100644 index 0000000000..ba5ec84f2e --- /dev/null +++ b/src/renderer/components/kube-object-details/kube-object-detail-registration.ts @@ -0,0 +1,18 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { KubeObject } from "../../../common/k8s-api/kube-object"; +import type { KubeObjectDetailsProps } from "./kube-object-details"; +import type React from "react"; + +export interface KubeObjectDetailComponents { + Details: React.ComponentType>; +} + +export interface KubeObjectDetailRegistration { + kind: string; + apiVersions: string[]; + components: KubeObjectDetailComponents; + priority?: number; +} diff --git a/src/renderer/components/kube-object-details/kube-object-details.tsx b/src/renderer/components/kube-object-details/kube-object-details.tsx index c0d566d049..047df72cd4 100644 --- a/src/renderer/components/kube-object-details/kube-object-details.tsx +++ b/src/renderer/components/kube-object-details/kube-object-details.tsx @@ -7,13 +7,13 @@ import "./kube-object-details.scss"; import React from "react"; import { disposeOnUnmount, observer } from "mobx-react"; +import type { IComputedValue } from "mobx"; import { computed, observable, reaction, makeObservable } from "mobx"; import { Drawer } from "../drawer"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; import { Spinner } from "../spinner"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; import { KubeObjectMenu } from "../kube-object-menu"; -import { KubeObjectDetailRegistry } from "../../api/kube-object-detail-registry"; import { CustomResourceDetails } from "../+custom-resources"; import { KubeObjectMeta } from "../kube-object-meta"; import type { PageParam } from "../../navigation"; @@ -24,7 +24,8 @@ import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.in import customResourceDefinitionStoreInjectable from "../+custom-resources/definition.store.injectable"; import hideDetailsInjectable from "../kube-detail-params/hide-details.injectable"; import kubeDetailsUrlParamInjectable from "../kube-detail-params/kube-details-url.injectable"; - +import kubeObjectDetailItemsInjectable from "./kube-object-detail-items/kube-object-detail-items.injectable"; +import currentKubeObjectInDetailsInjectable from "./current-kube-object-in-details.injectable"; export interface KubeObjectDetailsProps { className?: string; @@ -32,6 +33,8 @@ export interface KubeObjectDetailsProps { } interface Dependencies { + detailComponents: IComputedValue; + kubeObject: IComputedValue; kubeDetailsUrlParam: PageParam; apiManager: ApiManager; hideDetails: HideDetails; @@ -53,15 +56,7 @@ class NonInjectedKubeObjectDetails extends React.Component { } @computed get object() { - try { - return this.props.apiManager - .getStore(this.path) - ?.getByPath(this.path); - } catch (error) { - console.error(`[KUBE-OBJECT-DETAILS]: failed to get store or object: ${error}`, { path: this.path }); - - return undefined; - } + return this.props.kubeObject.get(); } componentDidMount(): void { @@ -108,39 +103,40 @@ class NonInjectedKubeObjectDetails extends React.Component { renderContents(object: KubeObject) { const { isLoading, loadingError } = this; - const details = KubeObjectDetailRegistry - .getInstance() - .getItemsForKind(object.kind, object.apiVersion) - .map((item, index) => ( - - )); + const details = this.props.detailComponents.get(); - if (details.length === 0) { - const crd = this.props.customResourceDefinitionStore.getByObject(object); + const getContents = () => { + if (details.length === 0) { + const crd = this.props.customResourceDefinitionStore.getByObject(object); - /** + /** * This is a fallback so that if a custom resource object doesn't have * any defined details we should try and display at least some details */ - if (crd) { - details.push(); + if (crd) { + return ( + + ); + } else { + // if we still don't have any details to show, just show the standard object metadata + return ; + } } - } - if (details.length === 0) { - // if we still don't have any details to show, just show the standard object metadata - details.push(); - } + return details.map((DetailComponent, index) => ( + + )); + }; return ( <> {isLoading && } {loadingError &&
{loadingError}
} - {details} + {getContents()} ); } @@ -169,5 +165,7 @@ export const KubeObjectDetails = withInjectables(NonInjectedKubeOb customResourceDefinitionStore: di.inject(customResourceDefinitionStoreInjectable), hideDetails: di.inject(hideDetailsInjectable), kubeDetailsUrlParam: di.inject(kubeDetailsUrlParamInjectable), + detailComponents: di.inject(kubeObjectDetailItemsInjectable), + kubeObject: di.inject(currentKubeObjectInDetailsInjectable), }), }); diff --git a/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts b/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts deleted file mode 100644 index 7539edd041..0000000000 --- a/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/get-kube-object-menu-items.ts +++ /dev/null @@ -1,31 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { conforms, includes, eq } from "lodash/fp"; -import type { KubeObject } from "../../../../../common/k8s-api/kube-object"; -import type { LensRendererExtension } from "../../../../../extensions/lens-renderer-extension"; -import { staticKubeObjectMenuItems as staticMenuItems } from "../static-kube-object-menu-items"; - -interface Dependencies { - extensions: LensRendererExtension[]; - kubeObject: KubeObject | null | undefined; -} - -export const getKubeObjectMenuItems = ({ - extensions, - kubeObject, -}: Dependencies) => { - return [ - ...staticMenuItems, - ...extensions.flatMap((extension) => extension.kubeObjectMenuItems), - ] - .filter( - conforms({ - kind: eq(kubeObject?.kind), - apiVersions: includes(kubeObject?.apiVersion), - }), - ) - .map((item) => item.components.MenuItem); -}; - diff --git a/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-items.injectable.ts b/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-items.injectable.ts deleted file mode 100644 index 1f9f8586e3..0000000000 --- a/src/renderer/components/kube-object-menu/dependencies/kube-object-menu-items/kube-object-menu-items.injectable.ts +++ /dev/null @@ -1,22 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; - -import { getKubeObjectMenuItems } from "./get-kube-object-menu-items"; -import type { KubeObject } from "../../../../../common/k8s-api/kube-object"; -import rendererExtensionsInjectable from "../../../../../extensions/renderer-extensions.injectable"; - -const kubeObjectMenuItemsInjectable = getInjectable({ - id: "kube-object-menu-items", - instantiate: (di, { kubeObject }: { kubeObject: KubeObject }) => - getKubeObjectMenuItems({ - extensions: di.inject(rendererExtensionsInjectable).get(), - kubeObject, - }), - - lifecycle: lifecycleEnum.transient, -}); - -export default kubeObjectMenuItemsInjectable; diff --git a/src/renderer/components/kube-object-menu/dependencies/static-kube-object-menu-items.ts b/src/renderer/components/kube-object-menu/dependencies/static-kube-object-menu-items.ts deleted file mode 100644 index b087a6551a..0000000000 --- a/src/renderer/components/kube-object-menu/dependencies/static-kube-object-menu-items.ts +++ /dev/null @@ -1,39 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { ServiceAccountMenu } from "../../+user-management/+service-accounts/service-account-menu"; -import { CronJobMenu } from "../../+workloads-cronjobs/cron-job-menu"; -import { DeploymentMenu } from "../../+workloads-deployments/deployment-menu"; -import { ReplicaSetMenu } from "../../+workloads-replicasets/replica-set-menu"; - -export const staticKubeObjectMenuItems = [ - { - kind: "ServiceAccount", - apiVersions: ["v1"], - components: { - MenuItem: ServiceAccountMenu, - }, - }, - { - kind: "CronJob", - apiVersions: ["batch/v1beta1"], - components: { - MenuItem: CronJobMenu, - }, - }, - { - kind: "Deployment", - apiVersions: ["apps/v1"], - components: { - MenuItem: DeploymentMenu, - }, - }, - { - kind: "ReplicaSet", - apiVersions: ["apps/v1"], - components: { - MenuItem: ReplicaSetMenu, - }, - }, -]; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu-item-injection-token.ts b/src/renderer/components/kube-object-menu/kube-object-menu-item-injection-token.ts new file mode 100644 index 0000000000..a3ec5dba4b --- /dev/null +++ b/src/renderer/components/kube-object-menu/kube-object-menu-item-injection-token.ts @@ -0,0 +1,25 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectionToken } from "@ogre-tools/injectable"; +import type { IComputedValue } from "mobx"; +import type { KubeObjectMenuProps } from "./kube-object-menu"; +import type { KubeObject } from "../../../common/k8s-api/kube-object"; +import type React from "react"; + +export type KubeObjectMenuItemComponent = React.ElementType< + KubeObjectMenuProps +>; + +export interface KubeObjectMenuItem { + kind: string; + apiVersions: string[]; + enabled: IComputedValue; + Component: KubeObjectMenuItemComponent; + orderNumber: number; +} + +export const kubeObjectMenuItemInjectionToken = getInjectionToken({ + id: "kube-object-menu-item-injection-token", +}); diff --git a/src/renderer/components/kube-object-menu/kube-object-menu-item-registrator.injectable.ts b/src/renderer/components/kube-object-menu/kube-object-menu-item-registrator.injectable.ts new file mode 100644 index 0000000000..4ee77ff4d0 --- /dev/null +++ b/src/renderer/components/kube-object-menu/kube-object-menu-item-registrator.injectable.ts @@ -0,0 +1,59 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { extensionRegistratorInjectionToken } from "../../../extensions/extension-loader/extension-registrator-injection-token"; +import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; +import getRandomIdInjectable from "../../../common/utils/get-random-id.injectable"; +import extensionShouldBeEnabledForClusterFrameInjectable from "../../extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; +import { kubeObjectMenuItemInjectionToken } from "./kube-object-menu-item-injection-token"; +import { computed } from "mobx"; + +const kubeObjectMenuItemRegistratorInjectable = getInjectable({ + id: "kube-object-menu-item-registrator", + + instantiate: (di) => { + const getRandomId = di.inject(getRandomIdInjectable); + + const getExtensionShouldBeEnabledForClusterFrame = ( + extension: LensRendererExtension, + ) => + di.inject(extensionShouldBeEnabledForClusterFrameInjectable, extension); + + return (ext) => { + const extension = ext as LensRendererExtension; + + const extensionShouldBeEnabledForClusterFrame = + getExtensionShouldBeEnabledForClusterFrame(extension); + + return extension.kubeObjectMenuItems.map((registration) => { + const id = `kube-object-menu-item-registration-from-${ + extension.sanitizedExtensionId + }-${getRandomId()}`; + + return getInjectable({ + id, + + instantiate: () => ({ + kind: registration.kind, + apiVersions: registration.apiVersions, + Component: registration.components.MenuItem, + + enabled: computed(() => + extensionShouldBeEnabledForClusterFrame.value.get(), + ), + + orderNumber: 100, + }), + + injectionToken: kubeObjectMenuItemInjectionToken, + }); + }); + }; + }, + + injectionToken: extensionRegistratorInjectionToken, +}); + +export default kubeObjectMenuItemRegistratorInjectable; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu-items.injectable.ts b/src/renderer/components/kube-object-menu/kube-object-menu-items.injectable.ts new file mode 100644 index 0000000000..796a805dfd --- /dev/null +++ b/src/renderer/components/kube-object-menu/kube-object-menu-items.injectable.ts @@ -0,0 +1,43 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; + +import type { KubeObject } from "../../../common/k8s-api/kube-object"; +import { computed } from "mobx"; +import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx"; +import { kubeObjectMenuItemInjectionToken } from "./kube-object-menu-item-injection-token"; +import { filter, map, sortBy } from "lodash/fp"; +import { pipeline } from "@ogre-tools/fp"; + +const kubeObjectMenuItemsInjectable = getInjectable({ + id: "kube-object-menu-items", + + instantiate: (di, kubeObject: KubeObject) => { + const computedInjectMany = di.inject(computedInjectManyInjectable); + const menuItems = computedInjectMany(kubeObjectMenuItemInjectionToken); + + return computed(() => + pipeline( + menuItems.get(), + + filter( + (item) => + item.kind === kubeObject?.kind && + item.apiVersions.includes(kubeObject?.apiVersion) && + item.enabled.get(), + ), + + sortBy((item) => item.orderNumber), + map((item) => item.Component), + ), + ); + }, + + lifecycle: lifecycleEnum.keyedSingleton({ + getInstanceKey: (di, kubeObject: KubeObject) => kubeObject?.getId(), + }), +}); + +export default kubeObjectMenuItemsInjectable; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu-items/cron-job-menu.injectable.ts b/src/renderer/components/kube-object-menu/kube-object-menu-items/cron-job-menu.injectable.ts new file mode 100644 index 0000000000..256e49736f --- /dev/null +++ b/src/renderer/components/kube-object-menu/kube-object-menu-items/cron-job-menu.injectable.ts @@ -0,0 +1,25 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import type { KubeObjectMenuItemComponent } from "../kube-object-menu-item-injection-token"; +import { kubeObjectMenuItemInjectionToken } from "../kube-object-menu-item-injection-token"; +import { computed } from "mobx"; +import { CronJobMenu } from "../../+workloads-cronjobs/cron-job-menu"; + +const cronJobMenuInjectable = getInjectable({ + id: "cron-job-menu-kube-object-menu", + + instantiate: () => ( { + kind: "CronJob", + apiVersions: ["batch/v1beta1"], + Component: CronJobMenu as KubeObjectMenuItemComponent, + enabled: computed(() => true), + orderNumber: 20, + }), + + injectionToken: kubeObjectMenuItemInjectionToken, +}); + +export default cronJobMenuInjectable; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu-items/deployment-menu.injectable.ts b/src/renderer/components/kube-object-menu/kube-object-menu-items/deployment-menu.injectable.ts new file mode 100644 index 0000000000..9791b2f20a --- /dev/null +++ b/src/renderer/components/kube-object-menu/kube-object-menu-items/deployment-menu.injectable.ts @@ -0,0 +1,25 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import type { KubeObjectMenuItemComponent } from "../kube-object-menu-item-injection-token"; +import { kubeObjectMenuItemInjectionToken } from "../kube-object-menu-item-injection-token"; +import { computed } from "mobx"; +import { DeploymentMenu } from "../../+workloads-deployments/deployment-menu"; + +const deploymentMenuInjectable = getInjectable({ + id: "deployment-menu-kube-object-menu", + + instantiate: () => ({ + kind: "Deployment", + apiVersions: ["apps/v1"], + Component: DeploymentMenu as KubeObjectMenuItemComponent, + enabled: computed(() => true), + orderNumber: 30, + }), + + injectionToken: kubeObjectMenuItemInjectionToken, +}); + +export default deploymentMenuInjectable; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu-items/replica-set-menu.injectable.ts b/src/renderer/components/kube-object-menu/kube-object-menu-items/replica-set-menu.injectable.ts new file mode 100644 index 0000000000..bb80bcd8fe --- /dev/null +++ b/src/renderer/components/kube-object-menu/kube-object-menu-items/replica-set-menu.injectable.ts @@ -0,0 +1,25 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import type { KubeObjectMenuItemComponent } from "../kube-object-menu-item-injection-token"; +import { kubeObjectMenuItemInjectionToken } from "../kube-object-menu-item-injection-token"; +import { computed } from "mobx"; +import { ReplicaSetMenu } from "../../+workloads-replicasets/replica-set-menu"; + +const replicaSetMenuInjectable = getInjectable({ + id: "replica-set-menu-kube-object-menu", + + instantiate: () => ({ + kind: "ReplicaSet", + apiVersions: ["apps/v1"], + Component: ReplicaSetMenu as KubeObjectMenuItemComponent, + enabled: computed(() => true), + orderNumber: 40, + }), + + injectionToken: kubeObjectMenuItemInjectionToken, +}); + +export default replicaSetMenuInjectable; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu-items/service-account-menu.injectable.ts b/src/renderer/components/kube-object-menu/kube-object-menu-items/service-account-menu.injectable.ts new file mode 100644 index 0000000000..37399ad863 --- /dev/null +++ b/src/renderer/components/kube-object-menu/kube-object-menu-items/service-account-menu.injectable.ts @@ -0,0 +1,25 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import type { KubeObjectMenuItemComponent } from "../kube-object-menu-item-injection-token"; +import { kubeObjectMenuItemInjectionToken } from "../kube-object-menu-item-injection-token"; +import { ServiceAccountMenu } from "../../+user-management/+service-accounts/service-account-menu"; +import { computed } from "mobx"; + +const serviceAccountMenuInjectable = getInjectable({ + id: "service-account-menu-kube-object-menu", + + instantiate: () => ({ + kind: "ServiceAccount", + apiVersions: ["v1"], + Component: ServiceAccountMenu as KubeObjectMenuItemComponent, + enabled: computed(() => true), + orderNumber: 10, + }), + + injectionToken: kubeObjectMenuItemInjectionToken, +}); + +export default serviceAccountMenuInjectable; diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx index 9dabdc9da4..0f0b338d8f 100644 --- a/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx +++ b/src/renderer/components/kube-object-menu/kube-object-menu.test.tsx @@ -8,12 +8,13 @@ import { screen, waitFor } from "@testing-library/react"; import "@testing-library/jest-dom/extend-expect"; import { KubeObject } from "../../../common/k8s-api/kube-object"; import userEvent from "@testing-library/user-event"; +import { getInjectable } from "@ogre-tools/injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import { ConfirmDialog } from "../confirm-dialog"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import { getDiForUnitTesting } from "../../getDiForUnitTesting"; - +import { computed } from "mobx"; import clusterInjectable from "./dependencies/cluster.injectable"; import type { DiRender } from "../test-utils/renderFor"; import { renderFor } from "../test-utils/renderFor"; @@ -21,12 +22,9 @@ import type { Cluster } from "../../../common/cluster/cluster"; import type { ApiManager } from "../../../common/k8s-api/api-manager"; import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; import { KubeObjectMenu } from "./index"; -import type { KubeObjectMenuRegistration } from "./kube-object-menu-registration"; -import { computed } from "mobx"; -import { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; -import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; import createEditResourceTabInjectable from "../dock/edit-resource/edit-resource-tab.injectable"; import hideDetailsInjectable from "../kube-detail-params/hide-details.injectable"; +import { kubeObjectMenuItemInjectionToken } from "./kube-object-menu-item-injection-token"; // TODO: Make tooltips free of side effects by making it deterministic jest.mock("../tooltip/tooltip"); @@ -35,59 +33,21 @@ jest.mock("../tooltip/withTooltip", () => ({ })); // TODO: make `animated={false}` not required to make tests deterministic - -class SomeTestExtension extends LensRendererExtension { - constructor( - kubeObjectMenuItems: KubeObjectMenuRegistration[], - ) { - super({ - id: "some-id", - absolutePath: "irrelevant", - isBundled: false, - isCompatible: false, - isEnabled: false, - manifest: { name: "some-id", version: "some-version", engines: { lens: "^5.5.0" }}, - manifestPath: "irrelevant", - }); - - this.kubeObjectMenuItems = kubeObjectMenuItems; - } -} - describe("kube-object-menu", () => { let di: DiContainer; let render: DiRender; beforeEach(() => { - const MenuItemComponent = () =>
  • Some menu item
    • ; - const someTestExtension = new SomeTestExtension([ - { - apiVersions: ["some-api-version"], - kind: "some-kind", - components: { MenuItem: MenuItemComponent }, - }, - - { - apiVersions: ["some-unrelated-api-version"], - kind: "some-kind", - components: { MenuItem: MenuItemComponent }, - }, - - { - apiVersions: ["some-api-version"], - kind: "some-unrelated-kind", - components: { MenuItem: MenuItemComponent }, - }, - ]); - di = getDiForUnitTesting({ doGeneralOverrides: true }); - render = renderFor(di); - - di.override(rendererExtensionsInjectable, () => - computed(() => [someTestExtension]), + di.register( + someMenuItemInjectable, + someOtherMenuItemInjectable, + someAnotherMenuItemInjectable, ); + render = renderFor(di); + di.override( clusterInjectable, () => @@ -318,3 +278,47 @@ describe("kube-object-menu", () => { }); }); }); + +const MenuItemComponent = () =>
  • Some menu item
    • ; + +const someMenuItemInjectable = getInjectable({ + id: "some-menu-item", + + instantiate: () => ({ + apiVersions: ["some-api-version"], + kind: "some-kind", + Component: MenuItemComponent, + enabled: computed(() => true), + orderNumber: 1, + }), + + injectionToken: kubeObjectMenuItemInjectionToken, +}); + +const someOtherMenuItemInjectable = getInjectable({ + id: "some-other-menu-item", + + instantiate: () => ({ + apiVersions: ["some-unrelated-api-version"], + kind: "some-kind", + Component: MenuItemComponent, + enabled: computed(() => true), + orderNumber: 1, + }), + + injectionToken: kubeObjectMenuItemInjectionToken, +}); + +const someAnotherMenuItemInjectable = getInjectable({ + id: "some-another-menu-item", + + instantiate: () => ({ + apiVersions: ["some-api-version"], + kind: "some-unrelated-kind", + Component: MenuItemComponent, + enabled: computed(() => true), + orderNumber: 1, + }), + + injectionToken: kubeObjectMenuItemInjectionToken, +}); diff --git a/src/renderer/components/kube-object-menu/kube-object-menu.tsx b/src/renderer/components/kube-object-menu/kube-object-menu.tsx index e78500d5ed..eb0dc025b9 100644 --- a/src/renderer/components/kube-object-menu/kube-object-menu.tsx +++ b/src/renderer/components/kube-object-menu/kube-object-menu.tsx @@ -13,13 +13,14 @@ import type { ApiManager } from "../../../common/k8s-api/api-manager"; import { withInjectables } from "@ogre-tools/injectable-react"; import clusterNameInjectable from "./dependencies/cluster-name.injectable"; import createEditResourceTabInjectable from "../dock/edit-resource/edit-resource-tab.injectable"; -import kubeObjectMenuItemsInjectable from "./dependencies/kube-object-menu-items/kube-object-menu-items.injectable"; +import kubeObjectMenuItemsInjectable from "./kube-object-menu-items.injectable"; import apiManagerInjectable from "../../../common/k8s-api/api-manager/manager.injectable"; import type { HideDetails } from "../kube-detail-params/hide-details.injectable"; import hideDetailsInjectable from "../kube-detail-params/hide-details.injectable"; import type { OnKubeObjectContextMenuOpen } from "./on-context-menu-open.injectable"; import onKubeObjectContextMenuOpenInjectable from "./on-context-menu-open.injectable"; import type { KubeObjectContextMenuItem } from "../../kube-object/handler"; +import type { IComputedValue } from "mobx"; import { observable, runInAction } from "mobx"; import type { WithConfirmation } from "../confirm-dialog/with-confirm.injectable"; import type { Navigate } from "../../navigation/navigate.injectable"; @@ -36,7 +37,7 @@ export interface KubeObjectMenuProps extends Men interface Dependencies { apiManager: ApiManager; - kubeObjectMenuItems: React.ElementType[]; + kubeObjectMenuItems: IComputedValue; clusterName: string | undefined; hideDetails: HideDetails; createEditResourceTab: (kubeObject: KubeObject) => void; @@ -73,7 +74,7 @@ class NonInjectedKubeObjectMenu extends React.Component private renderMenuItems() { const { object, toolbar } = this.props; - return this.props.kubeObjectMenuItems.map((MenuItem, index) => ( + return this.props.kubeObjectMenuItems.get().map((MenuItem, index) => ( { let render: DiRender; - let kubeObjectStatusRegistrations: KubeObjectStatusRegistration[]; + let di: DiContainer; beforeEach(() => { - // TODO: Make mocking of date in unit tests global - global.Date.now = () => new Date("2015-10-21T07:28:00Z").getTime(); + useFakeTime("2015-10-21T07:28:00Z"); - const di = getDiForUnitTesting({ doGeneralOverrides: true }); + di = getDiForUnitTesting({ doGeneralOverrides: true }); render = renderFor(di); - - kubeObjectStatusRegistrations = []; - - const someTestExtension = new SomeTestExtension( - kubeObjectStatusRegistrations, - ); - - di.override(rendererExtensionsInjectable, () => - computed(() => [someTestExtension]), - ); }); it("given no statuses, when rendered, renders as empty", () => { @@ -48,14 +39,14 @@ describe("kube-object-status-icon", () => { it('given level "critical" status, when rendered, renders with status', () => { const kubeObject = getKubeObjectStub("some-kind", "some-api-version"); - const statusRegistration = getStatusRegistration( + const statusTextInjectable = getStatusTextInjectable( KubeObjectStatusLevel.CRITICAL, "critical", "some-kind", ["some-api-version"], ); - kubeObjectStatusRegistrations.push(statusRegistration); + di.register(statusTextInjectable); const { baseElement } = render( , @@ -67,14 +58,14 @@ describe("kube-object-status-icon", () => { it('given level "info" status, when rendered, renders with status', () => { const kubeObject = getKubeObjectStub("some-kind", "some-api-version"); - const statusRegistration = getStatusRegistration( + const statusTextInjectable = getStatusTextInjectable( KubeObjectStatusLevel.INFO, "info", "some-kind", ["some-api-version"], ); - kubeObjectStatusRegistrations.push(statusRegistration); + di.register(statusTextInjectable); const { baseElement } = render( , @@ -86,14 +77,14 @@ describe("kube-object-status-icon", () => { it('given level "warning" status, when rendered, renders with status', () => { const kubeObject = getKubeObjectStub("some-kind", "some-api-version"); - const statusRegistration = getStatusRegistration( + const statusTextInjectable = getStatusTextInjectable( KubeObjectStatusLevel.WARNING, "warning", "some-kind", ["some-api-version"], ); - kubeObjectStatusRegistrations.push(statusRegistration); + di.register(statusTextInjectable); const { baseElement } = render( , @@ -105,30 +96,32 @@ describe("kube-object-status-icon", () => { it("given status for all levels is present, when rendered, renders with statuses", () => { const kubeObject = getKubeObjectStub("some-kind", "some-api-version"); - const critical = getStatusRegistration( + const criticalStatusTextInjectable = getStatusTextInjectable( KubeObjectStatusLevel.CRITICAL, "critical", "some-kind", ["some-api-version"], ); - const warning = getStatusRegistration( + const warningStatusTextInjectable = getStatusTextInjectable( KubeObjectStatusLevel.WARNING, "warning", "some-kind", ["some-api-version"], ); - const info = getStatusRegistration( + const infoStatusTextInjectable = getStatusTextInjectable( KubeObjectStatusLevel.INFO, "info", "some-kind", ["some-api-version"], ); - kubeObjectStatusRegistrations.push(critical); - kubeObjectStatusRegistrations.push(warning); - kubeObjectStatusRegistrations.push(info); + di.register( + criticalStatusTextInjectable, + warningStatusTextInjectable, + infoStatusTextInjectable, + ); const { baseElement } = render( , @@ -140,22 +133,21 @@ describe("kube-object-status-icon", () => { it("given info and warning statuses are present, when rendered, renders with statuses", () => { const kubeObject = getKubeObjectStub("some-kind", "some-api-version"); - const warning = getStatusRegistration( + const warningStatusTextInjectable = getStatusTextInjectable( KubeObjectStatusLevel.WARNING, "warning", "some-kind", ["some-api-version"], ); - const info = getStatusRegistration( + const infoStatusTextInjectable = getStatusTextInjectable( KubeObjectStatusLevel.INFO, "info", "some-kind", ["some-api-version"], ); - kubeObjectStatusRegistrations.push(warning); - kubeObjectStatusRegistrations.push(info); + di.register(warningStatusTextInjectable, infoStatusTextInjectable); const { baseElement } = render( , @@ -168,14 +160,14 @@ describe("kube-object-status-icon", () => { it("given registration for wrong api version, when rendered, renders as empty", () => { const kubeObject = getKubeObjectStub("some-kind", "some-api-version"); - const statusRegistration = getStatusRegistration( + const statusTextInjectable = getStatusTextInjectable( KubeObjectStatusLevel.CRITICAL, "irrelevant", "some-kind", ["some-other-api-version"], ); - kubeObjectStatusRegistrations.push(statusRegistration); + di.register(statusTextInjectable); const { baseElement } = render( , @@ -187,14 +179,14 @@ describe("kube-object-status-icon", () => { it("given registration for wrong kind, when rendered, renders as empty", () => { const kubeObject = getKubeObjectStub("some-kind", "some-api-version"); - const statusRegistration = getStatusRegistration( + const statusTextInjectable = getStatusTextInjectable( KubeObjectStatusLevel.CRITICAL, "irrelevant", "some-other-kind", ["some-api-version"], ); - kubeObjectStatusRegistrations.push(statusRegistration); + di.register(statusTextInjectable); const { baseElement } = render( , @@ -206,21 +198,25 @@ describe("kube-object-status-icon", () => { it("given registration without status for exact kube object, when rendered, renders as empty", () => { const kubeObject = getKubeObjectStub("some-kind", "some-api-version"); - const statusRegistration = { - apiVersions: ["some-api-version"], - kind: "some-kind", - resolve: (): void => {}, - }; + const statusTextInjectable = getInjectable({ + id: "some-id", + instantiate: () => ({ + apiVersions: ["some-api-version"], + kind: "some-kind", + resolve: () => { return undefined as unknown as KubeObjectStatus; }, + enabled: computed(() => true), + }), - // @ts-ignore - kubeObjectStatusRegistrations.push(statusRegistration); + injectionToken: kubeObjectStatusTextInjectionToken, + }); + + di.register(statusTextInjectable); const { baseElement } = render( , ); expect(baseElement).toMatchSnapshot(); - }); }); @@ -236,28 +232,20 @@ const getKubeObjectStub = (kind: string, apiVersion: string) => KubeObject.creat }, }); -const getStatusRegistration = (level: KubeObjectStatusLevel, title: string, kind: string, apiVersions: string[]) => ({ - apiVersions, - kind, - resolve: (kubeObject: KubeObject) => ({ - level, - text: `Some ${title} status for ${kubeObject.getName()}`, - timestamp: "2015-10-19T07:28:00Z", +const getStatusTextInjectable = (level: KubeObjectStatusLevel, title: string, kind: string, apiVersions: string[]) => getInjectable({ + id: title, + instantiate: () => ({ + apiVersions, + kind, + + resolve: (kubeObject: KubeObject) => ({ + level, + text: `Some ${title} status for ${kubeObject.getName()}`, + timestamp: "2015-10-19T07:28:00Z", + }), + + enabled: computed(() => true), }), + + injectionToken: kubeObjectStatusTextInjectionToken, }); - -class SomeTestExtension extends LensRendererExtension { - constructor(kubeObjectStatusTexts: KubeObjectStatusRegistration[]) { - super({ - id: "some-id", - absolutePath: "irrelevant", - isBundled: false, - isCompatible: false, - isEnabled: false, - manifest: { name: "some-id", version: "some-version", engines: { lens: "^5.5.0" }}, - manifestPath: "irrelevant", - }); - - this.kubeObjectStatusTexts = kubeObjectStatusTexts; - } -} diff --git a/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx b/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx index ee85ad6753..dd5010e9d9 100644 --- a/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx +++ b/src/renderer/components/kube-object-status-icon/kube-object-status-icon.tsx @@ -9,10 +9,12 @@ import React from "react"; import { Icon } from "../icon"; import { cssNames, formatDuration, getOrInsert } from "../../utils"; import { withInjectables } from "@ogre-tools/injectable-react"; -import statusesForKubeObjectInjectable from "./statuses-for-kube-object.injectable"; +import kubeObjectStatusTextsForObjectInjectable from "./kube-object-status-texts-for-object.injectable"; import type { KubeObject } from "../../../common/k8s-api/kube-object"; import type { KubeObjectStatus } from "../../../common/k8s-api/kube-object-status"; import { KubeObjectStatusLevel } from "../../../common/k8s-api/kube-object-status"; +import type { IComputedValue } from "mobx"; +import { observer } from "mobx-react"; function statusClassName(level: KubeObjectStatusLevel): string { switch (level) { @@ -76,9 +78,10 @@ export interface KubeObjectStatusIconProps { } interface Dependencies { - statuses: KubeObjectStatus[]; + statuses: IComputedValue; } +@observer class NonInjectedKubeObjectStatusIcon extends React.Component { renderStatuses(statuses: KubeObjectStatus[], level: number) { const filteredStatuses = statuses.filter((item) => item.level == level); @@ -104,7 +107,7 @@ class NonInjectedKubeObjectStatusIcon extends React.Component ({ - statuses: di.inject(statusesForKubeObjectInjectable, props.object), + statuses: di.inject(kubeObjectStatusTextsForObjectInjectable, props.object), ...props, }), }, diff --git a/src/renderer/components/kube-object-status-icon/kube-object-status-text-injection-token.ts b/src/renderer/components/kube-object-status-icon/kube-object-status-text-injection-token.ts new file mode 100644 index 0000000000..bac6e127d4 --- /dev/null +++ b/src/renderer/components/kube-object-status-icon/kube-object-status-text-injection-token.ts @@ -0,0 +1,20 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectionToken } from "@ogre-tools/injectable"; +import type { KubeObject } from "../../../common/k8s-api/kube-object"; +import type { KubeObjectStatus } from "../../../common/k8s-api/kube-object-status"; +import type { IComputedValue } from "mobx"; + +export interface KubeObjectStatusText { + kind: string; + apiVersions: string[]; + resolve: (object: KubeObject) => KubeObjectStatus; + enabled: IComputedValue; +} + +export const kubeObjectStatusTextInjectionToken = + getInjectionToken({ + id: "kube-object-status-text-injection-token", + }); diff --git a/src/renderer/components/kube-object-status-icon/kube-object-status-text-registrator.injectable.ts b/src/renderer/components/kube-object-status-icon/kube-object-status-text-registrator.injectable.ts new file mode 100644 index 0000000000..0592330e8c --- /dev/null +++ b/src/renderer/components/kube-object-status-icon/kube-object-status-text-registrator.injectable.ts @@ -0,0 +1,55 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { extensionRegistratorInjectionToken } from "../../../extensions/extension-loader/extension-registrator-injection-token"; +import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; +import getRandomIdInjectable from "../../../common/utils/get-random-id.injectable"; +import { kubeObjectStatusTextInjectionToken } from "./kube-object-status-text-injection-token"; +import extensionShouldBeEnabledForClusterFrameInjectable from "../../extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; +import { computed } from "mobx"; + +const kubeObjectStatusTextRegistratorInjectable = getInjectable({ + id: "kube-object-status-text-registrator", + + instantiate: (di) => { + const getRandomId = di.inject(getRandomIdInjectable); + + const getExtensionShouldBeEnabledForClusterFrame = ( + extension: LensRendererExtension, + ) => + di.inject(extensionShouldBeEnabledForClusterFrameInjectable, extension); + + return (ext) => { + const extension = ext as LensRendererExtension; + + const extensionShouldBeEnabledForClusterFrame = + getExtensionShouldBeEnabledForClusterFrame(extension); + + return extension.kubeObjectStatusTexts.map((registration) => { + const id = `kube-object-status-text-registration-from-${ + extension.sanitizedExtensionId + }-${getRandomId()}`; + + return getInjectable({ + id, + + instantiate: () => ({ + ...registration, + + enabled: computed(() => + extensionShouldBeEnabledForClusterFrame.value.get(), + ), + }), + + injectionToken: kubeObjectStatusTextInjectionToken, + }); + }); + }; + }, + + injectionToken: extensionRegistratorInjectionToken, +}); + +export default kubeObjectStatusTextRegistratorInjectable; diff --git a/src/renderer/components/kube-object-status-icon/kube-object-status-texts-for-object.injectable.ts b/src/renderer/components/kube-object-status-icon/kube-object-status-texts-for-object.injectable.ts new file mode 100644 index 0000000000..108c79b273 --- /dev/null +++ b/src/renderer/components/kube-object-status-icon/kube-object-status-texts-for-object.injectable.ts @@ -0,0 +1,42 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import kubeObjectStatusTextsInjectable from "./kube-object-status-texts.injectable"; +import type { KubeObject } from "../../../common/k8s-api/kube-object"; +import { conforms, eq, includes } from "lodash/fp"; +import type { KubeObjectStatusRegistration } from "./kube-object-status-registration"; +import { computed } from "mobx"; + +const kubeObjectStatusTextsForObjectInjectable = getInjectable({ + id: "kube-object-status-texts-for-object", + + instantiate: (di, kubeObject: KubeObject) => { + const allStatusTexts = di.inject(kubeObjectStatusTextsInjectable); + + return computed(() => + allStatusTexts + .get() + .filter(toKubeObjectRelated(kubeObject)) + .map(toStatus(kubeObject)) + .filter(Boolean), + ); + }, + + lifecycle: lifecycleEnum.keyedSingleton({ + getInstanceKey: (di, kubeObject: KubeObject) => kubeObject.getId(), + }), +}); + +const toKubeObjectRelated = (kubeObject: KubeObject) => + conforms({ + kind: eq(kubeObject.kind), + apiVersions: includes(kubeObject.apiVersion), + }); + +const toStatus = + (kubeObject: KubeObject) => (item: KubeObjectStatusRegistration) => + item.resolve(kubeObject); + +export default kubeObjectStatusTextsForObjectInjectable; diff --git a/src/renderer/components/kube-object-status-icon/kube-object-status-texts.injectable.ts b/src/renderer/components/kube-object-status-icon/kube-object-status-texts.injectable.ts new file mode 100644 index 0000000000..df5b5b65b3 --- /dev/null +++ b/src/renderer/components/kube-object-status-icon/kube-object-status-texts.injectable.ts @@ -0,0 +1,23 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx"; +import { computed } from "mobx"; +import { kubeObjectStatusTextInjectionToken } from "./kube-object-status-text-injection-token"; + +const kubeObjectStatusTextsInjectable = getInjectable({ + id: "kube-object-status-texts", + + instantiate: (di) => { + const computedInjectMany = di.inject(computedInjectManyInjectable); + const statusTexts = computedInjectMany(kubeObjectStatusTextInjectionToken); + + return computed(() => + statusTexts.get().filter((statusText) => statusText.enabled.get()), + ); + }, +}); + +export default kubeObjectStatusTextsInjectable; diff --git a/src/renderer/components/kube-object-status-icon/status-registrations.injectable.ts b/src/renderer/components/kube-object-status-icon/status-registrations.injectable.ts deleted file mode 100644 index 2e5f302382..0000000000 --- a/src/renderer/components/kube-object-status-icon/status-registrations.injectable.ts +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import { computed } from "mobx"; -import rendererExtensionsInjectable from "../../../extensions/renderer-extensions.injectable"; - -const statusRegistrationsInjectable = getInjectable({ - id: "status-registrations", - - instantiate: (di) => { - const extensions = di.inject(rendererExtensionsInjectable); - - return computed(() => - extensions.get().flatMap((extension) => extension.kubeObjectStatusTexts), - ); - }, -}); - -export default statusRegistrationsInjectable; diff --git a/src/renderer/components/kube-object-status-icon/statuses-for-kube-object.injectable.ts b/src/renderer/components/kube-object-status-icon/statuses-for-kube-object.injectable.ts deleted file mode 100644 index d277dd04a6..0000000000 --- a/src/renderer/components/kube-object-status-icon/statuses-for-kube-object.injectable.ts +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; -import statusRegistrationsInjectable from "./status-registrations.injectable"; -import type { KubeObject } from "../../../common/k8s-api/kube-object"; -import { conforms, eq, includes } from "lodash/fp"; -import type { KubeObjectStatusRegistration } from "./kube-object-status-registration"; - -const statusesForKubeObjectInjectable = getInjectable({ - id: "statuses-for-kube-object", - - instantiate: (di, kubeObject: KubeObject) => - di - .inject(statusRegistrationsInjectable) - .get() - .filter(toKubeObjectRelated(kubeObject)) - .map(toStatus(kubeObject)) - .filter(Boolean), - - lifecycle: lifecycleEnum.transient, -}); - -const toKubeObjectRelated = (kubeObject: KubeObject) => - conforms({ - kind: eq(kubeObject.kind), - apiVersions: includes(kubeObject.apiVersion), - }); - -const toStatus = - (kubeObject: KubeObject) => (item: KubeObjectStatusRegistration) => - item.resolve(kubeObject); - -export default statusesForKubeObjectInjectable; diff --git a/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx b/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx index 28c0ed89ed..9792855b07 100644 --- a/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx +++ b/src/renderer/components/layout/extension-sidebar-item-registrator.injectable.tsx @@ -14,6 +14,7 @@ import routeIsActiveInjectable from "../../routes/route-is-active.injectable"; import { navigateToRouteInjectionToken } from "../../../common/front-end-routing/navigate-to-route-injection-token"; import { getExtensionRoutePath } from "../../routes/for-extension"; import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; +import extensionShouldBeEnabledForClusterFrameInjectable from "../../extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; const extensionSidebarItemRegistratorInjectable = getInjectable({ id: "extension-sidebar-item-registrator", @@ -22,6 +23,7 @@ const extensionSidebarItemRegistratorInjectable = getInjectable({ const extension = ext as LensRendererExtension; const navigateToRoute = di.inject(navigateToRouteInjectionToken); const routes = di.inject(routesInjectable); + const extensionShouldBeEnabledForClusterFrame = di.inject(extensionShouldBeEnabledForClusterFrameInjectable, extension); const sidebarItemsForExtensionInjectable = getInjectable({ id: `sidebar-items-for-extension-${extension.sanitizedExtensionId}`, @@ -41,6 +43,18 @@ const extensionSidebarItemRegistratorInjectable = getInjectable({ matches({ path: targetRoutePath }), ); + const isVisible = computed(() => { + if (!extensionShouldBeEnabledForClusterFrame.value.get()) { + return false; + } + + if (!registration.visible) { + return true; + } + + return registration.visible.get(); + }); + const res: SidebarItemRegistration = { id: `${extension.sanitizedExtensionId}-${registration.id}`, orderNumber: 9999, @@ -49,7 +63,7 @@ const extensionSidebarItemRegistratorInjectable = getInjectable({ ? `${extension.sanitizedExtensionId}-${registration.parentId}` : null, - ...(registration.visible ? { isVisible: registration.visible } : {}), + isVisible, title: registration.title, getIcon: registration.components.Icon diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 174686bbdc..a83fd0d45d 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -58,6 +58,8 @@ import { renderFor } from "./renderFor"; import { RootFrame } from "../../frames/root-frame/root-frame"; import { ClusterFrame } from "../../frames/cluster-frame/cluster-frame"; import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable"; +import activeKubernetesClusterInjectable from "../../cluster-frame-context/active-kubernetes-cluster.injectable"; +import { catalogEntityFromCluster } from "../../../main/cluster-manager"; type Callback = (dis: DiContainers) => void | Promise; @@ -382,6 +384,10 @@ export const getApplicationBuilder = () => { accessibleNamespaces: [], } as unknown as Cluster; + rendererDi.override(activeKubernetesClusterInjectable, () => + computed(() => catalogEntityFromCluster(clusterStub)), + ); + const namespaceStoreStub = { contextNamespaces: [], items: [], diff --git a/src/renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable.ts b/src/renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable.ts new file mode 100644 index 0000000000..24c75f4d30 --- /dev/null +++ b/src/renderer/extension-loader/extension-should-be-enabled-for-cluster-frame.injectable.ts @@ -0,0 +1,49 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { asyncComputed } from "@ogre-tools/injectable-react"; +import type { LensRendererExtension } from "../../extensions/lens-renderer-extension"; +import type { KubernetesCluster } from "../../common/catalog-entities"; +import extensionIsEnabledForClusterInjectable from "../../extensions/extension-loader/extension-is-enabled-for-cluster.injectable"; +import activeKubernetesClusterInjectable from "../cluster-frame-context/active-kubernetes-cluster.injectable"; +import { untracked } from "mobx"; + +const extensionShouldBeEnabledForClusterFrameInjectable = getInjectable({ + id: "extension-should-be-enabled-for-cluster-frame", + + instantiate: (di, extension: LensRendererExtension) => { + const activeKubernetesCluster = di.inject(activeKubernetesClusterInjectable); + + const getExtensionIsEnabledForCluster = ( + extension: LensRendererExtension, + cluster: KubernetesCluster, + ) => + untracked(() => di.inject(extensionIsEnabledForClusterInjectable, { extension, cluster })); + + return asyncComputed( + async () => { + const cluster = activeKubernetesCluster.get(); + + if (!cluster) { + return false; + } + + return getExtensionIsEnabledForCluster( + extension, + cluster, + ); + }, + + false, + ); + }, + + lifecycle: lifecycleEnum.keyedSingleton({ + getInstanceKey: (di, extension: LensRendererExtension) => + extension.sanitizedExtensionId, + }), +}); + +export default extensionShouldBeEnabledForClusterFrameInjectable; diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx index ec78ce94b2..d643dabfb0 100644 --- a/src/renderer/getDiForUnitTesting.tsx +++ b/src/renderer/getDiForUnitTesting.tsx @@ -69,6 +69,8 @@ import kubeObjectDetailsClusterFrameChildComponentInjectable from "./components/ import kubeconfigDialogClusterFrameChildComponentInjectable from "./components/kubeconfig-dialog/kubeconfig-dialog-cluster-frame-child-component.injectable"; import portForwardDialogClusterFrameChildComponentInjectable from "./port-forward/port-forward-dialog-cluster-frame-child-component.injectable"; import setupSystemCaInjectable from "./frames/root-frame/setup-system-ca.injectable"; +import extensionShouldBeEnabledForClusterFrameInjectable from "./extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; +import { asyncComputed } from "@ogre-tools/injectable-react"; import forceUpdateModalRootFrameComponentInjectable from "./application-update/force-update-modal/force-update-modal-root-frame-component.injectable"; export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {}) => { @@ -126,6 +128,11 @@ export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {}) shouldRender: computed(() => false), })); + // TODO: Remove after "LensRendererExtension.isEnabledForCluster" is removed + di.override(extensionShouldBeEnabledForClusterFrameInjectable, () => + asyncComputed(async () => true, true), + ); + // TODO: Remove side-effects and shared global state const clusterFrameChildComponentInjectables: Injectable[] = [ commandContainerClusterFrameChildComponentInjectable, diff --git a/src/renderer/initializers/index.ts b/src/renderer/initializers/index.ts index b6b458a8eb..7653a6147a 100644 --- a/src/renderer/initializers/index.ts +++ b/src/renderer/initializers/index.ts @@ -7,6 +7,5 @@ export * from "./catalog-entity-detail-registry"; export * from "./catalog"; export * from "./entity-settings-registry"; export * from "./ipc"; -export * from "./kube-object-detail-registry"; export * from "./registries"; export * from "./catalog-category-registry"; diff --git a/src/renderer/initializers/kube-object-detail-registry.tsx b/src/renderer/initializers/kube-object-detail-registry.tsx deleted file mode 100644 index 1943341d68..0000000000 --- a/src/renderer/initializers/kube-object-detail-registry.tsx +++ /dev/null @@ -1,441 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ - -import React from "react"; -import { KubeObjectDetailRegistry } from "../api/kube-object-detail-registry"; -import type { HpaDetailsProps } from "../components/+config-autoscalers"; -import { HpaDetails } from "../components/+config-autoscalers"; -import { LimitRangeDetails } from "../components/+config-limit-ranges"; -import { ConfigMapDetails } from "../components/+config-maps"; -import { PodDisruptionBudgetDetails } from "../components/+config-pod-disruption-budgets"; -import { ResourceQuotaDetails } from "../components/+config-resource-quotas"; -import { SecretDetails } from "../components/+config-secrets"; -import { CRDDetails } from "../components/+custom-resources"; -import { EventDetails } from "../components/+events"; -import { KubeEventDetails } from "../components/+events/kube-event-details"; -import { NamespaceDetails } from "../components/+namespaces"; -import { EndpointsDetails } from "../components/+network-endpoints"; -import { IngressDetails } from "../components/+network-ingresses"; -import { NetworkPolicyDetails } from "../components/+network-policies"; -import { ServiceDetails } from "../components/+network-services"; -import { NodeDetails } from "../components/+nodes/details"; -import { PodSecurityPolicyDetails } from "../components/+pod-security-policies"; -import { StorageClassDetails } from "../components/+storage-classes"; -import { PersistentVolumeClaimDetails } from "../components/+storage-volume-claims"; -import { PersistentVolumeDetails } from "../components/+storage-volumes"; -import { ClusterRoleDetails } from "../components/+user-management/+cluster-roles"; -import { ClusterRoleBindingDetails } from "../components/+user-management/+cluster-role-bindings"; -import { RoleDetails } from "../components/+user-management/+roles"; -import { RoleBindingDetails } from "../components/+user-management/+role-bindings"; -import { ServiceAccountsDetails } from "../components/+user-management/+service-accounts"; -import { CronJobDetails } from "../components/+workloads-cronjobs"; -import { DaemonSetDetails } from "../components/+workloads-daemonsets"; -import { DeploymentDetails } from "../components/+workloads-deployments"; -import { JobDetails } from "../components/+workloads-jobs"; -import { PodDetails } from "../components/+workloads-pods"; -import { ReplicaSetDetails } from "../components/+workloads-replicasets"; -import { StatefulSetDetails } from "../components/+workloads-statefulsets"; -import type { KubeObjectDetailsProps } from "../components/kube-object-details"; - -export function initKubeObjectDetailRegistry() { - const registry = KubeObjectDetailRegistry.getInstance(); - - registry.add({ - kind: "HorizontalPodAutoscaler", - apiVersions: ["autoscaling/v2beta1"], - components: { - // Note: this line is left in the long form as a validation that this usecase is valid - Details: (props: HpaDetailsProps) => , - }, - }); - registry.add({ - kind: "HorizontalPodAutoscaler", - apiVersions: ["autoscaling/v2beta1"], - components: { - // Note: this line is left in the long form as a validation that this usecase is valid - Details: (props: HpaDetailsProps) => , - }, - }); - registry.add({ - kind: "HorizontalPodAutoscaler", - apiVersions: ["autoscaling/v2beta1"], - priority: 5, - components: { - // Note: this line is left in the long form as a validation that this usecase is valid - Details: (props: KubeObjectDetailsProps) => , - }, - }); - registry.add({ - kind: "LimitRange", - apiVersions: ["v1"], - components: { - Details: LimitRangeDetails, - }, - }); - registry.add({ - kind: "ConfigMap", - apiVersions: ["v1"], - components: { - Details: ConfigMapDetails, - }, - }); - registry.add({ - kind: "ConfigMap", - apiVersions: ["v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "PodDisruptionBudget", - apiVersions: ["policy/v1beta1"], - components: { - Details: PodDisruptionBudgetDetails, - }, - }); - registry.add({ - kind: "ResourceQuota", - apiVersions: ["v1"], - components: { - Details: ResourceQuotaDetails, - }, - }); - registry.add({ - kind: "Secret", - apiVersions: ["v1"], - components: { - Details: SecretDetails, - }, - }); - registry.add({ - kind: "CustomResourceDefinition", - apiVersions: ["apiextensions.k8s.io/v1", "apiextensions.k8s.io/v1beta1"], - components: { - Details: CRDDetails, - }, - }); - registry.add({ - kind: "Event", - apiVersions: ["v1"], - components: { - Details: EventDetails, - }, - }); - registry.add({ - kind: "Namespace", - apiVersions: ["v1"], - components: { - Details: NamespaceDetails, - }, - }); - registry.add({ - kind: "Endpoints", - apiVersions: ["v1"], - components: { - Details: EndpointsDetails, - }, - }); - registry.add({ - kind: "Endpoints", - apiVersions: ["v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "Ingress", - apiVersions: ["networking.k8s.io/v1", "extensions/v1beta1"], - components: { - Details: IngressDetails, - }, - }); - registry.add({ - kind: "Ingress", - apiVersions: ["networking.k8s.io/v1", "extensions/v1beta1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "NetworkPolicy", - apiVersions: ["networking.k8s.io/v1"], - components: { - Details: NetworkPolicyDetails, - }, - }); - registry.add({ - kind: "NetworkPolicy", - apiVersions: ["networking.k8s.io/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "Service", - apiVersions: ["v1"], - components: { - Details: ServiceDetails, - }, - }); - registry.add({ - kind: "Service", - apiVersions: ["v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "Node", - apiVersions: ["v1"], - components: { - Details: NodeDetails, - }, - }); - registry.add({ - kind: "Node", - apiVersions: ["v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "PodSecurityPolicy", - apiVersions: ["policy/v1beta1"], - components: { - Details: PodSecurityPolicyDetails, - }, - }); - registry.add({ - kind: "StorageClass", - apiVersions: ["storage.k8s.io/v1"], - components: { - Details: StorageClassDetails, - }, - }); - registry.add({ - kind: "StorageClass", - apiVersions: ["storage.k8s.io/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "PersistentVolumeClaim", - apiVersions: ["v1"], - components: { - Details: PersistentVolumeClaimDetails, - }, - }); - registry.add({ - kind: "PersistentVolumeClaim", - apiVersions: ["v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "PersistentVolume", - apiVersions: ["v1"], - components: { - Details: PersistentVolumeDetails, - }, - }); - registry.add({ - kind: "PersistentVolume", - apiVersions: ["v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "Role", - apiVersions: ["rbac.authorization.k8s.io/v1"], - components: { - Details: RoleDetails, - }, - }); - registry.add({ - kind: "Role", - apiVersions: ["rbac.authorization.k8s.io/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "ClusterRole", - apiVersions: ["rbac.authorization.k8s.io/v1"], - components: { - Details: ClusterRoleDetails, - }, - }); - registry.add({ - kind: "ClusterRole", - apiVersions: ["rbac.authorization.k8s.io/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "RoleBinding", - apiVersions: ["rbac.authorization.k8s.io/v1"], - components: { - Details: RoleBindingDetails, - }, - }); - registry.add({ - kind: "RoleBinding", - apiVersions: ["rbac.authorization.k8s.io/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "ClusterRoleBinding", - apiVersions: ["rbac.authorization.k8s.io/v1"], - components: { - Details: ClusterRoleBindingDetails, - }, - }); - registry.add({ - kind: "ClusterRoleBinding", - apiVersions: ["rbac.authorization.k8s.io/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "ServiceAccount", - apiVersions: ["v1"], - components: { - Details: ServiceAccountsDetails, - }, - }); - registry.add({ - kind: "ServiceAccount", - apiVersions: ["v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "CronJob", - apiVersions: ["batch/v1beta1"], - components: { - Details: CronJobDetails, - }, - }); - registry.add({ - kind: "CronJob", - apiVersions: ["batch/v1beta1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "DaemonSet", - apiVersions: ["apps/v1"], - components: { - Details: DaemonSetDetails, - }, - }); - registry.add({ - kind: "DaemonSet", - apiVersions: ["apps/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "Deployment", - apiVersions: ["apps/v1"], - components: { - Details: DeploymentDetails, - }, - }); - registry.add({ - kind: "Deployment", - apiVersions: ["apps/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "Job", - apiVersions: ["batch/v1"], - components: { - Details: JobDetails, - }, - }); - registry.add({ - kind: "Job", - apiVersions: ["batch/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "Pod", - apiVersions: ["v1"], - components: { - Details: PodDetails, - }, - }); - registry.add({ - kind: "Pod", - apiVersions: ["v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "ReplicaSet", - apiVersions: ["apps/v1"], - components: { - Details: ReplicaSetDetails, - }, - }); - registry.add({ - kind: "ReplicaSet", - apiVersions: ["apps/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); - registry.add({ - kind: "StatefulSet", - apiVersions: ["apps/v1"], - components: { - Details: StatefulSetDetails, - }, - }); - registry.add({ - kind: "StatefulSet", - apiVersions: ["apps/v1"], - priority: 5, - components: { - Details: KubeEventDetails, - }, - }); -} diff --git a/src/renderer/initializers/registries.ts b/src/renderer/initializers/registries.ts index 1caac13959..5db6be77f2 100644 --- a/src/renderer/initializers/registries.ts +++ b/src/renderer/initializers/registries.ts @@ -7,6 +7,5 @@ import * as registries from "../../extensions/registries"; export function initRegistries() { registries.CatalogEntityDetailRegistry.createInstance(); - registries.KubeObjectDetailRegistry.createInstance(); registries.EntitySettingRegistry.createInstance(); } diff --git a/src/renderer/routes/extension-route-registrator.injectable.tsx b/src/renderer/routes/extension-route-registrator.injectable.tsx index 54eecb3fe1..241e6950a5 100644 --- a/src/renderer/routes/extension-route-registrator.injectable.tsx +++ b/src/renderer/routes/extension-route-registrator.injectable.tsx @@ -14,9 +14,11 @@ import { extensionRegistratorInjectionToken } from "../../extensions/extension-l 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 type { IComputedValue } from "mobx"; import { computed } from "mobx"; import { frontEndRouteInjectionToken } from "../../common/front-end-routing/front-end-route-injection-token"; import { getExtensionRoutePath } from "./for-extension"; +import extensionShouldBeEnabledForClusterFrameInjectable from "../extension-loader/extension-should-be-enabled-for-cluster-frame.injectable"; const extensionRouteRegistratorInjectable = getInjectable({ id: "extension-route-registrator", @@ -24,14 +26,27 @@ const extensionRouteRegistratorInjectable = getInjectable({ instantiate: (di) => { return (ext) => { const extension = ext as LensRendererExtension; - const toRouteInjectable = toRouteInjectableFor( - di, + const toRouteInjectable = toRouteInjectableFor(di, extension); + + const extensionShouldBeEnabledForClusterFrame = di.inject( + extensionShouldBeEnabledForClusterFrameInjectable, extension, ); return [ - ...extension.globalPages.map(toRouteInjectable(false)), - ...extension.clusterPages.map(toRouteInjectable(true)), + ...extension.globalPages.map( + toRouteInjectable( + false, + computed(() => true), + ), + ), + + ...extension.clusterPages.map( + toRouteInjectable( + true, + computed(() => extensionShouldBeEnabledForClusterFrame.value.get()), + ), + ), ].flat(); }; }, @@ -46,7 +61,7 @@ const toRouteInjectableFor = di: DiContainerForInjection, extension: LensRendererExtension, ) => - (clusterFrame: boolean) => + (clusterFrame: boolean, isEnabled: IComputedValue) => (registration: PageRegistration) => { const routeInjectable = getInjectable({ id: `route-${registration.id}-for-extension-${extension.sanitizedExtensionId}`, @@ -54,7 +69,7 @@ const toRouteInjectableFor = instantiate: () => ({ path: getExtensionRoutePath(extension, registration.id), clusterFrame, - isEnabled: computed(() => true), + isEnabled, extension, }),