Send LensMainExtension.nagivate calls to renderer before navigating (#3082)

Signed-off-by: Sebastian Malton <sebastian@malton.name>

src/extensions/common-api/registrations.ts

@@ -24,6 +24,6 @@ export type { KubeObjectDetailRegistration, KubeObjectDetailComponents } from ".
 export type { KubeObjectMenuRegistration, KubeObjectMenuComponents } from "../registries/kube-object-menu-registry";
 export type { KubeObjectStatusRegistration } from "../registries/kube-object-status-registry";
 export type { PageRegistration, RegisteredPage, PageParams, PageComponentProps, PageComponents, PageTarget } from "../registries/page-registry";
-export type { PageMenuRegistration, ClusterPageMenuRegistration, PageMenuComponents } from "../registries/page-menu-registry";
+export type { ClusterPageMenuRegistration, ClusterPageMenuComponents } from "../registries/page-menu-registry";
 export type { StatusBarRegistration } from "../registries/status-bar-registry";
 export type { ProtocolHandlerRegistration, RouteParams as ProtocolRouteParams, RouteHandler as ProtocolRouteHandler } from "../registries/protocol-handler";

src/extensions/extension-loader.ts

@@ -355,6 +355,10 @@ export class ExtensionLoader extends Singleton {
     return this.extensions.get(extId);
   }
 
+  getInstanceById<E extends LensExtension>(extId: LensExtensionId): E {
+    return this.instances.get(extId) as E;
+  }
+
   toJSON(): Map<LensExtensionId, InstalledExtension> {
     return toJS(this.extensions);
   }

src/extensions/lens-main-extension.ts

@@ -21,7 +21,6 @@
 
 import { LensExtension } from "./lens-extension";
 import { WindowManager } from "../main/window-manager";
-import { getExtensionPageUrl } from "./registries/page-registry";
 import { catalogEntityRegistry } from "../main/catalog";
 import type { CatalogEntity } from "../common/catalog";
 import type { IObservableArray } from "mobx";
@@ -30,15 +29,8 @@ import type { MenuRegistration } from "./registries";
 export class LensMainExtension extends LensExtension {
   appMenus: MenuRegistration[] = [];
 
-  async navigate<P extends object>(pageId?: string, params?: P, frameId?: number) {
-    const windowManager = WindowManager.getInstance();
-    const pageUrl = getExtensionPageUrl({
-      extensionId: this.name,
-      pageId,
-      params: params ?? {}, // compile to url with params
-    });
-
-    await windowManager.navigate(pageUrl, frameId);
+  async navigate(pageId?: string, params?: Record<string, any>, frameId?: number) {
+    return WindowManager.getInstance().navigateExtension(this.id, pageId, params, frameId);
   }
 
   addCatalogSource(id: string, source: IObservableArray<CatalogEntity>) {

src/extensions/lens-renderer-extension.ts

@@ -19,33 +19,26 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-import type {
-  AppPreferenceRegistration, CatalogEntityDetailRegistration, ClusterPageMenuRegistration, KubeObjectDetailRegistration, KubeObjectMenuRegistration,
-  KubeObjectStatusRegistration, PageMenuRegistration, PageRegistration, StatusBarRegistration, WelcomeMenuRegistration, WorkloadsOverviewDetailRegistration,
-} from "./registries";
+import type * as registries from "./registries";
 import type { Cluster } from "../main/cluster";
 import { LensExtension } from "./lens-extension";
 import { getExtensionPageUrl } from "./registries/page-registry";
-import type { CommandRegistration } from "./registries/command-registry";
-import type { EntitySettingRegistration } from "./registries/entity-setting-registry";
-import type { TopBarRegistration } from "./registries/topbar-registry";
 
 export class LensRendererExtension extends LensExtension {
-  globalPages: PageRegistration[] = [];
-  clusterPages: PageRegistration[] = [];
-  globalPageMenus: PageMenuRegistration[] = [];
-  clusterPageMenus: ClusterPageMenuRegistration[] = [];
-  kubeObjectStatusTexts: KubeObjectStatusRegistration[] = [];
-  appPreferences: AppPreferenceRegistration[] = [];
-  entitySettings: EntitySettingRegistration[] = [];
-  statusBarItems: StatusBarRegistration[] = [];
-  kubeObjectDetailItems: KubeObjectDetailRegistration[] = [];
-  kubeObjectMenuItems: KubeObjectMenuRegistration[] = [];
-  kubeWorkloadsOverviewItems: WorkloadsOverviewDetailRegistration[] = [];
-  commands: CommandRegistration[] = [];
-  welcomeMenus: WelcomeMenuRegistration[] = [];
-  catalogEntityDetailItems: CatalogEntityDetailRegistration[] = [];
-  topBarItems: TopBarRegistration[] = [];
+  globalPages: registries.PageRegistration[] = [];
+  clusterPages: registries.PageRegistration[] = [];
+  clusterPageMenus: registries.ClusterPageMenuRegistration[] = [];
+  kubeObjectStatusTexts: registries.KubeObjectStatusRegistration[] = [];
+  appPreferences: registries.AppPreferenceRegistration[] = [];
+  entitySettings: registries.EntitySettingRegistration[] = [];
+  statusBarItems: registries.StatusBarRegistration[] = [];
+  kubeObjectDetailItems: registries.KubeObjectDetailRegistration[] = [];
+  kubeObjectMenuItems: registries.KubeObjectMenuRegistration[] = [];
+  kubeWorkloadsOverviewItems: registries.WorkloadsOverviewDetailRegistration[] = [];
+  commands: registries.CommandRegistration[] = [];
+  welcomeMenus: registries.WelcomeMenuRegistration[] = [];
+  catalogEntityDetailItems: registries.CatalogEntityDetailRegistration[] = [];
+  topBarItems: registries.TopBarRegistration[] = [];
 
   async navigate<P extends object>(pageId?: string, params?: P) {
     const { navigate } = await import("../renderer/navigation");

src/extensions/registries/page-menu-registry.ts

@@ -26,23 +26,20 @@ import type { PageTarget, RegisteredPage } from "./page-registry";
 import type { LensExtension } from "../lens-extension";
 import { BaseRegistry } from "./base-registry";
 
-export interface PageMenuRegistration {
-  target?: PageTarget;
-  title: React.ReactNode;
-  components: PageMenuComponents;
-}
-
-export interface ClusterPageMenuRegistration extends PageMenuRegistration {
+export interface ClusterPageMenuRegistration {
   id?: string;
   parentId?: string;
+  target?: PageTarget;
+  title: React.ReactNode;
+  components: ClusterPageMenuComponents;
 }
 
-export interface PageMenuComponents {
+export interface ClusterPageMenuComponents {
   Icon: React.ComponentType<IconProps>;
 }
 
-export class PageMenuRegistry<T extends PageMenuRegistration> extends BaseRegistry<T> {
-  add(items: T[], ext: LensExtension) {
+export class ClusterPageMenuRegistry extends BaseRegistry<ClusterPageMenuRegistration> {
+  add(items: ClusterPageMenuRegistration[], ext: LensExtension) {
     const normalizedItems = items.map(menuItem => {
       menuItem.target = {
         extensionId: ext.name,
@@ -54,9 +51,7 @@ export class PageMenuRegistry<T extends PageMenuRegistration> extends BaseRegist
 
     return super.add(normalizedItems);
   }
-}
 
-export class ClusterPageMenuRegistry extends PageMenuRegistry<ClusterPageMenuRegistration> {
   getRootItems() {
     return this.getItems().filter((item) => !item.parentId);
   }