From 2593a218f15ca734a7aa31c7152f3e0e32a7e821 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Thu, 16 Feb 2023 08:54:56 +0200 Subject: [PATCH] Fix configuration shown release details being stale Signed-off-by: Janne Savolainen --- ...wing-details-for-helm-release.test.ts.snap | 2086 ++++++++++++++++- .../showing-details-for-helm-release.test.ts | 91 +- .../release-details-content.tsx | 6 +- 3 files changed, 2170 insertions(+), 13 deletions(-) diff --git a/packages/core/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/packages/core/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap index 86e80acc4c..c36ac69784 100644 --- a/packages/core/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap +++ b/packages/core/src/features/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap @@ -5818,7 +5818,7 @@ exports[`showing details for helm release given application is started when navi @@ -7100,7 +7100,7 @@ exports[`showing details for helm release given application is started when navi @@ -8382,7 +8382,7 @@ exports[`showing details for helm release given application is started when navi @@ -9469,7 +9469,7 @@ exports[`showing details for helm release given application is started when navi @@ -10557,7 +10557,7 @@ exports[`showing details for helm release given application is started when navi @@ -11840,7 +11840,7 @@ exports[`showing details for helm release given application is started when navi @@ -17047,3 +17047,2077 @@ exports[`showing details for helm release given application is started when navi `; + +exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve when selecting release to see details when opening details for second release when details for second release resolve renders 1`] = ` + +
+
+
+
+
+ +
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Workloads + + + + keyboard_arrow_down + + + +
+
+ + + + list + + + + Config + + +
+
+ + + + device_hub + + + + Network + + + + keyboard_arrow_down + + + +
+
+ + + + storage + + + + Storage + + +
+
+ + + + + + Helm + + + + keyboard_arrow_down + + + +
+
+ + + + security + + + + Access Control + + +
+
+ + + + extension + + + + Custom Resources + + + + keyboard_arrow_down + + + +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 2 items +
+
+
+ + +
+
+
+ Namespaces: some-namespace, some-other-namespace +
+
+ +
+
+
+ + +
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+ Namespace +
+ + + arrow_drop_down + + +
+
+
+ Chart +
+ + + arrow_drop_down + + +
+
+
+ Revision +
+ + + arrow_drop_down + + +
+
+
+ Version +
+
+
+
+ App Version +
+
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ Updated +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+ +
+
+ some-name +
+
+
+ some-namespace +
+
+ Set global namespace filter to: + + some-namespace + +
+
+
+ some-chart +
+
+ NaN +
+
+ 1.0.0 +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+
+ some-other-namespace +
+
+ Set global namespace filter to: + + some-other-namespace + +
+
+
+ some-other-chart +
+
+ NaN +
+
+ 2.0.0 +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_up + + +
+ Open +
+
+
+
+
+
+
+
+
+
+
+ some-other-name + + + content_copy + + +
+ Copy +
+
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+ +`; + +exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve when selecting release to see details when opening details for second release when details for second release resolve when configuration resolves renders 1`] = ` + +
+
+
+
+
+ +
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Workloads + + + + keyboard_arrow_down + + + +
+
+ + + + list + + + + Config + + +
+
+ + + + device_hub + + + + Network + + + + keyboard_arrow_down + + + +
+
+ + + + storage + + + + Storage + + +
+
+ + + + + + Helm + + + + keyboard_arrow_down + + + +
+
+ + + + security + + + + Access Control + + +
+
+ + + + extension + + + + Custom Resources + + + + keyboard_arrow_down + + + +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 2 items +
+
+
+ + +
+
+
+ Namespaces: some-namespace, some-other-namespace +
+
+ +
+
+
+ + +
+
+
+
+
+ +
+
+
+
+
+
+
+ +
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+ Namespace +
+ + + arrow_drop_down + + +
+
+
+ Chart +
+ + + arrow_drop_down + + +
+
+
+ Revision +
+ + + arrow_drop_down + + +
+
+
+ Version +
+
+
+
+ App Version +
+
+
+
+ Status +
+ + + arrow_drop_down + + +
+
+
+ Updated +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+ +
+
+ some-name +
+
+
+ some-namespace +
+
+ Set global namespace filter to: + + some-namespace + +
+
+
+ some-chart +
+
+ NaN +
+
+ 1.0.0 +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+
+ some-other-namespace +
+
+ Set global namespace filter to: + + some-other-namespace + +
+
+
+ some-other-chart +
+
+ NaN +
+
+ 2.0.0 +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_up + + +
+ Open +
+
+
+
+
+
+
+
+
+
+
+ some-other-name + + + content_copy + + +
+ Copy +
+
+ + + close + + +
+ Close +
+
+
+
+
+
+
+
+ +`; diff --git a/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts b/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts index 9294b3057e..ca947358ad 100644 --- a/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts +++ b/packages/core/src/features/helm-releases/showing-details-for-helm-release.test.ts @@ -224,15 +224,96 @@ describe("showing details for helm release", () => { it("closes details for first release", () => { expect( - rendered.queryByTestId("helm-release-details-for-some-namespace/some-name"), + rendered.queryByTestId( + "helm-release-details-for-some-namespace/some-name", + ), ).not.toBeInTheDocument(); }); it("opens details for second release", () => { expect( - rendered.getByTestId("helm-release-details-for-some-other-namespace/some-other-name"), + rendered.getByTestId( + "helm-release-details-for-some-other-namespace/some-other-name", + ), ).toBeInTheDocument(); }); + + it("shows spinner", () => { + expect( + rendered.getByTestId("helm-release-detail-content-spinner"), + ).toBeInTheDocument(); + }); + + describe("when details for second release resolve", () => { + beforeEach(async () => { + await requestDetailedHelmReleaseMock.resolve({ + callWasSuccessful: true, + response: { + release: { + appVersion: "some-app-version", + chart: "some-chart-1.0.0", + status: "some-status", + updated: "some-updated", + revision: "some-revision", + name: "some-other-name", + namespace: "some-other-namespace", + }, + + details: { + name: "some-other-name", + namespace: "some-other-namespace", + version: "some-version", + config: "some-config", + manifest: "some-manifest", + + info: { + deleted: "some-deleted", + description: "some-description", + first_deployed: "some-first-deployed", + last_deployed: "some-last-deployed", + notes: "some-notes", + status: "some-status", + }, + + resources: [ + { + kind: "some-kind", + apiVersion: "some-api-version", + metadata: { + uid: "some-uid", + name: "some-resource", + namespace: "some-namespace", + creationTimestamp: "2015-10-22T07:28:00Z", + }, + }, + ], + }, + }, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("calls for release configuration", () => { + expect( + requestHelmReleaseConfigurationMock, + ).toHaveBeenCalledWith("some-other-name", "some-other-namespace", true); + }); + + describe("when configuration resolves", () => { + beforeEach(async () => { + await requestHelmReleaseConfigurationMock.resolve( + "some-other-configuration", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + }); + }); }); describe("when details is closed", () => { @@ -410,7 +491,7 @@ describe("showing details for helm release", () => { describe("when changing the configuration", () => { beforeEach(() => { const configuration = rendered.getByTestId( - "monaco-editor-for-helm-release-configuration", + "monaco-editor-for-helm-release-configuration-some-namespace/some-name", ); fireEvent.change(configuration, { @@ -424,7 +505,7 @@ describe("showing details for helm release", () => { it("has the configuration", () => { const input = rendered.getByTestId( - "monaco-editor-for-helm-release-configuration", + "monaco-editor-for-helm-release-configuration-some-namespace/some-name", ); expect(input).toHaveValue("some-new-configuration"); @@ -466,7 +547,7 @@ describe("showing details for helm release", () => { it("overrides the user inputted configuration with new configuration", () => { const input = rendered.getByTestId( - "monaco-editor-for-helm-release-configuration", + "monaco-editor-for-helm-release-configuration-some-namespace/some-name", ); expect(input).toHaveValue("some-other-configuration"); diff --git a/packages/core/src/renderer/components/+helm-releases/release-details/release-details-content.tsx b/packages/core/src/renderer/components/+helm-releases/release-details/release-details-content.tsx index 02e3255304..ebfb51c6ef 100644 --- a/packages/core/src/renderer/components/+helm-releases/release-details/release-details-content.tsx +++ b/packages/core/src/renderer/components/+helm-releases/release-details/release-details-content.tsx @@ -85,6 +85,7 @@ const NonInjectedReleaseDetailsContent = observer(({ model }: Dependencies & Rel { +const ReleaseValues = observer(({ releaseId, configuration, onlyUserSuppliedValuesAreShown }: ReleaseValuesProps) => { const configurationIsLoading = configuration.isLoading.get(); return ( @@ -171,7 +173,7 @@ const ReleaseValues = observer(({ configuration, onlyUserSuppliedValuesAreShown />