diff --git a/src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts b/src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts index 1902e37b0a..a39526e663 100644 --- a/src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts +++ b/src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts @@ -11,7 +11,7 @@ import asyncFn from "@async-fn/jest"; import execFileInjectable from "../../common/fs/exec-file.injectable"; import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; -import type { HelmRepo } from "../../common/helm-repo"; +import type { HelmRepo } from "../../common/helm/helm-repo"; import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; import isPathInjectable from "../../renderer/components/input/validators/is-path.injectable"; import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable"; diff --git a/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts b/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts index e0bd29f831..1a4b9db775 100644 --- a/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts +++ b/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts @@ -10,7 +10,7 @@ import asyncFn from "@async-fn/jest"; import execFileInjectable from "../../common/fs/exec-file.injectable"; import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; -import type { HelmRepo } from "../../common/helm-repo"; +import type { HelmRepo } from "../../common/helm/helm-repo"; import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable"; import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable"; diff --git a/src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts b/src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts index d8858a62c8..0d3dfe331a 100644 --- a/src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts +++ b/src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts @@ -11,7 +11,7 @@ import asyncFn from "@async-fn/jest"; import execFileInjectable from "../../common/fs/exec-file.injectable"; import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; -import type { HelmRepo } from "../../common/helm-repo"; +import type { HelmRepo } from "../../common/helm/helm-repo"; import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; import type { AsyncResult } from "../../common/utils/async-result"; diff --git a/src/common/helm/add-helm-repository-channel.injectable.ts b/src/common/helm/add-helm-repository-channel.injectable.ts index 73b5e3bc27..0bc10564ad 100644 --- a/src/common/helm/add-helm-repository-channel.injectable.ts +++ b/src/common/helm/add-helm-repository-channel.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 type { HelmRepo } from "../helm-repo"; +import type { HelmRepo } from "./helm-repo"; import type { RequestChannel } from "../utils/channel/request-channel-injection-token"; import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token"; import type { AsyncResult } from "../utils/async-result"; diff --git a/src/common/helm/get-active-helm-repositories-channel.injectable.ts b/src/common/helm/get-active-helm-repositories-channel.injectable.ts index a5997117cf..ac7355ace7 100644 --- a/src/common/helm/get-active-helm-repositories-channel.injectable.ts +++ b/src/common/helm/get-active-helm-repositories-channel.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { RequestChannel } from "../utils/channel/request-channel-injection-token"; -import type { HelmRepo } from "../helm-repo"; +import type { HelmRepo } from "./helm-repo"; import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token"; import type { AsyncResult } from "../utils/async-result"; diff --git a/src/common/helm-repo.ts b/src/common/helm/helm-repo.ts similarity index 100% rename from src/common/helm-repo.ts rename to src/common/helm/helm-repo.ts diff --git a/src/common/helm/remove-helm-repository-channel.injectable.ts b/src/common/helm/remove-helm-repository-channel.injectable.ts index a81ddbd45b..eddecb1ccd 100644 --- a/src/common/helm/remove-helm-repository-channel.injectable.ts +++ b/src/common/helm/remove-helm-repository-channel.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 type { HelmRepo } from "../helm-repo"; +import type { HelmRepo } from "./helm-repo"; import type { RequestChannel } from "../utils/channel/request-channel-injection-token"; import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token"; diff --git a/src/main/helm/__mocks__/helm-chart-manager.ts b/src/main/helm/__mocks__/helm-chart-manager.ts index 7f950ebd65..62c4ce4508 100644 --- a/src/main/helm/__mocks__/helm-chart-manager.ts +++ b/src/main/helm/__mocks__/helm-chart-manager.ts @@ -4,7 +4,7 @@ */ import { sortCharts } from "../../../common/utils"; -import type { HelmRepo } from "../../../common/helm-repo"; +import type { HelmRepo } from "../../../common/helm/helm-repo"; const charts = new Map([ ["stable", { diff --git a/src/main/helm/__tests__/helm-service.test.ts b/src/main/helm/__tests__/helm-service.test.ts index 2e15065272..fab93bf1e5 100644 --- a/src/main/helm/__tests__/helm-service.test.ts +++ b/src/main/helm/__tests__/helm-service.test.ts @@ -7,7 +7,7 @@ import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import listHelmChartsInjectable from "../helm-service/list-helm-charts.injectable"; import getActiveHelmRepositoriesInjectable from "../repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; import type { AsyncResult } from "../../../common/utils/async-result"; -import type { HelmRepo } from "../../../common/helm-repo"; +import type { HelmRepo } from "../../../common/helm/helm-repo"; jest.mock("../helm-chart-manager"); diff --git a/src/main/helm/helm-chart-manager.ts b/src/main/helm/helm-chart-manager.ts index 3806be9557..8ba7a83101 100644 --- a/src/main/helm/helm-chart-manager.ts +++ b/src/main/helm/helm-chart-manager.ts @@ -11,7 +11,7 @@ import { iter, put, sortCharts } from "../../common/utils"; import { execHelm } from "./exec"; import type { SetRequired } from "type-fest"; import { assert } from "console"; -import type { HelmRepo } from "../../common/helm-repo"; +import type { HelmRepo } from "../../common/helm/helm-repo"; interface ChartCacheEntry { data: string; // serialized JSON diff --git a/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts b/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts index 2f5c85a712..aa898eb099 100644 --- a/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts +++ b/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import execHelmInjectable from "../../exec-helm/exec-helm.injectable"; -import type { HelmRepo } from "../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../common/helm/helm-repo"; import loggerInjectable from "../../../../common/logger.injectable"; const addHelmRepositoryInjectable = getInjectable({ diff --git a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts index 3a47022f1e..d1b0c64311 100644 --- a/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable.ts +++ b/src/main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.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 type { HelmRepo } from "../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../common/helm/helm-repo"; import type { ReadYamlFile } from "../../../../common/fs/read-yaml-file.injectable"; import readYamlFileInjectable from "../../../../common/fs/read-yaml-file.injectable"; import getHelmEnvInjectable from "../../get-helm-env/get-helm-env.injectable"; diff --git a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts index 8a88fa3011..21f37490bc 100644 --- a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts +++ b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import execHelmInjectable from "../../exec-helm/exec-helm.injectable"; -import type { HelmRepo } from "../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../common/helm/helm-repo"; import loggerInjectable from "../../../../common/logger.injectable"; const removeHelmRepositoryInjectable = getInjectable({ diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx index f19a4d532f..091dce407f 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx @@ -11,7 +11,7 @@ import { Input } from "../../../../input"; import { systemName, isUrl } from "../../../../input/input_validators"; import { withInjectables } from "@ogre-tools/injectable-react"; import customHelmRepoInjectable from "./custom-helm-repo.injectable"; -import type { HelmRepo } from "../../../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../../../common/helm/helm-repo"; import { observer } from "mobx-react"; import type { IObservableValue } from "mobx"; import { action } from "mobx"; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts index 9a632fa533..0f4b68b4f5 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/submit-custom-helm-repository.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 type { HelmRepo } from "../../../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../../../common/helm/helm-repo"; import addHelmRepositoryInjectable from "../adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable"; import hideDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable"; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx index 0bcd584504..3c555823c9 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx @@ -6,7 +6,7 @@ import type { IAsyncComputed } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react"; import React from "react"; import publicHelmRepositoriesInjectable from "./public-helm-repositories/public-helm-repositories.injectable"; -import type { HelmRepo } from "../../../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../../../common/helm/helm-repo"; import type { SelectOption } from "../../../../select"; import { Select } from "../../../../select"; import { Icon } from "../../../../icon"; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts index fb9af977e1..6858b854fd 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { sortBy } from "lodash/fp"; -import type { HelmRepo } from "../../../../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../../../../common/helm/helm-repo"; import { customRequestPromise } from "../../../../../../../common/request"; const callForPublicHelmRepositoriesInjectable = getInjectable({ diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts index fd237c1375..50e02f4235 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts @@ -4,7 +4,7 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import addHelmRepositoryChannelInjectable from "../../../../../../../common/helm/add-helm-repository-channel.injectable"; -import type { HelmRepo } from "../../../../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../../../../common/helm/helm-repo"; import { requestFromChannelInjectionToken } from "../../../../../../../common/utils/channel/request-from-channel-injection-token"; import activeHelmRepositoriesInjectable from "../../active-helm-repositories.injectable"; import showErrorNotificationInjectable from "../../../../../notifications/show-error-notification.injectable"; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts index d603a32ab6..8128f39a47 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import addHelmRepositoryInjectable from "./add-helm-repository.injectable"; import type { SelectOption } from "../../../../../select"; -import type { HelmRepo } from "../../../../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../../../../common/helm/helm-repo"; import type { SingleValue } from "react-select"; import removeHelmRepositoryInjectable from "../../remove-helm-repository.injectable"; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx index 1e7038136a..4eeee10182 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx @@ -12,7 +12,7 @@ import activeHelmRepositoriesInjectable from "./active-helm-repositories.injecta import type { IAsyncComputed } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react"; import { Spinner } from "../../../spinner"; -import type { HelmRepo } from "../../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../../common/helm/helm-repo"; import { RemovableItem } from "../../removable-item"; import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable"; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts index 7a27ae7492..4f316baed0 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.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 type { HelmRepo } from "../../../../../common/helm-repo"; +import type { HelmRepo } from "../../../../../common/helm/helm-repo"; import { requestFromChannelInjectionToken } from "../../../../../common/utils/channel/request-from-channel-injection-token"; import activeHelmRepositoriesInjectable from "./active-helm-repositories.injectable"; import removeHelmRepositoryChannelInjectable from "../../../../../common/helm/remove-helm-repository-channel.injectable";