From 2e51e33853088d5b3647619ab65a44f4376c56f9 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Mon, 6 Jun 2022 16:00:42 +0300 Subject: [PATCH] Introduce competition for activating custom helm repository in preferences Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- ...m-helm-repository-preferences.test.ts.snap | 7517 +++++++++++++++++ ...custom-helm-repository-preferences.test.ts | 330 + ...-custom-helm-repository-dialog-content.tsx | 152 + ...ation-of-custom-helm-repository-dialog.tsx | 47 + ...-of-custom-helm-repository-open-button.tsx | 32 + .../custom-helm-repo.injectable.ts | 25 + ...repository-dialog-is-visible.injectable.ts | 13 + ...ating-custom-helm-repository.injectable.ts | 21 + ...ating-custom-helm-repository.injectable.ts | 21 + .../get-file-paths.injectable.ts | 24 + .../helm-file-input/helm-file-input.tsx | 74 + ...-helm-repo-options-are-shown.injectable.ts | 13 + ...ubmit-custom-helm-repository.injectable.ts | 25 + .../kubernetes/helm-charts/helm-charts-2.tsx | 6 + .../input/validators/is-path.injectable.ts | 32 + src/renderer/components/wizard/wizard.tsx | 6 +- src/renderer/getDiForUnitTesting.tsx | 5 + 17 files changed, 8342 insertions(+), 1 deletion(-) create mode 100644 src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap create mode 100644 src/behaviours/helm-charts/activate-custom-helm-repository-preferences.test.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog-content.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-open-button.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/custom-helm-repo.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/activation-of-custom-helm-repository-dialog-is-visible.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/hide-dialog-for-activating-custom-helm-repository.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/dialog-visibility/show-dialog-for-activating-custom-helm-repository.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/helm-file-input/get-file-paths.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/helm-file-input/helm-file-input.tsx create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/maximal-custom-helm-repo-options-are-shown.injectable.ts create mode 100644 src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/submit-custom-helm-repository.injectable.ts create mode 100644 src/renderer/components/input/validators/is-path.injectable.ts diff --git a/src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap b/src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap new file mode 100644 index 0000000000..402371797a --- /dev/null +++ b/src/behaviours/helm-charts/__snapshots__/activate-custom-helm-repository-preferences.test.ts.snap @@ -0,0 +1,7517 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +exports[`activate custom helm repository in preferences when navigating to preferences containing helm repositories when active repositories resolve 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+ +`; + +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`] = ` + +
+
+ +
+
+
+
+

+ 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ +`; + +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`] = ` + +
+
+ +
+
+
+
+

+ 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+ +`; + +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`] = ` + +
+
+ +
+
+
+
+

+ 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ +`; + +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`] = ` + +
+
+ +
+
+
+
+

+ 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ Security settings + +
+ +
+
+ +
+
+ + + folder + + +
+
+
+ +
+
+ + + folder + + +
+
+
+ +
+
+ + + folder + + +
+
+ Chart Repository Credentials + +
+
+ +
+
+
+ +
+
+
+
+
+
+ + +
+ +
+
+
+ +`; + +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`] = ` + +
+
+ +
+
+
+
+

+ 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ +`; + +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`] = ` + +
+
+ +
+
+
+
+

+ 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+ Security settings + +
+ +
+
+ +
+
+ + + folder + + +
+
+
+ +
+
+ + + folder + + +
+
+
+ +
+
+ + + folder + + +
+
+ Chart Repository Credentials + +
+
+ +
+
+
+ +
+
+
+
+
+
+ + +
+ +
+
+
+ +`; + +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`] = ` + +
+
+ +
+
+
+
+

