Get rid of this.disposers while registering stuff in extensions (#1148)

Signed-off-by: Roman <ixrock@gmail.com>

extensions/example-extension/renderer.tsx

@@ -1,26 +1,16 @@
-import { LensRendererExtension, Registry } from "@k8slens/extensions";
+import { LensRendererExtension } from "@k8slens/extensions";
-import { ExamplePage, ExampleIcon } from "./page"
+import { ExampleIcon, ExamplePage } from "./page"
 import React from "react"
 
 export default class ExampleExtension extends LensRendererExtension {
-  onActivate() {
+  clusterPages = [
-    console.log('EXAMPLE EXTENSION RENDERER: ACTIVATED', this.getMeta());
+    {
-  }
-
-  registerClusterPage(registry: Registry.ClusterPageRegistry) {
-    this.disposers.push(
-      registry.add({
       path: "/extension-example",
       title: "Example Extension",
       components: {
         Page: () => <ExamplePage extension={this}/>,
         MenuIcon: ExampleIcon,
       }
-      })
-    )
-  }
-
-  onDeactivate() {
-    console.log('EXAMPLE EXTENSION RENDERER: DEACTIVATED', this.getMeta());
     }
+  ]
 }

extensions/metrics-cluster-feature/renderer.tsx

@@ -1,11 +1,10 @@
-import { Registry, LensRendererExtension } from "@k8slens/extensions"
+import { LensRendererExtension } from "@k8slens/extensions"
 import { MetricsFeature } from "./src/metrics-feature"
 import React from "react"
 
 export default class ClusterMetricsFeatureExtension extends LensRendererExtension {
-  registerClusterFeatures(registry: Registry.ClusterFeatureRegistry) {
+  clusterFeatures = [
-    this.disposers.push(
+    {
-      registry.add({
       title: "Metrics Stack",
       components: {
         Description: () => {
@@ -19,7 +18,6 @@ export default class ClusterMetricsFeatureExtension extends LensRendererExtensio
         }
       },
       feature: new MetricsFeature()
-      })
-    )
     }
+  ]
 }

extensions/node-menu/renderer.tsx

@@ -1,21 +1,15 @@
-import { Registry, LensRendererExtension } from "@k8slens/extensions";
+import { LensRendererExtension } from "@k8slens/extensions";
 import React from "react"
-import { NodeMenu } from "./src/node-menu"
+import { NodeMenu, NodeMenuProps } from "./src/node-menu"
 
 export default class NodeMenuRendererExtension extends LensRendererExtension {
-  async onActivate() {
+  kubeObjectMenuItems = [
-    console.log("node-menu extension activated")
+    {
-  }
-
-  registerKubeObjectMenus(registry: Registry.KubeObjectMenuRegistry) {
-    this.disposers.push(
-      registry.add({
       kind: "Node",
       apiVersions: ["v1"],
       components: {
-          MenuItem: (props) => <NodeMenu {...props} />
+        MenuItem: (props: NodeMenuProps) => <NodeMenu {...props} />
-        }
-      })
-    )
       }
     }
+  ]
+}

extensions/node-menu/src/node-menu.tsx

@@ -1,7 +1,10 @@
 import React from "react";
 import { Component, K8sApi, Navigation} from "@k8slens/extensions"
 
-export function NodeMenu(props: Component.KubeObjectMenuProps<K8sApi.Node>) {
+export interface NodeMenuProps extends Component.KubeObjectMenuProps<K8sApi.Node> {
+}
+
+export function NodeMenu(props: NodeMenuProps) {
   const { object: node, toolbar } = props;
   if (!node) return null;
   const nodeName = node.getName();

extensions/pod-menu/renderer.tsx

@@ -1,31 +1,23 @@
-import { Registry, LensRendererExtension } from "@k8slens/extensions";
+import { LensRendererExtension } from "@k8slens/extensions";
-import { PodShellMenu } from "./src/shell-menu"
+import { PodShellMenu, PodShellMenuProps } from "./src/shell-menu"
-import { PodLogsMenu } from "./src/logs-menu"
+import { PodLogsMenu, PodLogsMenuProps } from "./src/logs-menu"
 import React from "react"
 
 export default class PodMenuRendererExtension extends LensRendererExtension {
-  async onActivate() {
+  kubeObjectMenuItems = [
-    console.log("pod-menu extension activated")
+    {
-  }
-
-  registerKubeObjectMenus(registry: Registry.KubeObjectMenuRegistry) {
-    this.disposers.push(
-      registry.add({
       kind: "Pod",
       apiVersions: ["v1"],
       components: {
-          MenuItem: (props) => <PodShellMenu {...props} />
+        MenuItem: (props: PodShellMenuProps) => <PodShellMenu {...props} />
       }
-      })
+    },
-    )
+    {
-    this.disposers.push(
-      registry.add({
       kind: "Pod",
       apiVersions: ["v1"],
       components: {
-          MenuItem: (props) => <PodLogsMenu {...props} />
+        MenuItem: (props: PodLogsMenuProps) => <PodLogsMenu {...props} />
-        }
-      })
-    )
       }
     }
+  ]
+}

extensions/pod-menu/src/logs-menu.tsx

@@ -1,10 +1,10 @@
 import React from "react";
 import { Component, K8sApi, Util, Navigation } from "@k8slens/extensions";
 
-interface Props extends Component.KubeObjectMenuProps<K8sApi.Pod> {
+export interface PodLogsMenuProps extends Component.KubeObjectMenuProps<K8sApi.Pod> {
 }
 
-export class PodLogsMenu extends React.Component<Props> {
+export class PodLogsMenu extends React.Component<PodLogsMenuProps> {
   showLogs(container: K8sApi.IPodContainer) {
     Navigation.hideDetails();
     const pod = this.props.object;

extensions/pod-menu/src/shell-menu.tsx

@@ -3,10 +3,10 @@
 import React from "react";
 import { Component, K8sApi, Util, Navigation } from "@k8slens/extensions";
 
-interface Props extends Component.KubeObjectMenuProps<K8sApi.Pod> {
+export interface PodShellMenuProps extends Component.KubeObjectMenuProps<K8sApi.Pod> {
 }
 
-export class PodShellMenu extends React.Component<Props> {
+export class PodShellMenu extends React.Component<PodShellMenuProps> {
   async execShell(container?: string) {
     Navigation.hideDetails();
     const { object: pod } = this.props

extensions/support-page/main.ts

@@ -1,20 +1,14 @@
-import { LensMainExtension, Registry, windowManager } from "@k8slens/extensions";
+import { LensMainExtension, windowManager } from "@k8slens/extensions";
 import { supportPageURL } from "./src/support.route";
 
 export default class SupportPageMainExtension extends LensMainExtension {
-  async onActivate() {
+  appMenus = [
-    console.log("support page extension activated")
+    {
-  }
-
-  async registerAppMenus(registry: Registry.MenuRegistry) {
-    this.disposers.push(
-      registry.add({
       parentId: "help",
       label: "Support",
       click() {
         windowManager.navigate(supportPageURL());
       }
-      })
-    )
     }
+  ]
 }

extensions/support-page/renderer.tsx

@@ -1,29 +1,22 @@
 import React from "react";
-import { Component, LensRendererExtension, Navigation, Registry } from "@k8slens/extensions";
+import { Component, LensRendererExtension, Navigation } from "@k8slens/extensions";
 import { supportPageRoute, supportPageURL } from "./src/support.route";
 import { Support } from "./src/support";
 
 export default class SupportPageRendererExtension extends LensRendererExtension {
-  async onActivate() {
+  globalPages = [
-    console.log("support page extension activated")
+    {
-  }
-
-  registerGlobalPage(registry: Registry.GlobalPageRegistry) {
-    this.disposers.push(
-      registry.add({
       ...supportPageRoute,
       url: supportPageURL(),
       hideInMenu: true,
       components: {
         Page: Support,
       }
-      })
-    )
     }
+  ]
 
-  registerStatusBarItem(registry: Registry.StatusBarRegistry) {
+  statusBarItems = [
-    this.disposers.push(
+    {
-      registry.add({
       item: (
         <div
           className="flex align-center gaps hover-highlight"
@@ -33,7 +26,6 @@ export default class SupportPageRendererExtension extends LensRendererExtension
           <span>Support</span>
         </div>
       )
-      })
-    )
     }
+  ]
 }

extensions/telemetry/renderer.tsx

@@ -1,29 +1,23 @@
-import { LensRendererExtension, Registry } from "@k8slens/extensions";
+import { LensRendererExtension } from "@k8slens/extensions";
 import { telemetryPreferencesStore } from "./src/telemetry-preferences-store"
 import { TelemetryPreferenceHint, TelemetryPreferenceInput } from "./src/telemetry-preference"
 import { tracker } from "./src/tracker"
 import React from "react"
 
 export default class TelemetryRendererExtension extends LensRendererExtension {
-  async onActivate() {
+  appPreferences = [
-    console.log("telemetry extension activated")
+    {
-    tracker.start()
-    await telemetryPreferencesStore.loadExtension(this)
-  }
-
-  registerAppPreferences(registry: Registry.AppPreferenceRegistry) {
-    this.disposers.push(
-      registry.add({
       title: "Telemetry & Usage Tracking",
       components: {
         Hint: () => <TelemetryPreferenceHint/>,
         Input: () => <TelemetryPreferenceInput telemetry={telemetryPreferencesStore}/>
       }
-      })
-    )
     }
+  ];
 
-  onDeactivate() {
+  async onActivate() {
-    console.log("telemetry extension deactivated")
+    console.log("telemetry extension activated")
+    tracker.start()
+    await telemetryPreferencesStore.loadExtension(this)
   }
 }

src/extensions/extension-loader.ts

@@ -36,26 +36,26 @@ export class ExtensionLoader {
 
   loadOnMain() {
     logger.info('[EXTENSIONS-LOADER]: load on main')
-    this.autoloadExtensions((instance: LensMainExtension) => {
+    this.autoloadExtensions((extension: LensMainExtension) => {
-      instance.registerAppMenus(menuRegistry);
+      extension.registerTo(menuRegistry, extension.appMenus)
     })
   }
 
   loadOnClusterManagerRenderer() {
     logger.info('[EXTENSIONS-LOADER]: load on main renderer (cluster manager)')
-    this.autoloadExtensions((instance: LensRendererExtension) => {
+    this.autoloadExtensions((extension: LensRendererExtension) => {
-      instance.registerGlobalPage(globalPageRegistry)
+      extension.registerTo(globalPageRegistry, extension.globalPages)
-      instance.registerAppPreferences(appPreferenceRegistry)
+      extension.registerTo(appPreferenceRegistry, extension.appPreferences)
-      instance.registerClusterFeatures(clusterFeatureRegistry)
+      extension.registerTo(clusterFeatureRegistry, extension.clusterFeatures)
-      instance.registerStatusBarItem(statusBarRegistry)
+      extension.registerTo(statusBarRegistry, extension.statusBarItems)
     })
   }
 
   loadOnClusterRenderer() {
     logger.info('[EXTENSIONS-LOADER]: load on cluster renderer (dashboard)')
-    this.autoloadExtensions((instance: LensRendererExtension) => {
+    this.autoloadExtensions((extension: LensRendererExtension) => {
-      instance.registerClusterPage(clusterPageRegistry)
+      extension.registerTo(clusterPageRegistry, extension.clusterPages)
-      instance.registerKubeObjectMenus(kubeObjectMenuRegistry)
+      extension.registerTo(kubeObjectMenuRegistry, extension.kubeObjectMenuItems)
     })
   }
 

src/extensions/lens-extension.ts

@@ -1,6 +1,7 @@
 import { readJsonSync } from "fs-extra";
 import { action, observable, toJS } from "mobx";
 import logger from "../main/logger";
+import { BaseRegistry } from "./registries/base-registry";
 
 export type ExtensionId = string | ExtensionPackageJsonPath;
 export type ExtensionPackageJsonPath = string;
@@ -25,7 +26,7 @@ export interface ExtensionManifest extends ExtensionModel {
 export class LensExtension implements ExtensionModel {
   public id: ExtensionId;
   public updateUrl: string;
-  protected disposers: Function[] = [];
+  protected disposers: (() => void)[] = [];
 
   @observable name = "";
   @observable description = "";
@@ -77,6 +78,14 @@ export class LensExtension implements ExtensionModel {
     // mock
   }
 
+  registerTo<T = any>(registry: BaseRegistry<T>, items: T[] = []) {
+    const disposers = items.map(item => registry.add(item));
+    this.disposers.push(...disposers);
+    return () => {
+      this.disposers = this.disposers.filter(disposer => !disposers.includes(disposer))
+    };
+  }
+
   getMeta() {
     return toJS({
       id: this.id,

src/extensions/lens-main-extension.ts

@@ -1,12 +1,7 @@
+import type { MenuRegistration } from "./registries/menu-registry";
+import { observable } from "mobx";
 import { LensExtension } from "./lens-extension"
-import type { MenuRegistry } from "./registries/menu-registry";
 
 export class LensMainExtension extends LensExtension {
-  registerAppMenus(registry: MenuRegistry) {
+  @observable.shallow appMenus: MenuRegistration[] = []
-    //
-  }
-
-  registerPrometheusProviders(registry: any) {
-    //
-  }
 }

src/extensions/lens-renderer-extension.ts

@@ -1,28 +1,12 @@
+import type { AppPreferenceRegistration, ClusterFeatureRegistration, KubeObjectMenuRegistration, PageRegistration, StatusBarRegistration } from "./registries"
+import { observable } from "mobx";
 import { LensExtension } from "./lens-extension"
-import type { GlobalPageRegistry, ClusterPageRegistry, AppPreferenceRegistry, StatusBarRegistry, KubeObjectMenuRegistry, ClusterFeatureRegistry } from "./registries"
 
 export class LensRendererExtension extends LensExtension {
-  registerGlobalPage(registry: GlobalPageRegistry) {
+  @observable.shallow globalPages: PageRegistration[] = []
-    return
+  @observable.shallow clusterPages: PageRegistration[] = []
-  }
+  @observable.shallow appPreferences: AppPreferenceRegistration[] = []
-
+  @observable.shallow clusterFeatures: ClusterFeatureRegistration[] = []
-  registerClusterPage(registry: ClusterPageRegistry) {
+  @observable.shallow statusBarItems: StatusBarRegistration[] = []
-    return
+  @observable.shallow kubeObjectMenuItems: KubeObjectMenuRegistration[] = []
-  }
-
-  registerAppPreferences(registry: AppPreferenceRegistry) {
-    return
-  }
-
-  registerClusterFeatures(registry: ClusterFeatureRegistry) {
-    return
-  }
-
-  registerStatusBarItem(registry: StatusBarRegistry) {
-    return
-  }
-
-  registerKubeObjectMenus(registry: KubeObjectMenuRegistry) {
-    return
-  }
 }

src/extensions/registries/menu-registry.ts

@@ -1,11 +1,10 @@
 // Extensions API -> Global menu customizations
 
-import type { MenuTopId } from "../../main/menu";
 import type { MenuItemConstructorOptions } from "electron";
 import { BaseRegistry } from "./base-registry";
 
 export interface MenuRegistration extends MenuItemConstructorOptions {
-  parentId?: MenuTopId;
+  parentId: string;
 }
 
 export class MenuRegistry extends BaseRegistry<MenuRegistration> {