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: cluster-settings page back-button navigation is broken (#2330)

Browse Source 
Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman 2021-03-12 19:48:09 +02:00 committed by GitHub
parent 7d1b5e4627
commit c815396622
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 31 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/window-manager.ts
View File

@ -138,13 +138,12 @@ export class WindowManager extends Singleton {
async navigate(url: string, frameId?: number) { async navigate(url: string, frameId?: number) {
await this.ensureMainWindow(); await this.ensureMainWindow();
let frameInfo: ClusterFrameInfo;
if (frameId) { const frameInfo = Array.from(clusterFrameMap.values()).find((frameInfo) => frameInfo.frameId === frameId);
frameInfo = Array.from(clusterFrameMap.values()).find((frameInfo) => frameInfo.frameId === frameId); const channel = frameInfo ? "renderer:navigate-in-cluster" : "renderer:navigate";
}
this.sendToView({ this.sendToView({
channel: "renderer:navigate", channel,
frameInfo, frameInfo,
data: [url], data: [url],
}); });

39
src/renderer/navigation/events.ts
View File

@ -10,22 +10,37 @@ export function bindEvents() {
} }
if (process.isMainFrame) { if (process.isMainFrame) {
// Keep track of active cluster-id for handling IPC/menus/etc. bindClusterManagerRouteEvents();
reaction(() => getMatchedClusterId(), clusterId => { } else {
broadcastMessage("cluster-view:current-id", clusterId); bindClusterFrameRouteEvents();
}, {
fireImmediately: true
});
} }
// Handle navigation via IPC (e.g. from top menu)
subscribeToBroadcast("renderer:navigate", (event, url: string) => {
logger.info(`[IPC]: ${event.type} ${JSON.stringify(url)}`, event);
navigate(url);
});
// Reload dashboard window // Reload dashboard window
subscribeToBroadcast("renderer:reload", () => { subscribeToBroadcast("renderer:reload", () => {
location.reload(); location.reload();
}); });
} }
// Handle events only in main window renderer process (see also: cluster-manager.tsx)
function bindClusterManagerRouteEvents() {
// Keep track of active cluster-id for handling IPC/menus/etc.
reaction(() => getMatchedClusterId(), clusterId => {
broadcastMessage("cluster-view:current-id", clusterId);
}, {
fireImmediately: true
});
// Handle navigation via IPC
subscribeToBroadcast("renderer:navigate", (event, url: string) => {
logger.info(`[IPC]: ${event.type}: ${url}`, { currentLocation: location.href });
navigate(url);
});
}
// Handle cluster-view renderer process events within iframes
function bindClusterFrameRouteEvents() {
subscribeToBroadcast("renderer:navigate-cluster-view", (event, url: string) => {
logger.info(`[IPC]: ${event.type}: ${url}`, { currentLocation: location.href });
navigate(url);
});
}