diff --git a/src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap similarity index 98% rename from src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap rename to src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap index e1ebe1b277..35db1088d9 100644 --- a/src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap +++ b/src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories renders 1`] = `
`; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve renders 1`] = `
@@ -943,7 +943,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe `; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository renders 1`] = `
@@ -1439,7 +1439,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe >
`; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when closing the dialog by clicking cancel renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when closing the dialog by clicking cancel renders 1`] = `
@@ -2008,7 +2008,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe `; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository renders 1`] = `
@@ -2504,7 +2504,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe >
`; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options renders 1`] = `
@@ -3087,7 +3087,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe >
`; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options when hiding maximal options renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options when hiding maximal options renders 1`] = `
@@ -3846,7 +3846,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe >
`; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options when inputted maximal options renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when showing the maximal options when inputted maximal options renders 1`] = `
@@ -4429,7 +4429,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe >
`; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes renders 1`] = `
@@ -5188,7 +5188,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe >
`; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation rejects renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation rejects renders 1`] = `
@@ -5757,7 +5757,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe `; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation resolves with success renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation resolves with success renders 1`] = `
`; -exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation resolves with success when adding custom repository again renders 1`] = ` +exports[`add custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve when selecting to add custom repository when inputted minimal options for the repository when submitted and some time passes when activation resolves with success when adding custom repository again renders 1`] = `
`; -exports[`activate helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve renders 1`] = ` +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve renders 1`] = `
@@ -943,7 +943,7 @@ exports[`activate helm repository from list in preferences when navigating to pr `; -exports[`activate helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for selecting active repositories is clicked renders 1`] = ` +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked renders 1`] = `
@@ -1460,7 +1460,7 @@ exports[`activate helm repository from list in preferences when navigating to pr class="flex gaps" > - Some to be activated repository + Some to be added repository
@@ -1470,7 +1470,7 @@ exports[`activate helm repository from list in preferences when navigating to pr `; -exports[`activate helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for selecting active repositories is clicked when deactive public repository is selected renders 1`] = ` +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected renders 1`] = `
@@ -1944,7 +1944,481 @@ exports[`activate helm repository from list in preferences when navigating to pr `; -exports[`activate helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for selecting active repositories is clicked when deactive public repository is selected when activating resolves renders 1`] = ` +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding rejects renders 1`] = ` + +
+
+ +
+
+
+
+

+ Kubernetes +

+
+
+ Kubectl binary download + +
+ +
+
+
+ Download mirror + +
+
+ + +
+
+
+ Download mirror for kubectl +
+
+ +
+
+
+ + +
+
+
+
+
+
+ Directory for binaries + +
+
+ +
+
+
+ The directory to download binaries into. +
+
+
+
+ Path to kubectl binary + +
+
+ +
+
+
+
+
+
+

+ Kubeconfig Syncs +

+
+ +
+
+ Synced Items + +
+
+
+ No files and folders have been synced yet +
+
+
+
+
+

+ Helm Charts +

