From d5012b86022f6c58d8e8f1262ea6fa561caca589 Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Wed, 22 Jun 2022 13:51:52 +0300 Subject: [PATCH] Disperse implementation of resolve-proxy back to conventional directory structure instead of an experimental one Co-authored-by: Janne Savolainen Signed-off-by: Iku-turso --- .../{proxy => }/resolve-proxy/resolve-proxy.test.ts | 12 ++++++------ .../resolve-proxy-channel.injectable.ts | 4 ++-- .../resolve-proxy}/resolve-proxy-injection-token.ts | 0 src/extensions/common-api/proxy.ts | 2 +- src/main/getDiForUnitTesting.ts | 2 +- .../utils/resolve-proxy}/electron.injectable.ts | 0 .../resolve-proxy-channel-responder.injectable.ts | 4 ++-- .../resolve-proxy-from-electron.injectable.ts | 2 +- .../resolve-proxy-from-electron.test.ts | 6 +++--- .../utils/resolve-proxy}/resolve-proxy.injectable.ts | 2 +- .../utils/resolve-proxy}/resolve-proxy.injectable.ts | 6 +++--- 11 files changed, 20 insertions(+), 20 deletions(-) rename src/behaviours/{proxy => }/resolve-proxy/resolve-proxy.test.ts (79%) rename src/{behaviours/proxy/resolve-proxy/common => common/utils/resolve-proxy}/resolve-proxy-channel.injectable.ts (71%) rename src/{behaviours/proxy/resolve-proxy/common => common/utils/resolve-proxy}/resolve-proxy-injection-token.ts (100%) rename src/{behaviours/proxy/resolve-proxy/main => main/utils/resolve-proxy}/electron.injectable.ts (100%) rename src/{behaviours/proxy/resolve-proxy/main => main/utils/resolve-proxy}/resolve-proxy-channel-responder.injectable.ts (72%) rename src/{behaviours/proxy/resolve-proxy/main => main/utils/resolve-proxy}/resolve-proxy-from-electron.injectable.ts (89%) rename src/{behaviours/proxy/resolve-proxy/main => main/utils/resolve-proxy}/resolve-proxy-from-electron.test.ts (94%) rename src/{behaviours/proxy/resolve-proxy/main => main/utils/resolve-proxy}/resolve-proxy.injectable.ts (84%) rename src/{behaviours/proxy/resolve-proxy/renderer => renderer/utils/resolve-proxy}/resolve-proxy.injectable.ts (66%) diff --git a/src/behaviours/proxy/resolve-proxy/resolve-proxy.test.ts b/src/behaviours/resolve-proxy/resolve-proxy.test.ts similarity index 79% rename from src/behaviours/proxy/resolve-proxy/resolve-proxy.test.ts rename to src/behaviours/resolve-proxy/resolve-proxy.test.ts index ee25d7b500..29f607737b 100644 --- a/src/behaviours/proxy/resolve-proxy/resolve-proxy.test.ts +++ b/src/behaviours/resolve-proxy/resolve-proxy.test.ts @@ -4,12 +4,12 @@ */ import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; -import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; -import type { ResolveProxy } from "./common/resolve-proxy-injection-token"; -import { resolveProxyInjectionToken } from "./common/resolve-proxy-injection-token"; -import resolveProxyFromElectronInjectable from "./main/resolve-proxy-from-electron.injectable"; -import { getPromiseStatus } from "../../../common/test-utils/get-promise-status"; +import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import type { ResolveProxy } from "../../common/utils/resolve-proxy/resolve-proxy-injection-token"; +import { resolveProxyInjectionToken } from "../../common/utils/resolve-proxy/resolve-proxy-injection-token"; +import resolveProxyFromElectronInjectable from "../../main/utils/resolve-proxy/resolve-proxy-from-electron.injectable"; +import { getPromiseStatus } from "../../common/test-utils/get-promise-status"; describe("resolve-proxy", () => { let applicationBuilder: ApplicationBuilder; diff --git a/src/behaviours/proxy/resolve-proxy/common/resolve-proxy-channel.injectable.ts b/src/common/utils/resolve-proxy/resolve-proxy-channel.injectable.ts similarity index 71% rename from src/behaviours/proxy/resolve-proxy/common/resolve-proxy-channel.injectable.ts rename to src/common/utils/resolve-proxy/resolve-proxy-channel.injectable.ts index aee889c8fd..621018833f 100644 --- a/src/behaviours/proxy/resolve-proxy/common/resolve-proxy-channel.injectable.ts +++ b/src/common/utils/resolve-proxy/resolve-proxy-channel.injectable.ts @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import type { RequestChannel } from "../../../../common/utils/channel/request-channel-injection-token"; -import { requestChannelInjectionToken } from "../../../../common/utils/channel/request-channel-injection-token"; +import type { RequestChannel } from "../channel/request-channel-injection-token"; +import { requestChannelInjectionToken } from "../channel/request-channel-injection-token"; export type ResolveProxyChannel = RequestChannel; diff --git a/src/behaviours/proxy/resolve-proxy/common/resolve-proxy-injection-token.ts b/src/common/utils/resolve-proxy/resolve-proxy-injection-token.ts similarity index 100% rename from src/behaviours/proxy/resolve-proxy/common/resolve-proxy-injection-token.ts rename to src/common/utils/resolve-proxy/resolve-proxy-injection-token.ts diff --git a/src/extensions/common-api/proxy.ts b/src/extensions/common-api/proxy.ts index a7a31b40ad..3ee549f309 100644 --- a/src/extensions/common-api/proxy.ts +++ b/src/extensions/common-api/proxy.ts @@ -4,6 +4,6 @@ */ import { asLegacyGlobalFunctionForExtensionApi } from "../as-legacy-globals-for-extension-api/as-legacy-global-function-for-extension-api"; -import { resolveProxyInjectionToken } from "../../behaviours/proxy/resolve-proxy/common/resolve-proxy-injection-token"; +import { resolveProxyInjectionToken } from "../../common/utils/resolve-proxy/resolve-proxy-injection-token"; export const resolveProxy = asLegacyGlobalFunctionForExtensionApi(resolveProxyInjectionToken); diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index 850100aff8..74a8198ef9 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -99,7 +99,7 @@ import rollbackHelmReleaseInjectable from "./helm/helm-service/rollback-helm-rel import updateHelmReleaseInjectable from "./helm/helm-service/update-helm-release.injectable"; import waitUntilBundledExtensionsAreLoadedInjectable from "./start-main-application/lens-window/application-window/wait-until-bundled-extensions-are-loaded.injectable"; import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; -import electronInjectable from "../behaviours/proxy/resolve-proxy/main/electron.injectable"; +import electronInjectable from "./utils/resolve-proxy/electron.injectable"; export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) { const { diff --git a/src/behaviours/proxy/resolve-proxy/main/electron.injectable.ts b/src/main/utils/resolve-proxy/electron.injectable.ts similarity index 100% rename from src/behaviours/proxy/resolve-proxy/main/electron.injectable.ts rename to src/main/utils/resolve-proxy/electron.injectable.ts diff --git a/src/behaviours/proxy/resolve-proxy/main/resolve-proxy-channel-responder.injectable.ts b/src/main/utils/resolve-proxy/resolve-proxy-channel-responder.injectable.ts similarity index 72% rename from src/behaviours/proxy/resolve-proxy/main/resolve-proxy-channel-responder.injectable.ts rename to src/main/utils/resolve-proxy/resolve-proxy-channel-responder.injectable.ts index dfee36149a..7c156dd962 100644 --- a/src/behaviours/proxy/resolve-proxy/main/resolve-proxy-channel-responder.injectable.ts +++ b/src/main/utils/resolve-proxy/resolve-proxy-channel-responder.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 resolveProxyChannelInjectable from "../common/resolve-proxy-channel.injectable"; +import resolveProxyChannelInjectable from "../../../common/utils/resolve-proxy/resolve-proxy-channel.injectable"; import resolveProxyInjectable from "./resolve-proxy.injectable"; -import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token"; +import { requestChannelListenerInjectionToken } from "../../../common/utils/channel/request-channel-listener-injection-token"; const resolveProxyChannelResponderInjectable = getInjectable({ id: "resolve-proxy-channel-responder", diff --git a/src/behaviours/proxy/resolve-proxy/main/resolve-proxy-from-electron.injectable.ts b/src/main/utils/resolve-proxy/resolve-proxy-from-electron.injectable.ts similarity index 89% rename from src/behaviours/proxy/resolve-proxy/main/resolve-proxy-from-electron.injectable.ts rename to src/main/utils/resolve-proxy/resolve-proxy-from-electron.injectable.ts index a9b74d81a3..eb1ce4cf66 100644 --- a/src/behaviours/proxy/resolve-proxy/main/resolve-proxy-from-electron.injectable.ts +++ b/src/main/utils/resolve-proxy/resolve-proxy-from-electron.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import electronInjectable from "./electron.injectable"; -import withErrorLoggingInjectable from "../../../../common/utils/with-error-logging/with-error-logging.injectable"; +import withErrorLoggingInjectable from "../../../common/utils/with-error-logging/with-error-logging.injectable"; const resolveProxyFromElectronInjectable = getInjectable({ id: "resolve-proxy-from-electron", diff --git a/src/behaviours/proxy/resolve-proxy/main/resolve-proxy-from-electron.test.ts b/src/main/utils/resolve-proxy/resolve-proxy-from-electron.test.ts similarity index 94% rename from src/behaviours/proxy/resolve-proxy/main/resolve-proxy-from-electron.test.ts rename to src/main/utils/resolve-proxy/resolve-proxy-from-electron.test.ts index 471b151322..384bc203df 100644 --- a/src/behaviours/proxy/resolve-proxy/main/resolve-proxy-from-electron.test.ts +++ b/src/main/utils/resolve-proxy/resolve-proxy-from-electron.test.ts @@ -3,14 +3,14 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import { getDiForUnitTesting } from "../../../../main/getDiForUnitTesting"; +import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import resolveProxyFromElectronInjectable from "./resolve-proxy-from-electron.injectable"; import electronInjectable from "./electron.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; import type electron from "electron"; -import { getPromiseStatus } from "../../../../common/test-utils/get-promise-status"; -import logErrorInjectable from "../../../../common/log-error.injectable"; +import { getPromiseStatus } from "../../../common/test-utils/get-promise-status"; +import logErrorInjectable from "../../../common/log-error.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; describe("technical: resolve-proxy-from-electron", () => { diff --git a/src/behaviours/proxy/resolve-proxy/main/resolve-proxy.injectable.ts b/src/main/utils/resolve-proxy/resolve-proxy.injectable.ts similarity index 84% rename from src/behaviours/proxy/resolve-proxy/main/resolve-proxy.injectable.ts rename to src/main/utils/resolve-proxy/resolve-proxy.injectable.ts index 12367da4ad..92a1a9dff8 100644 --- a/src/behaviours/proxy/resolve-proxy/main/resolve-proxy.injectable.ts +++ b/src/main/utils/resolve-proxy/resolve-proxy.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 { resolveProxyInjectionToken } from "../common/resolve-proxy-injection-token"; +import { resolveProxyInjectionToken } from "../../../common/utils/resolve-proxy/resolve-proxy-injection-token"; import resolveProxyFromElectronInjectable from "./resolve-proxy-from-electron.injectable"; const resolveProxyInjectable = getInjectable({ diff --git a/src/behaviours/proxy/resolve-proxy/renderer/resolve-proxy.injectable.ts b/src/renderer/utils/resolve-proxy/resolve-proxy.injectable.ts similarity index 66% rename from src/behaviours/proxy/resolve-proxy/renderer/resolve-proxy.injectable.ts rename to src/renderer/utils/resolve-proxy/resolve-proxy.injectable.ts index 5a7d5da073..237f127c59 100644 --- a/src/behaviours/proxy/resolve-proxy/renderer/resolve-proxy.injectable.ts +++ b/src/renderer/utils/resolve-proxy/resolve-proxy.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 { resolveProxyInjectionToken } from "../common/resolve-proxy-injection-token"; -import requestFromChannelInjectable from "../../../../renderer/utils/channel/request-from-channel.injectable"; -import resolveProxyChannelInjectable from "../common/resolve-proxy-channel.injectable"; +import { resolveProxyInjectionToken } from "../../../common/utils/resolve-proxy/resolve-proxy-injection-token"; +import requestFromChannelInjectable from "../channel/request-from-channel.injectable"; +import resolveProxyChannelInjectable from "../../../common/utils/resolve-proxy/resolve-proxy-channel.injectable"; const resolveProxyInjectable = getInjectable({ id: "resolve-proxy-for-renderer",