From 6c3e8e83c03d13bd42db4ab3c56ebae5b4b3d649 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Thu, 20 Apr 2023 16:04:52 -0400 Subject: [PATCH] chore: Move files around to flatten hierarchy Signed-off-by: Sebastian Malton --- .../namespaces/edit-namespace-from-new-tab.test.tsx | 8 ++++---- .../edit-namespace-from-previously-opened-tab.test.tsx | 4 ++-- ...l-for-patch-resource.global-override-for-injectable.ts | 0 .../call-for-patch-resource.injectable.ts | 8 ++++---- .../call-for-resource.global-override-for-injectable.ts | 0 .../call-for-resource.injectable.ts | 8 ++++---- .../edit-resource-model.injectable.tsx | 8 ++++---- 7 files changed, 18 insertions(+), 18 deletions(-) rename packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/{call-for-patch-resource => }/call-for-patch-resource.global-override-for-injectable.ts (100%) rename packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/{call-for-patch-resource => }/call-for-patch-resource.injectable.ts (77%) rename packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/{call-for-resource => }/call-for-resource.global-override-for-injectable.ts (100%) rename packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/{call-for-resource => }/call-for-resource.injectable.ts (76%) diff --git a/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx b/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx index 8480da45e3..f5e33dfabc 100644 --- a/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx +++ b/packages/core/src/features/cluster/namespaces/edit-namespace-from-new-tab.test.tsx @@ -12,8 +12,8 @@ import createEditResourceTabInjectable from "../../../renderer/components/dock/e import getRandomIdForEditResourceTabInjectable from "../../../renderer/components/dock/edit-resource/get-random-id-for-edit-resource-tab.injectable"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { CallForPatchResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.injectable"; -import callForPatchResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.injectable"; +import type { CallForPatchResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource.injectable"; +import callForPatchResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource.injectable"; import dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable"; import { Namespace } from "../../../common/k8s-api/endpoints"; import showSuccessNotificationInjectable from "../../../renderer/components/notifications/show-success-notification.injectable"; @@ -21,8 +21,8 @@ import showErrorNotificationInjectable from "../../../renderer/components/notifi import readJsonFileInjectable from "../../../common/fs/read-json-file.injectable"; import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable"; import hostedClusterIdInjectable from "../../../renderer/cluster-frame-context/hosted-cluster-id.injectable"; -import type { CallForResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable"; -import callForResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable"; +import type { CallForResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable"; +import callForResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable"; describe("cluster/namespaces - edit namespace from new tab", () => { let builder: ApplicationBuilder; diff --git a/packages/core/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx b/packages/core/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx index 8e2803a35c..0089b64c47 100644 --- a/packages/core/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx +++ b/packages/core/src/features/cluster/namespaces/edit-namespace-from-previously-opened-tab.test.tsx @@ -8,8 +8,8 @@ import type { ApplicationBuilder } from "../../../renderer/components/test-utils import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; import type { AsyncFnMock } from "@async-fn/jest"; import asyncFn from "@async-fn/jest"; -import type { CallForResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable"; -import callForResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable"; +import type { CallForResource } from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable"; +import callForResourceInjectable from "../../../renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable"; import directoryForLensLocalStorageInjectable from "../../../common/directory-for-lens-local-storage/directory-for-lens-local-storage.injectable"; import writeJsonFileInjectable from "../../../common/fs/write-json-file.injectable"; import { TabKind } from "../../../renderer/components/dock/dock/store"; diff --git a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.global-override-for-injectable.ts b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource.global-override-for-injectable.ts similarity index 100% rename from packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.global-override-for-injectable.ts rename to packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource.global-override-for-injectable.ts diff --git a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.injectable.ts b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource.injectable.ts similarity index 77% rename from packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.injectable.ts rename to packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource.injectable.ts index ddee1e6810..602312380c 100644 --- a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource/call-for-patch-resource.injectable.ts +++ b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-patch-resource.injectable.ts @@ -4,11 +4,11 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { AsyncResult } from "@k8slens/utilities"; -import apiManagerInjectable from "../../../../../../common/k8s-api/api-manager/manager.injectable"; -import type { JsonPatch } from "../../../../../../common/k8s-api/kube-object.store"; -import type { KubeObject } from "../../../../../../common/k8s-api/kube-object"; +import apiManagerInjectable from "../../../../../common/k8s-api/api-manager/manager.injectable"; +import type { JsonPatch } from "../../../../../common/k8s-api/kube-object.store"; +import type { KubeObject } from "../../../../../common/k8s-api/kube-object"; import assert from "assert"; -import { getErrorMessage } from "../../../../../../common/utils/get-error-message"; +import { getErrorMessage } from "../../../../../common/utils/get-error-message"; export type CallForPatchResource = ( item: KubeObject, diff --git a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.global-override-for-injectable.ts b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.global-override-for-injectable.ts similarity index 100% rename from packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.global-override-for-injectable.ts rename to packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.global-override-for-injectable.ts diff --git a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable.ts b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable.ts similarity index 76% rename from packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable.ts rename to packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable.ts index 8f66768c9c..256a906aa3 100644 --- a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource/call-for-resource.injectable.ts +++ b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/call-for-resource.injectable.ts @@ -3,11 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { KubeObject } from "../../../../../../common/k8s-api/kube-object"; -import { parseKubeApi } from "../../../../../../common/k8s-api/kube-api-parse"; +import { KubeObject } from "../../../../../common/k8s-api/kube-object"; +import { parseKubeApi } from "../../../../../common/k8s-api/kube-api-parse"; import type { AsyncResult } from "@k8slens/utilities"; -import { getErrorMessage } from "../../../../../../common/utils/get-error-message"; -import apiKubeInjectable from "../../../../../k8s/api-kube.injectable"; +import { getErrorMessage } from "../../../../../common/utils/get-error-message"; +import apiKubeInjectable from "../../../../k8s/api-kube.injectable"; export type CallForResource = (selfLink: string) => AsyncResult; diff --git a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/edit-resource-model.injectable.tsx b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/edit-resource-model.injectable.tsx index db16eb70ca..12f2424268 100644 --- a/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/edit-resource-model.injectable.tsx +++ b/packages/core/src/renderer/components/dock/edit-resource/edit-resource-model/edit-resource-model.injectable.tsx @@ -3,8 +3,8 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; -import type { CallForResource } from "./call-for-resource/call-for-resource.injectable"; -import callForResourceInjectable from "./call-for-resource/call-for-resource.injectable"; +import type { CallForResource } from "./call-for-resource.injectable"; +import callForResourceInjectable from "./call-for-resource.injectable"; import { waitUntilDefined } from "@k8slens/utilities"; import editResourceTabStoreInjectable from "../store.injectable"; import type { EditingResource, EditResourceTabStore } from "../store"; @@ -12,8 +12,8 @@ import { action, computed, observable, runInAction } from "mobx"; import type { KubeObject, RawKubeObject } from "../../../../../common/k8s-api/kube-object"; import yaml from "js-yaml"; import assert from "assert"; -import type { CallForPatchResource } from "./call-for-patch-resource/call-for-patch-resource.injectable"; -import callForPatchResourceInjectable from "./call-for-patch-resource/call-for-patch-resource.injectable"; +import type { CallForPatchResource } from "./call-for-patch-resource.injectable"; +import callForPatchResourceInjectable from "./call-for-patch-resource.injectable"; import { createPatch } from "rfc6902"; import type { ShowNotification } from "../../../notifications"; import showSuccessNotificationInjectable from "../../../notifications/show-success-notification.injectable";