Remove windowManager from extension api (#1323)

Signed-off-by: Jari Kolehmainen <jari.kolehmainen@gmail.com>

docs/extensions/typedoc-readme.md.tpl

@@ -16,6 +16,3 @@
 * [LensMainExtension](classes/lensmainextension.md)
 * [LensRendererExtension](classes/lensrendererextension.md)
 
-## Variables
-
-* [windowManager](README.md#windowmanager)

extensions/support-page/main.ts

@@ -1,4 +1,4 @@
-import { LensMainExtension, windowManager } from "@k8slens/extensions";
+import { LensMainExtension } from "@k8slens/extensions";
 import { supportPageURL } from "./src/support.route";
 
 export default class SupportPageMainExtension extends LensMainExtension {
@@ -6,8 +6,8 @@ export default class SupportPageMainExtension extends LensMainExtension {
     {
       parentId: "help",
       label: "Support",
-      click() {
-        windowManager.navigate(supportPageURL());
+      click: () => {
+        this.navigate(supportPageURL());
       }
     }
   ]

extensions/support-page/package-lock.json

@@ -26,6 +26,12 @@
       "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==",
       "dev": true
     },
+    "@types/node": {
+      "version": "14.14.7",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz",
+      "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==",
+      "dev": true
+    },
     "@types/prop-types": {
       "version": "15.7.3",
       "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.3.tgz",

src/extensions/core-api/index.ts

@@ -2,8 +2,6 @@
 export * from "../lens-main-extension"
 export * from "../lens-renderer-extension"
 
-import type { WindowManager } from "../../main/window-manager";
-
 // APIs
 import * as App from "./app"
 import * as EventBus from "./event-bus"
@@ -12,9 +10,6 @@ import * as Util from "./utils"
 import * as ClusterFeature from "./cluster-feature"
 import * as Interface from "../interfaces"
 
-// TODO: allow to expose windowManager.navigate() as Navigation.navigate() in runtime
-export let windowManager: WindowManager;
-
 export {
   App,
   EventBus,

src/extensions/lens-main-extension.ts

@@ -1,7 +1,12 @@
 import type { MenuRegistration } from "./registries/menu-registry";
 import { observable } from "mobx";
 import { LensExtension } from "./lens-extension"
+import { WindowManager } from "../main/window-manager";
 
 export class LensMainExtension extends LensExtension {
   @observable.shallow appMenus: MenuRegistration[] = []
+
+  async navigate(location: string, frameId?: number) {
+    await WindowManager.getInstance<WindowManager>().navigate(location, frameId)
+  }
 }

src/extensions/renderer-api/index.ts

@@ -8,5 +8,5 @@ import * as Navigation from "./navigation"
 export {
   Component,
   K8sApi,
-  Navigation,
+  Navigation
 }

src/extensions/renderer-api/navigation.ts

@@ -1,3 +1,4 @@
-export { navigate, hideDetails, showDetails, getDetailsUrl } from "../../renderer/navigation"
+export { navigate } from "../../renderer/navigation";
+export { hideDetails, showDetails, getDetailsUrl } from "../../renderer/navigation"
 export { RouteProps } from "react-router"
 export { IURLParams } from "../../common/utils/buildUrl";

src/main/index.ts

@@ -78,7 +78,7 @@ app.on("ready", async () => {
     app.exit();
   }
 
-  LensExtensionsApi.windowManager = windowManager = new WindowManager(proxyPort);
+  windowManager = WindowManager.getInstance<WindowManager>(proxyPort);
   extensionLoader.init(await extensionManager.load()); // call after windowManager to see splash earlier
 
   setTimeout(() => {

src/main/tray.ts

@@ -16,7 +16,7 @@ import { isDevelopment } from "../common/vars";
 export let tray: Tray;
 
 // refresh icon when MacOS dark/light theme has changed
-nativeTheme.on("updated", () => tray?.setImage(getTrayIcon()));
+nativeTheme?.on("updated", () => tray?.setImage(getTrayIcon()));
 
 export function getTrayIcon(isDark = nativeTheme.shouldUseDarkColors): string {
   return path.resolve(

src/main/window-manager.ts

@@ -7,8 +7,9 @@ import { extensionLoader } from "../extensions/extension-loader";
 import { appEventBus } from "../common/event-bus"
 import { initMenu } from "./menu";
 import { initTray } from "./tray";
+import { Singleton } from "../common/utils";
 
-export class WindowManager {
+export class WindowManager extends Singleton {
   protected mainWindow: BrowserWindow;
   protected splashWindow: BrowserWindow;
   protected windowState: windowStateKeeper.State;
@@ -17,6 +18,7 @@ export class WindowManager {
   @observable activeClusterId: ClusterId;
 
   constructor(protected proxyPort: number) {
+    super();
     this.bindEvents();
     this.initMenu();
     this.initTray();

src/renderer/navigation.ts

@@ -11,6 +11,9 @@ import { clusterViewRoute, IClusterViewRouteParams } from "./components/cluster-
 export const history = typeof window !== "undefined" ? createBrowserHistory() : createMemoryHistory();
 export const navigation = createObservableHistory(history);
 
+/**
+ * Navigate to a location. Works only in renderer.
+ */
 export function navigate(location: LocationDescriptor) {
   const currentLocation = navigation.getPath();
   navigation.push(location);
@@ -60,6 +63,9 @@ export function getDetailsUrl(details: string) {
   });
 }
 
+/**
+ * Show details. Works only in renderer.
+ */
 export function showDetails(path: string, resetSelected = true) {
   navigation.searchParams.merge({
     details: path,
@@ -67,6 +73,9 @@ export function showDetails(path: string, resetSelected = true) {
   })
 }
 
+/**
+ * Hide details. Works only in renderer.
+ */
 export function hideDetails() {
   showDetails(null)
 }