diff --git a/packages/core/src/common/logger/ipc-file-logger-channel.ts b/packages/core/src/features/population-of-logs-to-a-file/common/ipc-file-logger-channel.ts similarity index 100% rename from packages/core/src/common/logger/ipc-file-logger-channel.ts rename to packages/core/src/features/population-of-logs-to-a-file/common/ipc-file-logger-channel.ts diff --git a/packages/core/src/main/logger/close-ipc-logging-listener.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/main/close-ipc-logging-listener.injectable.ts similarity index 92% rename from packages/core/src/main/logger/close-ipc-logging-listener.injectable.ts rename to packages/core/src/features/population-of-logs-to-a-file/main/close-ipc-logging-listener.injectable.ts index df31f05760..e54789dca5 100644 --- a/packages/core/src/main/logger/close-ipc-logging-listener.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/main/close-ipc-logging-listener.injectable.ts @@ -6,7 +6,7 @@ import { getMessageChannelListenerInjectable } from "@k8slens/messaging"; import ipcFileLoggerInjectable from "./ipc-file-logger.injectable"; import { closeIpcFileLoggerChannel, -} from "../../common/logger/ipc-file-logger-channel"; +} from "../common/ipc-file-logger-channel"; const closeIpcFileLoggingListenerInjectable = getMessageChannelListenerInjectable({ id: "close-ipc-file-logging", diff --git a/packages/core/src/main/logger/create-ipc-file-transport.global-override-for-injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/main/create-ipc-file-transport.global-override-for-injectable.ts similarity index 100% rename from packages/core/src/main/logger/create-ipc-file-transport.global-override-for-injectable.ts rename to packages/core/src/features/population-of-logs-to-a-file/main/create-ipc-file-transport.global-override-for-injectable.ts diff --git a/packages/core/src/main/logger/create-ipc-file-transport.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/main/create-ipc-file-transport.injectable.ts similarity index 88% rename from packages/core/src/main/logger/create-ipc-file-transport.injectable.ts rename to packages/core/src/features/population-of-logs-to-a-file/main/create-ipc-file-transport.injectable.ts index f29e02fc90..f672c6a49d 100644 --- a/packages/core/src/main/logger/create-ipc-file-transport.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/main/create-ipc-file-transport.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { transports } from "winston"; -import directoryForLogsInjectable from "../../common/app-paths/directory-for-logs.injectable"; +import directoryForLogsInjectable from "../../../common/app-paths/directory-for-logs.injectable"; const createIpcFileLoggerTransportInjectable = getInjectable({ id: "create-ipc-file-logger-transport", diff --git a/packages/core/src/main/logger/ipc-file-logger.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/main/ipc-file-logger.injectable.ts similarity index 100% rename from packages/core/src/main/logger/ipc-file-logger.injectable.ts rename to packages/core/src/features/population-of-logs-to-a-file/main/ipc-file-logger.injectable.ts diff --git a/packages/core/src/main/logger/ipc-file-logger.test.ts b/packages/core/src/features/population-of-logs-to-a-file/main/ipc-file-logger.test.ts similarity index 98% rename from packages/core/src/main/logger/ipc-file-logger.test.ts rename to packages/core/src/features/population-of-logs-to-a-file/main/ipc-file-logger.test.ts index 1ff727e200..f7ab5d813d 100644 --- a/packages/core/src/main/logger/ipc-file-logger.test.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/main/ipc-file-logger.test.ts @@ -2,7 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getDiForUnitTesting } from "../getDiForUnitTesting"; +import { getDiForUnitTesting } from "../../../main/getDiForUnitTesting"; import createIpcFileLoggerTransportInjectable from "./create-ipc-file-transport.injectable"; import type { IpcFileLogger } from "./ipc-file-logger.injectable"; import ipcFileLoggerInjectable from "./ipc-file-logger.injectable"; diff --git a/packages/core/src/main/logger/ipc-logging-listener.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/main/ipc-logging-listener.injectable.ts similarity index 86% rename from packages/core/src/main/logger/ipc-logging-listener.injectable.ts rename to packages/core/src/features/population-of-logs-to-a-file/main/ipc-logging-listener.injectable.ts index dde708b44b..059b195cda 100644 --- a/packages/core/src/main/logger/ipc-logging-listener.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/main/ipc-logging-listener.injectable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getMessageChannelListenerInjectable } from "@k8slens/messaging"; -import type { IpcFileLogObject } from "../../common/logger/ipc-file-logger-channel"; -import { ipcFileLoggerChannel } from "../../common/logger/ipc-file-logger-channel"; +import type { IpcFileLogObject } from "../common/ipc-file-logger-channel"; +import { ipcFileLoggerChannel } from "../common/ipc-file-logger-channel"; import { MESSAGE } from "triple-beam"; import ipcFileLoggerInjectable from "./ipc-file-logger.injectable"; diff --git a/packages/core/src/main/logger/ipc-logging-listener.test.ts b/packages/core/src/features/population-of-logs-to-a-file/main/ipc-logging-listener.test.ts similarity index 100% rename from packages/core/src/main/logger/ipc-logging-listener.test.ts rename to packages/core/src/features/population-of-logs-to-a-file/main/ipc-logging-listener.test.ts diff --git a/packages/core/src/main/logger/stop-ipc-logging.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/main/stop-ipc-logging.injectable.ts similarity index 85% rename from packages/core/src/main/logger/stop-ipc-logging.injectable.ts rename to packages/core/src/features/population-of-logs-to-a-file/main/stop-ipc-logging.injectable.ts index bdb94a412e..89533411ca 100644 --- a/packages/core/src/main/logger/stop-ipc-logging.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/main/stop-ipc-logging.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { beforeQuitOfFrontEndInjectionToken } from "../start-main-application/runnable-tokens/phases"; +import { beforeQuitOfFrontEndInjectionToken } from "../../../main/start-main-application/runnable-tokens/phases"; import ipcFileLoggerInjectable from "./ipc-file-logger.injectable"; const stopIpcLoggingInjectable = getInjectable({ diff --git a/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts b/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts index 9adf37b7b6..6309eba979 100644 --- a/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/population-of-logs-to-a-file.test.ts @@ -10,8 +10,8 @@ import type winston from "winston"; import { MESSAGE } from "triple-beam"; import { noop } from "@k8slens/utilities"; import windowLocationInjectable from "../../common/k8s-api/window-location.injectable"; -import closeRendererLogFileInjectable from "../../renderer/logger/close-renderer-log-file.injectable"; -import createIpcFileLoggerTransportInjectable from "../../main/logger/create-ipc-file-transport.injectable"; +import closeRendererLogFileInjectable from "./renderer/close-renderer-log-file.injectable"; +import createIpcFileLoggerTransportInjectable from "./main/create-ipc-file-transport.injectable"; import browserLoggerTransportInjectable from "../../renderer/logger/browser-transport.injectable"; import { runInAction } from "mobx"; diff --git a/packages/core/src/renderer/logger/close-renderer-log-file-id.test.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts similarity index 91% rename from packages/core/src/renderer/logger/close-renderer-log-file-id.test.ts rename to packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts index 1c8f8bd514..6d7039e099 100644 --- a/packages/core/src/renderer/logger/close-renderer-log-file-id.test.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file-id.test.ts @@ -6,8 +6,8 @@ import type winston from "winston"; import type { SendMessageToChannel } from "@k8slens/messaging"; import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import type { DiContainer } from "@ogre-tools/injectable"; -import winstonLoggerInjectable from "../../common/winston-logger.injectable"; -import { getDiForUnitTesting } from "../getDiForUnitTesting"; +import winstonLoggerInjectable from "../../../common/winston-logger.injectable"; +import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting"; import closeRendererLogFileInjectable from "./close-renderer-log-file.injectable"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable"; diff --git a/packages/core/src/renderer/logger/close-renderer-log-file.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts similarity index 85% rename from packages/core/src/renderer/logger/close-renderer-log-file.injectable.ts rename to packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts index 73e579a8ea..a4f934164c 100644 --- a/packages/core/src/renderer/logger/close-renderer-log-file.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable.ts @@ -4,8 +4,8 @@ */ import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; import { getInjectable } from "@ogre-tools/injectable"; -import winstonLoggerInjectable from "../../common/winston-logger.injectable"; -import { closeIpcFileLoggerChannel } from "../../common/logger/ipc-file-logger-channel"; +import winstonLoggerInjectable from "../../../common/winston-logger.injectable"; +import { closeIpcFileLoggerChannel } from "../common/ipc-file-logger-channel"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable"; diff --git a/packages/core/src/renderer/logger/ipc-transport.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.injectable.ts similarity index 88% rename from packages/core/src/renderer/logger/ipc-transport.injectable.ts rename to packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.injectable.ts index a20096eb1a..0145882e74 100644 --- a/packages/core/src/renderer/logger/ipc-transport.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.injectable.ts @@ -3,16 +3,16 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { loggerTransportInjectionToken } from "../../common/logger/transports"; +import { loggerTransportInjectionToken } from "../../../common/logger/transports"; import type winston from "winston"; import { MESSAGE } from "triple-beam"; import IpcLogTransport from "./ipc-transport"; -import type { IpcFileLogObject } from "../../common/logger/ipc-file-logger-channel"; +import type { IpcFileLogObject } from "../common/ipc-file-logger-channel"; import { closeIpcFileLoggerChannel, ipcFileLoggerChannel, -} from "../../common/logger/ipc-file-logger-channel"; +} from "../common/ipc-file-logger-channel"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; diff --git a/packages/core/src/renderer/logger/ipc-transport.test.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.test.ts similarity index 94% rename from packages/core/src/renderer/logger/ipc-transport.test.ts rename to packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.test.ts index 2782724696..a0c3ab189f 100644 --- a/packages/core/src/renderer/logger/ipc-transport.test.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.test.ts @@ -6,9 +6,9 @@ import type { DiContainer } from "@ogre-tools/injectable"; import { MESSAGE } from "triple-beam"; import type { SendMessageToChannel } from "@k8slens/messaging"; import { sendMessageToChannelInjectionToken } from "@k8slens/messaging"; -import { getDiForUnitTesting } from "../getDiForUnitTesting"; import rendererLogFileIdInjectable from "./renderer-log-file-id.injectable"; import ipcLogTransportInjectable from "./ipc-transport.injectable"; +import { getDiForUnitTesting } from "../../../renderer/getDiForUnitTesting"; describe("renderer log transport through ipc", () => { let di: DiContainer; diff --git a/packages/core/src/renderer/logger/ipc-transport.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.ts similarity index 100% rename from packages/core/src/renderer/logger/ipc-transport.ts rename to packages/core/src/features/population-of-logs-to-a-file/renderer/ipc-transport.ts diff --git a/packages/core/src/renderer/logger/renderer-log-file-id.injectable.ts b/packages/core/src/features/population-of-logs-to-a-file/renderer/renderer-log-file-id.injectable.ts similarity index 73% rename from packages/core/src/renderer/logger/renderer-log-file-id.injectable.ts rename to packages/core/src/features/population-of-logs-to-a-file/renderer/renderer-log-file-id.injectable.ts index c66fe547e6..c575f48774 100644 --- a/packages/core/src/renderer/logger/renderer-log-file-id.injectable.ts +++ b/packages/core/src/features/population-of-logs-to-a-file/renderer/renderer-log-file-id.injectable.ts @@ -3,9 +3,9 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import windowLocationInjectable from "../../common/k8s-api/window-location.injectable"; -import currentlyInClusterFrameInjectable from "../routes/currently-in-cluster-frame.injectable"; -import { getClusterIdFromHost } from "../../common/utils"; +import windowLocationInjectable from "../../../common/k8s-api/window-location.injectable"; +import currentlyInClusterFrameInjectable from "../../../renderer/routes/currently-in-cluster-frame.injectable"; +import { getClusterIdFromHost } from "../../../common/utils"; const rendererLogFileIdInjectable = getInjectable({ id: "renderer-log-file-id", diff --git a/packages/core/src/renderer/before-frame-starts/runnables/listen-unload.injectable.ts b/packages/core/src/renderer/before-frame-starts/runnables/listen-unload.injectable.ts index 6b6e0e751c..dae545b32c 100644 --- a/packages/core/src/renderer/before-frame-starts/runnables/listen-unload.injectable.ts +++ b/packages/core/src/renderer/before-frame-starts/runnables/listen-unload.injectable.ts @@ -2,14 +2,14 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import { unmountComponentAtNode } from "react-dom"; import { getInjectable } from "@ogre-tools/injectable"; import currentlyInClusterFrameInjectable from "../../routes/currently-in-cluster-frame.injectable"; import { beforeFrameStartsSecondInjectionToken } from "../tokens"; import loggerInjectable from "../../../common/logger.injectable"; import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable"; import frameRoutingIdInjectable from "../../frames/cluster-frame/init-cluster-frame/frame-routing-id/frame-routing-id.injectable"; -import closeRendererLogFileInjectable from "../../logger/close-renderer-log-file.injectable"; -import { unmountComponentAtNode } from "react-dom"; +import closeRendererLogFileInjectable from "../../../features/population-of-logs-to-a-file/renderer/close-renderer-log-file.injectable"; const listenUnloadInjectable = getInjectable({ id: "listen-unload",