diff --git a/src/main/index.ts b/src/main/index.ts index 79f2a239bc..0a946b9c36 100644 --- a/src/main/index.ts +++ b/src/main/index.ts @@ -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() diff --git a/src/renderer/components/cluster-manager/cluster-actions.tsx b/src/renderer/components/cluster-manager/cluster-actions.tsx index f8f6f1ba41..93bde6d80d 100644 --- a/src/renderer/components/cluster-manager/cluster-actions.tsx +++ b/src/renderer/components/cluster-manager/cluster-actions.tsx @@ -9,9 +9,10 @@ import { clusterDisconnectHandler } from "../../../common/cluster-ipc"; import { ConfirmDialog } from "../confirm-dialog"; import { Cluster } from "../../../main/cluster"; import { Tooltip } from "../../components//tooltip"; +import { IpcRendererNavigationEvents } from "../../navigation/events"; const navigate = (route: string) => - broadcastMessage("renderer:navigate", route); + broadcastMessage(IpcRendererNavigationEvents.NAVIGATE_IN_APP, route); /** * Creates handlers for high-level actions diff --git a/src/renderer/components/layout/__test__/main-layout-header.test.tsx b/src/renderer/components/layout/__test__/main-layout-header.test.tsx index dc696592d9..1c5e381ce2 100644 --- a/src/renderer/components/layout/__test__/main-layout-header.test.tsx +++ b/src/renderer/components/layout/__test__/main-layout-header.test.tsx @@ -10,6 +10,7 @@ import { workspaceStore } from "../../../../common/workspace-store"; import { broadcastMessage, requestMain } from "../../../../common/ipc"; import { clusterDisconnectHandler } from "../../../../common/cluster-ipc"; import { ConfirmDialog } from "../../confirm-dialog"; +import { IpcRendererNavigationEvents } from "../../../navigation/events"; const mockBroadcastIpc = broadcastMessage as jest.MockedFunction; const mockRequestMain = requestMain as jest.MockedFunction; @@ -76,7 +77,7 @@ describe("", () => { it("navigates to cluster settings", () => { fireEvent.click(settingsBtn); - expect(mockBroadcastIpc).toBeCalledWith("renderer:navigate", "/cluster/foo/settings"); + expect(mockBroadcastIpc).toBeCalledWith(IpcRendererNavigationEvents.NAVIGATE_IN_APP, "/cluster/foo/settings"); }); it("disconnects from cluster", () => { @@ -86,7 +87,7 @@ describe("", () => { it("opens 'Remove cluster' dialog", async () => { fireEvent.click(removeBtn); - + const dialog = document.querySelector(".ConfirmDialog"); expect(dialog).toBeDefined(); @@ -94,7 +95,7 @@ describe("", () => { const okBtn = dialog.querySelector("button.ok"); - expect(okBtn.textContent).toBe("Remove"); + expect(okBtn.textContent).toBe("Remove"); }); }); }); diff --git a/src/renderer/lens-app.tsx b/src/renderer/lens-app.tsx index f5384b77f1..288312c6e8 100644 --- a/src/renderer/lens-app.tsx +++ b/src/renderer/lens-app.tsx @@ -15,6 +15,7 @@ import { CommandContainer } from "./components/command-palette/command-container import { LensProtocolRouterRenderer, bindProtocolAddRouteHandlers } from "./protocol-handler"; import { registerIpcHandlers } from "./ipc"; import { ipcRenderer } from "electron"; +import { IpcRendererNavigationEvents } from "./navigation/events"; @observer export class LensApp extends React.Component { @@ -30,7 +31,7 @@ export class LensApp extends React.Component { }); registerIpcHandlers(); - ipcRenderer.send("renderer:loaded"); + ipcRenderer.send(IpcRendererNavigationEvents.LOADED); } render() { diff --git a/src/renderer/navigation/events.ts b/src/renderer/navigation/events.ts index 6ae0107374..53c685c9f4 100644 --- a/src/renderer/navigation/events.ts +++ b/src/renderer/navigation/events.ts @@ -9,6 +9,7 @@ export const enum IpcRendererNavigationEvents { CLUSTER_VIEW_CURRENT_ID = "renderer:cluster-id-of-active-view", NAVIGATE_IN_APP = "renderer:navigate", NAVIGATE_IN_CLUSTER = "renderer:navigate-in-cluster", + LOADED = "renderer:loaded", } export function bindEvents() {