+ 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + +
+
+
+
+ +
+
+
+
+ Some active repository +
+
+ some-url +
+ + + delete + + +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ +`; + +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 activating resolves 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+ +`; + +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 activating resolves when adding custom repository again 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 +
+
+ +
+
+
+ + + +
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+ Repositories +
+
+ +
+
+
+ + + +
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ + + close + + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+ Add custom Helm Repo +
+
+
+
+
+
+ +
+
+
+ +
+
+ +
+
+
+ + +
+ +
+
+
+ +`; diff --git a/src/behaviours/helm-charts/activate-custom-helm-repository-preferences.test.ts b/src/behaviours/helm-charts/activate-custom-helm-repository-preferences.test.ts new file mode 100644 index 0000000000..bbac3e8ca3 --- /dev/null +++ b/src/behaviours/helm-charts/activate-custom-helm-repository-preferences.test.ts @@ -0,0 +1,330 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { RenderResult } from "@testing-library/react"; +import { fireEvent } 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 type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; +import execFileInjectable from "../../common/fs/exec-file.injectable"; +import helmBinaryPathInjectable from "../../main/helm/helm-binary-path.injectable"; +import getActiveHelmRepositoriesInjectable from "../../main/helm/repositories/get-active-helm-repositories/get-active-helm-repositories.injectable"; +import type { HelmRepo } from "../../common/helm-repo"; +import callForPublicHelmRepositoriesInjectable from "../../renderer/components/+preferences/kubernetes/helm-charts/activation-of-public-helm-repository/public-helm-repositories/call-for-public-helm-repositories.injectable"; +import isPathInjectable from "../../renderer/components/input/validators/is-path.injectable"; + +// TODO: Make tooltips free of side effects by making it deterministic +jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: (target: any) => target, +})); + +describe("activate custom helm repository in preferences", () => { + let applicationBuilder: ApplicationBuilder; + let rendered: RenderResult; + let execFileMock: AsyncFnMock< + ReturnType + >; + let getActiveHelmRepositoriesMock: AsyncFnMock<() => Promise>; + + beforeEach(async () => { + jest.useFakeTimers("modern"); + + applicationBuilder = getApplicationBuilder(); + + execFileMock = asyncFn(); + getActiveHelmRepositoriesMock = asyncFn(); + + applicationBuilder.beforeApplicationStart(({ mainDi, rendererDi }) => { + rendererDi.override(callForPublicHelmRepositoriesInjectable, () => async () => []); + + rendererDi.override(isPathInjectable, () => ({ debounce: 0, validate: async () => {} })); + + mainDi.override( + getActiveHelmRepositoriesInjectable, + () => getActiveHelmRepositoriesMock, + ); + + mainDi.override(execFileInjectable, () => execFileMock); + mainDi.override(helmBinaryPathInjectable, () => "some-helm-binary-path"); + }); + + rendered = await applicationBuilder.render(); + }); + + describe("when navigating to preferences containing helm repositories", () => { + beforeEach(async () => { + applicationBuilder.preferences.navigate(); + applicationBuilder.preferences.navigation.click("kubernetes"); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when active repositories resolve", () => { + beforeEach(async () => { + await Promise.all([ + getActiveHelmRepositoriesMock.resolve([ + { name: "Some active repository", url: "some-url" }, + ]), + ]); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when selecting to add custom repository", () => { + beforeEach(() => { + const button = rendered.getByTestId("add-custom-helm-repo-button"); + + fireEvent.click(button); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("shows dialog", () => { + expect( + rendered.queryByTestId("activate-custom-helm-repository-dialog"), + ).toBeInTheDocument(); + }); + + // TODO: Figure out how to close dialog by clicking outside of it + xdescribe("when closing the dialog by clicking outside", () => { + beforeEach(() => {}); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show dialog anymore", () => { + expect( + rendered.queryByTestId("activate-custom-helm-repository-dialog"), + ).not.toBeInTheDocument(); + }); + }); + + describe("when closing the dialog by clicking cancel", () => { + beforeEach(() => { + const button = rendered.getByTestId("custom-helm-repository-cancel-button"); + + fireEvent.click(button); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show dialog anymore", () => { + expect( + rendered.queryByTestId("activate-custom-helm-repository-dialog"), + ).not.toBeInTheDocument(); + }); + }); + + describe("when inputted minimal options for the repository", () => { + beforeEach(() => { + getActiveHelmRepositoriesMock.mockClear(); + + const nameInput = rendered.getByTestId("custom-helm-repository-name-input"); + + fireEvent.change(nameInput, { target: { value: "some-custom-repository" }}); + + const urlInput = rendered.getByTestId("custom-helm-repository-url-input"); + + fireEvent.change(urlInput, { target: { value: "http://some.url" }}); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when submitted and some time passes", () => { + beforeEach(() => { + const submitButton = rendered.getByTestId("custom-helm-repository-submit-button"); + + fireEvent.click(submitButton); + + // TODO: Remove when debounce is removed from WizardStep.submit + jest.runOnlyPendingTimers(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("activates the repository", () => { + expect(execFileMock).toHaveBeenCalledWith( + "some-helm-binary-path", + ["repo", "add", "some-custom-repository", "http://some.url"], + ); + }); + + it("does not reload active repositories yet", () => { + expect(getActiveHelmRepositoriesMock).not.toHaveBeenCalled(); + }); + + describe("when activating resolves", () => { + beforeEach(async () => { + await execFileMock.resolveSpecific( + [ + "some-helm-binary-path", + ["repo", "add", "some-custom-repository", "http://some.url"], + ], + + "", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show dialog anymore", () => { + expect(rendered.queryByTestId("activate-custom-helm-repository-dialog")).not.toBeInTheDocument(); + }); + + it("reloads active repositories", () => { + expect(getActiveHelmRepositoriesMock).toHaveBeenCalled(); + }); + + describe("when adding custom repository again", () => { + beforeEach(() => { + const button = rendered.getByTestId("add-custom-helm-repo-button"); + + fireEvent.click(button); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("repository name is empty", () => { + const input = rendered.getByTestId("custom-helm-repository-name-input") as HTMLInputElement; + + expect(input.value).toBe(""); + }); + + it("repository url is empty", () => { + const input = rendered.getByTestId("custom-helm-repository-url-input") as HTMLInputElement; + + expect(input.value).toBe(""); + }); + }); + }); + }); + + describe("when showing the maximal options", () => { + beforeEach(() => { + const button = rendered.getByTestId("toggle-maximal-options-for-custom-helm-repository-button"); + + fireEvent.click(button); + }); + + it("shows maximal options", () => { + const maximalOptions = rendered.getByTestId("maximal-options-for-custom-helm-repository-dialog"); + + expect(maximalOptions).toBeInTheDocument(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("given closing the dialog, when reopening the dialog, still shows maximal options", () => { + const cancelButton = rendered.getByTestId("custom-helm-repository-cancel-button"); + + fireEvent.click(cancelButton); + + const openButton = rendered.getByTestId("add-custom-helm-repo-button"); + + fireEvent.click(openButton); + + const maximalOptions = rendered.getByTestId("maximal-options-for-custom-helm-repository-dialog"); + + expect(maximalOptions).toBeInTheDocument(); + }); + + describe("when hiding maximal options", () => { + beforeEach(() => { + const button = rendered.getByTestId("toggle-maximal-options-for-custom-helm-repository-button"); + + fireEvent.click(button); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show maximal options anymore", () => { + const maximalOptions = rendered.queryByTestId("maximal-options-for-custom-helm-repository-dialog"); + + expect(maximalOptions).not.toBeInTheDocument(); + }); + }); + + describe("when inputted maximal options", () => { + beforeEach(async () => { + [ + { selector: "username-input", value: "some-username" }, + { selector: "password-input", value: "some-password" }, + { selector: "ca-cert-file-input", value: "some-ca-cert-file" }, + { selector: "cert-file-input", value: "some-cert-file" }, + { selector: "key-file-input", value: "some-key-file" }, + ].forEach(({ selector, value }) => { + const input = rendered.getByTestId(`custom-helm-repository-${selector}`); + + fireEvent.change(input, { target: { value }}); + }); + + const checkbox = rendered.getByTestId(`custom-helm-repository-verify-tls-input`); + + fireEvent.click(checkbox); + + jest.runOnlyPendingTimers(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("when submitted and some time passes, activates the repository with maximal options", () => { + const submitButton = rendered.getByTestId("custom-helm-repository-submit-button"); + + fireEvent.click(submitButton); + + // TODO: Remove when debounce is removed from WizardStep.submit + jest.runOnlyPendingTimers(); + + expect(execFileMock).toHaveBeenCalledWith( + "some-helm-binary-path", + [ + "repo", + "add", + "some-custom-repository", + "http://some.url", + "--insecure-skip-tls-verify", + "--username", + "some-username", + "--password", + "some-password", + "--ca-file", + "some-ca-cert-file", + "--key-file", + "some-key-file", + "--cert-file", + "some-cert-file", + ], + ); + }); + }); + }); + }); + }); + }); + }); +}); 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/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog-content.tsx new file mode 100644 index 0000000000..37309a7f80 --- /dev/null +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog-content.tsx @@ -0,0 +1,152 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import "../../../add-helm-repo-dialog.scss"; + +import React from "react"; +import { Wizard, WizardStep } from "../../../../wizard"; +import { Input } from "../../../../input"; +import { systemName, isUrl } from "../../../../input/input_validators"; +import { withInjectables } from "@ogre-tools/injectable-react"; +import customHelmRepoInjectable from "./custom-helm-repo.injectable"; +import type { HelmRepo } from "../../../../../../common/helm-repo"; +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 { Button } from "../../../../button"; +import { Icon } from "../../../../icon"; +import maximalCustomHelmRepoOptionsAreShownInjectable from "./maximal-custom-helm-repo-options-are-shown.injectable"; +import { SubTitle } from "../../../../layout/sub-title"; +import { Checkbox } from "../../../../checkbox"; +import { HelmFileInput } from "./helm-file-input/helm-file-input"; + +interface Dependencies { + helmRepo: HelmRepo; + hideDialog: () => void; + submitCustomRepository: (repository: HelmRepo) => Promise; + maximalOptionsAreShown: IObservableValue; +} + +const NonInjectedActivationOfCustomHelmRepositoryDialogContent = observer(({ helmRepo, submitCustomRepository, maximalOptionsAreShown, hideDialog } : Dependencies) => ( + Add custom Helm Repo} done={hideDialog}> + submitCustomRepository(helmRepo)} + testIdForNext="custom-helm-repository-submit-button" + testIdForPrev="custom-helm-repository-cancel-button" + > +
+ helmRepo.name = v)} + data-testid="custom-helm-repository-name-input" + /> + helmRepo.url = v)} + data-testid="custom-helm-repository-url-input" + /> + + + {maximalOptionsAreShown.get() && ( +
+ + + { + helmRepo.insecureSkipTlsVerify = v; + })} + data-testid="custom-helm-repository-verify-tls-input" + /> + + helmRepo.keyFile = value)} + fileExtensions={keyExtensions} + data-testid="custom-helm-repository-key-file-input" + /> + + helmRepo.caFile = value)} + fileExtensions={certExtensions} + data-testid="custom-helm-repository-ca-cert-file-input" + /> + + helmRepo.certFile = value)} + fileExtensions={certExtensions} + data-testid="custom-helm-repository-cert-file-input" + /> + + + + helmRepo.username = v)} + data-testid="custom-helm-repository-username-input" + /> + helmRepo.password = v)} + data-testid="custom-helm-repository-password-input" + /> +
+ )} +
+ + +)); + + + +export const ActivationOfCustomHelmRepositoryDialogContent = withInjectables( + NonInjectedActivationOfCustomHelmRepositoryDialogContent, + + { + getProps: (di) => ({ + helmRepo: di.inject(customHelmRepoInjectable), + hideDialog: di.inject(hideDialogForActivatingCustomHelmRepositoryInjectable), + submitCustomRepository: di.inject(submitCustomHelmRepositoryInjectable), + maximalOptionsAreShown: di.inject(maximalCustomHelmRepoOptionsAreShownInjectable), + }), + }, +); + +const keyExtensions = ["key", "keystore", "jks", "p12", "pfx", "pem"]; +const certExtensions = ["crt", "cer", "ca-bundle", "p7b", "p7c", "p7s", "p12", "pfx", "pem"]; + 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/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx new file mode 100644 index 0000000000..eec64cefb2 --- /dev/null +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-dialog.tsx @@ -0,0 +1,47 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +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 type { IObservableValue } from "mobx"; +import { observer } from "mobx-react"; +import hideDialogForActivatingCustomHelmRepositoryInjectable from "./dialog-visibility/hide-dialog-for-activating-custom-helm-repository.injectable"; + +interface Dependencies { + contentIsVisible: IObservableValue; + hideDialog: () => void; +} + +const NonInjectedActivationOfCustomHelmRepositoryDialog = observer(({ + contentIsVisible, + hideDialog, +}: Dependencies) => ( +
+ + {contentIsVisible.get() && } + +
+)); + + +export const ActivationOfCustomHelmRepositoryDialog = withInjectables( + NonInjectedActivationOfCustomHelmRepositoryDialog, + + { + getProps: (di) => ({ + contentIsVisible: di.inject(activationOfCustomHelmRepositoryDialogIsVisibleInjectable), + hideDialog: di.inject(hideDialogForActivatingCustomHelmRepositoryInjectable), + }), + }, +); 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/activation-of-custom-helm-repository/activation-of-custom-helm-repository-open-button.tsx new file mode 100644 index 0000000000..de1e6d4745 --- /dev/null +++ b/src/renderer/components/+preferences/kubernetes/helm-charts/activation-of-custom-helm-repository/activation-of-custom-helm-repository-open-button.tsx @@ -0,0 +1,32 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +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"; + +interface Dependencies { + showDialog: () => void; +} + +const NonInjectedActivationOfCustomHelmRepositoryOpenButton = ({ showDialog }: Dependencies) => ( +
)} diff --git a/src/renderer/getDiForUnitTesting.tsx b/src/renderer/getDiForUnitTesting.tsx index 3d89322cdf..2fbca970d1 100644 --- a/src/renderer/getDiForUnitTesting.tsx +++ b/src/renderer/getDiForUnitTesting.tsx @@ -45,6 +45,7 @@ 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"; export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {}) => { const { @@ -95,6 +96,10 @@ export const getDiForUnitTesting = (opts: { doGeneralOverrides?: boolean } = {}) throw new Error("Tried to broadcast message over IPC without explicit override."); }); + di.override(getFilePathsInjectable, () => () => { + throw new Error("Tried to get file paths without explicit override."); + }); + // eslint-disable-next-line unused-imports/no-unused-vars-ts di.override(extensionsStoreInjectable, () => ({ isEnabled: ({ id, isBundled }) => false }) as ExtensionsStore);