diff --git a/src/common/k8s-api/endpoints/helm-charts.api/request-versions.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-versions.injectable.ts index ad5da0ea4f..410d8ea596 100644 --- a/src/common/k8s-api/endpoints/helm-charts.api/request-versions.injectable.ts +++ b/src/common/k8s-api/endpoints/helm-charts.api/request-versions.injectable.ts @@ -11,7 +11,7 @@ import { isDefined } from "../../../utils"; const requestVersionsEndpoint = urlBuilderFor("/v2/charts/:repo/:name/versions"); -export type RequestHelmChartVersions = (repo: string, name: string) => Promise; +export type RequestHelmChartVersions = (repo: string, chartName: string) => Promise; const requestHelmChartVersionsInjectable = getInjectable({ id: "request-helm-chart-versions", diff --git a/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap b/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap new file mode 100644 index 0000000000..3c5e4adce0 --- /dev/null +++ b/src/features/helm-charts/upgrade-chart/__snapshots__/upgrade-chart-new-tab.test.ts.snap @@ -0,0 +1,6099 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 0 items +
+
+
+ + +
+
+
+ Namespace: my-second-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 + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + add + + +
+ New tab +
+
+
+
+
+
+
+
+ +`; + +exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 1 item +
+
+
+ + +
+
+
+ Namespace: my-second-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 +
+
+ my-second-namespace +
+
+ some-chart +
+
+ NaN +
+
+ 1.0.0 +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + add + + +
+ New tab +
+
+
+
+
+
+
+
+ +`; + +exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves when clicking the menu for a helm release renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 1 item +
+
+
+ + +
+
+
+ Namespace: my-second-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 +
+
+ my-second-namespace +
+
+ some-chart +
+
+ NaN +
+
+ 1.0.0 +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + add + + +
+ New tab +
+
+
+
+
+
+
+
+ + +`; + +exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves when clicking the menu for a helm release when clicking the upgrade chart menu item renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 1 item +
+
+
+ + +
+
+
+ Namespace: my-second-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 +
+
+ my-second-namespace +
+
+ some-chart +
+
+ NaN +
+
+ 1.0.0 +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+
+
+ + +`; + +exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves when clicking the menu for a helm release when clicking the upgrade chart menu item when request for all helm charts resolves when the requests of versions of the helm charts resolves renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 1 item +
+
+
+ + +
+
+
+ Namespace: my-second-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 +
+
+ my-second-namespace +
+
+ some-chart +
+
+ NaN +
+
+ 1.0.0 +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ New tab +
+
+ + + fullscreen + + +
+ Fit to window +
+ + + keyboard_arrow_down + + +
+ Minimize +
+
+
+
+
+
+
+
+ + Release + + +
+ some-name +
+ + Namespace + + +
+ my-second-namespace +
+ + Version + + +
+ 1.0.0 +
+ + Upgrade version + +
+ + +
+
+
+ some-repo/some-chart-1.0.1 +
+
+ +
+
+
+ + +
+
+
+
+
+
+ + + +
+ +
+
+
+
+
+
+ + +`; + +exports[`New Upgrade Helm Chart Dock Tab given a namespace is selected when navigating to the helm releases view when helm releases resolves when clicking the menu for a helm release when clicking the upgrade chart menu item when request for all helm charts resolves when the requests of versions of the helm charts resolves when the configuration request resolves when closing the upgrade chart tab renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 1 item +
+
+
+ + +
+
+
+ Namespace: my-second-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 +
+
+ my-second-namespace +
+
+ some-chart +
+
+ NaN +
+
+ 1.0.0 +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + add + + +
+ New tab +
+
+
+
+
+
+
+
+ + +`; diff --git a/src/features/helm-charts/upgrade-chart/upgrade-chart-new-tab.test.ts b/src/features/helm-charts/upgrade-chart/upgrade-chart-new-tab.test.ts new file mode 100644 index 0000000000..bc3cbe53d8 --- /dev/null +++ b/src/features/helm-charts/upgrade-chart/upgrade-chart-new-tab.test.ts @@ -0,0 +1,264 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; +import type { RenderResult } from "@testing-library/react"; +import type { NavigateToHelmReleases } from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable"; +import navigateToHelmReleasesInjectable from "../../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable"; +import { HelmChart } from "../../../common/k8s-api/endpoints/helm-charts.api"; +import type { RequestHelmCharts } from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; +import requestHelmChartsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-charts.injectable"; +import type { RequestHelmChartVersions } from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import requestHelmChartVersionsInjectable from "../../../common/k8s-api/endpoints/helm-charts.api/request-versions.injectable"; +import type { RequestHelmReleaseConfiguration } from "../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; +import requestHelmReleaseConfigurationInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-configuration.injectable"; +import type { RequestHelmReleases } from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; +import requestHelmReleasesInjectable from "../../../common/k8s-api/endpoints/helm-releases.api/request-releases.injectable"; +import dockStoreInjectable from "../../../renderer/components/dock/dock/store.injectable"; +import type { ApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../../renderer/components/test-utils/get-application-builder"; + +describe("New Upgrade Helm Chart Dock Tab", () => { + let builder: ApplicationBuilder; + let renderResult: RenderResult; + let requestHelmReleaseConfigurationMock: AsyncFnMock; + let requestHelmReleasesMock: AsyncFnMock; + let requestHelmChartsMock: AsyncFnMock; + let requestHelmChartVersionsMock: AsyncFnMock; + let navigateToHelmReleases: NavigateToHelmReleases; + + beforeEach(async () => { + builder = getApplicationBuilder(); + builder.setEnvironmentToClusterFrame(); + + builder.beforeWindowStart((windowDi) => { + requestHelmReleaseConfigurationMock = asyncFn(); + windowDi.override(requestHelmReleaseConfigurationInjectable, () => requestHelmReleaseConfigurationMock); + + requestHelmReleasesMock = asyncFn(); + windowDi.override(requestHelmReleasesInjectable, () => requestHelmReleasesMock); + + requestHelmChartsMock = asyncFn(); + windowDi.override(requestHelmChartsInjectable, () => requestHelmChartsMock); + + requestHelmChartVersionsMock = asyncFn(); + windowDi.override(requestHelmChartVersionsInjectable, () => requestHelmChartVersionsMock); + + navigateToHelmReleases = windowDi.inject(navigateToHelmReleasesInjectable); + }); + + builder.namespaces.add("my-first-namespace"); + builder.namespaces.add("my-second-namespace"); + + renderResult = await builder.render(); + + const dockStore = builder.applicationWindow.only.di.inject(dockStoreInjectable); + + // TODO: Make TerminalWindow unit testable to allow realistic behaviour + dockStore.closeTab("terminal"); + }); + + describe("given a namespace is selected", () => { + beforeEach(() => { + builder.namespaces.select("my-second-namespace"); + }); + + describe("when navigating to the helm releases view", () => { + beforeEach(() => { + navigateToHelmReleases(); + }); + + it("renders", () => { + expect(renderResult.baseElement).toMatchSnapshot(); + }); + + it("requests helm releases for the selected namespace", () => { + expect(requestHelmReleasesMock).toBeCalledWith("my-second-namespace"); + }); + + describe("when helm releases resolves", () => { + beforeEach(async () => { + await requestHelmReleasesMock.resolve([ + { + appVersion: "some-app-version", + name: "some-name", + namespace: "my-second-namespace", + chart: "some-chart-1.0.0", + status: "some-status", + updated: "some-updated", + revision: "some-revision", + }, + ]); + }); + + it("renders", () => { + expect(renderResult.baseElement).toMatchSnapshot(); + }); + + describe("when clicking the menu for a helm release", () => { + beforeEach(() => { + const helmReleaseMenu = renderResult.getByTestId("menu-actions-icon-for-release-menu-for-my-second-namespace/some-name"); + + helmReleaseMenu.click(); + }); + + it("renders", () => { + expect(renderResult.baseElement).toMatchSnapshot(); + }); + + describe("when clicking the upgrade chart menu item", () => { + beforeEach(() => { + const upgradeHelmChartMenuItem = renderResult.getByTestId("upgrade-chart-menu-item-for-my-second-namespace/some-name"); + + upgradeHelmChartMenuItem.click(); + }); + + it("renders", () => { + expect(renderResult.baseElement).toMatchSnapshot(); + }); + + it("requests all helm charts", () => { + expect(requestHelmChartsMock).toBeCalled(); + }); + + describe("when request for all helm charts resolves", () => { + beforeEach(async () => { + await requestHelmChartsMock.resolve([ + HelmChart.create({ + apiVersion: "1.2.3", + version: "1.0.0", + created: "at-some-time", + name: "some-chart", + repo: "some-repo", + }), + HelmChart.create({ + apiVersion: "1.2.3", + version: "1.0.0", + created: "at-some-third-time", + name: "some-chart", + repo: "some-third-repo", + }), + HelmChart.create({ + apiVersion: "1.2.3", + version: "0.9.0", + created: "at-some-other-time", + name: "some-other-chart", + repo: "some-repo", + }), + ]); + }); + + it("requests versions of the helm charts", () => { + expect(requestHelmChartVersionsMock).toBeCalledWith( + "some-repo", + "some-chart", + ); + expect(requestHelmChartVersionsMock).toBeCalledWith( + "some-third-repo", + "some-chart", + ); + }); + + it("shows the dock tab of the upgrade chart tab", () => { + expect(renderResult.queryByTestId("dock-tab-content-for-some-irrelevant-random-id")).toBeInTheDocument(); + }); + + it("does not yet show the dock contents of the upgrade chart tab", () => { + expect(renderResult.queryByTestId("upgrade-chart-dock-tab-contents-for-my-second-namespace/some-name")).not.toBeInTheDocument(); + }); + + describe("when the requests of versions of the helm charts resolves", () => { + beforeEach(async () => { + await requestHelmChartVersionsMock.resolveSpecific( + ["some-repo", "some-chart"], + [ + HelmChart.create({ + apiVersion: "1.2.3", + version: "1.0.0", + created: "at-some-time", + name: "some-chart", + repo: "some-repo", + }), + HelmChart.create({ + apiVersion: "1.2.3", + version: "1.0.1", + created: "at-some-time", + name: "some-chart", + repo: "some-repo", + }), + ], + ); + + await requestHelmChartVersionsMock.resolveSpecific( + ["some-third-repo", "some-chart"], + [ + HelmChart.create({ + apiVersion: "1.2.3", + version: "0.9.0", + created: "at-some-other-time", + name: "some-other-chart", + repo: "some-repo", + }), + HelmChart.create({ + apiVersion: "1.2.3", + version: "0.9.1", + created: "at-some-other-time", + name: "some-other-chart", + repo: "some-repo", + }), + ], + ); + }); + + it("renders", () => { + expect(renderResult.baseElement).toMatchSnapshot(); + }); + + it("shows the dock contents of the upgrade chart tab", () => { + expect(renderResult.queryByTestId("upgrade-chart-dock-tab-contents-for-my-second-namespace/some-name")).toBeInTheDocument(); + }); + + it("requests the configuration for the specific helm release", () => { + expect(requestHelmReleaseConfigurationMock).toBeCalledWith( + "some-name", + "my-second-namespace", + true, + ); + }); + + describe("when the configuration request resolves", () => { + beforeEach(async () => { + await requestHelmReleaseConfigurationMock.resolve("some confiration for the helm release"); + }); + + it("renders", () => { + expect(renderResult.baseElement).toMatchSnapshot(); + }); + + describe("when closing the upgrade chart tab", () => { + beforeEach(() => { + const closeDockTab = renderResult.getByTestId("dock-tab-close-for-some-irrelevant-random-id"); + + closeDockTab.click(); + }); + + it("renders", () => { + expect(renderResult.baseElement).toMatchSnapshot(); + }); + + it("does so", () => { + expect(renderResult.queryByTestId("dock-tab-content-for-some-irrelevant-random-id")).not.toBeInTheDocument(); + }); + }); + }); + }); + }); + }); + }); + }); + }); + }); +}); diff --git a/src/renderer/components/+helm-releases/release-menu.tsx b/src/renderer/components/+helm-releases/release-menu.tsx index a53c59a682..694dd69b3c 100644 --- a/src/renderer/components/+helm-releases/release-menu.tsx +++ b/src/renderer/components/+helm-releases/release-menu.tsx @@ -61,7 +61,10 @@ class NonInjectedHelmReleaseMenu extends React.ComponentRollback )} - + { const clusterContext = di.inject(clusterFrameContextInjectable); - const namespaceStore = di.inject(namespaceStoreInjectable); const releaseSecrets = di.inject(releaseSecretsInjectable); const requestHelmReleases = di.inject(requestHelmReleasesInjectable); const toHelmRelease = di.inject(toHelmReleaseInjectable); return asyncComputed(async () => { - const contextNamespaces = namespaceStore.contextNamespaces || []; - void releaseSecrets.get(); - const isLoadingAll = - clusterContext.allNamespaces?.length > 1 && - clusterContext.cluster?.accessibleNamespaces.length === 0 && - clusterContext.allNamespaces.every((namespace) => - contextNamespaces.includes(namespace), - ); - - const releaseArrays = await (isLoadingAll ? requestHelmReleases() : Promise.all( - contextNamespaces.map((namespace) => - requestHelmReleases(namespace), - ), - )); + const releaseArrays = await (clusterContext.hasSelectedAll + ? requestHelmReleases() + : Promise.all(clusterContext.contextNamespaces.map(namespace => requestHelmReleases(namespace))) + ); return releaseArrays.flat().map(toHelmRelease); }, []); diff --git a/src/renderer/components/dock/dock-tab.tsx b/src/renderer/components/dock/dock-tab.tsx index df578675fd..5a672e2fb3 100644 --- a/src/renderer/components/dock/dock-tab.tsx +++ b/src/renderer/components/dock/dock-tab.tsx @@ -103,6 +103,7 @@ class NonInjectedDockTab extends React.Component { material="close" tooltip={`Close ${this.props.isMac ? "⌘+W" : "Ctrl+W"}`} onClick={close} + data-testid={`dock-tab-close-for-${id}`} />
)} diff --git a/src/renderer/components/dock/upgrade-chart/tab-data.injectable.ts b/src/renderer/components/dock/upgrade-chart/tab-data.injectable.ts new file mode 100644 index 0000000000..0189ecf6a7 --- /dev/null +++ b/src/renderer/components/dock/upgrade-chart/tab-data.injectable.ts @@ -0,0 +1,21 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable, lifecycleEnum } from "@ogre-tools/injectable"; +import { waitUntilDefined } from "../../../utils"; +import upgradeChartTabStoreInjectable from "./store.injectable"; + +const upgradeChartTabDataInjectable = getInjectable({ + id: "upgrade-chart-tab-data", + instantiate: (di, tabId) => { + const upgradeChartTabStore = di.inject(upgradeChartTabStoreInjectable); + + return waitUntilDefined(() => upgradeChartTabStore.getData(tabId)); + }, + lifecycle: lifecycleEnum.keyedSingleton({ + getInstanceKey: (di, tabId: string) => tabId, + }), +}); + +export default upgradeChartTabDataInjectable; diff --git a/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts b/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts index 3b946d6c9e..41d414be25 100644 --- a/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts +++ b/src/renderer/components/dock/upgrade-chart/upgrade-chart-model.injectable.ts @@ -16,7 +16,7 @@ import requestHelmReleaseConfigurationInjectable from "../../../../common/k8s-ap import { waitUntilDefined } from "../../../utils"; import type { SelectOption } from "../../select"; import type { DockTab } from "../dock/store"; -import upgradeChartTabStoreInjectable from "./store.injectable"; +import upgradeChartTabDataInjectable from "./tab-data.injectable"; export interface UpgradeChartModel { readonly release: HelmRelease; @@ -41,13 +41,19 @@ export interface UpgradeChartSubmitResult { const upgradeChartModelInjectable = getInjectable({ id: "upgrade-chart-model", instantiate: async (di, tab): Promise => { - const upgradeChartTabStore = di.inject(upgradeChartTabStoreInjectable); const releases = di.inject(releasesInjectable); const requestHelmReleaseConfiguration = di.inject(requestHelmReleaseConfigurationInjectable); const updateRelease = di.inject(updateReleaseInjectable); + const tabData = await di.inject(upgradeChartTabDataInjectable, tab.id); - const tabData = await waitUntilDefined(() => upgradeChartTabStore.getData(tab.id)); - const release = await waitUntilDefined(() => releases.value.get().find(release => release.getName() === tabData.releaseName)); + const release = await waitUntilDefined(() => ( + releases.value + .get() + .find(release => ( + release.getName() === tabData.releaseName + && release.getNs() === tabData.releaseNamespace + )) + )); const versions = di.inject(helmChartVersionsInjectable, release); const storedConfiguration = asyncComputed(() => requestHelmReleaseConfiguration( release.getName(), diff --git a/src/renderer/components/dock/upgrade-chart/view.tsx b/src/renderer/components/dock/upgrade-chart/view.tsx index 5a6319c9cd..2a3fe59996 100644 --- a/src/renderer/components/dock/upgrade-chart/view.tsx +++ b/src/renderer/components/dock/upgrade-chart/view.tsx @@ -6,7 +6,6 @@ import "./upgrade-chart.scss"; import React from "react"; -import { makeObservable, observable } from "mobx"; import { observer } from "mobx-react"; import { cssNames } from "../../../utils"; import type { DockTab } from "../dock/store"; @@ -32,13 +31,6 @@ interface Dependencies { @observer export class NonInjectedUpgradeChart extends React.Component { - @observable error?: string; - - constructor(props: UpgradeChartProps & Dependencies) { - super(props); - makeObservable(this); - } - upgrade = async () => { const { model } = this.props; const { completedSuccessfully } = await model.submit(); @@ -63,7 +55,10 @@ export class NonInjectedUpgradeChart extends React.Component +
void; }; }; - + namespaces: { + add: (namespace: string) => void; + select: (namespace: string) => void; + }; helmCharts: { navigate: NavigateToHelmCharts; }; @@ -244,6 +247,9 @@ export const getApplicationBuilder = () => { let applicationHasStarted = false; + const namespaces = observable.array(); + const selectedNamespaces = observable.array(); + const builder: ApplicationBuilder = { mainDi, applicationWindow: { @@ -304,7 +310,10 @@ export const getApplicationBuilder = () => { return builder.applicationWindow.get(id); }, }, - + namespaces: { + add: action((namespace) => namespaces.push(namespace)), + select: action((namespace) => selectedNamespaces.push(namespace)), + }, applicationMenu: { click: (path: string) => { const applicationMenuItems = mainDi.inject( @@ -470,7 +479,8 @@ export const getApplicationBuilder = () => { // TODO: Figure out a way to remove this stub. const namespaceStoreStub = { isLoaded: true, - contextNamespaces: [], + contextNamespaces: selectedNamespaces, + allowedNamespaces: namespaces, contextItems: [], api: { kind: "Namespace",