Move code related to helm chart preferences under related Feature in preparation for competition

Co-authored-by: Mikko Aspiala <mikko.aspiala@gmail.com>

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>

src/features/helm-charts/add-custom-helm-repository-in-preferences.test.ts

@@ -13,7 +13,7 @@ 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/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 callForPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/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";
 import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";

src/features/helm-charts/add-helm-repository-from-list-in-preferences.test.ts

@@ -12,7 +12,7 @@ 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/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 callForPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/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";
 import type { AsyncResult } from "../../common/utils/async-result";

src/features/helm-charts/child-features/preferences/renderer/active-helm-repositories.injectable.ts

@@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable";
 import { asyncComputed } from "@ogre-tools/injectable-react";
 import { getActiveHelmRepositoriesChannel } from "../../../../../common/helm/get-active-helm-repositories-channel";
 import { requestFromChannelInjectionToken } from "../../../../../common/utils/channel/request-from-channel-injection-token";
-import showErrorNotificationInjectable from "../../../notifications/show-error-notification.injectable";
+import showErrorNotificationInjectable from "../../../../../renderer/components/notifications/show-error-notification.injectable";
 import helmRepositoriesErrorStateInjectable from "./helm-repositories-error-state.injectable";
 import { runInAction } from "mobx";
 

src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx

@@ -6,9 +6,9 @@
 import "./add-helm-repo-dialog.scss";
 
 import React from "react";
-import { Wizard, WizardStep } from "../../../../wizard";
-import { Input } from "../../../../input";
-import { systemName, isUrl } from "../../../../input/input_validators";
+import { Wizard, WizardStep } from "../../../../../../renderer/components/wizard";
+import { Input } from "../../../../../../renderer/components/input";
+import { isUrl, systemName } from "../../../../../../renderer/components/input/input_validators";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import customHelmRepoInjectable from "./custom-helm-repo.injectable";
 import type { HelmRepo } from "../../../../../../common/helm/helm-repo";
@@ -17,11 +17,11 @@ import type { IObservableValue } from "mobx";
 import { action } from "mobx";
 import submitCustomHelmRepositoryInjectable from "./submit-custom-helm-repository.injectable";
 import hideDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable";
-import { Button } from "../../../../button";
-import { Icon } from "../../../../icon";
+import { Button } from "../../../../../../renderer/components/button";
+import { Icon } from "../../../../../../renderer/components/icon";
 import maximalCustomHelmRepoOptionsAreShownInjectable from "./maximal-custom-helm-repo-options-are-shown.injectable";
