From 4222359bd65e755a250de9638de0dcf7addeea1d Mon Sep 17 00:00:00 2001 From: Jari Kolehmainen Date: Thu, 12 Nov 2020 10:30:57 +0200 Subject: [PATCH] Add LensRendererExtension.navigate (#1345) Signed-off-by: Jari Kolehmainen --- src/extensions/lens-renderer-extension.ts | 5 +++++ src/main/window-manager.ts | 4 ++-- src/renderer/navigation.ts | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/extensions/lens-renderer-extension.ts b/src/extensions/lens-renderer-extension.ts index 8c8735da86..d26bc4764e 100644 --- a/src/extensions/lens-renderer-extension.ts +++ b/src/extensions/lens-renderer-extension.ts @@ -5,6 +5,7 @@ import type { } from "./registries" import { observable } from "mobx"; import { LensExtension } from "./lens-extension" +import { ipcRenderer } from "electron" export class LensRendererExtension extends LensExtension { @observable.shallow globalPages: PageRegistration[] = [] @@ -15,4 +16,8 @@ export class LensRendererExtension extends LensExtension { @observable.shallow statusBarItems: StatusBarRegistration[] = [] @observable.shallow kubeObjectDetailItems: KubeObjectDetailRegistration[] = [] @observable.shallow kubeObjectMenuItems: KubeObjectMenuRegistration[] = [] + + navigate(location: string) { + ipcRenderer.emit("renderer:navigate", location) + } } diff --git a/src/main/window-manager.ts b/src/main/window-manager.ts index ef68cf779f..fc61ca8345 100644 --- a/src/main/window-manager.ts +++ b/src/main/window-manager.ts @@ -122,7 +122,7 @@ export class WindowManager extends Singleton { async navigate(url: string, frameId?: number) { await this.ensureMainWindow(); this.sendToView({ - channel: "menu:navigate", + channel: "renderer:navigate", frameId: frameId, data: [url], }) @@ -131,7 +131,7 @@ export class WindowManager extends Singleton { reload() { const frameId = clusterStore.getById(this.activeClusterId)?.frameId; if (frameId) { - this.sendToView({ channel: "menu:reload", frameId }); + this.sendToView({ channel: "renderer:reload", frameId }); } else { webContents.getFocusedWebContents()?.reload(); } diff --git a/src/renderer/navigation.ts b/src/renderer/navigation.ts index f894f37140..e894b819c8 100644 --- a/src/renderer/navigation.ts +++ b/src/renderer/navigation.ts @@ -110,12 +110,12 @@ if (process.isMainFrame) { } // Handle navigation via IPC (e.g. from top menu) -ipcRenderer.on("menu:navigate", (event, location: LocationDescriptor) => { +ipcRenderer.on("renderer:navigate", (event, location: LocationDescriptor) => { logger.info(`[IPC]: ${event.type} ${JSON.stringify(location)}`, event); navigate(location); }); // Reload dashboard window -ipcRenderer.on("menu:reload", () => { +ipcRenderer.on("renderer:reload", () => { location.reload(); });