diff --git a/packages/core/src/features/electron/renderer/frame-routing-id.injectable.ts b/packages/core/src/features/electron/renderer/frame-routing-id.injectable.ts deleted file mode 100644 index 0a31827088..0000000000 --- a/packages/core/src/features/electron/renderer/frame-routing-id.injectable.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import webFrameInjectable from "./web-frame.injectable"; - -const frameRoutingIdInjectable = getInjectable({ - id: "frame-routing-id", - instantiate: (di) => di.inject(webFrameInjectable).routingId, -}); - -export default frameRoutingIdInjectable; diff --git a/packages/core/src/features/electron/renderer/web-frame.injectable.ts b/packages/core/src/features/electron/renderer/web-frame.injectable.ts deleted file mode 100644 index f746d33d1a..0000000000 --- a/packages/core/src/features/electron/renderer/web-frame.injectable.ts +++ /dev/null @@ -1,14 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import { webFrame } from "electron"; - -const webFrameInjectable = getInjectable({ - id: "web-frame", - instantiate: () => webFrame, - causesSideEffects: true, -}); - -export default webFrameInjectable; diff --git a/packages/core/src/renderer/frames/cluster-frame/on-cluster-frame-close.injectable.ts b/packages/core/src/renderer/frames/cluster-frame/on-cluster-frame-close.injectable.ts index 42bfe712a1..0750de4697 100644 --- a/packages/core/src/renderer/frames/cluster-frame/on-cluster-frame-close.injectable.ts +++ b/packages/core/src/renderer/frames/cluster-frame/on-cluster-frame-close.injectable.ts @@ -5,7 +5,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { once } from "lodash"; import prefixedLoggerInjectable from "../../../common/logger/prefixed-logger.injectable"; -import frameRoutingIdInjectable from "../../../features/electron/renderer/frame-routing-id.injectable"; import clusterFrameClusterInjectable from "../../cluster-frame-context/cluster-frame-cluster.injectable"; import closeRendererLogFileInjectable from "../../logger/close-renderer-log-file.injectable"; import unmountRootComponentInjectable from "../../window/unmount-root-component.injectable"; @@ -14,13 +13,12 @@ const handleOnClusterFrameCloseInjectable = getInjectable({ id: "handle-on-cluster-frame-close", instantiate: (di) => { const cluster = di.inject(clusterFrameClusterInjectable); - const frameRoutingId = di.inject(frameRoutingIdInjectable); const logger = di.inject(prefixedLoggerInjectable, "CLUSTER-FRAME"); const closeFileLogging = di.inject(closeRendererLogFileInjectable); const unmountRootComponent = di.inject(unmountRootComponentInjectable); const onCloseFrame = once(() => { - logger.info(`Unload dashboard, clusterId=${(cluster.id)}, frameId=${frameRoutingId}`); + logger.info(`Unload dashboard, clusterId=${(cluster.id)}`); closeFileLogging(); unmountRootComponent(); }); diff --git a/packages/core/src/renderer/frames/cluster-frame/wait-for-cluster-to-finish-activating.injectable.ts b/packages/core/src/renderer/frames/cluster-frame/wait-for-cluster-to-finish-activating.injectable.ts index c0279be5c6..fe27782592 100644 --- a/packages/core/src/renderer/frames/cluster-frame/wait-for-cluster-to-finish-activating.injectable.ts +++ b/packages/core/src/renderer/frames/cluster-frame/wait-for-cluster-to-finish-activating.injectable.ts @@ -6,7 +6,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { when } from "mobx"; import prefixedLoggerInjectable from "../../../common/logger/prefixed-logger.injectable"; import requestSetClusterFrameIdInjectable from "../../../features/cluster/frame-id/renderer/request-set-frame-id.injectable"; -import frameRoutingIdInjectable from "../../../features/electron/renderer/frame-routing-id.injectable"; import { beforeClusterFrameStartsSecondInjectionToken } from "../../before-frame-starts/tokens"; import clusterFrameClusterInjectable from "../../cluster-frame-context/cluster-frame-cluster.injectable"; @@ -18,9 +17,8 @@ const waitForClusterToFinishActivatingInjectable = getInjectable({ const cluster = di.inject(clusterFrameClusterInjectable); const requestSetClusterFrameId = di.inject(requestSetClusterFrameIdInjectable); const logger = di.inject(prefixedLoggerInjectable, "CLUSTER-FRAME"); - const frameRoutingId = di.inject(frameRoutingIdInjectable); - logger.info(`Init dashboard, clusterId=${cluster.id}, frameId=${frameRoutingId}`); + logger.info(`Init dashboard, clusterId=${cluster.id}`); await requestSetClusterFrameId(cluster.id); await when(() => cluster.ready); // cluster.activate() is done at this point