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

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

src/extensions/extension-loader.ts

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

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) {
-    return
-  }
-
-  registerClusterPage(registry: ClusterPageRegistry) {
-    return
-  }
-
-  registerAppPreferences(registry: AppPreferenceRegistry) {
-    return
-  }
-
-  registerClusterFeatures(registry: ClusterFeatureRegistry) {
-    return
-  }
-
-  registerStatusBarItem(registry: StatusBarRegistry) {
-    return
-  }
-
-  registerKubeObjectMenus(registry: KubeObjectMenuRegistry) {
-    return
-  }
+  @observable.shallow globalPages: PageRegistration[] = []
+  @observable.shallow clusterPages: PageRegistration[] = []
+  @observable.shallow appPreferences: AppPreferenceRegistration[] = []
+  @observable.shallow clusterFeatures: ClusterFeatureRegistration[] = []
+  @observable.shallow statusBarItems: StatusBarRegistration[] = []
+  @observable.shallow kubeObjectMenuItems: KubeObjectMenuRegistration[] = []
 }

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> {