hendrik/lens
1
0 Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Fix: incorrect subscribing event name to navigate in cluster view (#2363)

Browse Source 
Co-authored-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
RomanandSebastian Malton authored and GitHub committed 2021-03-23 11:04:31 -04:00
1 parent e718b250cc
commit 62c3501011
6 files changed
+31 -16
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/index.ts
+2 -1
View File
@@ -29,6 +29,7 @@ import { LensProtocolRouterMain } from "./protocol-handler";
import { getAppVersion, getAppVersionFromProxyServer } from "../common/utils";
import { bindBroadcastHandlers } from "../common/ipc";
import { startUpdateChecking } from "./app-updater";
import { IpcRendererNavigationEvents } from "../renderer/navigation/events";
const workingDir = path.join(app.getPath("appData"), appName);
let proxyPort: number;
@@ -162,7 +163,7 @@ app.on("ready", async () => {
windowManager.initMainWindow();
}
ipcMain.on("renderer:loaded", () => {
ipcMain.on(IpcRendererNavigationEvents.LOADED, () => {
startUpdateChecking();
LensProtocolRouterMain
.getInstance<LensProtocolRouterMain>()
src/main/window-manager.ts
+9 -6
View File
@@ -8,6 +8,7 @@ import { initMenu } from "./menu";
import { initTray } from "./tray";
import { Singleton } from "../common/utils";
import { ClusterFrameInfo, clusterFrameMap } from "../common/cluster-frames";
import { IpcRendererNavigationEvents } from "../renderer/navigation/events";
import logger from "./logger";
export class WindowManager extends Singleton {
@@ -65,13 +66,13 @@ export class WindowManager extends Singleton {
shell.openExternal(url);
});
this.mainWindow.webContents.on("dom-ready", () => {
appEventBus.emit({name: "app", action: "dom-ready"});
appEventBus.emit({ name: "app", action: "dom-ready" });
});
this.mainWindow.on("focus", () => {
appEventBus.emit({name: "app", action: "focus"});
appEventBus.emit({ name: "app", action: "focus" });
});
this.mainWindow.on("blur", () => {
appEventBus.emit({name: "app", action: "blur"});
appEventBus.emit({ name: "app", action: "blur" });
});
// clean up
@@ -115,7 +116,7 @@ export class WindowManager extends Singleton {
protected bindEvents() {
// track visible cluster from ui
subscribeToBroadcast("cluster-view:current-id", (event, clusterId: ClusterId) => {
subscribeToBroadcast(IpcRendererNavigationEvents.CLUSTER_VIEW_CURRENT_ID, (event, clusterId: ClusterId) => {
this.activeClusterId = clusterId;
});
}
@@ -139,7 +140,9 @@ export class WindowManager extends Singleton {
await this.ensureMainWindow();
const frameInfo = Array.from(clusterFrameMap.values()).find((frameInfo) => frameInfo.frameId === frameId);
const channel = frameInfo ? "renderer:navigate-in-cluster" : "renderer:navigate";
const channel = frameInfo
? IpcRendererNavigationEvents.NAVIGATE_IN_CLUSTER
: IpcRendererNavigationEvents.NAVIGATE_IN_APP;
this.sendToView({
channel,
@@ -152,7 +155,7 @@ export class WindowManager extends Singleton {
const frameInfo = clusterFrameMap.get(this.activeClusterId);
if (frameInfo) {
this.sendToView({ channel: "renderer:reload", frameInfo });
this.sendToView({ channel: IpcRendererNavigationEvents.RELOAD_PAGE, frameInfo });
} else {
webContents.getFocusedWebContents()?.reload();
}