-import { SubTitle } from "../../../../layout/sub-title";
-import { Checkbox } from "../../../../checkbox";
+import { SubTitle } from "../../../../../../renderer/components/layout/sub-title";
+import { Checkbox } from "../../../../../../renderer/components/checkbox";
 import { HelmFileInput } from "./helm-file-input/helm-file-input";
 
 interface Dependencies {

src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx

@@ -6,7 +6,7 @@
 import "./add-helm-repo-dialog.scss";
 
 import React from "react";
-import { Dialog } from "../../../../dialog";
+import { Dialog } from "../../../../../../renderer/components/dialog";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import { AddingOfCustomHelmRepositoryDialogContent } from "./adding-of-custom-helm-repository-dialog-content";
 import addingOfCustomHelmRepositoryDialogIsVisibleInjectable from "./dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable";

src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx

@@ -4,7 +4,7 @@
  */
 import { withInjectables } from "@ogre-tools/injectable-react";
 import React from "react";
-import { Button } from "../../../../button";
+import { Button } from "../../../../../../renderer/components/button";
 import showDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable";
 
 interface Dependencies {

src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import type { FileFilter } from "electron";
-import { requestOpenFilePickingDialog } from "../../../../../../ipc";
+import { requestOpenFilePickingDialog } from "../../../../../../../renderer/ipc";
 
 const getFilePathsInjectable = getInjectable({
   id: "get-file-paths",

src/features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx

@@ -2,14 +2,14 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import type { InputValidator } from "../../../../../input";
-import { Input } from "../../../../../input";
-import { Icon } from "../../../../../icon";
+import type { InputValidator } from "../../../../../../../renderer/components/input";
+import { Input } from "../../../../../../../renderer/components/input";
+import { Icon } from "../../../../../../../renderer/components/icon";
 import { withInjectables } from "@ogre-tools/injectable-react";
 import React from "react";
 import getFilePathsInjectable from "./get-file-paths.injectable";
 import type { FileFilter } from "electron";
-import isPathInjectable from "../../../../../input/validators/is-path.injectable";
+import isPathInjectable from "../../../../../../../renderer/components/input/validators/is-path.injectable";
 
 interface HelmFileInputProps {
   placeholder: string;

src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx

@@ -7,9 +7,9 @@ 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/helm-repo";
-import type { SelectOption } from "../../../../select";
-import { Select } from "../../../../select";
-import { Icon } from "../../../../icon";
+import type { SelectOption } from "../../../../../../renderer/components/select";
+import { Select } from "../../../../../../renderer/components/select";
+import { Icon } from "../../../../../../renderer/components/icon";
 import { observer } from "mobx-react";
 import type { SingleValue } from "react-select";
 import selectHelmRepositoryInjectable from "./select-helm-repository/select-helm-repository.injectable";

src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts

@@ -6,8 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable";
 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";
-import showSuccessNotificationInjectable from "../../../../../notifications/show-success-notification.injectable";
+import showErrorNotificationInjectable from "../../../../../../../renderer/components/notifications/show-error-notification.injectable";
+import showSuccessNotificationInjectable from "../../../../../../../renderer/components/notifications/show-success-notification.injectable";
 import { addHelmRepositoryChannel } from "../../../../../../../common/helm/add-helm-repository-channel";
 
 const addHelmRepositoryInjectable = getInjectable({

src/features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts

@@ -4,7 +4,7 @@
  */
 import { getInjectable } from "@ogre-tools/injectable";
 import addHelmRepositoryInjectable from "./add-helm-repository.injectable";
-import type { SelectOption } from "../../../../../select";
+import type { SelectOption } from "../../../../../../../renderer/components/select";
 import type { HelmRepo } from "../../../../../../../common/helm/helm-repo";
 import type { SingleValue } from "react-select";
 import removeHelmRepositoryInjectable from "../../remove-helm-repository.injectable";

src/features/helm-charts/child-features/preferences/renderer/helm-charts.tsx

@@ -14,7 +14,7 @@ import type { HelmRepositoriesErrorState } from "./helm-repositories-error-state
 import helmRepositoriesErrorStateInjectable from "./helm-repositories-error-state.injectable";
 import type { IObservableValue } from "mobx";
 import { observer } from "mobx-react";
-import { Notice } from "../../../+extensions/notice";
+import { Notice } from "../../../../../renderer/components/+extensions/notice";
 
 interface Dependencies {
   helmRepositoriesErrorState: IObservableValue<HelmRepositoriesErrorState>;
@@ -25,27 +25,31 @@ const NonInjectedHelmCharts = observer(
     const state = helmRepositoriesErrorState.get();
 
     return (
-      <div>
-        {!state.controlsAreShown && (
-          <Notice>
-            <div className="flex-grow text-center">{state.errorMessage}</div>
-          </Notice>
-        )}
+      <section id="helm">
+        <h2>Helm Charts</h2>
 
-        {state.controlsAreShown && (
-          <div data-testid="helm-controls">
-            <div className="flex gaps">
-              <AddingOfPublicHelmRepository />
+        <div>
+          {!state.controlsAreShown && (
+            <Notice>
+              <div className="flex-grow text-center">{state.errorMessage}</div>
+            </Notice>
+          )}
 
-              <AddingOfCustomHelmRepositoryOpenButton />
+          {state.controlsAreShown && (
+            <div data-testid="helm-controls">
+              <div className="flex gaps">
+                <AddingOfPublicHelmRepository />
+
+                <AddingOfCustomHelmRepositoryOpenButton />
+              </div>
+
+              <HelmRepositories />
+
+              <AddingOfCustomHelmRepositoryDialog />
             </div>
-
-            <HelmRepositories />
-
-            <AddingOfCustomHelmRepositoryDialog />
-          </div>
-        )}
-      </div>
+          )}
+        </div>
+      </section>
     );
   },
 );

src/features/helm-charts/child-features/preferences/renderer/helm-repositories.tsx

@@ -11,9 +11,9 @@ import { observer } from "mobx-react";
 import activeHelmRepositoriesInjectable from "./active-helm-repositories.injectable";
 import type { IAsyncComputed } from "@ogre-tools/injectable-react";
 import { withInjectables } from "@ogre-tools/injectable-react";
-import { Spinner } from "../../../spinner";
+import { Spinner } from "../../../../../renderer/components/spinner";
 import type { HelmRepo } from "../../../../../common/helm/helm-repo";
-import { RemovableItem } from "../../removable-item";
+import { RemovableItem } from "../../../../../renderer/components/+preferences/removable-item";
 import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable";
 
 interface Dependencies {

src/features/helm-charts/listing-active-helm-repositories-in-preferences.test.ts

@@ -14,7 +14,7 @@ import execFileInjectable, { type ExecFile } from "../../common/fs/exec-file.inj
 import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
 import loggerInjectable from "../../common/logger.injectable";
 import type { Logger } from "../../common/logger";
-import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import callForPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
 import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
 
 describe("listing active helm repositories in preferences", () => {

src/features/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts

@@ -13,7 +13,7 @@ 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/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 callForPublicHelmRepositoriesInjectable from "./child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
 import type { AsyncResult } from "../../common/utils/async-result";
 
 describe("remove helm repository from list of active repositories in preferences", () => {

src/features/preferences/navigation-to-kubernetes-preferences.test.ts

@@ -5,7 +5,7 @@
 import type { RenderResult } from "@testing-library/react";
 import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
 import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder";
-import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import callForPublicHelmRepositoriesInjectable from "../helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
 import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
 
 describe("preferences - navigation to kubernetes preferences", () => {

src/renderer/components/+preferences/kubernetes.tsx

@@ -4,7 +4,7 @@
  */
 import { observer } from "mobx-react";
 import React from "react";
-import { HelmCharts } from "./kubernetes/helm-charts/helm-charts";
+import { HelmCharts } from "../../../features/helm-charts/child-features/preferences/renderer/helm-charts";
 import { KubeconfigSyncs } from "./kubeconfig-syncs";
 import { KubectlBinaries } from "./kubectl-binaries";
 import { Preferences } from "./preferences";
@@ -22,10 +22,7 @@ export const Kubernetes = observer(() => (
         <KubeconfigSyncs />
       </section>
       <hr />
-      <section id="helm">
-        <h2>Helm Charts</h2>
-        <HelmCharts />
-      </section>
+      <HelmCharts />
     </section>
   </Preferences>
 ));

src/renderer/getDiForUnitTesting.tsx

@@ -30,8 +30,8 @@ import { observable, computed, runInAction } from "mobx";
 import defaultShellInjectable from "./components/+preferences/default-shell.injectable";
 import requestAnimationFrameInjectable from "./components/animate/request-animation-frame.injectable";
 import getRandomIdInjectable from "../common/utils/get-random-id.injectable";
-import getFilePathsInjectable from "./components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable";
-import callForPublicHelmRepositoriesInjectable from "./components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
+import getFilePathsInjectable from "../features/helm-charts/child-features/preferences/renderer/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable";
+import callForPublicHelmRepositoriesInjectable from "../features/helm-charts/child-features/preferences/renderer/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
 import platformInjectable from "../common/vars/platform.injectable";
 import startTopbarStateSyncInjectable from "./components/layout/top-bar/start-state-sync.injectable";
 import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx";

src/renderer/initializers/add-sync-entries.injectable.tsx

@@ -2,7 +2,7 @@
  * Copyright (c) OpenLens Authors. All rights reserved.
  * Licensed under MIT License. See LICENSE in root directory for more information.
  */
-import { getAllEntries } from "../components/+preferences/kubeconfig-syncs";
+import { getAllEntries } from "../../features/preferences/renderer/preference-items/kubernetes/kubeconfig-sync/kubeconfig-sync";
 import { Notifications } from "../components/notifications";
 import { getInjectable } from "@ogre-tools/injectable";
 import userStoreInjectable from "../../common/user-store/user-store.injectable";