+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+ +
+
+
+
+ Some already active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves renders 1`] = `
`; -exports[`activate helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for selecting active repositories is clicked when deactive public repository is selected when activating resolves when active repositories resolve again renders 1`] = ` +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again renders 1`] = `
@@ -2842,9 +3316,9 @@ exports[`activate helm repository from list in preferences when navigating to pr >
- Some to be activated repository + Some to be added repository
@@ -2915,7 +3389,7 @@ exports[`activate helm repository from list in preferences when navigating to pr `; -exports[`activate helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for selecting active repositories is clicked when deactive public repository is selected when activating resolves when active repositories resolve again when select for selecting active repositories is clicked renders 1`] = ` +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked renders 1`] = `
@@ -3346,9 +3820,9 @@ exports[`activate helm repository from list in preferences when navigating to pr >
- Some to be activated repository + Some to be added repository
@@ -3460,7 +3934,7 @@ exports[`activate helm repository from list in preferences when navigating to pr class="flex gaps" > - Some to be activated repository + Some to be added repository `; -exports[`activate helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for selecting active repositories is clicked when deactive public repository is selected when activating resolves when active repositories resolve again when select for selecting active repositories is clicked when active repository is selected renders 1`] = ` +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked when active repository is selected renders 1`] = `
@@ -3909,9 +4383,9 @@ exports[`activate helm repository from list in preferences when navigating to pr >
- Some to be activated repository + Some to be added repository
@@ -3982,7 +4456,7 @@ exports[`activate helm repository from list in preferences when navigating to pr `; -exports[`activate helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for selecting active repositories is clicked when deactive public repository is selected when activating resolves when active repositories resolve again when select for selecting active repositories is clicked when active repository is selected when deactivating resolves renders 1`] = ` +exports[`add helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for adding public repositories is clicked when deactive public repository is selected when adding resolves when active repositories resolve again when select for selecting active repositories is clicked when active repository is selected when removing resolves renders 1`] = `
`; - -exports[`activate helm repository from list in preferences when navigating to preferences containing helm repositories when both active and public repositories resolve when select for selecting active repositories is clicked when deactive public repository is selected when activation rejects renders 1`] = ` - -
-
- -
-
-
-
-

- Kubernetes -

-
-
- Kubectl binary download - -
- -
-
-
- Download mirror - -
-
- - -
-
-
- Download mirror for kubectl -
-
- -
-
-
- - -
-
-
-
-
-
- Directory for binaries - -
-
- -
-
-
- The directory to download binaries into. -
-
-
-
- Path to kubectl binary - -
-
- -
-
-
-
-
-
-

- Kubeconfig Syncs -

-
- -
-
- Synced Items - -
-
-
- No files and folders have been synced yet -
-
-
-
-
-

- Helm Charts -

-
-
-
-
- - -
-
-
- Repositories -
-
- -
-
-
- - -
-
-
- -
-
-
-
- Some already active repository -
-
- some-url -
- - - delete - - -
-
-
-
-
-
-
-
-
-
-
-
- - - close - - -
- -
-
-
-
-
-
-
- -`; diff --git a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap index e72d9547a1..9e7b5c2385 100644 --- a/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap +++ b/src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap @@ -3010,7 +3010,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
@@ -3038,7 +3038,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
diff --git a/src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap similarity index 98% rename from src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap rename to src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap index 7b901103c6..d32ca6ffb7 100644 --- a/src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap +++ b/src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap @@ -1,6 +1,6 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`deactivate helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories renders 1`] = ` +exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories renders 1`] = `
`; -exports[`deactivate helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve renders 1`] = ` +exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve renders 1`] = `
@@ -943,7 +943,7 @@ exports[`deactivate helm repository from list of active repositories in preferen `; -exports[`deactivate helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when deactivating repository renders 1`] = ` +exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when removing repository renders 1`] = `
@@ -1417,7 +1417,7 @@ exports[`deactivate helm repository from list of active repositories in preferen `; -exports[`deactivate helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when deactivating repository when deactivating resolves renders 1`] = ` +exports[`remove helm repository from list of active repositories in preferences when navigating to preferences containing helm repositories when active repositories resolve when removing repository when removing resolves renders 1`] = `
({ withTooltip: (target: any) => target, })); -describe("activate custom helm repository in preferences", () => { +describe("add custom helm repository in preferences", () => { let applicationBuilder: ApplicationBuilder; let showSuccessNotificationMock: jest.Mock; let showErrorNotificationMock: jest.Mock; @@ -106,7 +106,7 @@ describe("activate custom helm repository in preferences", () => { it("shows dialog", () => { expect( - rendered.queryByTestId("activate-custom-helm-repository-dialog"), + rendered.queryByTestId("add-custom-helm-repository-dialog"), ).toBeInTheDocument(); }); @@ -120,7 +120,7 @@ describe("activate custom helm repository in preferences", () => { it("does not show dialog anymore", () => { expect( - rendered.queryByTestId("activate-custom-helm-repository-dialog"), + rendered.queryByTestId("add-custom-helm-repository-dialog"), ).not.toBeInTheDocument(); }); }); @@ -138,7 +138,7 @@ describe("activate custom helm repository in preferences", () => { it("does not show dialog anymore", () => { expect( - rendered.queryByTestId("activate-custom-helm-repository-dialog"), + rendered.queryByTestId("add-custom-helm-repository-dialog"), ).not.toBeInTheDocument(); }); }); @@ -174,7 +174,7 @@ describe("activate custom helm repository in preferences", () => { expect(rendered.baseElement).toMatchSnapshot(); }); - it("activates the repository", () => { + it("adds the repository", () => { expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "add", "some-custom-repository", "http://some.url"], @@ -211,7 +211,7 @@ describe("activate custom helm repository in preferences", () => { }); it("does not show dialog anymore", () => { - expect(rendered.queryByTestId("activate-custom-helm-repository-dialog")).not.toBeInTheDocument(); + expect(rendered.queryByTestId("add-custom-helm-repository-dialog")).not.toBeInTheDocument(); }); it("does not reload active repositories", () => { @@ -236,7 +236,7 @@ describe("activate custom helm repository in preferences", () => { }); it("does not show dialog anymore", () => { - expect(rendered.queryByTestId("activate-custom-helm-repository-dialog")).not.toBeInTheDocument(); + expect(rendered.queryByTestId("add-custom-helm-repository-dialog")).not.toBeInTheDocument(); }); it("reloads active repositories", () => { @@ -349,7 +349,7 @@ describe("activate custom helm repository in preferences", () => { expect(rendered.baseElement).toMatchSnapshot(); }); - it("when submitted and some time passes, activates the repository with maximal options", () => { + it("when submitted and some time passes, adds the repository with maximal options", () => { const submitButton = rendered.getByTestId("custom-helm-repository-submit-button"); fireEvent.click(submitButton); diff --git a/src/behaviours/helm-charts/activate-helm-repository-from-list-in-preferences.test.ts b/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts similarity index 86% rename from src/behaviours/helm-charts/activate-helm-repository-from-list-in-preferences.test.ts rename to src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts index 48721690d1..e0bd29f831 100644 --- a/src/behaviours/helm-charts/activate-helm-repository-from-list-in-preferences.test.ts +++ b/src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts @@ -11,11 +11,9 @@ 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 callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/activation-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 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"; import type { AsyncResult } from "../../common/utils/async-result"; // TODO: Make tooltips free of side effects by making it deterministic @@ -23,8 +21,7 @@ jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ withTooltip: (target: any) => target, })); - -describe("activate helm repository from list in preferences", () => { +describe("add helm repository from list in preferences", () => { let applicationBuilder: ApplicationBuilder; let showSuccessNotificationMock: jest.Mock; let showErrorNotificationMock: jest.Mock; @@ -90,7 +87,7 @@ describe("activate helm repository from list in preferences", () => { await Promise.all([ callForPublicHelmRepositoriesMock.resolve([ { name: "Some already active repository", url: "some-url" }, - { name: "Some to be activated repository", url: "some-other-url" }, + { name: "Some to be added repository", url: "some-other-url" }, ]), getActiveHelmRepositoriesMock.resolve({ @@ -106,7 +103,7 @@ describe("activate helm repository from list in preferences", () => { expect(rendered.baseElement).toMatchSnapshot(); }); - describe("when select for selecting active repositories is clicked", () => { + describe("when select for adding public repositories is clicked", () => { beforeEach(() => { applicationBuilder.select.openMenu( "selection-of-active-public-helm-repository", @@ -123,7 +120,7 @@ describe("activate helm repository from list in preferences", () => { applicationBuilder.select.selectOption( "selection-of-active-public-helm-repository", - "Some to be activated repository", + "Some to be added repository", ); }); @@ -131,10 +128,10 @@ describe("activate helm repository from list in preferences", () => { expect(rendered.baseElement).toMatchSnapshot(); }); - it("activates the repository", () => { + it("adds the repository", () => { expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", - ["repo", "add", "Some to be activated repository", "some-other-url"], + ["repo", "add", "Some to be added repository", "some-other-url"], ); }); @@ -142,7 +139,7 @@ describe("activate helm repository from list in preferences", () => { expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); }); - describe("when activation rejects", () => { + describe("when adding rejects", () => { beforeEach(async () => { await execFileMock.reject( "Some error", @@ -164,7 +161,7 @@ describe("activate helm repository from list in preferences", () => { }); it("does not show dialog anymore", () => { - expect(rendered.queryByTestId("activate-custom-helm-repository-dialog")).not.toBeInTheDocument(); + expect(rendered.queryByTestId("add-custom-helm-repository-dialog")).not.toBeInTheDocument(); }); it("does not reload active repositories", () => { @@ -172,12 +169,12 @@ describe("activate helm repository from list in preferences", () => { }); }); - describe("when activating resolves", () => { + describe("when adding resolves", () => { beforeEach(async () => { await execFileMock.resolveSpecific( [ "some-helm-binary-path", - ["repo", "add", "Some to be activated repository", "some-other-url"], + ["repo", "add", "Some to be added repository", "some-other-url"], ], "", @@ -194,7 +191,7 @@ describe("activate helm repository from list in preferences", () => { it("shows success notification", () => { expect(showSuccessNotificationMock).toHaveBeenCalledWith( - "Helm repository Some to be activated repository has been added.", + "Helm repository Some to be added repository has been added.", ); }); @@ -204,7 +201,7 @@ describe("activate helm repository from list in preferences", () => { callWasSuccessful: true, response: [ { name: "Some already active repository", url: "some-url" }, - { name: "Some to be activated repository", url: "some-other-url" }, + { name: "Some to be added repository", url: "some-other-url" }, ], }); }); @@ -239,7 +236,7 @@ describe("activate helm repository from list in preferences", () => { expect(rendered.baseElement).toMatchSnapshot(); }); - it("deactivates the repository", () => { + it("removes the repository", () => { expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "remove", "Some already active repository"], @@ -250,7 +247,7 @@ describe("activate helm repository from list in preferences", () => { expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); }); - describe("when deactivating resolves", () => { + describe("when removing resolves", () => { beforeEach(async () => { await execFileMock.resolveSpecific( [ diff --git a/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts b/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts index 5d840618c9..a801487d10 100644 --- a/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts +++ b/src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts @@ -14,9 +14,8 @@ import execFileInjectable from "../../common/fs/exec-file.injectable"; 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/activation-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; -import showErrorNotificationInjectable - from "../../renderer/components/notifications/show-error-notification.injectable"; +import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; +import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable"; // TODO: Make tooltips free of side effects by making it deterministic jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ diff --git a/src/behaviours/helm-charts/deactivate-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 similarity index 87% rename from src/behaviours/helm-charts/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts rename to src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts index 98178d2fd6..d8858a62c8 100644 --- a/src/behaviours/helm-charts/deactivate-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 @@ -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-repo"; -import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; +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"; // TODO: Make tooltips free of side effects by making it deterministic @@ -20,7 +20,7 @@ jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ withTooltip: (target: any) => target, })); -describe("deactivate helm repository from list of active repositories in preferences", () => { +describe("remove helm repository from list of active repositories in preferences", () => { let applicationBuilder: ApplicationBuilder; let rendered: RenderResult; let getActiveHelmRepositoriesMock: AsyncFnMock<() => AsyncResult>; @@ -73,23 +73,23 @@ describe("deactivate helm repository from list of active repositories in prefere expect(rendered.baseElement).toMatchSnapshot(); }); - describe("when deactivating repository", () => { + describe("when removing repository", () => { beforeEach(() => { execFileMock.mockClear(); getActiveHelmRepositoriesMock.mockClear(); - const deactiveButton = rendered.getByTestId( - "deactivate-helm-repository-some-active-repository", + const removeButton = rendered.getByTestId( + "remove-helm-repository-some-active-repository", ); - fireEvent.click(deactiveButton); + fireEvent.click(removeButton); }); it("renders", () => { expect(rendered.baseElement).toMatchSnapshot(); }); - it("deactivates the repository", () => { + it("removes the repository", () => { expect(execFileMock).toHaveBeenCalledWith( "some-helm-binary-path", ["repo", "remove", "some-active-repository"], @@ -100,7 +100,7 @@ describe("deactivate helm repository from list of active repositories in prefere expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); }); - describe("when deactivating resolves", () => { + describe("when removing resolves", () => { beforeEach(async () => { await execFileMock.resolveSpecific( [ diff --git a/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts b/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts index 736cddf7de..75b4585c21 100644 --- a/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts +++ b/src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts @@ -5,10 +5,8 @@ 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/activation-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"; +import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/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", () => { let applicationBuilder: ApplicationBuilder; diff --git a/src/common/helm/activate-helm-repository-channel.injectable.ts b/src/common/helm/add-helm-repository-channel.injectable.ts similarity index 61% rename from src/common/helm/activate-helm-repository-channel.injectable.ts rename to src/common/helm/add-helm-repository-channel.injectable.ts index f1b2d4878a..73b5e3bc27 100644 --- a/src/common/helm/activate-helm-repository-channel.injectable.ts +++ b/src/common/helm/add-helm-repository-channel.injectable.ts @@ -8,16 +8,16 @@ import type { RequestChannel } from "../utils/channel/request-channel-injection- import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token"; import type { AsyncResult } from "../utils/async-result"; -export type ActivateHelmRepositoryChannel = RequestChannel>; +export type AddHelmRepositoryChannel = RequestChannel>; -const activateHelmRepositoryChannelInjectable = getInjectable({ - id: "activate-helm-repository-channel", +const addHelmRepositoryChannelInjectable = getInjectable({ + id: "add-helm-repository-channel", - instantiate: (): ActivateHelmRepositoryChannel => ({ - id: "activate-helm-repository-channel", + instantiate: (): AddHelmRepositoryChannel => ({ + id: "add-helm-repository-channel", }), injectionToken: requestChannelInjectionToken, }); -export default activateHelmRepositoryChannelInjectable; +export default addHelmRepositoryChannelInjectable; diff --git a/src/common/helm/deactivate-helm-repository-channel.injectable.ts b/src/common/helm/remove-helm-repository-channel.injectable.ts similarity index 59% rename from src/common/helm/deactivate-helm-repository-channel.injectable.ts rename to src/common/helm/remove-helm-repository-channel.injectable.ts index a841525987..a81ddbd45b 100644 --- a/src/common/helm/deactivate-helm-repository-channel.injectable.ts +++ b/src/common/helm/remove-helm-repository-channel.injectable.ts @@ -7,16 +7,16 @@ 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"; -export type DeactivateHelmRepositoryChannel = RequestChannel; +export type RemoveHelmRepositoryChannel = RequestChannel; -const deactivateHelmRepositoryChannelInjectable = getInjectable({ - id: "deactivate-helm-repository-channel", +const removeHelmRepositoryChannelInjectable = getInjectable({ + id: "remove-helm-repository-channel", - instantiate: (): DeactivateHelmRepositoryChannel => ({ - id: "deactivate-helm-repository-channel", + instantiate: (): RemoveHelmRepositoryChannel => ({ + id: "remove-helm-repository-channel", }), injectionToken: requestChannelInjectionToken, }); -export default deactivateHelmRepositoryChannelInjectable; +export default removeHelmRepositoryChannelInjectable; diff --git a/src/main/helm/repositories/activate-helm-repository/activate-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/activate-helm-repository/activate-helm-repository-channel-listener.injectable.ts deleted file mode 100644 index ae7f12efe9..0000000000 --- a/src/main/helm/repositories/activate-helm-repository/activate-helm-repository-channel-listener.injectable.ts +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import activateHelmRepositoryChannelInjectable from "../../../../common/helm/activate-helm-repository-channel.injectable"; -import activateHelmRepositoryInjectable from "./activate-helm-repository.injectable"; -import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token"; - -const activateHelmRepositoryChannelListenerInjectable = getInjectable({ - id: "activate-helm-repository-channel-listener", - - instantiate: (di) => { - const activateHelmRepository = di.inject(activateHelmRepositoryInjectable); - const channel = di.inject(activateHelmRepositoryChannelInjectable); - - return { - channel, - handler: activateHelmRepository, - }; - }, - - injectionToken: requestChannelListenerInjectionToken, -}); - -export default activateHelmRepositoryChannelListenerInjectable; diff --git a/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts new file mode 100644 index 0000000000..f4effd1a62 --- /dev/null +++ b/src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts @@ -0,0 +1,26 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import addHelmRepositoryChannelInjectable from "../../../../common/helm/add-helm-repository-channel.injectable"; +import addHelmRepositoryInjectable from "./add-helm-repository.injectable"; +import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token"; + +const addHelmRepositoryChannelListenerInjectable = getInjectable({ + id: "add-helm-repository-channel-listener", + + instantiate: (di) => { + const addHelmRepository = di.inject(addHelmRepositoryInjectable); + const channel = di.inject(addHelmRepositoryChannelInjectable); + + return { + channel, + handler: addHelmRepository, + }; + }, + + injectionToken: requestChannelListenerInjectionToken, +}); + +export default addHelmRepositoryChannelListenerInjectable; diff --git a/src/main/helm/repositories/activate-helm-repository/activate-helm-repository.injectable.ts b/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts similarity index 90% rename from src/main/helm/repositories/activate-helm-repository/activate-helm-repository.injectable.ts rename to src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts index ad57afd1cb..2f5c85a712 100644 --- a/src/main/helm/repositories/activate-helm-repository/activate-helm-repository.injectable.ts +++ b/src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts @@ -7,8 +7,8 @@ import execHelmInjectable from "../../exec-helm/exec-helm.injectable"; import type { HelmRepo } from "../../../../common/helm-repo"; import loggerInjectable from "../../../../common/logger.injectable"; -const activateHelmRepositoryInjectable = getInjectable({ - id: "activate-helm-repository", +const addHelmRepositoryInjectable = getInjectable({ + id: "add-helm-repository", instantiate: (di) => { const execHelm = di.inject(execHelmInjectable); @@ -59,4 +59,4 @@ const activateHelmRepositoryInjectable = getInjectable({ }, }); -export default activateHelmRepositoryInjectable; +export default addHelmRepositoryInjectable; diff --git a/src/main/helm/repositories/deactivate-helm-repository/deactivate-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/deactivate-helm-repository/deactivate-helm-repository-channel-listener.injectable.ts deleted file mode 100644 index 9eb852aee6..0000000000 --- a/src/main/helm/repositories/deactivate-helm-repository/deactivate-helm-repository-channel-listener.injectable.ts +++ /dev/null @@ -1,26 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token"; -import deactivateHelmRepositoryInjectable from "./deactivate-helm-repository.injectable"; -import deactivateHelmRepositoryChannelInjectable from "../../../../common/helm/deactivate-helm-repository-channel.injectable"; - -const deactivateHelmRepositoryChannelListenerInjectable = getInjectable({ - id: "deactivate-helm-repository-channel-listener", - - instantiate: (di) => { - const deactivateHelmRepository = di.inject(deactivateHelmRepositoryInjectable); - const channel = di.inject(deactivateHelmRepositoryChannelInjectable); - - return { - channel, - handler: deactivateHelmRepository, - }; - }, - - injectionToken: requestChannelListenerInjectionToken, -}); - -export default deactivateHelmRepositoryChannelListenerInjectable; diff --git a/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts new file mode 100644 index 0000000000..b9b2f11777 --- /dev/null +++ b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts @@ -0,0 +1,26 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { requestChannelListenerInjectionToken } from "../../../../common/utils/channel/request-channel-listener-injection-token"; +import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable"; +import removeHelmRepositoryChannelInjectable from "../../../../common/helm/remove-helm-repository-channel.injectable"; + +const removeHelmRepositoryChannelListenerInjectable = getInjectable({ + id: "remove-helm-repository-channel-listener", + + instantiate: (di) => { + const removeHelmRepository = di.inject(removeHelmRepositoryInjectable); + const channel = di.inject(removeHelmRepositoryChannelInjectable); + + return { + channel, + handler: removeHelmRepository, + }; + }, + + injectionToken: requestChannelListenerInjectionToken, +}); + +export default removeHelmRepositoryChannelListenerInjectable; diff --git a/src/main/helm/repositories/deactivate-helm-repository/deactivate-helm-repository.injectable.ts b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts similarity index 83% rename from src/main/helm/repositories/deactivate-helm-repository/deactivate-helm-repository.injectable.ts rename to src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts index d31ca9e883..8a88fa3011 100644 --- a/src/main/helm/repositories/deactivate-helm-repository/deactivate-helm-repository.injectable.ts +++ b/src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts @@ -7,8 +7,8 @@ import execHelmInjectable from "../../exec-helm/exec-helm.injectable"; import type { HelmRepo } from "../../../../common/helm-repo"; import loggerInjectable from "../../../../common/logger.injectable"; -const deactivateHelmRepositoryInjectable = getInjectable({ - id: "deactive-helm-repository", +const removeHelmRepositoryInjectable = getInjectable({ + id: "remove-helm-repository", instantiate: (di) => { const execHelm = di.inject(execHelmInjectable); @@ -26,4 +26,4 @@ const deactivateHelmRepositoryInjectable = getInjectable({ }, }); -export default deactivateHelmRepositoryInjectable; +export default removeHelmRepositoryInjectable; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/hide-dialog-for-activating-custom-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/hide-dialog-for-activating-custom-helm-repository.injectable.ts deleted file mode 100644 index efe53a46f9..0000000000 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/hide-dialog-for-activating-custom-helm-repository.injectable.ts +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import { action } from "mobx"; -import activationOfCustomHelmRepositoryDialogIsVisibleInjectable from "./activation-of-custom-helm-repository-dialog-is-visible.injectable"; - -const hideDialogForActivatingCustomHelmRepositoryInjectable = getInjectable({ - id: "hide-dialog-for-activating-custom-helm-repository", - - instantiate: (di) => { - const state = di.inject(activationOfCustomHelmRepositoryDialogIsVisibleInjectable); - - return action(() => { - state.set(false); - }); - }, -}); - -export default hideDialogForActivatingCustomHelmRepositoryInjectable; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/show-dialog-for-activating-custom-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/show-dialog-for-activating-custom-helm-repository.injectable.ts deleted file mode 100644 index 34c81b4552..0000000000 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/show-dialog-for-activating-custom-helm-repository.injectable.ts +++ /dev/null @@ -1,21 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; -import { action } from "mobx"; -import activationOfCustomHelmRepositoryDialogIsVisibleInjectable from "./activation-of-custom-helm-repository-dialog-is-visible.injectable"; - -const showDialogForActivatingCustomHelmRepositoryInjectable = getInjectable({ - id: "show-dialog-for-activating-custom-helm-repository", - - instantiate: (di) => { - const state = di.inject(activationOfCustomHelmRepositoryDialogIsVisibleInjectable); - - return action(() => { - state.set(true); - }); - }, -}); - -export default showDialogForActivatingCustomHelmRepositoryInjectable; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/add-helm-repo-dialog.scss b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/add-helm-repo-dialog.scss similarity index 100% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/add-helm-repo-dialog.scss rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/add-helm-repo-dialog.scss diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-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 similarity index 92% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog-content.tsx rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx index 0c254d91fb..f19a4d532f 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-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 @@ -16,7 +16,7 @@ import { observer } from "mobx-react"; import type { IObservableValue } from "mobx"; import { action } from "mobx"; import submitCustomHelmRepositoryInjectable from "./submit-custom-helm-repository.injectable"; -import hideDialogForActivatingCustomHelmRepositoryInjectable from "./dialog-visibility/hide-dialog-for-activating-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 maximalCustomHelmRepoOptionsAreShownInjectable from "./maximal-custom-helm-repo-options-are-shown.injectable"; @@ -40,7 +40,7 @@ const NonInjectedActivationOfCustomHelmRepositoryDialogContent = observer(({ hel testIdForNext="custom-helm-repository-submit-button" testIdForPrev="custom-helm-repository-cancel-button" > -
+
( +export const AddingOfCustomHelmRepositoryDialogContent = withInjectables( NonInjectedActivationOfCustomHelmRepositoryDialogContent, { getProps: (di) => ({ helmRepo: di.inject(customHelmRepoInjectable), - hideDialog: di.inject(hideDialogForActivatingCustomHelmRepositoryInjectable), + hideDialog: di.inject(hideDialogForAddingCustomHelmRepositoryInjectable), submitCustomRepository: di.inject(submitCustomHelmRepositoryInjectable), maximalOptionsAreShown: di.inject(maximalCustomHelmRepoOptionsAreShownInjectable), }), diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx similarity index 53% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx index 612ef7fdde..3c6a2da9a4 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx @@ -8,11 +8,11 @@ import "./add-helm-repo-dialog.scss"; import React from "react"; import { Dialog } from "../../../../dialog"; import { withInjectables } from "@ogre-tools/injectable-react"; -import { ActivationOfCustomHelmRepositoryDialogContent } from "./activation-of-custom-helm-repository-dialog-content"; -import activationOfCustomHelmRepositoryDialogIsVisibleInjectable from "./dialog-visibility/activation-of-custom-helm-repository-dialog-is-visible.injectable"; +import { AddingOfCustomHelmRepositoryDialogContent } from "./adding-of-custom-helm-repository-dialog-content"; +import addingOfCustomHelmRepositoryDialogIsVisibleInjectable from "./dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable"; import type { IObservableValue } from "mobx"; import { observer } from "mobx-react"; -import hideDialogForActivatingCustomHelmRepositoryInjectable from "./dialog-visibility/hide-dialog-for-activating-custom-helm-repository.injectable"; +import hideDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable"; interface Dependencies { contentIsVisible: IObservableValue; @@ -29,19 +29,19 @@ const NonInjectedActivationOfCustomHelmRepositoryDialog = observer(({ isOpen={contentIsVisible.get()} close={hideDialog} > - {contentIsVisible.get() && } + {contentIsVisible.get() && }
)); -export const ActivationOfCustomHelmRepositoryDialog = withInjectables( +export const AddingOfCustomHelmRepositoryDialog = withInjectables( NonInjectedActivationOfCustomHelmRepositoryDialog, { getProps: (di) => ({ - contentIsVisible: di.inject(activationOfCustomHelmRepositoryDialogIsVisibleInjectable), - hideDialog: di.inject(hideDialogForActivatingCustomHelmRepositoryInjectable), + contentIsVisible: di.inject(addingOfCustomHelmRepositoryDialogIsVisibleInjectable), + hideDialog: di.inject(hideDialogForAddingCustomHelmRepositoryInjectable), }), }, ); diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-open-button.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx similarity index 67% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-open-button.tsx rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx index de1e6d4745..99f16a83ed 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-open-button.tsx +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx @@ -5,7 +5,7 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import React from "react"; import { Button } from "../../../../button"; -import showDialogForActivatingCustomHelmRepositoryInjectable from "./dialog-visibility/show-dialog-for-activating-custom-helm-repository.injectable"; +import showDialogForAddingCustomHelmRepositoryInjectable from "./dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable"; interface Dependencies { showDialog: () => void; @@ -20,12 +20,12 @@ const NonInjectedActivationOfCustomHelmRepositoryOpenButton = ({ showDialog }: D /> ); -export const ActivationOfCustomHelmRepositoryOpenButton = withInjectables( +export const AddingOfCustomHelmRepositoryOpenButton = withInjectables( NonInjectedActivationOfCustomHelmRepositoryOpenButton, { getProps: (di) => ({ - showDialog: di.inject(showDialogForActivatingCustomHelmRepositoryInjectable), + showDialog: di.inject(showDialogForAddingCustomHelmRepositoryInjectable), }), }, ); diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/custom-helm-repo.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/custom-helm-repo.injectable.ts similarity index 100% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/custom-helm-repo.injectable.ts rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/custom-helm-repo.injectable.ts diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/activation-of-custom-helm-repository-dialog-is-visible.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable.ts similarity index 57% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/activation-of-custom-helm-repository-dialog-is-visible.injectable.ts rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable.ts index da10db675d..8c5fc69815 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/activation-of-custom-helm-repository-dialog-is-visible.injectable.ts +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable.ts @@ -5,9 +5,9 @@ import { getInjectable } from "@ogre-tools/injectable"; import { observable } from "mobx"; -const activationOfCustomHelmRepositoryDialogIsVisibleInjectable = getInjectable({ - id: "add-custom-helm-repository-dialog-is-visible", +const addingOfCustomHelmRepositoryDialogIsVisibleInjectable = getInjectable({ + id: "adding-of-custom-helm-repository-dialog-is-visible", instantiate: () => observable.box(false), }); -export default activationOfCustomHelmRepositoryDialogIsVisibleInjectable; +export default addingOfCustomHelmRepositoryDialogIsVisibleInjectable; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable.ts new file mode 100644 index 0000000000..3acd2061f7 --- /dev/null +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable.ts @@ -0,0 +1,21 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { action } from "mobx"; +import addingOfCustomHelmRepositoryDialogIsVisibleInjectable from "./adding-of-custom-helm-repository-dialog-is-visible.injectable"; + +const hideDialogForAddingCustomHelmRepositoryInjectable = getInjectable({ + id: "hide-dialog-for-adding-custom-helm-repository", + + instantiate: (di) => { + const state = di.inject(addingOfCustomHelmRepositoryDialogIsVisibleInjectable); + + return action(() => { + state.set(false); + }); + }, +}); + +export default hideDialogForAddingCustomHelmRepositoryInjectable; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable.ts new file mode 100644 index 0000000000..825bfeae9b --- /dev/null +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable.ts @@ -0,0 +1,21 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { action } from "mobx"; +import addingOfCustomHelmRepositoryDialogIsVisibleInjectable from "./adding-of-custom-helm-repository-dialog-is-visible.injectable"; + +const showDialogForAddingCustomHelmRepositoryInjectable = getInjectable({ + id: "show-dialog-for-adding-custom-helm-repository", + + instantiate: (di) => { + const state = di.inject(addingOfCustomHelmRepositoryDialogIsVisibleInjectable); + + return action(() => { + state.set(true); + }); + }, +}); + +export default showDialogForAddingCustomHelmRepositoryInjectable; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts similarity index 100% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/helm-file-input/helm-file-input.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx similarity index 100% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/helm-file-input/helm-file-input.tsx rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts similarity index 100% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-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 similarity index 51% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts index 0575faa010..9a632fa533 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-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 @@ -4,18 +4,18 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import type { HelmRepo } from "../../../../../../common/helm-repo"; -import activateHelmRepositoryInjectable from "../activation-of-public-helm-repository/select-helm-repository/activate-helm-repository.injectable"; -import hideDialogForActivatingCustomHelmRepositoryInjectable from "./dialog-visibility/hide-dialog-for-activating-custom-helm-repository.injectable"; +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"; const submitCustomHelmRepositoryInjectable = getInjectable({ id: "submit-custom-helm-repository", instantiate: (di) => { - const activateHelmRepository = di.inject(activateHelmRepositoryInjectable); - const hideDialog = di.inject(hideDialogForActivatingCustomHelmRepositoryInjectable); + const addHelmRepository = di.inject(addHelmRepositoryInjectable); + const hideDialog = di.inject(hideDialogForAddingCustomHelmRepositoryInjectable); return async (repository: HelmRepo) => { - await activateHelmRepository(repository); + await addHelmRepository(repository); hideDialog(); }; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/activation-of-public-helm-repository.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx similarity index 93% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/activation-of-public-helm-repository.tsx rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx index 57c449e55b..0bcd584504 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/activation-of-public-helm-repository.tsx +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx @@ -22,7 +22,7 @@ interface Dependencies { selectRepository: (value: SingleValue>) => void; } -const NonInjectedActivationOfPublicHelmRepository = observer(({ +const NonInjectedAddingOfPublicHelmRepository = observer(({ publicRepositories, activeRepositories, selectRepository, @@ -55,8 +55,8 @@ const NonInjectedActivationOfPublicHelmRepository = observer(({ ); }); -export const ActivationOfPublicHelmRepository = withInjectables( - NonInjectedActivationOfPublicHelmRepository, +export const AddingOfPublicHelmRepository = withInjectables( + NonInjectedAddingOfPublicHelmRepository, { getProps: (di) => ({ diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-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 similarity index 100% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts similarity index 100% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/select-helm-repository/activate-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 similarity index 78% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/select-helm-repository/activate-helm-repository.injectable.ts rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts index d077a5c605..fd237c1375 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/select-helm-repository/activate-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 @@ -3,26 +3,26 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import activateHelmRepositoryChannelInjectable from "../../../../../../../common/helm/activate-helm-repository-channel.injectable"; +import addHelmRepositoryChannelInjectable from "../../../../../../../common/helm/add-helm-repository-channel.injectable"; import type { HelmRepo } from "../../../../../../../common/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"; -const activateHelmRepositoryInjectable = getInjectable({ - id: "activate-public-helm-repository", +const addHelmRepositoryInjectable = getInjectable({ + id: "add-public-helm-repository", instantiate: (di) => { const requestFromChannel = di.inject(requestFromChannelInjectionToken); - const activateHelmRepositoryChannel = di.inject(activateHelmRepositoryChannelInjectable); + const addHelmRepositoryChannel = di.inject(addHelmRepositoryChannelInjectable); const activeHelmRepositories = di.inject(activeHelmRepositoriesInjectable); const showErrorNotification = di.inject(showErrorNotificationInjectable); const showSuccessNotification = di.inject(showSuccessNotificationInjectable); return async (repository: HelmRepo) => { const result = await requestFromChannel( - activateHelmRepositoryChannel, + addHelmRepositoryChannel, repository, ); @@ -39,4 +39,4 @@ const activateHelmRepositoryInjectable = getInjectable({ }, }); -export default activateHelmRepositoryInjectable; +export default addHelmRepositoryInjectable; diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-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 similarity index 64% rename from src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts rename to src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts index dd2e9c3aa5..d603a32ab6 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/activation-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 @@ -3,18 +3,18 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import activateHelmRepositoryInjectable from "./activate-helm-repository.injectable"; +import addHelmRepositoryInjectable from "./add-helm-repository.injectable"; import type { SelectOption } from "../../../../../select"; import type { HelmRepo } from "../../../../../../../common/helm-repo"; import type { SingleValue } from "react-select"; -import deactivateHelmRepositoryInjectable from "../../deactivate-helm-repository.injectable"; +import removeHelmRepositoryInjectable from "../../remove-helm-repository.injectable"; const selectHelmRepositoryInjectable = getInjectable({ id: "select-helm-repository", instantiate: (di) => { - const activateHelmRepository = di.inject(activateHelmRepositoryInjectable); - const deactivateHelmRepository = di.inject(deactivateHelmRepositoryInjectable); + const addHelmRepository = di.inject(addHelmRepositoryInjectable); + const removeHelmRepository = di.inject(removeHelmRepositoryInjectable); return (selected: SingleValue>) => { if (!selected) { @@ -22,9 +22,9 @@ const selectHelmRepositoryInjectable = getInjectable({ } if (!selected.isSelected) { - activateHelmRepository(selected.value); + addHelmRepository(selected.value); } else { - deactivateHelmRepository(selected.value); + removeHelmRepository(selected.value); } }; }, diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx b/src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx index 26ebfeef83..691d618061 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx @@ -6,9 +6,9 @@ import React from "react"; import { HelmRepositories } from "./helm-repositories"; -import { ActivationOfPublicHelmRepository } from "./activation-of-public-helm-repository/activation-of-public-helm-repository"; -import { ActivationOfCustomHelmRepositoryOpenButton } from "./activation-of-custom-helm-repository/activation-of-custom-helm-repository-open-button"; -import { ActivationOfCustomHelmRepositoryDialog } from "./activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog"; +import { AddingOfPublicHelmRepository } from "./adding-of-public-helm-repository/adding-of-public-helm-repository"; +import { AddingOfCustomHelmRepositoryOpenButton } from "./adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button"; +import { AddingOfCustomHelmRepositoryDialog } from "./adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { HelmRepositoriesErrorState } from "./helm-repositories-error-state.injectable"; import helmRepositoriesErrorStateInjectable from "./helm-repositories-error-state.injectable"; @@ -35,14 +35,14 @@ const NonInjectedHelmCharts = observer( {state.controlsAreShown && (
- + - +
- +
)}
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 9f46a5a42b..1e7038136a 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx @@ -14,14 +14,14 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import { Spinner } from "../../../spinner"; import type { HelmRepo } from "../../../../../common/helm-repo"; import { RemovableItem } from "../../removable-item"; -import deactivateHelmRepositoryInjectable from "./deactivate-helm-repository.injectable"; +import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable"; interface Dependencies { activeHelmRepositories: IAsyncComputed; - deactivateRepository: (repository: HelmRepo) => Promise; + removeRepository: (repository: HelmRepo) => Promise; } -const NonInjectedActiveHelmRepositories = observer(({ activeHelmRepositories, deactivateRepository }: Dependencies) => { +const NonInjectedActiveHelmRepositories = observer(({ activeHelmRepositories, removeRepository }: Dependencies) => { if (activeHelmRepositories.pending.get()) { return (
@@ -39,9 +39,9 @@ const NonInjectedActiveHelmRepositories = observer(({ activeHelmRepositories, de {repositories.map((repository) => ( deactivateRepository(repository)} + onRemove={() => removeRepository(repository)} className="mt-3" - data-testid={`deactivate-helm-repository-${repository.name}`} + data-testid={`remove-helm-repository-${repository.name}`} >
{repository.name} @@ -61,7 +61,7 @@ export const HelmRepositories = withInjectables( { getProps: (di) => ({ activeHelmRepositories: di.inject(activeHelmRepositoriesInjectable), - deactivateRepository: di.inject(deactivateHelmRepositoryInjectable), + removeRepository: di.inject(removeHelmRepositoryInjectable), }), }, ); diff --git a/src/renderer/components/+preferences/kubernetes/helm-charts/deactivate-helm-repository.injectable.ts b/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts similarity index 62% rename from src/renderer/components/+preferences/kubernetes/helm-charts/deactivate-helm-repository.injectable.ts rename to src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts index 3a1f7c000a..7a27ae7492 100644 --- a/src/renderer/components/+preferences/kubernetes/helm-charts/deactivate-helm-repository.injectable.ts +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts @@ -6,22 +6,22 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { HelmRepo } from "../../../../../common/helm-repo"; import { requestFromChannelInjectionToken } from "../../../../../common/utils/channel/request-from-channel-injection-token"; import activeHelmRepositoriesInjectable from "./active-helm-repositories.injectable"; -import deactivateHelmRepositoryChannelInjectable from "../../../../../common/helm/deactivate-helm-repository-channel.injectable"; +import removeHelmRepositoryChannelInjectable from "../../../../../common/helm/remove-helm-repository-channel.injectable"; -const activatePublicHelmRepositoryInjectable = getInjectable({ - id: "deactivate-public-helm-repository", +const removePublicHelmRepositoryInjectable = getInjectable({ + id: "remove-public-helm-repository", instantiate: (di) => { const requestFromChannel = di.inject(requestFromChannelInjectionToken); - const deactivateHelmRepositoryChannel = di.inject(deactivateHelmRepositoryChannelInjectable); + const removeHelmRepositoryChannel = di.inject(removeHelmRepositoryChannelInjectable); const activeHelmRepositories = di.inject(activeHelmRepositoriesInjectable); return async (repository: HelmRepo) => { - await requestFromChannel(deactivateHelmRepositoryChannel, repository); + await requestFromChannel(removeHelmRepositoryChannel, repository); activeHelmRepositories.invalidate(); }; }, }); -export default activatePublicHelmRepositoryInjectable; +export default removePublicHelmRepositoryInjectable; diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx index 0e9cfc764f..e42ccdaced 100644 --- a/src/renderer/getDiForUnitTesting.tsx +++ b/src/renderer/getDiForUnitTesting.tsx @@ -50,8 +50,8 @@ import appVersionInjectable from "../common/get-configuration-file-model/app-ver import provideInitialValuesForSyncBoxesInjectable from "./utils/sync-box/provide-initial-values-for-sync-boxes.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/activation-of-custom-helm-repository/helm-file-input/get-file-paths.injectable"; -import callForPublicHelmRepositoriesInjectable from "./components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.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"; export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {}) => { const {