hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Consolidate naming to match Helm's internal

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

Signed-off-by: Janne Savolainen <janne.savolainen@live.fi>
This commit is contained in:
Janne Savolainen 2022-06-09 14:28:28 +03:00
parent 9afa10f3ad
commit ba737ea07e
No known key found for this signature in database
GPG Key ID: 8C6CFB2FFFE8F68A
40 changed files with 743 additions and 749 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap → src/behaviours/helm-charts/__snapshots__/add-custom-helm-repository-in-preferences.test.ts.snap
View File

@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP // 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`] = `
<body> <body>
<div> <div>
<div <div
@ -469,7 +469,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -881,7 +881,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-Some active repository" data-testid="remove-helm-repository-Some active repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -943,7 +943,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -1355,7 +1355,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-Some active repository" data-testid="remove-helm-repository-Some active repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -1439,7 +1439,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
> >
<div <div
class="flex column gaps" class="flex column gaps"
data-testid="activate-custom-helm-repository-dialog" data-testid="add-custom-helm-repository-dialog"
> >
<div <div
class="Input focused invalid" class="Input focused invalid"
@ -1526,7 +1526,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -1938,7 +1938,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-Some active repository" data-testid="remove-helm-repository-Some active repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -2008,7 +2008,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -2420,7 +2420,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-Some active repository" data-testid="remove-helm-repository-Some active repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -2504,7 +2504,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
> >
<div <div
class="flex column gaps" class="flex column gaps"
data-testid="activate-custom-helm-repository-dialog" data-testid="add-custom-helm-repository-dialog"
> >
<div <div
class="Input focused" class="Input focused"
@ -2591,7 +2591,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -3003,7 +3003,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-Some active repository" data-testid="remove-helm-repository-Some active repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -3087,7 +3087,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
> >
<div <div
class="flex column gaps" class="flex column gaps"
data-testid="activate-custom-helm-repository-dialog" data-testid="add-custom-helm-repository-dialog"
> >
<div <div
class="Input focused" class="Input focused"
@ -3350,7 +3350,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -3762,7 +3762,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-Some active repository" data-testid="remove-helm-repository-Some active repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -3846,7 +3846,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
> >
<div <div
class="flex column gaps" class="flex column gaps"
data-testid="activate-custom-helm-repository-dialog" data-testid="add-custom-helm-repository-dialog"
> >
<div <div
class="Input focused" class="Input focused"
@ -3933,7 +3933,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -4345,7 +4345,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-Some active repository" data-testid="remove-helm-repository-Some active repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -4429,7 +4429,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
> >
<div <div
class="flex column gaps" class="flex column gaps"
data-testid="activate-custom-helm-repository-dialog" data-testid="add-custom-helm-repository-dialog"
> >
<div <div
class="Input focused dirty" class="Input focused dirty"
@ -4692,7 +4692,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -5104,7 +5104,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-Some active repository" data-testid="remove-helm-repository-Some active repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -5188,7 +5188,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
> >
<div <div
class="flex column gaps" class="flex column gaps"
data-testid="activate-custom-helm-repository-dialog" data-testid="add-custom-helm-repository-dialog"
> >
<div <div
class="Input focused dirty" class="Input focused dirty"
@ -5275,7 +5275,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -5687,7 +5687,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-Some active repository" data-testid="remove-helm-repository-Some active repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -5757,7 +5757,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -6234,7 +6234,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -6725,7 +6725,7 @@ exports[`activate custom helm repository in preferences when navigating to prefe
> >
<div <div
class="flex column gaps" class="flex column gaps"
data-testid="activate-custom-helm-repository-dialog" data-testid="add-custom-helm-repository-dialog"
> >
<div <div
class="Input focused invalid" class="Input focused invalid"

1000
src/behaviours/helm-charts/__snapshots__/activate-helm-repository-from-list-in-preferences.test.ts.snap → src/behaviours/helm-charts/__snapshots__/add-helm-repository-from-list-in-preferences.test.ts.snap
View File

File diff suppressed because it is too large Load Diff

4
src/behaviours/helm-charts/__snapshots__/listing-active-helm-repositories-in-preferences.test.ts.snap
View File

@ -3010,7 +3010,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-some-repository" data-testid="remove-helm-repository-some-repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -3038,7 +3038,7 @@ exports[`listing active helm repositories in preferences when navigating to pref
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-some-other-repository" data-testid="remove-helm-repository-some-other-repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >

12
src/behaviours/helm-charts/__snapshots__/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap → src/behaviours/helm-charts/__snapshots__/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts.snap
View File

@ -1,6 +1,6 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP // 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`] = `
<body> <body>
<div> <div>
<div <div
@ -469,7 +469,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -881,7 +881,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-some-active-repository" data-testid="remove-helm-repository-some-active-repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -943,7 +943,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div
@ -1355,7 +1355,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
</div> </div>
<i <i
class="Icon material interactive focusable" class="Icon material interactive focusable"
data-testid="deactivate-helm-repository-some-active-repository" data-testid="remove-helm-repository-some-active-repository"
tabindex="0" tabindex="0"
tooltip="Remove" tooltip="Remove"
> >
@ -1417,7 +1417,7 @@ exports[`deactivate helm repository from list of active repositories in preferen
</body> </body>
`; `;
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`] = `
<body> <body>
<div> <div>
<div <div

18
src/behaviours/helm-charts/activate-custom-helm-repository-preferences.test.ts → src/behaviours/helm-charts/add-custom-helm-repository-in-preferences.test.ts
View File

@ -12,7 +12,7 @@ import execFileInjectable from "../../common/fs/exec-file.injectable";
import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.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 getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
import type { HelmRepo } from "../../common/helm-repo"; import type { HelmRepo } from "../../common/helm-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 isPathInjectable from "../../renderer/components/input/validators/is-path.injectable"; import isPathInjectable from "../../renderer/components/input/validators/is-path.injectable";
import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable"; import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable";
import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable"; import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
@ -23,7 +23,7 @@ jest.mock("../../renderer/components/tooltip/withTooltip", () => ({
withTooltip: (target: any) => target, withTooltip: (target: any) => target,
})); }));
describe("activate custom helm repository in preferences", () => { describe("add custom helm repository in preferences", () => {
let applicationBuilder: ApplicationBuilder; let applicationBuilder: ApplicationBuilder;
let showSuccessNotificationMock: jest.Mock; let showSuccessNotificationMock: jest.Mock;
let showErrorNotificationMock: jest.Mock; let showErrorNotificationMock: jest.Mock;
@ -106,7 +106,7 @@ describe("activate custom helm repository in preferences", () => {
it("shows dialog", () => { it("shows dialog", () => {
expect( expect(
rendered.queryByTestId("activate-custom-helm-repository-dialog"), rendered.queryByTestId("add-custom-helm-repository-dialog"),
).toBeInTheDocument(); ).toBeInTheDocument();
}); });
@ -120,7 +120,7 @@ describe("activate custom helm repository in preferences", () => {
it("does not show dialog anymore", () => { it("does not show dialog anymore", () => {
expect( expect(
rendered.queryByTestId("activate-custom-helm-repository-dialog"), rendered.queryByTestId("add-custom-helm-repository-dialog"),
).not.toBeInTheDocument(); ).not.toBeInTheDocument();
}); });
}); });
@ -138,7 +138,7 @@ describe("activate custom helm repository in preferences", () => {
it("does not show dialog anymore", () => { it("does not show dialog anymore", () => {
expect( expect(
rendered.queryByTestId("activate-custom-helm-repository-dialog"), rendered.queryByTestId("add-custom-helm-repository-dialog"),
).not.toBeInTheDocument(); ).not.toBeInTheDocument();
}); });
}); });
@ -174,7 +174,7 @@ describe("activate custom helm repository in preferences", () => {
expect(rendered.baseElement).toMatchSnapshot(); expect(rendered.baseElement).toMatchSnapshot();
}); });
it("activates the repository", () => { it("adds the repository", () => {
expect(execFileMock).toHaveBeenCalledWith( expect(execFileMock).toHaveBeenCalledWith(
"some-helm-binary-path", "some-helm-binary-path",
["repo", "add", "some-custom-repository", "http://some.url"], ["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", () => { 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", () => { it("does not reload active repositories", () => {
@ -236,7 +236,7 @@ describe("activate custom helm repository in preferences", () => {
}); });
it("does not show dialog anymore", () => { 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", () => { it("reloads active repositories", () => {
@ -349,7 +349,7 @@ describe("activate custom helm repository in preferences", () => {
expect(rendered.baseElement).toMatchSnapshot(); 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"); const submitButton = rendered.getByTestId("custom-helm-repository-submit-button");
fireEvent.click(submitButton); fireEvent.click(submitButton);

37
src/behaviours/helm-charts/activate-helm-repository-from-list-in-preferences.test.ts → src/behaviours/helm-charts/add-helm-repository-from-list-in-preferences.test.ts
View File

@ -11,11 +11,9 @@ import execFileInjectable from "../../common/fs/exec-file.injectable";
import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.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 getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
import type { HelmRepo } from "../../common/helm-repo"; import type { HelmRepo } from "../../common/helm-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 showSuccessNotificationInjectable import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable";
from "../../renderer/components/notifications/show-success-notification.injectable"; import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
import showErrorNotificationInjectable
from "../../renderer/components/notifications/show-error-notification.injectable";
import type { AsyncResult } from "../../common/utils/async-result"; import type { AsyncResult } from "../../common/utils/async-result";
// TODO: Make tooltips free of side effects by making it deterministic // 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, withTooltip: (target: any) => target,
})); }));
describe("add helm repository from list in preferences", () => {
describe("activate helm repository from list in preferences", () => {
let applicationBuilder: ApplicationBuilder; let applicationBuilder: ApplicationBuilder;
let showSuccessNotificationMock: jest.Mock; let showSuccessNotificationMock: jest.Mock;
let showErrorNotificationMock: jest.Mock; let showErrorNotificationMock: jest.Mock;
@ -90,7 +87,7 @@ describe("activate helm repository from list in preferences", () => {
await Promise.all([ await Promise.all([
callForPublicHelmRepositoriesMock.resolve([ callForPublicHelmRepositoriesMock.resolve([
{ name: "Some already active repository", url: "some-url" }, { 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({ getActiveHelmRepositoriesMock.resolve({
@ -106,7 +103,7 @@ describe("activate helm repository from list in preferences", () => {
expect(rendered.baseElement).toMatchSnapshot(); expect(rendered.baseElement).toMatchSnapshot();
}); });
describe("when select for selecting active repositories is clicked", () => { describe("when select for adding public repositories is clicked", () => {
beforeEach(() => { beforeEach(() => {
applicationBuilder.select.openMenu( applicationBuilder.select.openMenu(
"selection-of-active-public-helm-repository", "selection-of-active-public-helm-repository",
@ -123,7 +120,7 @@ describe("activate helm repository from list in preferences", () => {
applicationBuilder.select.selectOption( applicationBuilder.select.selectOption(
"selection-of-active-public-helm-repository", "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(); expect(rendered.baseElement).toMatchSnapshot();
}); });
it("activates the repository", () => { it("adds the repository", () => {
expect(execFileMock).toHaveBeenCalledWith( expect(execFileMock).toHaveBeenCalledWith(
"some-helm-binary-path", "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(); expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled();
}); });
describe("when activation rejects", () => { describe("when adding rejects", () => {
beforeEach(async () => { beforeEach(async () => {
await execFileMock.reject( await execFileMock.reject(
"Some error", "Some error",
@ -164,7 +161,7 @@ describe("activate helm repository from list in preferences", () => {
}); });
it("does not show dialog anymore", () => { 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", () => { 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 () => { beforeEach(async () => {
await execFileMock.resolveSpecific( await execFileMock.resolveSpecific(
[ [
"some-helm-binary-path", "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", () => { it("shows success notification", () => {
expect(showSuccessNotificationMock).toHaveBeenCalledWith( 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, callWasSuccessful: true,
response: [ response: [
{ name: "Some already active repository", url: "some-url" }, { 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(); expect(rendered.baseElement).toMatchSnapshot();
}); });
it("deactivates the repository", () => { it("removes the repository", () => {
expect(execFileMock).toHaveBeenCalledWith( expect(execFileMock).toHaveBeenCalledWith(
"some-helm-binary-path", "some-helm-binary-path",
["repo", "remove", "Some already active repository"], ["repo", "remove", "Some already active repository"],
@ -250,7 +247,7 @@ describe("activate helm repository from list in preferences", () => {
expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled();
}); });
describe("when deactivating resolves", () => { describe("when removing resolves", () => {
beforeEach(async () => { beforeEach(async () => {
await execFileMock.resolveSpecific( await execFileMock.resolveSpecific(
[ [

5
src/behaviours/helm-charts/listing-active-helm-repositories-in-preferences.test.ts
View File

@ -14,9 +14,8 @@ import execFileInjectable from "../../common/fs/exec-file.injectable";
import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable";
import loggerInjectable from "../../common/logger.injectable"; import loggerInjectable from "../../common/logger.injectable";
import type { Logger } from "../../common/logger"; 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 callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable";
import showErrorNotificationInjectable import showErrorNotificationInjectable from "../../renderer/components/notifications/show-error-notification.injectable";
from "../../renderer/components/notifications/show-error-notification.injectable";
// TODO: Make tooltips free of side effects by making it deterministic // TODO: Make tooltips free of side effects by making it deterministic
jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ jest.mock("../../renderer/components/tooltip/withTooltip", () => ({

16
src/behaviours/helm-charts/deactivate-helm-repository-from-list-of-active-repository-in-preferences.test.ts → src/behaviours/helm-charts/remove-helm-repository-from-list-of-active-repository-in-preferences.test.ts
View File

@ -12,7 +12,7 @@ import execFileInjectable from "../../common/fs/exec-file.injectable";
import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.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 getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable";
import type { HelmRepo } from "../../common/helm-repo"; import type { HelmRepo } from "../../common/helm-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"; import type { AsyncResult } from "../../common/utils/async-result";
// TODO: Make tooltips free of side effects by making it deterministic // 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, 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 applicationBuilder: ApplicationBuilder;
let rendered: RenderResult; let rendered: RenderResult;
let getActiveHelmRepositoriesMock: AsyncFnMock<() => AsyncResult<HelmRepo[]>>; let getActiveHelmRepositoriesMock: AsyncFnMock<() => AsyncResult<HelmRepo[]>>;
@ -73,23 +73,23 @@ describe("deactivate helm repository from list of active repositories in prefere
expect(rendered.baseElement).toMatchSnapshot(); expect(rendered.baseElement).toMatchSnapshot();
}); });
describe("when deactivating repository", () => { describe("when removing repository", () => {
beforeEach(() => { beforeEach(() => {
execFileMock.mockClear(); execFileMock.mockClear();
getActiveHelmRepositoriesMock.mockClear(); getActiveHelmRepositoriesMock.mockClear();
const deactiveButton = rendered.getByTestId( const removeButton = rendered.getByTestId(
"deactivate-helm-repository-some-active-repository", "remove-helm-repository-some-active-repository",
); );
fireEvent.click(deactiveButton); fireEvent.click(removeButton);
}); });
it("renders", () => { it("renders", () => {
expect(rendered.baseElement).toMatchSnapshot(); expect(rendered.baseElement).toMatchSnapshot();
}); });
it("deactivates the repository", () => { it("removes the repository", () => {
expect(execFileMock).toHaveBeenCalledWith( expect(execFileMock).toHaveBeenCalledWith(
"some-helm-binary-path", "some-helm-binary-path",
["repo", "remove", "some-active-repository"], ["repo", "remove", "some-active-repository"],
@ -100,7 +100,7 @@ describe("deactivate helm repository from list of active repositories in prefere
expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled();
}); });
describe("when deactivating resolves", () => { describe("when removing resolves", () => {
beforeEach(async () => { beforeEach(async () => {
await execFileMock.resolveSpecific( await execFileMock.resolveSpecific(
[ [

6
src/behaviours/preferences/navigation-to-kubernetes-preferences.test.ts
View File

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

12
src/common/helm/activate-helm-repository-channel.injectable.ts → src/common/helm/add-helm-repository-channel.injectable.ts
View File

@ -8,16 +8,16 @@ import type { RequestChannel } from "../utils/channel/request-channel-injection-
import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token"; import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
import type { AsyncResult } from "../utils/async-result"; import type { AsyncResult } from "../utils/async-result";
export type ActivateHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<string>>; export type AddHelmRepositoryChannel = RequestChannel<HelmRepo, AsyncResult<string>>;
const activateHelmRepositoryChannelInjectable = getInjectable({ const addHelmRepositoryChannelInjectable = getInjectable({
id: "activate-helm-repository-channel", id: "add-helm-repository-channel",
instantiate: (): ActivateHelmRepositoryChannel => ({ instantiate: (): AddHelmRepositoryChannel => ({
id: "activate-helm-repository-channel", id: "add-helm-repository-channel",
}), }),
injectionToken: requestChannelInjectionToken, injectionToken: requestChannelInjectionToken,
}); });
export default activateHelmRepositoryChannelInjectable; export default addHelmRepositoryChannelInjectable;

12
src/common/helm/deactivate-helm-repository-channel.injectable.ts → src/common/helm/remove-helm-repository-channel.injectable.ts
View File

@ -7,16 +7,16 @@ import type { HelmRepo } from "../helm-repo";
import type { RequestChannel } from "../utils/channel/request-channel-injection-token"; import type { RequestChannel } from "../utils/channel/request-channel-injection-token";
import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token"; import { requestChannelInjectionToken } from "../utils/channel/request-channel-injection-token";
export type DeactivateHelmRepositoryChannel = RequestChannel<HelmRepo>; export type RemoveHelmRepositoryChannel = RequestChannel<HelmRepo>;
const deactivateHelmRepositoryChannelInjectable = getInjectable({ const removeHelmRepositoryChannelInjectable = getInjectable({
id: "deactivate-helm-repository-channel", id: "remove-helm-repository-channel",
instantiate: (): DeactivateHelmRepositoryChannel => ({ instantiate: (): RemoveHelmRepositoryChannel => ({
id: "deactivate-helm-repository-channel", id: "remove-helm-repository-channel",
}), }),
injectionToken: requestChannelInjectionToken, injectionToken: requestChannelInjectionToken,
}); });
export default deactivateHelmRepositoryChannelInjectable; export default removeHelmRepositoryChannelInjectable;

26
src/main/helm/repositories/activate-helm-repository/activate-helm-repository-channel-listener.injectable.ts
View File

@ -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;

26
src/main/helm/repositories/add-helm-repository/add-helm-repository-channel-listener.injectable.ts Normal file
View File

@ -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;

6
src/main/helm/repositories/activate-helm-repository/activate-helm-repository.injectable.ts → src/main/helm/repositories/add-helm-repository/add-helm-repository.injectable.ts
View File

@ -7,8 +7,8 @@ import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
import type { HelmRepo } from "../../../../common/helm-repo"; import type { HelmRepo } from "../../../../common/helm-repo";
import loggerInjectable from "../../../../common/logger.injectable"; import loggerInjectable from "../../../../common/logger.injectable";
const activateHelmRepositoryInjectable = getInjectable({ const addHelmRepositoryInjectable = getInjectable({
id: "activate-helm-repository", id: "add-helm-repository",
instantiate: (di) => { instantiate: (di) => {
const execHelm = di.inject(execHelmInjectable); const execHelm = di.inject(execHelmInjectable);
@ -59,4 +59,4 @@ const activateHelmRepositoryInjectable = getInjectable({
}, },
}); });
export default activateHelmRepositoryInjectable; export default addHelmRepositoryInjectable;

26
src/main/helm/repositories/deactivate-helm-repository/deactivate-helm-repository-channel-listener.injectable.ts
View File

@ -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;

26
src/main/helm/repositories/remove-helm-repository/remove-helm-repository-channel-listener.injectable.ts Normal file
View File

@ -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;

6
src/main/helm/repositories/deactivate-helm-repository/deactivate-helm-repository.injectable.ts → src/main/helm/repositories/remove-helm-repository/remove-helm-repository.injectable.ts
View File

@ -7,8 +7,8 @@ import execHelmInjectable from "../../exec-helm/exec-helm.injectable";
import type { HelmRepo } from "../../../../common/helm-repo"; import type { HelmRepo } from "../../../../common/helm-repo";
import loggerInjectable from "../../../../common/logger.injectable"; import loggerInjectable from "../../../../common/logger.injectable";
const deactivateHelmRepositoryInjectable = getInjectable({ const removeHelmRepositoryInjectable = getInjectable({
id: "deactive-helm-repository", id: "remove-helm-repository",
instantiate: (di) => { instantiate: (di) => {
const execHelm = di.inject(execHelmInjectable); const execHelm = di.inject(execHelmInjectable);
@ -26,4 +26,4 @@ const deactivateHelmRepositoryInjectable = getInjectable({
}, },
}); });
export default deactivateHelmRepositoryInjectable; export default removeHelmRepositoryInjectable;

21
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/hide-dialog-for-activating-custom-helm-repository.injectable.ts
View File

@ -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;

21
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/show-dialog-for-activating-custom-helm-repository.injectable.ts
View File

@ -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;

0
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/add-helm-repo-dialog.scss → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/add-helm-repo-dialog.scss
View File

8
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog-content.tsx → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog-content.tsx
View File

@ -16,7 +16,7 @@ import { observer } from "mobx-react";
import type { IObservableValue } from "mobx"; import type { IObservableValue } from "mobx";
import { action } from "mobx"; import { action } from "mobx";
import submitCustomHelmRepositoryInjectable from "./submit-custom-helm-repository.injectable"; 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 { Button } from "../../../../button";
import { Icon } from "../../../../icon"; import { Icon } from "../../../../icon";
import maximalCustomHelmRepoOptionsAreShownInjectable from "./maximal-custom-helm-repo-options-are-shown.injectable"; 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" testIdForNext="custom-helm-repository-submit-button"
testIdForPrev="custom-helm-repository-cancel-button" testIdForPrev="custom-helm-repository-cancel-button"
> >
<div className="flex column gaps" data-testid="activate-custom-helm-repository-dialog"> <div className="flex column gaps" data-testid="add-custom-helm-repository-dialog">
<Input <Input
autoFocus autoFocus
required required
@ -134,13 +134,13 @@ const NonInjectedActivationOfCustomHelmRepositoryDialogContent = observer(({ hel
export const ActivationOfCustomHelmRepositoryDialogContent = withInjectables<Dependencies>( export const AddingOfCustomHelmRepositoryDialogContent = withInjectables<Dependencies>(
NonInjectedActivationOfCustomHelmRepositoryDialogContent, NonInjectedActivationOfCustomHelmRepositoryDialogContent,
{ {
getProps: (di) => ({ getProps: (di) => ({
helmRepo: di.inject(customHelmRepoInjectable), helmRepo: di.inject(customHelmRepoInjectable),
hideDialog: di.inject(hideDialogForActivatingCustomHelmRepositoryInjectable), hideDialog: di.inject(hideDialogForAddingCustomHelmRepositoryInjectable),
submitCustomRepository: di.inject(submitCustomHelmRepositoryInjectable), submitCustomRepository: di.inject(submitCustomHelmRepositoryInjectable),
maximalOptionsAreShown: di.inject(maximalCustomHelmRepoOptionsAreShownInjectable), maximalOptionsAreShown: di.inject(maximalCustomHelmRepoOptionsAreShownInjectable),
}), }),

14
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog.tsx
View File

@ -8,11 +8,11 @@ import "./add-helm-repo-dialog.scss";
import React from "react"; import React from "react";
import { Dialog } from "../../../../dialog"; import { Dialog } from "../../../../dialog";
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import { ActivationOfCustomHelmRepositoryDialogContent } from "./activation-of-custom-helm-repository-dialog-content"; import { AddingOfCustomHelmRepositoryDialogContent } from "./adding-of-custom-helm-repository-dialog-content";
import activationOfCustomHelmRepositoryDialogIsVisibleInjectable from "./dialog-visibility/activation-of-custom-helm-repository-dialog-is-visible.injectable"; import addingOfCustomHelmRepositoryDialogIsVisibleInjectable from "./dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable";
import type { IObservableValue } from "mobx"; import type { IObservableValue } from "mobx";
import { observer } from "mobx-react"; 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 { interface Dependencies {
contentIsVisible: IObservableValue<boolean>; contentIsVisible: IObservableValue<boolean>;
@ -29,19 +29,19 @@ const NonInjectedActivationOfCustomHelmRepositoryDialog = observer(({
isOpen={contentIsVisible.get()} isOpen={contentIsVisible.get()}
close={hideDialog} close={hideDialog}
> >
{contentIsVisible.get() && <ActivationOfCustomHelmRepositoryDialogContent />} {contentIsVisible.get() && <AddingOfCustomHelmRepositoryDialogContent />}
</Dialog> </Dialog>
</div> </div>
)); ));
export const ActivationOfCustomHelmRepositoryDialog = withInjectables<Dependencies>( export const AddingOfCustomHelmRepositoryDialog = withInjectables<Dependencies>(
NonInjectedActivationOfCustomHelmRepositoryDialog, NonInjectedActivationOfCustomHelmRepositoryDialog,
{ {
getProps: (di) => ({ getProps: (di) => ({
contentIsVisible: di.inject(activationOfCustomHelmRepositoryDialogIsVisibleInjectable), contentIsVisible: di.inject(addingOfCustomHelmRepositoryDialogIsVisibleInjectable),
hideDialog: di.inject(hideDialogForActivatingCustomHelmRepositoryInjectable), hideDialog: di.inject(hideDialogForAddingCustomHelmRepositoryInjectable),
}), }),
}, },
); );

6
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-open-button.tsx → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button.tsx
View File

@ -5,7 +5,7 @@
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import React from "react"; import React from "react";
import { Button } from "../../../../button"; 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 { interface Dependencies {
showDialog: () => void; showDialog: () => void;
@ -20,12 +20,12 @@ const NonInjectedActivationOfCustomHelmRepositoryOpenButton = ({ showDialog }: D
/> />
); );
export const ActivationOfCustomHelmRepositoryOpenButton = withInjectables<Dependencies>( export const AddingOfCustomHelmRepositoryOpenButton = withInjectables<Dependencies>(
NonInjectedActivationOfCustomHelmRepositoryOpenButton, NonInjectedActivationOfCustomHelmRepositoryOpenButton,
{ {
getProps: (di) => ({ getProps: (di) => ({
showDialog: di.inject(showDialogForActivatingCustomHelmRepositoryInjectable), showDialog: di.inject(showDialogForAddingCustomHelmRepositoryInjectable),
}), }),
}, },
); );

0
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/custom-helm-repo.injectable.ts → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/custom-helm-repo.injectable.ts
View File

6
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/activation-of-custom-helm-repository-dialog-is-visible.injectable.ts → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/adding-of-custom-helm-repository-dialog-is-visible.injectable.ts
View File

@ -5,9 +5,9 @@
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import { observable } from "mobx"; import { observable } from "mobx";
const activationOfCustomHelmRepositoryDialogIsVisibleInjectable = getInjectable({ const addingOfCustomHelmRepositoryDialogIsVisibleInjectable = getInjectable({
id: "add-custom-helm-repository-dialog-is-visible", id: "adding-of-custom-helm-repository-dialog-is-visible",
instantiate: () => observable.box(false), instantiate: () => observable.box(false),
}); });
export default activationOfCustomHelmRepositoryDialogIsVisibleInjectable; export default addingOfCustomHelmRepositoryDialogIsVisibleInjectable;

21
src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/hide-dialog-for-adding-custom-helm-repository.injectable.ts Normal file
View File

@ -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;

21
src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/dialog-visibility/show-dialog-for-adding-custom-helm-repository.injectable.ts Normal file
View File

@ -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;

0
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts
View File

0
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/helm-file-input/helm-file-input.tsx → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/helm-file-input/helm-file-input.tsx
View File

0
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts
View File

10
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts
View File

@ -4,18 +4,18 @@
*/ */
import { getInjectable } from "@ogre-tools/injectable"; import { getInjectable } from "@ogre-tools/injectable";
import type { HelmRepo } from "../../../../../../common/helm-repo"; import type { HelmRepo } from "../../../../../../common/helm-repo";
import activateHelmRepositoryInjectable from "../activation-of-public-helm-repository/select-helm-repository/activate-helm-repository.injectable"; import addHelmRepositoryInjectable from "../adding-of-public-helm-repository/select-helm-repository/add-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";
const submitCustomHelmRepositoryInjectable = getInjectable({ const submitCustomHelmRepositoryInjectable = getInjectable({
id: "submit-custom-helm-repository", id: "submit-custom-helm-repository",
instantiate: (di) => { instantiate: (di) => {
const activateHelmRepository = di.inject(activateHelmRepositoryInjectable); const addHelmRepository = di.inject(addHelmRepositoryInjectable);
const hideDialog = di.inject(hideDialogForActivatingCustomHelmRepositoryInjectable); const hideDialog = di.inject(hideDialogForAddingCustomHelmRepositoryInjectable);
return async (repository: HelmRepo) => { return async (repository: HelmRepo) => {
await activateHelmRepository(repository); await addHelmRepository(repository);
hideDialog(); hideDialog();
}; };

6
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/activation-of-public-helm-repository.tsx → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/adding-of-public-helm-repository.tsx
View File

@ -22,7 +22,7 @@ interface Dependencies {
selectRepository: (value: SingleValue<SelectOption<HelmRepo>>) => void; selectRepository: (value: SingleValue<SelectOption<HelmRepo>>) => void;
} }
const NonInjectedActivationOfPublicHelmRepository = observer(({ const NonInjectedAddingOfPublicHelmRepository = observer(({
publicRepositories, publicRepositories,
activeRepositories, activeRepositories,
selectRepository, selectRepository,
@ -55,8 +55,8 @@ const NonInjectedActivationOfPublicHelmRepository = observer(({
); );
}); });
export const ActivationOfPublicHelmRepository = withInjectables<Dependencies>( export const AddingOfPublicHelmRepository = withInjectables<Dependencies>(
NonInjectedActivationOfPublicHelmRepository, NonInjectedAddingOfPublicHelmRepository,
{ {
getProps: (di) => ({ getProps: (di) => ({

0
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable.ts
View File

0
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/public-helm-repositories/public-helm-repositories.injectable.ts
View File

12
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/select-helm-repository/activate-helm-repository.injectable.ts → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/add-helm-repository.injectable.ts
View File

@ -3,26 +3,26 @@
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import { getInjectable } from "@ogre-tools/injectable"; 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 type { HelmRepo } from "../../../../../../../common/helm-repo";
import { requestFromChannelInjectionToken } from "../../../../../../../common/utils/channel/request-from-channel-injection-token"; import { requestFromChannelInjectionToken } from "../../../../../../../common/utils/channel/request-from-channel-injection-token";
import activeHelmRepositoriesInjectable from "../../active-helm-repositories.injectable"; import activeHelmRepositoriesInjectable from "../../active-helm-repositories.injectable";
import showErrorNotificationInjectable from "../../../../../notifications/show-error-notification.injectable"; import showErrorNotificationInjectable from "../../../../../notifications/show-error-notification.injectable";
import showSuccessNotificationInjectable from "../../../../../notifications/show-success-notification.injectable"; import showSuccessNotificationInjectable from "../../../../../notifications/show-success-notification.injectable";
const activateHelmRepositoryInjectable = getInjectable({ const addHelmRepositoryInjectable = getInjectable({
id: "activate-public-helm-repository", id: "add-public-helm-repository",
instantiate: (di) => { instantiate: (di) => {
const requestFromChannel = di.inject(requestFromChannelInjectionToken); const requestFromChannel = di.inject(requestFromChannelInjectionToken);
const activateHelmRepositoryChannel = di.inject(activateHelmRepositoryChannelInjectable); const addHelmRepositoryChannel = di.inject(addHelmRepositoryChannelInjectable);
const activeHelmRepositories = di.inject(activeHelmRepositoriesInjectable); const activeHelmRepositories = di.inject(activeHelmRepositoriesInjectable);
const showErrorNotification = di.inject(showErrorNotificationInjectable); const showErrorNotification = di.inject(showErrorNotificationInjectable);
const showSuccessNotification = di.inject(showSuccessNotificationInjectable); const showSuccessNotification = di.inject(showSuccessNotificationInjectable);
return async (repository: HelmRepo) => { return async (repository: HelmRepo) => {
const result = await requestFromChannel( const result = await requestFromChannel(
activateHelmRepositoryChannel, addHelmRepositoryChannel,
repository, repository,
); );
@ -39,4 +39,4 @@ const activateHelmRepositoryInjectable = getInjectable({
}, },
}); });
export default activateHelmRepositoryInjectable; export default addHelmRepositoryInjectable;

12
src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts → src/renderer/components/+preferences/kubernetes/helm-charts/adding-of-public-helm-repository/select-helm-repository/select-helm-repository.injectable.ts
View File

@ -3,18 +3,18 @@
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import { getInjectable } from "@ogre-tools/injectable"; 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 { SelectOption } from "../../../../../select";
import type { HelmRepo } from "../../../../../../../common/helm-repo"; import type { HelmRepo } from "../../../../../../../common/helm-repo";
import type { SingleValue } from "react-select"; import type { SingleValue } from "react-select";
import deactivateHelmRepositoryInjectable from "../../deactivate-helm-repository.injectable"; import removeHelmRepositoryInjectable from "../../remove-helm-repository.injectable";
const selectHelmRepositoryInjectable = getInjectable({ const selectHelmRepositoryInjectable = getInjectable({
id: "select-helm-repository", id: "select-helm-repository",
instantiate: (di) => { instantiate: (di) => {
const activateHelmRepository = di.inject(activateHelmRepositoryInjectable); const addHelmRepository = di.inject(addHelmRepositoryInjectable);
const deactivateHelmRepository = di.inject(deactivateHelmRepositoryInjectable); const removeHelmRepository = di.inject(removeHelmRepositoryInjectable);
return (selected: SingleValue<SelectOption<HelmRepo>>) => { return (selected: SingleValue<SelectOption<HelmRepo>>) => {
if (!selected) { if (!selected) {
@ -22,9 +22,9 @@ const selectHelmRepositoryInjectable = getInjectable({
} }
if (!selected.isSelected) { if (!selected.isSelected) {
activateHelmRepository(selected.value); addHelmRepository(selected.value);
} else { } else {
deactivateHelmRepository(selected.value); removeHelmRepository(selected.value);
} }
}; };
}, },

12
src/renderer/components/+preferences/kubernetes/helm-charts/helm-charts.tsx
View File

@ -6,9 +6,9 @@
import React from "react"; import React from "react";
import { HelmRepositories } from "./helm-repositories"; import { HelmRepositories } from "./helm-repositories";
import { ActivationOfPublicHelmRepository } from "./activation-of-public-helm-repository/activation-of-public-helm-repository"; import { AddingOfPublicHelmRepository } from "./adding-of-public-helm-repository/adding-of-public-helm-repository";
import { ActivationOfCustomHelmRepositoryOpenButton } from "./activation-of-custom-helm-repository/activation-of-custom-helm-repository-open-button"; import { AddingOfCustomHelmRepositoryOpenButton } from "./adding-of-custom-helm-repository/adding-of-custom-helm-repository-open-button";
import { ActivationOfCustomHelmRepositoryDialog } from "./activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog"; import { AddingOfCustomHelmRepositoryDialog } from "./adding-of-custom-helm-repository/adding-of-custom-helm-repository-dialog";
import { withInjectables } from "@ogre-tools/injectable-react"; import { withInjectables } from "@ogre-tools/injectable-react";
import type { HelmRepositoriesErrorState } from "./helm-repositories-error-state.injectable"; import type { HelmRepositoriesErrorState } from "./helm-repositories-error-state.injectable";
import helmRepositoriesErrorStateInjectable from "./helm-repositories-error-state.injectable"; import helmRepositoriesErrorStateInjectable from "./helm-repositories-error-state.injectable";
@ -35,14 +35,14 @@ const NonInjectedHelmCharts = observer(
{state.controlsAreShown && ( {state.controlsAreShown && (
<div data-testid="helm-controls"> <div data-testid="helm-controls">
<div className="flex gaps"> <div className="flex gaps">
<ActivationOfPublicHelmRepository /> <AddingOfPublicHelmRepository />
<ActivationOfCustomHelmRepositoryOpenButton /> <AddingOfCustomHelmRepositoryOpenButton />
</div> </div>
<HelmRepositories /> <HelmRepositories />
<ActivationOfCustomHelmRepositoryDialog /> <AddingOfCustomHelmRepositoryDialog />
</div> </div>
)} )}
</div> </div>

12
src/renderer/components/+preferences/kubernetes/helm-charts/helm-repositories.tsx
View File

@ -14,14 +14,14 @@ import { withInjectables } from "@ogre-tools/injectable-react";
import { Spinner } from "../../../spinner"; import { Spinner } from "../../../spinner";
import type { HelmRepo } from "../../../../../common/helm-repo"; import type { HelmRepo } from "../../../../../common/helm-repo";
import { RemovableItem } from "../../removable-item"; import { RemovableItem } from "../../removable-item";
import deactivateHelmRepositoryInjectable from "./deactivate-helm-repository.injectable"; import removeHelmRepositoryInjectable from "./remove-helm-repository.injectable";
interface Dependencies { interface Dependencies {
activeHelmRepositories: IAsyncComputed<HelmRepo[]>; activeHelmRepositories: IAsyncComputed<HelmRepo[]>;
deactivateRepository: (repository: HelmRepo) => Promise<void>; removeRepository: (repository: HelmRepo) => Promise<void>;
} }
const NonInjectedActiveHelmRepositories = observer(({ activeHelmRepositories, deactivateRepository }: Dependencies) => { const NonInjectedActiveHelmRepositories = observer(({ activeHelmRepositories, removeRepository }: Dependencies) => {
if (activeHelmRepositories.pending.get()) { if (activeHelmRepositories.pending.get()) {
return ( return (
<div className={styles.repos}> <div className={styles.repos}>
@ -39,9 +39,9 @@ const NonInjectedActiveHelmRepositories = observer(({ activeHelmRepositories, de
{repositories.map((repository) => ( {repositories.map((repository) => (
<RemovableItem <RemovableItem
key={repository.name} key={repository.name}
onRemove={() => deactivateRepository(repository)} onRemove={() => removeRepository(repository)}
className="mt-3" className="mt-3"
data-testid={`deactivate-helm-repository-${repository.name}`} data-testid={`remove-helm-repository-${repository.name}`}
> >
<div data-testid={`helm-repository-${repository.name}`} className={styles.repoName}> <div data-testid={`helm-repository-${repository.name}`} className={styles.repoName}>
{repository.name} {repository.name}
@ -61,7 +61,7 @@ export const HelmRepositories = withInjectables<Dependencies>(
{ {
getProps: (di) => ({ getProps: (di) => ({
activeHelmRepositories: di.inject(activeHelmRepositoriesInjectable), activeHelmRepositories: di.inject(activeHelmRepositoriesInjectable),
deactivateRepository: di.inject(deactivateHelmRepositoryInjectable), removeRepository: di.inject(removeHelmRepositoryInjectable),
}), }),
}, },
); );

12
src/renderer/components/+preferences/kubernetes/helm-charts/deactivate-helm-repository.injectable.ts → src/renderer/components/+preferences/kubernetes/helm-charts/remove-helm-repository.injectable.ts
View File

@ -6,22 +6,22 @@ import { getInjectable } from "@ogre-tools/injectable";
import type { HelmRepo } from "../../../../../common/helm-repo"; import type { HelmRepo } from "../../../../../common/helm-repo";
import { requestFromChannelInjectionToken } from "../../../../../common/utils/channel/request-from-channel-injection-token"; import { requestFromChannelInjectionToken } from "../../../../../common/utils/channel/request-from-channel-injection-token";
import activeHelmRepositoriesInjectable from "./active-helm-repositories.injectable"; 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({ const removePublicHelmRepositoryInjectable = getInjectable({
id: "deactivate-public-helm-repository", id: "remove-public-helm-repository",
instantiate: (di) => { instantiate: (di) => {
const requestFromChannel = di.inject(requestFromChannelInjectionToken); const requestFromChannel = di.inject(requestFromChannelInjectionToken);
const deactivateHelmRepositoryChannel = di.inject(deactivateHelmRepositoryChannelInjectable); const removeHelmRepositoryChannel = di.inject(removeHelmRepositoryChannelInjectable);
const activeHelmRepositories = di.inject(activeHelmRepositoriesInjectable); const activeHelmRepositories = di.inject(activeHelmRepositoriesInjectable);
return async (repository: HelmRepo) => { return async (repository: HelmRepo) => {
await requestFromChannel(deactivateHelmRepositoryChannel, repository); await requestFromChannel(removeHelmRepositoryChannel, repository);
activeHelmRepositories.invalidate(); activeHelmRepositories.invalidate();
}; };
}, },
}); });
export default activatePublicHelmRepositoryInjectable; export default removePublicHelmRepositoryInjectable;

4
src/renderer/getDiForUnitTesting.tsx
View File

@ -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 provideInitialValuesForSyncBoxesInjectable from "./utils/sync-box/provide-initial-values-for-sync-boxes.injectable";
import requestAnimationFrameInjectable from "./components/animate/request-animation-frame.injectable"; import requestAnimationFrameInjectable from "./components/animate/request-animation-frame.injectable";
import getRandomIdInjectable from "../common/utils/get-random-id.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 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/activation-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.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 } = {}) => { export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {}) => {
const { const {