support-page extension -- menu-registry / part 1

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

extensions/support-page/main.ts

@@ -1,4 +1,5 @@
 import { LensMainExtension, Registry } from "@lens/extensions";
+import { supportPageURL } from "./src/support.route";
 
 export default class SupportPageMainExtension extends LensMainExtension {
   async onActivate() {
@@ -6,6 +7,15 @@ export default class SupportPageMainExtension extends LensMainExtension {
   }
 
   async registerAppMenus(registry: Registry.MenuRegistry) {
-    // TODO: allow to modify global menu item "Help -> Support"
+    this.disposers.push(
+      registry.add({
+        parentId: "help",
+        label: "Support",
+        async click() {
+          // fixme: require runtime windowManager (ensureMainWindow + navigate for main)
+          console.log(`navigate: ${supportPageURL()}`);
+        }
+      })
+    )
   }
 }

src/extensions/menu-registry.ts

@@ -1,15 +1,23 @@
 // Extensions API -> Global menu customize
 
 import { observable } from "mobx";
+import { MenuItemConstructorOptions } from "electron";
+import type { MenuTopId } from "../main/menu";
 
-export interface MenuRegistration {
+export interface MenuRegistration extends MenuItemConstructorOptions {
-  data?: any;
+  parentId?: MenuTopId;
 }
 
 export class MenuRegistry {
-  items = observable<MenuRegistration>([], { deep: false });
+  protected items = observable.array([], { deep: false });
+
+  getItems(): MenuRegistration[] {
+    return this.items.toJS();
+  }
 
   add(item: MenuRegistration) {
+    this.items.push(item);
+    return () => this.items.remove(item)
   }
 }
 

src/extensions/page-registry.ts

@@ -38,12 +38,10 @@ export class PageRegistry {
   }
 
   // fixme: validate route paths to avoid collisions
-  add(params: PageRegistration) {
+  add(pageInit: PageRegistration) {
-    this.pages.push(params);
+    this.pages.push(pageInit);
     return () => {
-      this.pages.replace(
+      this.pages.remove(pageInit); // works because of {deep: false}
-        this.pages.filter(page => page.components !== params.components)
-      )
     };
   }
 }

src/main/menu.ts

@@ -6,8 +6,11 @@ import { addClusterURL } from "../renderer/components/+add-cluster/add-cluster.r
 import { preferencesURL } from "../renderer/components/+preferences/preferences.route";
 import { whatsNewURL } from "../renderer/components/+whats-new/whats-new.route";
 import { clusterSettingsURL } from "../renderer/components/+cluster-settings/cluster-settings.route";
+import { menuRegistry } from "../extensions/menu-registry";
 import logger from "./logger";
 
+export type MenuTopId = "mac" | "file" | "edit" | "view" | "help"
+
 export function initMenu(windowManager: WindowManager) {
   autorun(() => buildMenu(windowManager), {
     delay: 100
@@ -53,8 +56,6 @@ export function buildMenu(windowManager: WindowManager) {
     })
   }
 
-  const mt: MenuItemConstructorOptions[] = [];
-
   const macAppMenu: MenuItemConstructorOptions = {
     label: app.getName(),
     submenu: [
@@ -83,10 +84,6 @@ export function buildMenu(windowManager: WindowManager) {
     ]
   };
 
-  if (isMac) {
-    mt.push(macAppMenu);
-  }
-
   const fileMenu: MenuItemConstructorOptions = {
     label: "File",
     submenu: [
@@ -124,7 +121,6 @@ export function buildMenu(windowManager: WindowManager) {
       ])
     ]
   };
-  mt.push(fileMenu)
 
   const editMenu: MenuItemConstructorOptions = {
     label: 'Edit',
@@ -140,7 +136,7 @@ export function buildMenu(windowManager: WindowManager) {
       { role: 'selectAll' },
     ]
   };
-  mt.push(editMenu)
+
   const viewMenu: MenuItemConstructorOptions = {
     label: 'View',
     submenu: [
@@ -174,7 +170,6 @@ export function buildMenu(windowManager: WindowManager) {
       { role: 'togglefullscreen' }
     ]
   };
-  mt.push(viewMenu)
 
   const helpMenu: MenuItemConstructorOptions = {
     role: 'help',
@@ -214,7 +209,29 @@ export function buildMenu(windowManager: WindowManager) {
     ]
   };
 
-  mt.push(helpMenu)
+  // Prepare menu items order
-
+  const appMenu: Record<MenuTopId, MenuItemConstructorOptions> = {
-  Menu.setApplicationMenu(Menu.buildFromTemplate(mt));
+    mac: macAppMenu,
+    file: fileMenu,
+    edit: editMenu,
+    view: viewMenu,
+    help: helpMenu,
+  }
+
+  // Modify menu from extensions-api
+  menuRegistry.getItems().forEach(({ parentId, ...menuItem }) => {
+    try {
+      const topMenu = appMenu[parentId].submenu as MenuItemConstructorOptions[];
+      topMenu.push(menuItem);
+    } catch (err) {
+      logger.error(`[MENU]: can't register menu item, parentId=${parentId}`, { menuItem })
+    }
+  })
+
+  if (!isMac) {
+    delete appMenu.mac
+  }
+
+  const menu = Menu.buildFromTemplate(Object.values(appMenu));
+  Menu.setApplicationMenu(menu);
 }

src/renderer/i18n.ts

@@ -14,7 +14,7 @@ export interface ILanguage {
 
 export const _i18n = setupI18n({
   missing: (message, id) => {
-    console.warn('Missing localization:', message, id);
+    // console.warn('Missing localization:', message, id);
     return id;
   }
 });