Turn on strict mode in tsconfig.json, some helpful lints, and required cleanup where strictness necessitates it (#5195)

* Turn on strict mode in tsconfig.json - Add route, clusterRoute, and payloadValidatedClusterRoute helper functions to improve types with backend routes - Turn on the following new lints: - react/jsx-first-prop-new-line - react/jsx-wrap-multilines - react/jsx-one-expression-per-line - react/jsx-max-props-per-line - react/jsx-indent - react/jsx-indent-props Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix build Signed-off-by: Sebastian Malton <sebastian@malton.name> * Replace KubeObject scope strings with enum Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert package.json version changes Signed-off-by: Sebastian Malton <sebastian@malton.name> * revert move hostedCluster(Id) Signed-off-by: Sebastian Malton <sebastian@malton.name> * change some type param names to be not single letters Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove copy-extension-themes Signed-off-by: Sebastian Malton <sebastian@malton.name> * add new make clean action Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix build to not use webpack for generating types Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object-menu.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * revert move fileNameMigration to index Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix ref logic error Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix log-resource-selector.test.tsx tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-store.test.ts test by overriding createStorage to not touch file system Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster.test.ts tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube=api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fixed hotbar-store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kubeconfig-manager.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster-role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pods.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix delete-cluster-dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix daemonset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix replicaset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix statefulsets/dialog/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix replicasets/scale-dialog/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployments.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployments/scale/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cronjob.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix stateful-set.api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix deployment.api.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix api-manager.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix statefulset.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix job.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pods.store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix scroll-spy.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix hotbar-remove-command.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog-entity-registry.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix welcome.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix verify-that-all-routes-have-route-component.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix pod-tolerations.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * better fix for previous 3 fixes, plus also select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object-menu.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix app-paths.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-tabs.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix isReactNode typing Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sub-title.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix drawer.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix list-layout.tsx and header.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix error-boundary.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix upgrade-chart/store.ts and dock-tab.store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix install-chart/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix edit-resource/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix create-resource/store.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix namespace-select.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix namespace-select-filter.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix crd-list.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix wrong types for extensions Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix circular dependency Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix circular dependency on catalogCategoryRegistry Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix api-kube Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type errors, most <Select /> errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * fixing more type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * some more fixing type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * convert all KubeApis to injectable with legacy global backups Signed-off-by: Sebastian Malton <sebastian@malton.name> * factor out into a common file all the exports Signed-off-by: Sebastian Malton <sebastian@malton.name> * convert all KubeObjectStores to injectable with legacy global backups Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unused legacy KubeApi globals Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix bad previous commit Signed-off-by: Sebastian Malton <sebastian@malton.name> * more crash fixing Signed-off-by: Sebastian Malton <sebastian@malton.name> * try and fix behavioural tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sidebar-and-tab-navigation-for-core.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix sidebar-and-tab-navigation-for-extensions.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make ThemeStore non-singleton and fix navigation-to-terminal-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * extensions.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix catalog-entity-registry.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix log-resource-selector.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-tabs.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix delete-cluster-dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-kubernetes-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-editor-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-proxy-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-using-application-menu.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-application-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix dock-store.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix select.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix hotbar-remove-command.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix cluster-role-bindings/__tests__/dialog.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-extension-specific-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-telemetry-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix closing-preferences.test.tsx Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-editor-preferences.test.ts Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix navigation-to-proxy-preferences.test.ts - Fix other type errors too Signed-off-by: Sebastian Malton <sebastian@malton.name> * final tweaks Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add more tsconfig files, fix bug in <Catalog> - Make all of history, navigation injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type errors Signed-off-by: Sebastian Malton <sebastian@malton.name> * Convert all of kube-details-params/ and navigate/ to injectable - This fixes a runtime error that was encountered during testing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix runtime errors on renderer - remove all static uses of `createPageParam` (and then removed the legacy global) - Made LensRendererExtension and LensMainExtension just used dependencies and not the getLegacyDi - Fixed circular dep in extension-loader Signed-off-by: Sebastian Malton <sebastian@malton.name> * Move registerStore calls to after injectMany Signed-off-by: Sebastian Malton <sebastian@malton.name> * replace all the rest of the legacy uses of apiManager Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix stack overflow and cycles in DI Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix NamespaceSelectFilter not opening Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix WizardStep and AddNamespaceDialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix KubeApi's not being registered Signed-off-by: Sebastian Malton <sebastian@malton.name> * cleanup WindowManager Signed-off-by: Sebastian Malton <sebastian@malton.name> * Proper fix for Wizard, fix NamespaceStore.subscribe Signed-off-by: Sebastian Malton <sebastian@malton.name> * Rewrite withTooltip to be more type correct - Fixes mobx related "too many recursive actions" error - Change all the uses of withTooltips to be functional components Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add e2e test to cover kube api registration Signed-off-by: Sebastian Malton <sebastian@malton.name> * cleanup internal-commands Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove cast in <Animate> Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix command-palette e2e test Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix type error after rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix test name Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix code to help CodeQL scanner Signed-off-by: Sebastian Malton <sebastian@malton.name> * update intree extension lock files Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix build-extensions picking wrong @types/react Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix tests from rebase Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix type error Signed-off-by: Sebastian Malton <sebastian@malton.name> * Make KubeconfigSyncManager more injectable Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix crash in test mode for Dialog Signed-off-by: Sebastian Malton <sebastian@malton.name> * make Select snapshots deterministic Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix new type error Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix kube-object.store.test.ts typing Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix merge build issues Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix snapshots after merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix lint after merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * reexport BaseKubeJsonApiObjectMetadata Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typo in terminalSpawningPool Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove duplicate license header Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typo to waitUntilDefined Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove iter use from getLegacyGlobalDiForExtensionApi Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove complex createStorage override Signed-off-by: Sebastian Malton <sebastian@malton.name> * override logger with mocks only when needed for tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove specialized overrideStore flags for getDiForUnitTesting Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unnecessary | undefined types from the exactOptionalFieldTypes experiment Signed-off-by: Sebastian Malton <sebastian@malton.name> * use more descriptive name for local test mocks Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove unnecessary addition to 'make clean' target Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove oddity of KubeObjectStore.getById(undefined) being allowed Signed-off-by: Sebastian Malton <sebastian@malton.name> * rename KubeObject.getDescriptor in favour of name without fundemental JS meaning Signed-off-by: Sebastian Malton <sebastian@malton.name> * Simplify legacyRegisterApi when working in behaviour unit tests - Don't emit within main environment as there should be no auto registering there Signed-off-by: Sebastian Malton <sebastian@malton.name> * change confusing variable name in ReactiveDuration Signed-off-by: Sebastian Malton <sebastian@malton.name> * make visitor pattern more explicit for Entity contextMenuOpen Signed-off-by: Sebastian Malton <sebastian@malton.name> * toggleDetails -> toggleKubeDetailsPane is more specific Signed-off-by: Sebastian Malton <sebastian@malton.name> * remove outdated comment Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix bug where LensExtension dependencies are not set Signed-off-by: Sebastian Malton <sebastian@malton.name> * Fix tests from the revert of react 18 Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix more tests from merge Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix typings with new is-compatible-extension tests Signed-off-by: Sebastian Malton <sebastian@malton.name> * more type fixing Signed-off-by: Sebastian Malton <sebastian@malton.name> * Revert in-tree extension versions Signed-off-by: Sebastian Malton <sebastian@malton.name> * Improve name of guarding injectable for stores and apis - New name better implies that it is just a guard state and does not do anything Signed-off-by: Sebastian Malton <sebastian@malton.name> * Add helper for <Select>.isMulti for storing in a Set<Value> Signed-off-by: Sebastian Malton <sebastian@malton.name> * fix is-compatible-extension.test.ts types Signed-off-by: Sebastian Malton <sebastian@malton.name>
2025-05-20 05:10:56 +00:00 · 2022-05-16 07:17:57 -04:00
1 parent 381d77c633
commit dfcb7c3330
@@ -2,15 +2,15 @@
 * Copyright (c) OpenLens Authors. All rights reserved.
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
-import React from "react";
+import React, { useEffect } from "react";
 import type { IComputedValue } from "mobx";
-import { disposeOnUnmount, observer } from "mobx-react";
+import { observer } from "mobx-react";
 import { Redirect } from "react-router";
 import { ConfirmDialog } from "../../components/confirm-dialog";
-import { DeploymentScaleDialog } from "../../components/+workloads-deployments/deployment-scale-dialog";
+import { DeploymentScaleDialog } from "../../components/+workloads-deployments/scale/dialog";
 import { CronJobTriggerDialog } from "../../components/+workloads-cronjobs/cronjob-trigger-dialog";
-import { StatefulSetScaleDialog } from "../../components/+workloads-statefulsets/statefulset-scale-dialog";
-import { ReplicaSetScaleDialog } from "../../components/+workloads-replicasets/replicaset-scale-dialog";
+import { StatefulSetScaleDialog } from "../../components/+workloads-statefulsets/scale/dialog";
+import { ReplicaSetScaleDialog } from "../../components/+workloads-replicasets/scale-dialog/dialog";
 import { CommandContainer } from "../../components/command-palette/command-container";
 import { ErrorBoundary } from "../../components/error-boundary";
 import { MainLayout } from "../../components/layout/main-layout";
@@ -22,74 +22,72 @@ import { Dock } from "../../components/dock";
 import { watchHistoryState } from "../../remote-helpers/history-updater";
 import { PortForwardDialog } from "../../port-forward";
 import { DeleteClusterDialog } from "../../components/delete-cluster-dialog";
-import type { NamespaceStore } from "../../components/+namespaces/namespace-store/namespace.store";
+import type { NamespaceStore } from "../../components/+namespaces/store";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import namespaceStoreInjectable  from "../../components/+namespaces/namespace-store/namespace-store.injectable";
-import type { KubeObjectStore } from "../../../common/k8s-api/kube-object.store";
-import type { KubeObject } from "../../../common/k8s-api/kube-object";
-import type { Disposer } from "../../../common/utils";
-import kubeWatchApiInjectable from "../../kube-watch-api/kube-watch-api.injectable";
+import namespaceStoreInjectable  from "../../components/+namespaces/store.injectable";
+import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api";
+import { disposer } from "../../utils";
 import currentRouteComponentInjectable from "../../routes/current-route-component.injectable";
 import startUrlInjectable from "./start-url.injectable";
+import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable";

 interface Dependencies {
  namespaceStore: NamespaceStore;
-  subscribeStores: (stores: KubeObjectStore<KubeObject>[]) => Disposer;
-  currentRouteComponent: IComputedValue<React.ElementType>;
+  currentRouteComponent: IComputedValue<React.ElementType<{}> | undefined | null>;
  startUrl: IComputedValue<string>;
+  subscribeStores: SubscribeStores;
 }

-@observer
-class NonInjectedClusterFrame extends React.Component<Dependencies> {
-  static displayName = "ClusterFrame";
+export const NonInjectedClusterFrame = observer(({
+  namespaceStore,
+  currentRouteComponent,
+  startUrl,
+  subscribeStores,
+}: Dependencies) => {
+  useEffect(() => disposer(
+    subscribeStores([
+      namespaceStore,
+    ]),
+    watchHistoryState(),
+  ), []);

-  constructor(props: Dependencies) {
-    super(props);
-  }
+  const Component = currentRouteComponent.get();

-  componentDidMount() {
-    disposeOnUnmount(this, [
-      this.props.subscribeStores([
-        this.props.namespaceStore,
-      ]),
-      watchHistoryState(),
-    ]);
-  }
+  return (
+    <ErrorBoundary>
+      <MainLayout
+        sidebar={<Sidebar />}
+        footer={<Dock />}
+      >
+        {
+          Component
+            ? <Component />
+            : <Redirect to={startUrl.get()} />
+        }
+      </MainLayout>

-  render() {
-    const Component = this.props.currentRouteComponent.get();
-
-    if (!Component) {
-      return <Redirect to={this.props.startUrl.get()} />;
-    }
-
-    return (
-      <ErrorBoundary>
-        <MainLayout sidebar={<Sidebar />} footer={<Dock />}>
-          <Component />
-        </MainLayout>
-
-        <Notifications />
-        <ConfirmDialog />
-        <KubeObjectDetails />
-        <KubeConfigDialog />
-        <DeploymentScaleDialog />
-        <StatefulSetScaleDialog />
-        <ReplicaSetScaleDialog />
-        <CronJobTriggerDialog />
-        <PortForwardDialog />
-        <DeleteClusterDialog />
-        <CommandContainer />
-      </ErrorBoundary>
-    );
-  }
-}
+      <Notifications />
+      <ConfirmDialog />
+      <KubeObjectDetails />
+      <KubeConfigDialog />
+      <DeploymentScaleDialog />
+      <StatefulSetScaleDialog />
+      <ReplicaSetScaleDialog />
+      <CronJobTriggerDialog />
+      <PortForwardDialog />
+      <DeleteClusterDialog />
+      <CommandContainer />
+    </ErrorBoundary>
+  );
+});

 export const ClusterFrame = withInjectables<Dependencies>(NonInjectedClusterFrame, {
  getProps: di => ({
    namespaceStore: di.inject(namespaceStoreInjectable),
-    subscribeStores: di.inject(kubeWatchApiInjectable).subscribeStores,
+    subscribeStores: di.inject(subscribeStoresInjectable),
    startUrl: di.inject(startUrlInjectable),
    currentRouteComponent: di.inject(currentRouteComponentInjectable),
  }),
 });
+
+ClusterFrame.displayName = "ClusterFrame";
@@ -5,25 +5,30 @@
 import { getInjectable } from "@ogre-tools/injectable";
 import { initClusterFrame } from "./init-cluster-frame";
 import extensionLoaderInjectable from "../../../../extensions/extension-loader/extension-loader.injectable";
-import catalogEntityRegistryInjectable from "../../../api/catalog-entity-registry/catalog-entity-registry.injectable";
+import catalogEntityRegistryInjectable from "../../../api/catalog/entity/registry.injectable";
 import frameRoutingIdInjectable from "./frame-routing-id/frame-routing-id.injectable";
 import hostedClusterInjectable from "../../../../common/cluster-store/hosted-cluster.injectable";
 import appEventBusInjectable from "../../../../common/app-event-bus/app-event-bus.injectable";
 import clusterFrameContextInjectable from "../../../cluster-frame-context/cluster-frame-context.injectable";
+import assert from "assert";

 const initClusterFrameInjectable = getInjectable({
  id: "init-cluster-frame",

-  instantiate: (di) =>
-    initClusterFrame({
-      hostedCluster: di.inject(hostedClusterInjectable),
+  instantiate: (di) => {
+    const hostedCluster = di.inject(hostedClusterInjectable);
+
+    assert(hostedCluster, "This can only be injected within a cluster frame");
+
+    return initClusterFrame({
+      hostedCluster,
      loadExtensions: di.inject(extensionLoaderInjectable).loadOnClusterRenderer,
      catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
      frameRoutingId: di.inject(frameRoutingIdInjectable),
      emitEvent: di.inject(appEventBusInjectable).emit,
-
      clusterFrameContext: di.inject(clusterFrameContextInjectable),
-    }),
+    });
+  },
 });

 export default initClusterFrameInjectable;
@@ -3,7 +3,7 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */
 import type { Cluster } from "../../../../common/cluster/cluster";
-import type { CatalogEntityRegistry } from "../../../api/catalog-entity-registry";
+import type { CatalogEntityRegistry } from "../../../api/catalog/entity/registry";
 import logger from "../../../../main/logger";
 import type { KubernetesCluster } from "../../../../common/catalog-entities";
 import { Notifications } from "../../../components/notifications";
@@ -27,61 +27,65 @@ interface Dependencies {

 const logPrefix = "[CLUSTER-FRAME]:";

-export const initClusterFrame =
-  ({ hostedCluster, loadExtensions, catalogEntityRegistry, frameRoutingId, emitEvent, clusterFrameContext }: Dependencies) =>
-    async (unmountRoot: () => void) => {
+export const initClusterFrame = ({
+  hostedCluster,
+  loadExtensions,
+  catalogEntityRegistry,
+  frameRoutingId,
+  emitEvent,
+  clusterFrameContext,
+}: Dependencies) =>
+  async (unmountRoot: () => void) => {
+    // TODO: Make catalogEntityRegistry already initialized when passed as dependency
+    catalogEntityRegistry.init();

-      // TODO: Make catalogEntityRegistry already initialized when passed as dependency
-      catalogEntityRegistry.init();
+    logger.info(
+      `${logPrefix} Init dashboard, clusterId=${hostedCluster.id}, frameId=${frameRoutingId}`,
+    );

-      logger.info(
-        `${logPrefix} Init dashboard, clusterId=${hostedCluster.id}, frameId=${frameRoutingId}`,
-      );
+    await requestSetClusterFrameId(hostedCluster.id);
+    await hostedCluster.whenReady; // cluster.activate() is done at this point

-      await requestSetClusterFrameId(hostedCluster.id);
-      await hostedCluster.whenReady; // cluster.activate() is done at this point
+    catalogEntityRegistry.activeEntity = hostedCluster.id;

-      catalogEntityRegistry.activeEntity = hostedCluster.id;
+    // Only load the extensions once the catalog has been populated.
+    // Note that the Catalog might still have unprocessed entities until the extensions are fully loaded.
+    when(
+      () => catalogEntityRegistry.items.get().length > 0,
+      () =>
+        loadExtensions(() => catalogEntityRegistry.activeEntity as KubernetesCluster),
+      {
+        timeout: 15_000,
+        onError: (error) => {
+          console.warn(
+            "[CLUSTER-FRAME]: error from activeEntity when()",
+            error,
+          );

-      // Only load the extensions once the catalog has been populated.
-      // Note that the Catalog might still have unprocessed entities until the extensions are fully loaded.
-      when(
-        () => catalogEntityRegistry.items.length > 0,
-        () =>
-          loadExtensions(() => catalogEntityRegistry.activeEntity as KubernetesCluster),
-        {
-          timeout: 15_000,
-          onError: (error) => {
-            console.warn(
-              "[CLUSTER-FRAME]: error from activeEntity when()",
-              error,
-            );
-
-            Notifications.error(
-              "Failed to get KubernetesCluster for this view. Extensions will not be loaded.",
-            );
-          },
+          Notifications.error(
+            "Failed to get KubernetesCluster for this view. Extensions will not be loaded.",
+          );
        },
+      },
+    );
+
+    setTimeout(() => {
+      emitEvent({
+        name: "cluster",
+        action: "open",
+        params: {
+          clusterId: hostedCluster.id,
+        },
+      });
+    });
+
+    window.onbeforeunload = () => {
+      logger.info(
+        `${logPrefix} Unload dashboard, clusterId=${(hostedCluster.id)}, frameId=${frameRoutingId}`,
      );

-      setTimeout(() => {
-        emitEvent({
-          name: "cluster",
-          action: "open",
-          params: {
-            clusterId: hostedCluster.id,
-          },
-        });
-      });
-
-      window.onbeforeunload = () => {
-        logger.info(
-          `${logPrefix} Unload dashboard, clusterId=${(hostedCluster.id)}, frameId=${frameRoutingId}`,
-        );
-
-        unmountRoot();
-      };
-
-      // TODO: Make context dependency of KubeObjectStore
-      KubeObjectStore.defaultContext.set(clusterFrameContext);
+      unmountRoot();
    };
+    // TODO: Make context dependency of KubeObjectStore
+    KubeObjectStore.defaultContext.set(clusterFrameContext);
+  };
@@ -14,7 +14,7 @@ const startUrlInjectable = getInjectable({
  id: "start-url",

  instantiate: (di) => {
-    const isAllowedResource = (resourceName: any) => di.inject(isAllowedResourceInjectable, resourceName);
+    const isAllowedResource = (resourceName: string) => di.inject(isAllowedResourceInjectable, resourceName);

    const clusterOverviewRoute = di.inject(clusterOverviewRouteInjectable);
    const workloadOverviewRoute = di.inject(workloadsOverviewRouteInjectable);
@@ -8,33 +8,19 @@ import extensionLoaderInjectable from "../../../../extensions/extension-loader/e
 import ipcRendererInjectable from "../../../app-paths/get-value-from-registered-channel/ipc-renderer/ipc-renderer.injectable";
 import bindProtocolAddRouteHandlersInjectable from "../../../protocol-handler/bind-protocol-add-route-handlers/bind-protocol-add-route-handlers.injectable";
 import lensProtocolRouterRendererInjectable from "../../../protocol-handler/lens-protocol-router-renderer/lens-protocol-router-renderer.injectable";
-import catalogEntityRegistryInjectable from "../../../api/catalog-entity-registry/catalog-entity-registry.injectable";
+import catalogEntityRegistryInjectable from "../../../api/catalog/entity/registry.injectable";
 import registerIpcListenersInjectable from "../../../ipc/register-ipc-listeners.injectable";

 const initRootFrameInjectable = getInjectable({
  id: "init-root-frame",
-
-  instantiate: (di) => {
-    const extensionLoader = di.inject(extensionLoaderInjectable);
-
-    return initRootFrame({
-      loadExtensions: extensionLoader.loadOnClusterManagerRenderer,
-
-      registerIpcListeners: di.inject(registerIpcListenersInjectable),
-
-      ipcRenderer: di.inject(ipcRendererInjectable),
-
-      bindProtocolAddRouteHandlers: di.inject(
-        bindProtocolAddRouteHandlersInjectable,
-      ),
-
-      lensProtocolRouterRenderer: di.inject(
-        lensProtocolRouterRendererInjectable,
-      ),
-
-      catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
-    });
-  },
+  instantiate: (di) => initRootFrame({
+    loadExtensions: di.inject(extensionLoaderInjectable).loadOnClusterManagerRenderer,
+    registerIpcListeners: di.inject(registerIpcListenersInjectable),
+    ipcRenderer: di.inject(ipcRendererInjectable),
+    bindProtocolAddRouteHandlers: di.inject(bindProtocolAddRouteHandlersInjectable),
+    lensProtocolRouterRenderer: di.inject(lensProtocolRouterRendererInjectable),
+    catalogEntityRegistry: di.inject(catalogEntityRegistryInjectable),
+  }),
 });

 export default initRootFrameInjectable;
@@ -6,7 +6,7 @@ import { delay } from "../../../../common/utils";
 import { broadcastMessage } from "../../../../common/ipc";
 import logger from "../../../../common/logger";
 import type { ExtensionLoading } from "../../../../extensions/extension-loader";
-import type { CatalogEntityRegistry } from "../../../api/catalog-entity-registry";
+import type { CatalogEntityRegistry } from "../../../api/catalog/entity/registry";
 import { bundledExtensionsLoaded } from "../../../../common/ipc/extension-handling";


@@ -13,7 +13,6 @@ import { ConfirmDialog } from "../../components/confirm-dialog";
 import { CommandContainer } from "../../components/command-palette/command-container";
 import { ipcRenderer } from "electron";
 import { IpcRendererNavigationEvents } from "../../navigation/events";
-import { ClusterFrameHandler } from "../../components/cluster-manager/lens-views";

 injectSystemCAs();

@@ -21,12 +20,6 @@ injectSystemCAs();
 export class RootFrame extends React.Component {
  static displayName = "RootFrame";

-  constructor(props: any) {
-    super(props);
-
-    ClusterFrameHandler.createInstance();
-  }
-
  componentDidMount() {
    ipcRenderer.send(IpcRendererNavigationEvents.LOADED);
  }