diff --git a/package.json b/package.json index 02f0bbcec0..5e3b764467 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "OpenLens", "description": "OpenLens - Open Source IDE for Kubernetes", "homepage": "https://github.com/lensapp/lens", - "version": "5.6.0-alpha.7", + "version": "6.0.0-alpha.0", "main": "static/build/main.js", "copyright": "© 2022 OpenLens Authors", "license": "MIT", diff --git a/scripts/create-release-pr.mjs b/scripts/create-release-pr.mjs index 54b6ed17c5..e135f66fc4 100755 --- a/scripts/create-release-pr.mjs +++ b/scripts/create-release-pr.mjs @@ -83,7 +83,6 @@ if (basename(process.cwd()) === "scripts") { const currentVersion = new SemVer(readJsonSync("./package.json").version); -const currentVersionMilestone = `${currentVersion.major}.${currentVersion.minor}.${currentVersion.patch}`; console.log(`current version: ${currentVersion.format()}`); console.log("fetching tags..."); @@ -111,6 +110,9 @@ npmVersionArgs.push("--git-tag-version false"); execSync(npmVersionArgs.join(" "), { stdio: "ignore" }); const newVersion = new SemVer(readJsonSync("./package.json").version); +const newVersionMilestone = `${newVersion.major}.${newVersion.minor}.${newVersion.patch}`; + +console.log(`new version: ${newVersion.format()}`); const getMergedPrsArgs = [ "gh", @@ -124,7 +126,7 @@ const getMergedPrsArgs = [ console.log("retreiving last 500 PRs to create release PR body..."); const mergedPrs = JSON.parse(execSync(getMergedPrsArgs.join(" "), { encoding: "utf-8" })); -const milestoneRelevantPrs = mergedPrs.filter(pr => pr.milestone && pr.milestone.title === currentVersionMilestone); +const milestoneRelevantPrs = mergedPrs.filter(pr => pr.milestone?.title === newVersionMilestone); const relaventPrsQuery = await Promise.all( milestoneRelevantPrs.map(async pr => ({ pr, diff --git a/src/behaviours/application-update/analytics-for-installing-update.test.ts b/src/behaviours/application-update/analytics-for-installing-update.test.ts index e9dccb326e..b72946f80d 100644 --- a/src/behaviours/application-update/analytics-for-installing-update.test.ts +++ b/src/behaviours/application-update/analytics-for-installing-update.test.ts @@ -16,7 +16,7 @@ import processCheckingForUpdatesInjectable from "../../main/application-update/c import type { DownloadPlatformUpdate } from "../../main/application-update/download-platform-update/download-platform-update.injectable"; import downloadPlatformUpdateInjectable from "../../main/application-update/download-platform-update/download-platform-update.injectable"; import quitAndInstallUpdateInjectable from "../../main/application-update/quit-and-install-update.injectable"; -import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../../common/vars/app-version.injectable"; import periodicalCheckForUpdatesInjectable from "../../main/application-update/periodical-check-for-updates/periodical-check-for-updates.injectable"; import { advanceFakeTime, useFakeTime } from "../../common/test-utils/use-fake-time"; diff --git a/src/behaviours/application-update/downgrading-version-update.test.ts b/src/behaviours/application-update/downgrading-version-update.test.ts index 2abefa1ac8..b50d9c940b 100644 --- a/src/behaviours/application-update/downgrading-version-update.test.ts +++ b/src/behaviours/application-update/downgrading-version-update.test.ts @@ -13,7 +13,7 @@ import checkForPlatformUpdatesInjectable from "../../main/application-update/che import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable"; import selectedUpdateChannelInjectable from "../../common/application-update/selected-update-channel/selected-update-channel.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; -import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../../common/vars/app-version.injectable"; import { updateChannels } from "../../common/application-update/update-channels"; describe("downgrading version update", () => { diff --git a/src/behaviours/application-update/selection-of-update-stability.test.ts b/src/behaviours/application-update/selection-of-update-stability.test.ts index c934e7fc43..e90d92770f 100644 --- a/src/behaviours/application-update/selection-of-update-stability.test.ts +++ b/src/behaviours/application-update/selection-of-update-stability.test.ts @@ -21,7 +21,7 @@ import type { IComputedValue } from "mobx"; import setUpdateOnQuitInjectable from "../../main/electron-app/features/set-update-on-quit.injectable"; import showInfoNotificationInjectable from "../../renderer/components/notifications/show-info-notification.injectable"; import processCheckingForUpdatesInjectable from "../../main/application-update/check-for-updates/process-checking-for-updates.injectable"; -import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../../common/vars/app-version.injectable"; describe("selection of update stability", () => { let applicationBuilder: ApplicationBuilder; diff --git a/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap b/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap index ad5d354124..eb02f57fc8 100644 --- a/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap +++ b/src/behaviours/helm-charts/installing-chart/__snapshots__/installing-helm-chart-from-new-tab.test.ts.snap @@ -11123,6 +11123,49 @@ exports[`installing helm chart from new tab given tab for installing chart was n +
+
+
+
+ +
+ + + close + + +
+
+
+
+
+
+
`; diff --git a/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap b/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap new file mode 100644 index 0000000000..3c36512476 --- /dev/null +++ b/src/behaviours/helm-releases/__snapshots__/showing-details-for-helm-release.test.ts.snap @@ -0,0 +1,16071 @@ +// Jest Snapshot v1, https://goo.gl/fbAQLP + +exports[`showing details for helm release given application is started when navigating to helm releases renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 0 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 + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+ +`; + +exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve but there is none, renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 0 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 + + +
+
+
+
+
+ Item list is empty +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+ +`; + +exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+ +`; + +exports[`showing details for helm release given application is started when navigating to helm releases when releases resolve when selecting release to see details renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ +
+ + + 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 details is closed renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+ +`; + +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 details is closed when opening details for same release renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ +
+ + + 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 details resolve renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ +
+ + + 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 details resolve when configuration resolves renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ some-name + + + content_copy + + +
+ + + + close + + +
+
+
+
+ + Chart + + +
+ + some-chart + + +
+ +
+
+ + Updated + + + NaNy + ago (some-updated) + +
+
+ + Namespace + + + some-namespace + +
+
+ + Version + + +
+ +
+ +
+
+ + Status + + +
+ Some-status +
+ +
+
+
+ Values +
+
+ + + +
+
+
+ Notes +
+
+ some-notes +
+
+ Resources +
+
+
+ some-kind + +
+
+
+
+ Name +
+
+ Namespace +
+
+ Age +
+
+
+
+ some-resource +
+
+ some-namespace +
+
+ 0s +
+
+
+
+
+
+
+
+
+ +`; + +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 details resolve when configuration resolves when changing the configuration renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ some-name + + + content_copy + + +
+ + + + close + + +
+
+
+
+ + Chart + + +
+ + some-chart + + +
+ +
+
+ + Updated + + + NaNy + ago (some-updated) + +
+
+ + Namespace + + + some-namespace + +
+
+ + Version + + +
+ +
+ +
+
+ + Status + + +
+ Some-status +
+ +
+
+
+ Values +
+
+ + + +
+
+
+ Notes +
+
+ some-notes +
+
+ Resources +
+
+
+ some-kind + +
+
+
+
+ Name +
+
+ Namespace +
+
+ Age +
+
+
+
+ some-resource +
+
+ some-namespace +
+
+ 0s +
+
+
+
+
+
+
+
+
+ +`; + +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 details resolve when configuration resolves when changing the configuration when saving renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ some-name + + + content_copy + + +
+ + + + close + + +
+
+
+
+ + Chart + + +
+ + some-chart + + +
+ +
+
+ + Updated + + + NaNy + ago (some-updated) + +
+
+ + Namespace + + + some-namespace + +
+
+ + Version + + +
+ +
+ +
+
+ + Status + + +
+ Some-status +
+ +
+
+
+ Values +
+
+ + + +
+
+
+ Notes +
+
+ some-notes +
+
+ Resources +
+
+
+ some-kind + +
+
+
+
+ Name +
+
+ Namespace +
+
+ Age +
+
+
+
+ some-resource +
+
+ some-namespace +
+
+ 0s +
+
+
+
+
+
+
+
+
+ +`; + +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 details resolve when configuration resolves when changing the configuration when saving when update resolves with failure renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 0 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 + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ some-name + + + content_copy + + +
+ + + + close + + +
+
+
+
+ + Chart + + +
+ + some-chart + + +
+ +
+
+ + Updated + + + NaNy + ago (some-updated) + +
+
+ + Namespace + + + some-namespace + +
+
+ + Version + + +
+ +
+ +
+
+ + Status + + +
+ Some-status +
+ +
+
+
+ Values +
+
+ + + +
+
+
+ Notes +
+
+ some-notes +
+
+ Resources +
+
+
+ some-kind + +
+
+
+
+ Name +
+
+ Namespace +
+
+ Age +
+
+
+
+ some-resource +
+
+ some-namespace +
+
+ 0s +
+
+
+
+
+
+
+
+
+ +`; + +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 details resolve when configuration resolves when changing the configuration when saving when update resolves with success renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ Releases +
+
+ 0 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 + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ some-name + + + content_copy + + +
+ + + + close + + +
+
+
+
+ + Chart + + +
+ + some-chart + + +
+ +
+
+ + Updated + + + NaNy + ago (some-updated) + +
+
+ + Namespace + + + some-namespace + +
+
+ + Version + + +
+ +
+ +
+
+ + Status + + +
+ Some-status +
+ +
+
+
+ Values +
+
+ + + +
+
+
+ Notes +
+
+ some-notes +
+
+ Resources +
+
+
+ some-kind + +
+
+
+
+ Name +
+
+ Namespace +
+
+ Age +
+
+
+
+ some-resource +
+
+ some-namespace +
+
+ 0s +
+
+
+
+
+
+
+
+
+ +`; + +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 details resolve when configuration resolves when changing the configuration when toggling to see only user defined values when configuration resolves renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ some-name + + + content_copy + + +
+ + + + close + + +
+
+
+
+ + Chart + + +
+ + some-chart + + +
+ +
+
+ + Updated + + + NaNy + ago (some-updated) + +
+
+ + Namespace + + + some-namespace + +
+
+ + Version + + +
+ +
+ +
+
+ + Status + + +
+ Some-status +
+ +
+
+
+ Values +
+
+ + + +
+
+
+ Notes +
+
+ some-notes +
+
+ Resources +
+
+
+ some-kind + +
+
+
+
+ Name +
+
+ Namespace +
+
+ Age +
+
+
+
+ some-resource +
+
+ some-namespace +
+
+ 0s +
+
+
+
+
+
+
+
+
+ +`; + +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 details resolve when configuration resolves when selecting to upgrade chart renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_down + + +
+
+
+
+
+
+
+
+
+ +`; + +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 renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ +
+ + + 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 release resolve with no data, renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+ 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 +
+
+ some-chart +
+
+ NaN +
+
+ +
+
+ some-app-version +
+
+ Some-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+ +
+
+ some-other-name +
+
+ some-other-namespace +
+
+ some-other-chart +
+
+ NaN +
+
+ +
+
+ some-other-app-version +
+
+ Some-other-status +
+
+ NaNy +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+ + + add + + +
+ + + fullscreen + + + + + keyboard_arrow_up + + +
+
+
+
+
+
+
+
+
+
+ +
+ + + close + + +
+
+
+
+
+
+
+ +`; diff --git a/src/behaviours/helm-releases/showing-details-for-helm-release.test.ts b/src/behaviours/helm-releases/showing-details-for-helm-release.test.ts new file mode 100644 index 0000000000..21c4771e05 --- /dev/null +++ b/src/behaviours/helm-releases/showing-details-for-helm-release.test.ts @@ -0,0 +1,604 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { ApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import { getApplicationBuilder } from "../../renderer/components/test-utils/get-application-builder"; +import navigateToHelmReleasesInjectable from "../../common/front-end-routing/routes/cluster/helm/releases/navigate-to-helm-releases.injectable"; +import type { RenderResult } from "@testing-library/react"; +import { fireEvent } from "@testing-library/react"; +import type { AsyncFnMock } from "@async-fn/jest"; +import asyncFn from "@async-fn/jest"; +import type { CallForHelmReleases } from "../../renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable"; +import callForHelmReleasesInjectable from "../../renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable"; +import namespaceStoreInjectable from "../../renderer/components/+namespaces/store.injectable"; +import type { NamespaceStore } from "../../renderer/components/+namespaces/store"; +import type { CallForHelmReleaseConfiguration } from "../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.injectable"; +import callForHelmReleaseConfigurationInjectable from "../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.injectable"; +import type { CallForHelmReleaseUpdate } from "../../renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable"; +import callForHelmReleaseUpdateInjectable from "../../renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable"; +import { useFakeTime } from "../../common/test-utils/use-fake-time"; +import type { CallForHelmRelease, DetailedHelmRelease } from "../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release.injectable"; +import callForHelmReleaseInjectable from "../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release.injectable"; +import showSuccessNotificationInjectable from "../../renderer/components/notifications/show-success-notification.injectable"; +import showCheckedErrorInjectable from "../../renderer/components/notifications/show-checked-error.injectable"; +import getRandomUpgradeChartTabIdInjectable from "../../renderer/components/dock/upgrade-chart/get-random-upgrade-chart-tab-id.injectable"; + +// TODO: Make tooltips free of side effects by making it deterministic +jest.mock("../../renderer/components/tooltip/withTooltip", () => ({ + withTooltip: (target: any) => target, +})); + +describe("showing details for helm release", () => { + let builder: ApplicationBuilder; + let callForHelmReleasesMock: AsyncFnMock; + let callForHelmReleaseMock: AsyncFnMock; + let callForHelmReleaseConfigurationMock: AsyncFnMock; + let callForHelmReleaseUpdateMock: AsyncFnMock; + let showSuccessNotificationMock: jest.Mock; + let showCheckedErrorNotificationMock: jest.Mock; + + beforeEach(() => { + useFakeTime("2015-10-21T07:28:00Z"); + + builder = getApplicationBuilder(); + + builder.setEnvironmentToClusterFrame(); + + callForHelmReleasesMock = asyncFn(); + callForHelmReleaseMock = asyncFn(); + callForHelmReleaseConfigurationMock = asyncFn(); + callForHelmReleaseUpdateMock = asyncFn(); + + showSuccessNotificationMock = jest.fn(); + showCheckedErrorNotificationMock = jest.fn(); + + builder.beforeApplicationStart(({ rendererDi }) => { + rendererDi.override( + getRandomUpgradeChartTabIdInjectable, + () => () => "some-tab-id", + ); + + rendererDi.override( + showSuccessNotificationInjectable, + () => showSuccessNotificationMock, + ); + + rendererDi.override( + showCheckedErrorInjectable, + () => showCheckedErrorNotificationMock, + ); + + rendererDi.override( + callForHelmReleasesInjectable, + () => callForHelmReleasesMock, + ); + + rendererDi.override( + callForHelmReleaseInjectable, + () => callForHelmReleaseMock, + ); + + rendererDi.override( + callForHelmReleaseConfigurationInjectable, + () => callForHelmReleaseConfigurationMock, + ); + + rendererDi.override( + callForHelmReleaseUpdateInjectable, + () => callForHelmReleaseUpdateMock, + ); + + rendererDi.override( + namespaceStoreInjectable, + () => + ({ + contextNamespaces: ["some-namespace", "some-other-namespace"], + items: [], + selectNamespaces: () => {}, + } as unknown as NamespaceStore), + ); + }); + }); + + describe("given application is started", () => { + let rendered: RenderResult; + + beforeEach(async () => { + rendered = await builder.render(); + }); + + describe("when navigating to helm releases", () => { + beforeEach(() => { + const rendererDi = builder.dis.rendererDi; + + const navigateToHelmReleases = rendererDi.inject( + navigateToHelmReleasesInjectable, + ); + + navigateToHelmReleases(); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("calls for releases for each selected namespace", () => { + expect(callForHelmReleasesMock.mock.calls).toEqual([ + ["some-namespace"], + ["some-other-namespace"], + ]); + }); + + it("shows spinner", () => { + expect( + rendered.getByTestId("helm-releases-spinner"), + ).toBeInTheDocument(); + }); + + it("when releases resolve but there is none, renders", async () => { + await callForHelmReleasesMock.resolve([]); + await callForHelmReleasesMock.resolve([]); + + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when releases resolve", () => { + beforeEach(async () => { + await callForHelmReleasesMock.resolveSpecific( + ([namespace]) => namespace === "some-namespace", + [ + { + appVersion: "some-app-version", + name: "some-name", + namespace: "some-namespace", + chart: "some-chart", + status: "some-status", + updated: "some-updated", + revision: "some-revision", + }, + ], + ); + + await callForHelmReleasesMock.resolveSpecific( + ([namespace]) => namespace === "some-other-namespace", + [ + { + appVersion: "some-other-app-version", + name: "some-other-name", + namespace: "some-other-namespace", + chart: "some-other-chart", + status: "some-other-status", + updated: "some-other-updated", + revision: "some-other-revision", + }, + ], + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show spinner anymore", () => { + expect( + rendered.queryByTestId("helm-releases-spinner"), + ).not.toBeInTheDocument(); + }); + + describe("when selecting release to see details", () => { + beforeEach(() => { + const row = rendered.getByTestId( + "helm-release-row-for-some-namespace/some-name", + ); + + fireEvent.click(row); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("opens the details", () => { + expect( + rendered.getByTestId("helm-release-details-for-some-namespace/some-name"), + ).toBeInTheDocument(); + }); + + it("calls for release", () => { + expect(callForHelmReleaseMock).toHaveBeenCalledWith( + "some-name", + "some-namespace", + ); + }); + + it("shows spinner", () => { + expect( + rendered.getByTestId("helm-release-detail-content-spinner"), + ).toBeInTheDocument(); + }); + + describe("when opening details for second release", () => { + beforeEach(() => { + callForHelmReleaseMock.mockClear(); + + const row = rendered.getByTestId( + "helm-release-row-for-some-other-namespace/some-other-name", + ); + + fireEvent.click(row); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("calls for another release", () => { + expect(callForHelmReleaseMock).toHaveBeenCalledWith( + "some-other-name", + "some-other-namespace", + ); + }); + + it("closes details for first release", () => { + expect( + 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"), + ).toBeInTheDocument(); + }); + }); + + describe("when details is closed", () => { + beforeEach(() => { + const closeButton = rendered.getByTestId( + "close-helm-release-detail", + ); + + fireEvent.click(closeButton); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("closes the details", () => { + expect( + rendered.queryByTestId("helm-release-details-for-some-namespace/some-name"), + ).not.toBeInTheDocument(); + }); + + describe("when opening details for same release", () => { + beforeEach(() => { + callForHelmReleaseMock.mockClear(); + + const row = rendered.getByTestId( + "helm-release-row-for-some-namespace/some-name", + ); + + fireEvent.click(row); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not reload", () => { + expect(callForHelmReleaseMock).not.toHaveBeenCalled(); + }); + }); + }); + + it("when release resolve with no data, renders", async () => { + await callForHelmReleaseMock.resolve(undefined); + + expect(rendered.baseElement).toMatchSnapshot(); + }); + + describe("when details resolve", () => { + beforeEach(async () => { + await callForHelmReleaseMock.resolve(detailedReleaseFake); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("calls for release configuration", () => { + expect(callForHelmReleaseConfigurationMock).toHaveBeenCalledWith( + "some-name", + "some-namespace", + true, + ); + }); + + describe("when configuration resolves", () => { + beforeEach(async () => { + await callForHelmReleaseConfigurationMock.resolve( + "some-configuration", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not have tab for upgrading chart yet", () => { + expect( + rendered.queryByTestId("dock-tab-for-some-tab-id"), + ).not.toBeInTheDocument(); + }); + + describe("when selecting to upgrade chart", () => { + beforeEach(() => { + const upgradeButton = rendered.getByTestId( + "helm-release-upgrade-button", + ); + + fireEvent.click(upgradeButton); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("opens tab for upgrading chart", () => { + expect( + rendered.getByTestId("dock-tab-for-some-tab-id"), + ).toBeInTheDocument(); + }); + + it("closes the details", () => { + expect( + rendered.queryByTestId("helm-release-details-for-some-namespace/some-name"), + ).not.toBeInTheDocument(); + }); + }); + + describe("when changing the configuration", () => { + beforeEach(() => { + const configuration = rendered.getByTestId( + "monaco-editor-for-helm-release-configuration", + ); + + fireEvent.change(configuration, { + target: { value: "some-new-configuration" }, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("has the configuration", () => { + const input = rendered.getByTestId( + "monaco-editor-for-helm-release-configuration", + ); + + expect(input).toHaveValue("some-new-configuration"); + }); + + it("does not save changes yet", () => { + expect(callForHelmReleaseUpdateMock).not.toHaveBeenCalled(); + }); + + describe("when toggling to see only user defined values", () => { + beforeEach(() => { + callForHelmReleaseConfigurationMock.mockClear(); + + const toggle = rendered.getByTestId( + "user-supplied-values-only-checkbox", + ); + + fireEvent.click(toggle); + }); + + it("calls for only user defined configuration", () => { + expect(callForHelmReleaseConfigurationMock).toHaveBeenCalledWith( + "some-name", + "some-namespace", + false, + ); + }); + + describe("when configuration resolves", () => { + beforeEach(async () => { + await callForHelmReleaseConfigurationMock.resolve( + "some-other-configuration", + ); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("overrides the user inputted configuration with new configuration", () => { + const input = rendered.getByTestId( + "monaco-editor-for-helm-release-configuration", + ); + + expect(input).toHaveValue("some-other-configuration"); + }); + + it("when toggling again, calls for all configuration", () => { + callForHelmReleaseConfigurationMock.mockClear(); + + const toggle = rendered.getByTestId( + "user-supplied-values-only-checkbox", + ); + + fireEvent.click(toggle); + + expect(callForHelmReleaseConfigurationMock).toHaveBeenCalledWith( + "some-name", + "some-namespace", + true, + ); + }); + }); + }); + + describe("when saving", () => { + beforeEach(() => { + const saveButton = rendered.getByTestId( + "helm-release-configuration-save-button", + ); + + fireEvent.click(saveButton); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("calls for update", () => { + expect(callForHelmReleaseUpdateMock).toHaveBeenCalledWith( + "some-name", + "some-namespace", + + { + chart: "some-chart", + repo: "", + values: "some-new-configuration", + version: "", + }, + ); + }); + + it("shows spinner", () => { + const saveButton = rendered.getByTestId( + "helm-release-configuration-save-button", + ); + + expect(saveButton).toHaveClass("waiting"); + }); + + describe("when update resolves with success", () => { + beforeEach(async () => { + callForHelmReleasesMock.mockClear(); + callForHelmReleaseConfigurationMock.mockClear(); + + await callForHelmReleaseUpdateMock.resolve({ + updateWasSuccessful: true, + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show spinner anymore", () => { + const saveButton = rendered.getByTestId( + "helm-release-configuration-save-button", + ); + + expect(saveButton).not.toHaveClass("waiting"); + }); + + it("reloads the configuration", () => { + expect(callForHelmReleaseConfigurationMock).toHaveBeenCalledWith( + "some-name", + "some-namespace", + true, + ); + }); + + it("shows success notification", () => { + expect(showSuccessNotificationMock).toHaveBeenCalled(); + }); + + it("does not show error notification", () => { + expect(showCheckedErrorNotificationMock).not.toHaveBeenCalled(); + }); + }); + + describe("when update resolves with failure", () => { + beforeEach(async () => { + callForHelmReleasesMock.mockClear(); + callForHelmReleaseConfigurationMock.mockClear(); + + await callForHelmReleaseUpdateMock.resolve({ + updateWasSuccessful: false, + error: "some-error", + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + + it("does not show spinner anymore", () => { + const saveButton = rendered.getByTestId( + "helm-release-configuration-save-button", + ); + + expect(saveButton).not.toHaveClass("waiting"); + }); + + it("does not reload the configuration", () => { + expect(callForHelmReleaseConfigurationMock).not.toHaveBeenCalled(); + }); + + it("does not show success notification", () => { + expect(showSuccessNotificationMock).not.toHaveBeenCalled(); + }); + + it("shows error notification", () => { + expect(showCheckedErrorNotificationMock).toHaveBeenCalled(); + }); + }); + }); + }); + }); + }); + }); + }); + }); + }); +}); + +const detailedReleaseFake: DetailedHelmRelease = { + release: { + appVersion: "some-app-version", + chart: "some-chart", + status: "some-status", + updated: "some-updated", + revision: "some-revision", + name: "some-name", + namespace: "some-namespace", + }, + + details: { + name: "some-name", + namespace: "some-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", + }, + }, + ], + }, +}; diff --git a/src/common/__tests__/base-store.test.ts b/src/common/__tests__/base-store.test.ts index e7eb952111..e6b1c2d1d2 100644 --- a/src/common/__tests__/base-store.test.ts +++ b/src/common/__tests__/base-store.test.ts @@ -7,14 +7,9 @@ import mockFs from "mock-fs"; import { BaseStore } from "../base-store"; import { action, comparer, makeObservable, observable, toJS } from "mobx"; import { readFileSync } from "fs"; - -import directoryForUserDataInjectable - from "../app-paths/directory-for-user-data/directory-for-user-data.injectable"; +import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable"; import { getDiForUnitTesting } from "../../main/getDiForUnitTesting"; -import getConfigurationFileModelInjectable - from "../get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable - from "../get-configuration-file-model/app-version/app-version.injectable"; +import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable"; jest.mock("electron", () => ({ ipcMain: { @@ -86,7 +81,6 @@ describe("BaseStore", () => { mainDi.override(directoryForUserDataInjectable, () => "some-user-data-directory"); mainDi.permitSideEffects(getConfigurationFileModelInjectable); - mainDi.permitSideEffects(appVersionInjectable); TestStore.resetInstance(); diff --git a/src/common/__tests__/cluster-store.test.ts b/src/common/__tests__/cluster-store.test.ts index e03e0aa533..b74659aea0 100644 --- a/src/common/__tests__/cluster-store.test.ts +++ b/src/common/__tests__/cluster-store.test.ts @@ -18,7 +18,7 @@ import { createClusterInjectionToken } from "../cluster/create-cluster-injection import directoryForUserDataInjectable from "../app-paths/directory-for-user-data/directory-for-user-data.injectable"; import { getDiForUnitTesting } from "../../main/getDiForUnitTesting"; import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../vars/app-version.injectable"; import assert from "assert"; import directoryForTempInjectable from "../app-paths/directory-for-temp/directory-for-temp.injectable"; import kubectlBinaryNameInjectable from "../../main/kubectl/binary-name.injectable"; @@ -93,7 +93,6 @@ describe("cluster-store", () => { mainDi.override(normalizedPlatformInjectable, () => "darwin"); mainDi.permitSideEffects(getConfigurationFileModelInjectable); - mainDi.permitSideEffects(appVersionInjectable); mainDi.permitSideEffects(clusterStoreInjectable); mainDi.permitSideEffects(fsInjectable); diff --git a/src/common/__tests__/hotbar-store.test.ts b/src/common/__tests__/hotbar-store.test.ts index cc8a4dc8fa..d847ac76dc 100644 --- a/src/common/__tests__/hotbar-store.test.ts +++ b/src/common/__tests__/hotbar-store.test.ts @@ -8,7 +8,7 @@ import mockFs from "mock-fs"; import type { CatalogEntity, CatalogEntityData, CatalogEntityKindData } from "../catalog"; import { getDiForUnitTesting } from "../../main/getDiForUnitTesting"; import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../vars/app-version.injectable"; import type { DiContainer } from "@ogre-tools/injectable"; import hotbarStoreInjectable from "../hotbars/store.injectable"; import type { HotbarStore } from "../hotbars/store"; @@ -113,7 +113,6 @@ describe("HotbarStore", () => { ])); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); di.permitSideEffects(hotbarStoreInjectable); }); diff --git a/src/common/__tests__/user-store.test.ts b/src/common/__tests__/user-store.test.ts index 238fc5bce8..23740c5457 100644 --- a/src/common/__tests__/user-store.test.ts +++ b/src/common/__tests__/user-store.test.ts @@ -34,7 +34,7 @@ import { defaultThemeId } from "../vars"; import writeFileInjectable from "../fs/write-file.injectable"; import { getDiForUnitTesting } from "../../main/getDiForUnitTesting"; import getConfigurationFileModelInjectable from "../get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../vars/app-version.injectable"; console = new Console(stdout, stderr); @@ -50,8 +50,6 @@ describe("user store tests", () => { di.override(writeFileInjectable, () => () => Promise.resolve()); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); di.permitSideEffects(getConfigurationFileModelInjectable); - - di.permitSideEffects(appVersionInjectable); di.permitSideEffects(userStoreInjectable); di.unoverride(userStoreInjectable); diff --git a/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts b/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts index 3d9101b672..90dc22457a 100644 --- a/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts +++ b/src/common/application-update/selected-update-channel/default-update-channel.injectable.ts @@ -3,8 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { SemVer } from "semver"; -import appVersionInjectable from "../../get-configuration-file-model/app-version/app-version.injectable"; +import appSemanticVersionInjectable from "../../vars/app-semantic-version.injectable"; import type { UpdateChannelId } from "../update-channels"; import { updateChannels } from "../update-channels"; @@ -12,12 +11,11 @@ const defaultUpdateChannelInjectable = getInjectable({ id: "default-update-channel", instantiate: (di) => { - const appVersion = di.inject(appVersionInjectable); + const appSemanticVersion = di.inject(appSemanticVersionInjectable); + const currentReleaseChannel = appSemanticVersion.prerelease[0]?.toString(); - const currentReleaseChannel = new SemVer(appVersion).prerelease[0]?.toString() as UpdateChannelId; - - if (currentReleaseChannel && updateChannels[currentReleaseChannel]) { - return updateChannels[currentReleaseChannel]; + if (currentReleaseChannel in updateChannels) { + return updateChannels[currentReleaseChannel as UpdateChannelId]; } return updateChannels.latest; diff --git a/src/common/base-store.ts b/src/common/base-store.ts index 9cc4e27b92..1bc2357458 100644 --- a/src/common/base-store.ts +++ b/src/common/base-store.ts @@ -19,7 +19,7 @@ import { kebabCase } from "lodash"; import { getLegacyGlobalDiForExtensionApi } from "../extensions/as-legacy-globals-for-extension-api/legacy-global-di-for-extension-api"; import directoryForUserDataInjectable from "./app-paths/directory-for-user-data/directory-for-user-data.injectable"; import getConfigurationFileModelInjectable from "./get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "./get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "./vars/app-version.injectable"; export interface BaseStoreParams extends ConfOptions { syncOptions?: { diff --git a/src/common/k8s-api/endpoints/helm-releases.api.ts b/src/common/k8s-api/endpoints/helm-releases.api.ts index b3922276bd..f9e11073c0 100644 --- a/src/common/k8s-api/endpoints/helm-releases.api.ts +++ b/src/common/k8s-api/endpoints/helm-releases.api.ts @@ -3,48 +3,11 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ -import yaml from "js-yaml"; -import { formatDuration } from "../../utils"; -import capitalize from "lodash/capitalize"; import { apiBase } from "../index"; -import { helmChartStore } from "../../../renderer/components/+helm-charts/helm-chart.store"; import type { ItemObject } from "../../item.store"; import type { JsonApiData } from "../json-api"; import { buildURLPositional } from "../../utils/buildUrl"; -import type { KubeJsonApiData } from "../kube-json-api"; - -export interface HelmReleaseDetails { - resources: KubeJsonApiData[]; - name: string; - namespace: string; - version: string; - config: string; // release values - manifest: string; - info: { - deleted: string; - description: string; - first_deployed: string; - last_deployed: string; - notes: string; - status: string; - }; -} - -export interface HelmReleaseCreatePayload { - name?: string; - repo: string; - chart: string; - namespace: string; - version: string; - values: string; -} - -export interface HelmReleaseUpdatePayload { - repo: string; - chart: string; - version: string; - values: string; -} +import type { HelmReleaseDetails } from "../../../renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.injectable"; export interface HelmReleaseUpdateDetails { log: string; @@ -69,47 +32,7 @@ interface EndpointQuery { all?: boolean; } -const endpoint = buildURLPositional("/v2/releases/:namespace?/:name?/:route?"); - -export async function listReleases(namespace?: string): Promise { - const releases = await apiBase.get(endpoint({ namespace })); - - return releases.map(toHelmRelease); -} - -export async function getRelease(name: string, namespace: string): Promise { - const path = endpoint({ name, namespace }); - - return apiBase.get(path); -} - -export async function createRelease(payload: HelmReleaseCreatePayload): Promise { - const { repo, chart: rawChart, values: rawValues, ...data } = payload; - const chart = `${repo}/${rawChart}`; - const values = yaml.load(rawValues); - - return apiBase.post(endpoint(), { - data: { - chart, - values, - ...data, - }, - }); -} - -export async function updateRelease(name: string, namespace: string, payload: HelmReleaseUpdatePayload): Promise { - const { repo, chart: rawChart, values: rawValues, ...data } = payload; - const chart = `${repo}/${rawChart}`; - const values = yaml.load(rawValues); - - return apiBase.put(endpoint({ name, namespace }), { - data: { - chart, - values, - ...data, - }, - }); -} +export const endpoint = buildURLPositional("/v2/releases/:namespace?/:name?/:route?"); export async function deleteRelease(name: string, namespace: string): Promise { const path = endpoint({ name, namespace }); @@ -139,7 +62,7 @@ export async function rollbackRelease(name: string, namespace: string, revision: return apiBase.put(path, { data }); } -interface HelmReleaseDto { +export interface HelmReleaseDto { appVersion: string; name: string; namespace: string; @@ -158,70 +81,3 @@ export interface HelmRelease extends HelmReleaseDto, ItemObject { getUpdated: (humanize?: boolean, compact?: boolean) => string | number; getRepo: () => Promise; } - -const toHelmRelease = (release: HelmReleaseDto) : HelmRelease => ({ - ...release, - - getId() { - return this.namespace + this.name; - }, - - getName() { - return this.name; - }, - - getNs() { - return this.namespace; - }, - - getChart(withVersion = false) { - let chart = this.chart; - - if (!withVersion && this.getVersion() != "") { - const search = new RegExp(`-${this.getVersion()}`); - - chart = chart.replace(search, ""); - } - - return chart; - }, - - getRevision() { - return parseInt(this.revision, 10); - }, - - getStatus() { - return capitalize(this.status); - }, - - getVersion() { - const versions = this.chart.match(/(?<=-)(v?\d+)[^-].*$/); - - return versions?.[0] ?? ""; - }, - - getUpdated(humanize = true, compact = true) { - const updated = this.updated.replace(/\s\w*$/, ""); // 2019-11-26 10:58:09 +0300 MSK -> 2019-11-26 10:58:09 +0300 to pass into Date() - const updatedDate = new Date(updated).getTime(); - const diff = Date.now() - updatedDate; - - if (humanize) { - return formatDuration(diff, compact); - } - - return diff; - }, - - // Helm does not store from what repository the release is installed, - // so we have to try to guess it by searching charts - async getRepo() { - const chartName = this.getChart(); - const version = this.getVersion(); - const versions = await helmChartStore.getVersions(chartName); - const chartVersion = versions.find( - (chartVersion) => chartVersion.version === version, - ); - - return chartVersion ? chartVersion.repo : ""; - }, -}); diff --git a/src/common/test-utils/get-global-override.ts b/src/common/test-utils/get-global-override.ts new file mode 100644 index 0000000000..3a556df793 --- /dev/null +++ b/src/common/test-utils/get-global-override.ts @@ -0,0 +1,13 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import type { Injectable } from "@ogre-tools/injectable"; + +export const getGlobalOverride = >( + injectable: T, + overridingInstantiate: T["instantiate"], +) => ({ + injectable, + overridingInstantiate, + }); diff --git a/src/common/vars.ts b/src/common/vars.ts index fb9156725c..be8b472a5d 100644 --- a/src/common/vars.ts +++ b/src/common/vars.ts @@ -5,7 +5,6 @@ // App's common configuration for any process (main, renderer, build pipeline, etc.) import path from "path"; -import { SemVer } from "semver"; import packageInfo from "../../package.json"; import type { ThemeId } from "../renderer/themes/store"; import { lazyInitialized } from "./utils/lazy-initialized"; @@ -139,7 +138,6 @@ export const lensTwitterWeblinkId = "lens-twitter-link"; export const lensBlogWeblinkId = "lens-blog-link"; export const kubernetesDocumentationWeblinkId = "kubernetes-documentation-link"; -export const appSemVer = new SemVer(packageInfo.version); export const docsUrl = "https://docs.k8slens.dev/main" as string; export const sentryDsn = packageInfo.config?.sentryDsn ?? ""; diff --git a/src/common/vars/app-semantic-version.injectable.ts b/src/common/vars/app-semantic-version.injectable.ts new file mode 100644 index 0000000000..ae68ea828d --- /dev/null +++ b/src/common/vars/app-semantic-version.injectable.ts @@ -0,0 +1,14 @@ +/** + * 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 { SemVer } from "semver"; +import appVersionInjectable from "./app-version.injectable"; + +const appSemanticVersionInjectable = getInjectable({ + id: "app-semantic-version", + instantiate: (di) => new SemVer(di.inject(appVersionInjectable)), +}); + +export default appSemanticVersionInjectable; diff --git a/src/common/get-configuration-file-model/app-version/app-version.injectable.ts b/src/common/vars/app-version.injectable.ts similarity index 83% rename from src/common/get-configuration-file-model/app-version/app-version.injectable.ts rename to src/common/vars/app-version.injectable.ts index 5fdfd30eba..d7647f8318 100644 --- a/src/common/get-configuration-file-model/app-version/app-version.injectable.ts +++ b/src/common/vars/app-version.injectable.ts @@ -3,7 +3,7 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import packageJsonInjectable from "../../vars/package-json.injectable"; +import packageJsonInjectable from "./package-json.injectable"; const appVersionInjectable = getInjectable({ id: "app-version", diff --git a/src/extensions/extension-discovery/extension-discovery.test.ts b/src/extensions/extension-discovery/extension-discovery.test.ts index 0ae51623ad..cfbad4e11c 100644 --- a/src/extensions/extension-discovery/extension-discovery.test.ts +++ b/src/extensions/extension-discovery/extension-discovery.test.ts @@ -19,6 +19,7 @@ import directoryForUserDataInjectable import mockFs from "mock-fs"; import { delay } from "../../renderer/utils"; import { observable, when } from "mobx"; +import appVersionInjectable from "../../common/vars/app-version.injectable"; jest.setTimeout(60_000); @@ -56,6 +57,7 @@ describe("ExtensionDiscovery", () => { di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); di.override(installExtensionInjectable, () => () => Promise.resolve()); + di.override(appVersionInjectable, () => "5.0.0"); mockFs(); diff --git a/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts b/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts index 046b106da5..7a29daf23c 100644 --- a/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts +++ b/src/extensions/extension-discovery/is-compatible-bundled-extension/is-compatible-bundled-extension.injectable.ts @@ -3,12 +3,14 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { appSemVer } from "../../../common/vars"; +import appSemanticVersionInjectable from "../../../common/vars/app-semantic-version.injectable"; import { isCompatibleBundledExtension } from "./is-compatible-bundled-extension"; const isCompatibleBundledExtensionInjectable = getInjectable({ id: "is-compatible-bundled-extension", - instantiate: () => isCompatibleBundledExtension({ appSemVer }), + instantiate: (di) => isCompatibleBundledExtension({ + appSemVer: di.inject(appSemanticVersionInjectable), + }), }); export default isCompatibleBundledExtensionInjectable; diff --git a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts index 7ca49a41cd..75e2f45d4a 100644 --- a/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts +++ b/src/extensions/extension-discovery/is-compatible-extension/is-compatible-extension.injectable.ts @@ -3,12 +3,14 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { appSemVer } from "../../../common/vars"; +import appSemanticVersionInjectable from "../../../common/vars/app-semantic-version.injectable"; import { isCompatibleExtension } from "./is-compatible-extension"; const isCompatibleExtensionInjectable = getInjectable({ id: "is-compatible-extension", - instantiate: () => isCompatibleExtension({ appSemVer }), + instantiate: (di) => isCompatibleExtension({ + appSemVer: di.inject(appSemanticVersionInjectable), + }), }); export default isCompatibleExtensionInjectable; diff --git a/src/main/__test__/kube-auth-proxy.test.ts b/src/main/__test__/kube-auth-proxy.test.ts index ffb1892da2..1e66d0d42b 100644 --- a/src/main/__test__/kube-auth-proxy.test.ts +++ b/src/main/__test__/kube-auth-proxy.test.ts @@ -54,7 +54,6 @@ import { createClusterInjectionToken } from "../../common/cluster/create-cluster import path from "path"; import spawnInjectable from "../child-process/spawn.injectable"; import getConfigurationFileModelInjectable from "../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; import directoryForUserDataInjectable from "../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import directoryForTempInjectable from "../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; import normalizedPlatformInjectable from "../../common/vars/normalized-platform.injectable"; @@ -112,7 +111,6 @@ describe("kube auth proxy tests", () => { di.override(normalizedPlatformInjectable, () => "darwin"); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); mockFs(mockMinikubeConfig); diff --git a/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts b/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts index 72ea5c4023..08fd1d933d 100644 --- a/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts +++ b/src/main/application-update/check-for-updates/update-can-be-downgraded.injectable.ts @@ -5,7 +5,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; import selectedUpdateChannelInjectable from "../../../common/application-update/selected-update-channel/selected-update-channel.injectable"; -import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../../../common/vars/app-version.injectable"; import { SemVer } from "semver"; const updateCanBeDowngradedInjectable = getInjectable({ diff --git a/src/main/application-update/emit-current-version-to-analytics.injectable.ts b/src/main/application-update/emit-current-version-to-analytics.injectable.ts index fd190ebf72..7ec8d0b3b5 100644 --- a/src/main/application-update/emit-current-version-to-analytics.injectable.ts +++ b/src/main/application-update/emit-current-version-to-analytics.injectable.ts @@ -6,7 +6,7 @@ import { getInjectable } from "@ogre-tools/injectable"; import { afterApplicationIsLoadedInjectionToken } from "../start-main-application/runnable-tokens/after-application-is-loaded-injection-token"; import emitEventInjectable from "../../common/app-event-bus/emit-event.injectable"; import { getCurrentDateTime } from "../../common/utils/date/get-current-date-time"; -import appVersionInjectable from "../../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../../common/vars/app-version.injectable"; const emitCurrentVersionToAnalyticsInjectable = getInjectable({ id: "emit-current-version-to-analytics", diff --git a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts index 72acbb3c03..08ff464bf2 100644 --- a/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts +++ b/src/main/catalog-sources/__test__/kubeconfig-sync.test.ts @@ -15,7 +15,6 @@ import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import { createClusterInjectionToken } from "../../../common/cluster/create-cluster-injection-token"; import directoryForKubeConfigsInjectable from "../../../common/app-paths/directory-for-kube-configs/directory-for-kube-configs.injectable"; import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; import clusterManagerInjectable from "../../cluster-manager.injectable"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import directoryForTempInjectable from "../../../common/app-paths/directory-for-temp/directory-for-temp.injectable"; @@ -59,7 +58,6 @@ describe("kubeconfig-sync.source tests", () => { di.unoverride(clusterStoreInjectable); di.permitSideEffects(clusterStoreInjectable); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); computeDiff = computeDiffFor({ directoryForKubeConfigs: di.inject(directoryForKubeConfigsInjectable), diff --git a/src/main/getDiForUnitTesting.ts b/src/main/getDiForUnitTesting.ts index 51a677ad07..9c5a3ab741 100644 --- a/src/main/getDiForUnitTesting.ts +++ b/src/main/getDiForUnitTesting.ts @@ -80,7 +80,7 @@ import setUpdateOnQuitInjectable from "./electron-app/features/set-update-on-qui import downloadPlatformUpdateInjectable from "./application-update/download-platform-update/download-platform-update.injectable"; import startCatalogSyncInjectable from "./catalog-sync-to-renderer/start-catalog-sync.injectable"; import startKubeConfigSyncInjectable from "./start-main-application/runnables/kube-config-sync/start-kube-config-sync.injectable"; -import appVersionInjectable from "../common/get-configuration-file-model/app-version/app-version.injectable"; +import appVersionInjectable from "../common/vars/app-version.injectable"; import getRandomIdInjectable from "../common/utils/get-random-id.injectable"; import periodicalCheckForUpdatesInjectable from "./application-update/periodical-check-for-updates/periodical-check-for-updates.injectable"; import execFileInjectable from "../common/fs/exec-file.injectable"; @@ -124,6 +124,16 @@ export function getDiForUnitTesting(opts: { doGeneralOverrides?: boolean } = {}) di.preventSideEffects(); if (doGeneralOverrides) { + const globalOverrideFilePaths = getGlobalOverridePaths(); + + const globalOverrides = globalOverrideFilePaths.map( + (filePath) => require(filePath).default, + ); + + globalOverrides.forEach(globalOverride => { + di.override(globalOverride.injectable, globalOverride.overridingInstantiate); + }); + di.override(electronInjectable, () => ({})); di.override(waitUntilBundledExtensionsAreLoadedInjectable, () => async () => {}); di.override(getRandomIdInjectable, () => () => "some-irrelevant-random-id"); @@ -211,6 +221,14 @@ const getInjectableFilePaths = memoize(() => [ ...glob.sync("../common/**/*.injectable.{ts,tsx}", { cwd: __dirname }), ]); +const getGlobalOverridePaths = memoize(() => + glob.sync( + "../{common,extensions,main}/**/*.global-override-for-injectable.{ts,tsx}", + + { cwd: __dirname }, + ), +); + // TODO: Reorganize code in Runnables to get rid of requirement for override const overrideRunnablesHavingSideEffects = (di: DiContainer) => { [ diff --git a/src/main/helm/helm-release-manager.ts b/src/main/helm/helm-release-manager.ts index c537a31aab..4c6e974152 100644 --- a/src/main/helm/helm-release-manager.ts +++ b/src/main/helm/helm-release-manager.ts @@ -191,7 +191,6 @@ async function getResources(name: string, namespace: string, kubeconfigPath: str ]; const kubectlArgs = [ "get", - "--namespace", namespace, "--kubeconfig", kubeconfigPath, "-f", "-", "--output", "json", diff --git a/src/main/protocol-handler/__test__/router.test.ts b/src/main/protocol-handler/__test__/router.test.ts index 868aaee7dc..a0f26e9764 100644 --- a/src/main/protocol-handler/__test__/router.test.ts +++ b/src/main/protocol-handler/__test__/router.test.ts @@ -14,7 +14,6 @@ import { getDiForUnitTesting } from "../../getDiForUnitTesting"; import lensProtocolRouterMainInjectable from "../lens-protocol-router-main/lens-protocol-router-main.injectable"; import extensionsStoreInjectable from "../../../extensions/extensions-store/extensions-store.injectable"; import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; import { LensExtension } from "../../../extensions/lens-extension"; import type { LensExtensionId } from "../../../extensions/lens-extension"; import type { ObservableMap } from "mobx"; @@ -44,7 +43,6 @@ describe("protocol router tests", () => { } as unknown as ExtensionsStore)); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); di.override(directoryForUserDataInjectable, () => "some-directory-for-user-data"); diff --git a/src/renderer/components/+catalog/catalog.test.tsx b/src/renderer/components/+catalog/catalog.test.tsx index 808226727c..899b97bed2 100644 --- a/src/renderer/components/+catalog/catalog.test.tsx +++ b/src/renderer/components/+catalog/catalog.test.tsx @@ -22,7 +22,6 @@ import { renderFor } from "../test-utils/renderFor"; import mockFs from "mock-fs"; import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; import type { AppEvent } from "../../../common/app-event-bus/event-bus"; import appEventBusInjectable from "../../../common/app-event-bus/app-event-bus.injectable"; import { computed } from "mobx"; @@ -95,7 +94,6 @@ describe("", () => { di.override(broadcastMessageInjectable, () => async () => {}); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); mockFs(); CatalogEntityDetailRegistry.createInstance(); diff --git a/src/renderer/components/+extensions/__tests__/extensions.test.tsx b/src/renderer/components/+extensions/__tests__/extensions.test.tsx index 66f0830c3d..5de9e15f1f 100644 --- a/src/renderer/components/+extensions/__tests__/extensions.test.tsx +++ b/src/renderer/components/+extensions/__tests__/extensions.test.tsx @@ -21,7 +21,6 @@ import extensionDiscoveryInjectable from "../../../../extensions/extension-disco import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import directoryForDownloadsInjectable from "../../../../common/app-paths/directory-for-downloads/directory-for-downloads.injectable"; import getConfigurationFileModelInjectable from "../../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../../common/get-configuration-file-model/app-version/app-version.injectable"; import assert from "assert"; import type { InstallFromInput } from "../install-from-input/install-from-input"; import installFromInputInjectable from "../install-from-input/install-from-input.injectable"; @@ -64,7 +63,6 @@ describe("Extensions", () => { di.override(directoryForDownloadsInjectable, () => "some-directory-for-downloads"); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); mockFs({ "some-directory-for-user-data": {}, diff --git a/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.global-override-for-injectable.ts b/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.global-override-for-injectable.ts new file mode 100644 index 0000000000..282ef22fe3 --- /dev/null +++ b/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.global-override-for-injectable.ts @@ -0,0 +1,15 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import callForHelmReleasesInjectable from "./call-for-helm-releases.injectable"; +import { getGlobalOverride } from "../../../../common/test-utils/get-global-override"; + +export default getGlobalOverride( + callForHelmReleasesInjectable, + () => () => { + throw new Error( + "Tried to call for helm releases without explicit override.", + ); + }, +); diff --git a/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable.ts b/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable.ts new file mode 100644 index 0000000000..d166091352 --- /dev/null +++ b/src/renderer/components/+helm-releases/call-for-helm-releases/call-for-helm-releases.injectable.ts @@ -0,0 +1,24 @@ +/** + * 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 type { HelmReleaseDto } from "../../../../common/k8s-api/endpoints/helm-releases.api"; + +import { apiBase } from "../../../../common/k8s-api"; +import { endpoint } from "../../../../common/k8s-api/endpoints/helm-releases.api"; + +export type CallForHelmReleases = ( + namespace?: string +) => Promise; + +const callForHelmReleasesInjectable = getInjectable({ + id: "call-for-helm-releases", + + instantiate: (): CallForHelmReleases => async (namespace) => + await apiBase.get(endpoint({ namespace })), + + causesSideEffects: true, +}); + +export default callForHelmReleasesInjectable; diff --git a/src/renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable.ts b/src/renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable.ts index d5506b486e..9e3e3800a3 100644 --- a/src/renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable.ts +++ b/src/renderer/components/+helm-releases/create-release/call-for-create-helm-release.injectable.ts @@ -2,9 +2,20 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import yaml from "js-yaml"; import { getInjectable } from "@ogre-tools/injectable"; -import type { HelmReleaseCreatePayload, HelmReleaseUpdateDetails } from "../../../../common/k8s-api/endpoints/helm-releases.api"; -import { createRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; +import type { HelmReleaseUpdateDetails } from "../../../../common/k8s-api/endpoints/helm-releases.api"; +import { endpoint } from "../../../../common/k8s-api/endpoints/helm-releases.api"; +import { apiBase } from "../../../../common/k8s-api"; + +interface HelmReleaseCreatePayload { + name?: string; + repo: string; + chart: string; + namespace: string; + version: string; + values: string; +} export type CallForCreateHelmRelease = ( payload: HelmReleaseCreatePayload @@ -12,7 +23,21 @@ export type CallForCreateHelmRelease = ( const callForCreateHelmReleaseInjectable = getInjectable({ id: "call-for-create-helm-release", - instantiate: (): CallForCreateHelmRelease => createRelease, + + instantiate: (): CallForCreateHelmRelease => (payload) => { + const { repo, chart: rawChart, values: rawValues, ...data } = payload; + const chart = `${repo}/${rawChart}`; + const values = yaml.load(rawValues); + + return apiBase.post(endpoint(), { + data: { + chart, + values, + ...data, + }, + }); + }, + causesSideEffects: true, }); diff --git a/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts b/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts index b2e292b034..51006266c8 100644 --- a/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts +++ b/src/renderer/components/+helm-releases/create-release/create-release.injectable.ts @@ -4,19 +4,18 @@ */ import { getInjectable } from "@ogre-tools/injectable"; -import type { - HelmReleaseCreatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import releasesInjectable from "../releases.injectable"; +import type { CallForCreateHelmRelease } from "./call-for-create-helm-release.injectable"; import callForCreateHelmReleaseInjectable from "./call-for-create-helm-release.injectable"; const createReleaseInjectable = getInjectable({ id: "create-release", - instantiate: (di) => { + instantiate: (di): CallForCreateHelmRelease => { const releases = di.inject(releasesInjectable); const callForCreateRelease = di.inject(callForCreateHelmReleaseInjectable); - return async (payload: HelmReleaseCreatePayload) => { + return async (payload) => { const release = await callForCreateRelease(payload); releases.invalidate(); diff --git a/src/renderer/components/+helm-releases/release-details/release-details-cluster-frame-child-component.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-cluster-frame-child-component.injectable.ts new file mode 100644 index 0000000000..a2293e5ca1 --- /dev/null +++ b/src/renderer/components/+helm-releases/release-details/release-details-cluster-frame-child-component.injectable.ts @@ -0,0 +1,26 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getInjectable } from "@ogre-tools/injectable"; +import { computed } from "mobx"; +import { clusterFrameChildComponentInjectionToken } from "../../../frames/cluster-frame/cluster-frame-child-component-injection-token"; +import { ReleaseDetails } from "./release-details"; +import targetHelmReleaseInjectable from "./target-helm-release.injectable"; + +const releaseDetailsClusterFrameChildComponentInjectable = getInjectable({ + id: "release-details-cluster-frame-child-component", + + instantiate: (di) => { + const targetRelease = di.inject(targetHelmReleaseInjectable); + + return { + id: "release-details", + Component: ReleaseDetails, + shouldRender: computed(() => !!targetRelease.get()), + }; + }, + injectionToken: clusterFrameChildComponentInjectionToken, +}); + +export default releaseDetailsClusterFrameChildComponentInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release-details-content.tsx b/src/renderer/components/+helm-releases/release-details/release-details-content.tsx new file mode 100644 index 0000000000..b03f23de34 --- /dev/null +++ b/src/renderer/components/+helm-releases/release-details/release-details-content.tsx @@ -0,0 +1,210 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import "./release-details.scss"; + +import React from "react"; + +import { Link } from "react-router-dom"; +import { Drawer, DrawerItem, DrawerTitle } from "../../drawer"; +import { cssNames, stopPropagation } from "../../../utils"; +import { observer } from "mobx-react"; +import { withInjectables } from "@ogre-tools/injectable-react"; +import type { ConfigurationInput, MinimalResourceGroup, OnlyUserSuppliedValuesAreShownToggle, ReleaseDetailsModel } from "./release-details-model/release-details-model.injectable"; +import releaseDetailsModelInjectable from "./release-details-model/release-details-model.injectable"; +import { Button } from "../../button"; +import { kebabCase } from "lodash/fp"; +import { Badge } from "../../badge"; +import { SubTitle } from "../../layout/sub-title"; +import { Table, TableCell, TableHead, TableRow } from "../../table"; +import { ReactiveDuration } from "../../duration/reactive-duration"; +import { HelmReleaseMenu } from "../release-menu"; +import { Checkbox } from "../../checkbox"; +import { MonacoEditor } from "../../monaco-editor"; +import { Spinner } from "../../spinner"; +import type { TargetHelmRelease } from "./target-helm-release.injectable"; + +interface ReleaseDetailsContentProps { + targetRelease: TargetHelmRelease; +} + +interface Dependencies { + model: ReleaseDetailsModel; +} + +const NonInjectedReleaseDetailsContent = observer(({ model }: Dependencies & ReleaseDetailsContentProps) => { + const isLoading = model.isLoading.get(); + + return ( + + ) + } + data-testid={`helm-release-details-for-${model.id}`} + > + {isLoading ? ( + + ) : ( +
+ +
+ {model.release.chart} + +
+ + + + {model.release.getUpdated()} + {` ago (${model.release.updated})`} + + + {model.release.getNs()} + + +
+ {model.release.getVersion()} +
+ + + + + + + + + Notes + + {model.notes &&
{model.notes}
} + + Resources + + {model.groupedResources.length > 0 && ( +
+ {model.groupedResources.map((group) => ( + + ))} +
+ )} +
+ )} + + ); +}); + +export const ReleaseDetailsContent = withInjectables(NonInjectedReleaseDetailsContent, { + getProps: (di, props) => ({ + model: di.inject(releaseDetailsModelInjectable, props.targetRelease), + ...props, + }), +}); + +const ResourceGroup = ({ + group: { kind, isNamespaced, resources }, +}: { + group: MinimalResourceGroup; +}) => ( + <> + + + + + Name + + {isNamespaced && Namespace} + + Age + + + {resources.map( + ({ creationTimestamp, detailsUrl, name, namespace, uid }) => ( + + + {detailsUrl ? {name} : name} + + + {isNamespaced && ( + {namespace} + )} + + + + + + ), + )} +
+ +); + +interface ReleaseValuesProps { + configuration: ConfigurationInput; + onlyUserSuppliedValuesAreShown: OnlyUserSuppliedValuesAreShownToggle; +} + +const ReleaseValues = observer(({ configuration, onlyUserSuppliedValuesAreShown }: ReleaseValuesProps) => { + const configurationIsLoading = configuration.isLoading.get(); + + return ( +
+ Values + +
+ + + + +
+
+ ); +}); diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.global-override-for-injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.global-override-for-injectable.ts new file mode 100644 index 0000000000..e54f980728 --- /dev/null +++ b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.global-override-for-injectable.ts @@ -0,0 +1,15 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getGlobalOverride } from "../../../../../../common/test-utils/get-global-override"; +import callForHelmReleaseConfigurationInjectable from "./call-for-helm-release-configuration.injectable"; + +export default getGlobalOverride( + callForHelmReleaseConfigurationInjectable, + () => () => { + throw new Error( + "Tried to call for helm release configuration without explicit override.", + ); + }, +); diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.injectable.ts new file mode 100644 index 0000000000..d0ed0fac7c --- /dev/null +++ b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release-configuration/call-for-helm-release-configuration.injectable.ts @@ -0,0 +1,29 @@ +/** + * 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 { apiBase } from "../../../../../../common/k8s-api"; +import { endpoint } from "../../../../../../common/k8s-api/endpoints/helm-releases.api"; + +export type CallForHelmReleaseConfiguration = ( + name: string, + namespace: string, + all: boolean +) => Promise; + +const callForHelmReleaseConfigurationInjectable = getInjectable({ + id: "call-for-helm-release-configuration", + + instantiate: + (): CallForHelmReleaseConfiguration => async (name, namespace, all: boolean) => { + const route = "values"; + const path = endpoint({ name, namespace, route }, { all }); + + return apiBase.get(path); + }, + + causesSideEffects: true, +}); + +export default callForHelmReleaseConfigurationInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.global-override-for-injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.global-override-for-injectable.ts new file mode 100644 index 0000000000..373b7cae4f --- /dev/null +++ b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.global-override-for-injectable.ts @@ -0,0 +1,15 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getGlobalOverride } from "../../../../../../../common/test-utils/get-global-override"; +import callForHelmReleaseDetailsInjectable from "./call-for-helm-release-details.injectable"; + +export default getGlobalOverride( + callForHelmReleaseDetailsInjectable, + () => () => { + throw new Error( + "Tried to call for helm release details without explicit override.", + ); + }, +); diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.injectable.ts new file mode 100644 index 0000000000..e5dccb1340 --- /dev/null +++ b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release-details/call-for-helm-release-details.injectable.ts @@ -0,0 +1,45 @@ +/** + * 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 { apiBase } from "../../../../../../../common/k8s-api"; +import { endpoint } from "../../../../../../../common/k8s-api/endpoints/helm-releases.api"; +import type { KubeJsonApiData } from "../../../../../../../common/k8s-api/kube-json-api"; + +export interface HelmReleaseDetails { + resources: KubeJsonApiData[]; + name: string; + namespace: string; + version: string; + config: string; // release values + manifest: string; + + info: { + deleted: string; + description: string; + first_deployed: string; + last_deployed: string; + notes: string; + status: string; + }; +} + +export type CallForHelmReleaseDetails = ( + name: string, + namespace: string +) => Promise; + +const callForHelmReleaseDetailsInjectable = getInjectable({ + id: "call-for-helm-release-details", + + instantiate: (): CallForHelmReleaseDetails => async (name, namespace) => { + const path = endpoint({ name, namespace }); + + return apiBase.get(path); + }, + + causesSideEffects: true, +}); + +export default callForHelmReleaseDetailsInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release.injectable.ts new file mode 100644 index 0000000000..fcf1496ba7 --- /dev/null +++ b/src/renderer/components/+helm-releases/release-details/release-details-model/call-for-helm-release/call-for-helm-release.injectable.ts @@ -0,0 +1,47 @@ +/** + * 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 type { HelmReleaseDto } from "../../../../../../common/k8s-api/endpoints/helm-releases.api"; +import callForHelmReleasesInjectable from "../../../call-for-helm-releases/call-for-helm-releases.injectable"; +import type { HelmReleaseDetails } from "./call-for-helm-release-details/call-for-helm-release-details.injectable"; +import callForHelmReleaseDetailsInjectable from "./call-for-helm-release-details/call-for-helm-release-details.injectable"; + +export interface DetailedHelmRelease { + release: HelmReleaseDto; + details: HelmReleaseDetails; +} + +export type CallForHelmRelease = ( + name: string, + namespace: string +) => Promise; + +const callForHelmReleaseInjectable = getInjectable({ + id: "call-for-helm-release", + + instantiate: (di): CallForHelmRelease => { + const callForHelmReleases = di.inject(callForHelmReleasesInjectable); + const callForHelmReleaseDetails = di.inject(callForHelmReleaseDetailsInjectable); + + return async (name, namespace) => { + const [releases, details] = await Promise.all([ + callForHelmReleases(namespace), + callForHelmReleaseDetails(name, namespace), + ]); + + const release = releases.find( + (rel) => rel.name === name && rel.namespace === namespace, + ); + + if (!release) { + return undefined; + } + + return { release, details }; + }; + }, +}); + +export default callForHelmReleaseInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/get-resource-details-url.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details-model/get-resource-details-url.injectable.ts new file mode 100644 index 0000000000..d1052fa436 --- /dev/null +++ b/src/renderer/components/+helm-releases/release-details/release-details-model/get-resource-details-url.injectable.ts @@ -0,0 +1,45 @@ +/** + * 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 apiManagerInjectable from "../../../../../common/k8s-api/api-manager/manager.injectable"; +import getDetailsUrlInjectable from "../../../kube-detail-params/get-details-url.injectable"; + +export type GetResourceDetailsUrl = ( + kind: string, + apiVersion: string, + namespace: string | undefined, + name: string +) => string; + +const getResourceDetailsUrlInjectable = getInjectable({ + id: "get-resource-details-url", + + instantiate: (di): GetResourceDetailsUrl => { + const apiManager = di.inject(apiManagerInjectable); + const getDetailsUrl = di.inject(getDetailsUrlInjectable); + + const getKubeApi = (kind: string, apiVersion: string) => + apiManager.getApi( + (api) => api.kind === kind && api.apiVersionWithGroup == apiVersion, + ); + + return (kind, apiVersion, namespace, name) => { + const kubeApi = getKubeApi(kind, apiVersion); + + if (!kubeApi) { + return ""; + } + + const resourceUrl = kubeApi.getUrl({ + name, + namespace, + }); + + return getDetailsUrl(resourceUrl); + }; + }, +}); + +export default getResourceDetailsUrlInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx b/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx new file mode 100644 index 0000000000..640ee88412 --- /dev/null +++ b/src/renderer/components/+helm-releases/release-details/release-details-model/release-details-model.injectable.tsx @@ -0,0 +1,308 @@ +/** + * 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 type { IObservableValue } from "mobx"; +import { runInAction, action, observable, computed } from "mobx"; +import type { TargetHelmRelease } from "../target-helm-release.injectable"; +import type { CallForHelmRelease, DetailedHelmRelease } from "./call-for-helm-release/call-for-helm-release.injectable"; +import callForHelmReleaseInjectable from "./call-for-helm-release/call-for-helm-release.injectable"; +import type { ThemeStore } from "../../../../themes/store"; +import themeStoreInjectable from "../../../../themes/store.injectable"; +import type { CallForHelmReleaseConfiguration } from "./call-for-helm-release-configuration/call-for-helm-release-configuration.injectable"; +import callForHelmReleaseConfigurationInjectable from "./call-for-helm-release-configuration/call-for-helm-release-configuration.injectable"; +import { toHelmRelease } from "../../releases.injectable"; +import { pipeline } from "@ogre-tools/fp"; +import { groupBy, map } from "lodash/fp"; +import type { KubeJsonApiData } from "../../../../../common/k8s-api/kube-json-api"; +import type { GetResourceDetailsUrl } from "./get-resource-details-url.injectable"; +import getResourceDetailsUrlInjectable from "./get-resource-details-url.injectable"; +import type { CallForHelmReleaseUpdate } from "../../update-release/call-for-helm-release-update/call-for-helm-release-update.injectable"; +import updateReleaseInjectable from "../../update-release/update-release.injectable"; +import type { ShowCheckedErrorNotification } from "../../../notifications/show-checked-error.injectable"; +import showCheckedErrorNotificationInjectable from "../../../notifications/show-checked-error.injectable"; +import type { ShowNotification } from "../../../notifications"; +import showSuccessNotificationInjectable from "../../../notifications/show-success-notification.injectable"; +import React from "react"; +import createUpgradeChartTabInjectable from "../../../dock/upgrade-chart/create-upgrade-chart-tab.injectable"; +import type { HelmRelease } from "../../../../../common/k8s-api/endpoints/helm-releases.api"; +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 assert from "assert"; +import withOrphanPromiseInjectable from "../../../../../common/utils/with-orphan-promise/with-orphan-promise.injectable"; + +const releaseDetailsModelInjectable = getInjectable({ + id: "release-details-model", + + instantiate: (di, targetRelease: TargetHelmRelease) => { + const callForHelmRelease = di.inject(callForHelmReleaseInjectable); + const callForHelmReleaseConfiguration = di.inject(callForHelmReleaseConfigurationInjectable); + const themeStore = di.inject(themeStoreInjectable); + const getResourceDetailsUrl = di.inject(getResourceDetailsUrlInjectable); + const updateRelease = di.inject(updateReleaseInjectable); + const showCheckedErrorNotification = di.inject(showCheckedErrorNotificationInjectable); + const showSuccessNotification = di.inject(showSuccessNotificationInjectable); + const createUpgradeChartTab = di.inject(createUpgradeChartTabInjectable); + const navigateToHelmReleases = di.inject(navigateToHelmReleasesInjectable); + const withOrphanPromise = di.inject(withOrphanPromiseInjectable); + + const model = new ReleaseDetailsModel({ + callForHelmRelease, + targetRelease, + themeStore, + callForHelmReleaseConfiguration, + getResourceDetailsUrl, + updateRelease, + showCheckedErrorNotification, + showSuccessNotification, + createUpgradeChartTab, + navigateToHelmReleases, + }); + + const load = withOrphanPromise(model.load); + + // TODO: Reorganize Drawer to allow setting of header-bar in children to make "getPlaceholder" from injectable usable. + load(); + + return model; + }, + + lifecycle: lifecycleEnum.keyedSingleton({ + getInstanceKey: (di, release: TargetHelmRelease) => + `${release.namespace}/${release.name}`, + }), +}); + +export default releaseDetailsModelInjectable; + +export interface OnlyUserSuppliedValuesAreShownToggle { + value: IObservableValue; + toggle: () => Promise; +} + +export interface ConfigurationInput { + nonSavedValue: IObservableValue; + isLoading: IObservableValue; + isSaving: IObservableValue; + onChange: (value: string) => void; + save: () => Promise; +} + +interface Dependencies { + callForHelmRelease: CallForHelmRelease; + targetRelease: TargetHelmRelease; + themeStore: ThemeStore; + callForHelmReleaseConfiguration: CallForHelmReleaseConfiguration; + getResourceDetailsUrl: GetResourceDetailsUrl; + updateRelease: CallForHelmReleaseUpdate; + showCheckedErrorNotification: ShowCheckedErrorNotification; + showSuccessNotification: ShowNotification; + createUpgradeChartTab: (release: HelmRelease) => string; + navigateToHelmReleases: NavigateToHelmReleases; +} + +export class ReleaseDetailsModel { + id = `${this.dependencies.targetRelease.namespace}/${this.dependencies.targetRelease.name}`; + + constructor(private dependencies: Dependencies) {} + + private detailedRelease = observable.box(); + + readonly isLoading = observable.box(false); + + readonly configuration: ConfigurationInput = { + nonSavedValue: observable.box(""), + isLoading: observable.box(false), + isSaving: observable.box(false), + + onChange: action((value: string) => { + this.configuration.nonSavedValue.set(value); + }), + + save: async () => { + runInAction(() => { + this.configuration.isSaving.set(true); + }); + + const name = this.release.getName(); + const namespace = this.release.getNs(); + + const data = { + chart: this.release.getChart(), + repo: await this.release.getRepo(), + version: this.release.getVersion(), + values: this.configuration.nonSavedValue.get(), + }; + + const result = await this.dependencies.updateRelease(name, namespace, data); + + runInAction(() => { + this.configuration.isSaving.set(false); + }); + + if (!result.updateWasSuccessful) { + this.dependencies.showCheckedErrorNotification( + result.error, + "Unknown error occured while updating release", + ); + + return; + } + + this.dependencies.showSuccessNotification( +

+ Release + {" "} + {name} + {" successfully updated!"} +

, + ); + + await this.loadConfiguration(); + }, + }; + + readonly onlyUserSuppliedValuesAreShown: OnlyUserSuppliedValuesAreShownToggle = { + value: observable.box(false), + + toggle: action(async () => { + const value = this.onlyUserSuppliedValuesAreShown.value; + + value.set(!value.get()); + + await this.loadConfiguration(); + }), + }; + + load = async () => { + runInAction(() => { + this.isLoading.set(true); + }); + + const { name, namespace } = this.dependencies.targetRelease; + + const detailedRelease = await this.dependencies.callForHelmRelease( + name, + namespace, + ); + + runInAction(() => { + this.detailedRelease.set(detailedRelease); + }); + + await this.loadConfiguration(); + + runInAction(() => { + this.isLoading.set(false); + }); + }; + + private loadConfiguration = async () => { + runInAction(() => { + this.configuration.isLoading.set(true); + }); + + const { name, namespace } = this.release; + + const configuration = + await this.dependencies.callForHelmReleaseConfiguration( + name, + namespace, + !this.onlyUserSuppliedValuesAreShown.value.get(), + ); + + runInAction(() => { + this.configuration.isLoading.set(false); + this.configuration.nonSavedValue.set(configuration); + }); + }; + + @computed get release() { + const detailedRelease = this.detailedRelease.get(); + + assert(detailedRelease, "Tried to access release before load"); + + return toHelmRelease(detailedRelease.release); + } + + @computed private get details() { + const detailedRelease = this.detailedRelease.get(); + + assert(detailedRelease, "Tried to access details before load"); + + return detailedRelease.details; + } + + @computed get notes() { + return this.details.info.notes; + } + + @computed get groupedResources(): MinimalResourceGroup[] { + return pipeline( + this.details.resources, + groupBy((resource) => resource.kind), + (grouped) => Object.entries(grouped), + + map(([kind, resources]) => ({ + kind, + + resources: resources.map( + toMinimalResourceFor(this.dependencies.getResourceDetailsUrl, kind), + ), + + isNamespaced: resources.some( + (resource) => !!resource.metadata.namespace, + ), + })), + ); + } + + @computed get activeTheme() { + return this.dependencies.themeStore.activeTheme.type; + } + + close = () => { + this.dependencies.navigateToHelmReleases(); + }; + + startUpgradeProcess = () => { + this.dependencies.createUpgradeChartTab(this.release); + + this.close(); + }; +} + +export interface MinimalResourceGroup { + kind: string; + isNamespaced: boolean; + resources: MinimalResource[]; +} + +export interface MinimalResource { + uid: string | undefined; + name: string; + namespace: string | undefined; + detailsUrl: string | undefined; + creationTimestamp: string | undefined; +} + +const toMinimalResourceFor = + (getResourceDetailsUrl: GetResourceDetailsUrl, kind: string) => + (resource: KubeJsonApiData): MinimalResource => { + const { creationTimestamp, name, namespace, uid } = resource.metadata; + + return { + uid, + name, + namespace, + creationTimestamp, + + detailsUrl: getResourceDetailsUrl( + kind, + resource.apiVersion, + namespace, + name, + ), + }; + }; diff --git a/src/renderer/components/+helm-releases/release-details/release-details.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-details.injectable.ts deleted file mode 100644 index f788d5ac57..0000000000 --- a/src/renderer/components/+helm-releases/release-details/release-details.injectable.ts +++ /dev/null @@ -1,24 +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 { getRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; -import { asyncComputed } from "@ogre-tools/injectable-react"; -import releaseInjectable from "./release.injectable"; -import { waitUntilDefined } from "../../../utils"; - -const releaseDetailsInjectable = getInjectable({ - id: "release-details", - - instantiate: (di) => { - const releaseComputed = di.inject(releaseInjectable); - - return asyncComputed(async () => { - const release = await waitUntilDefined(releaseComputed); - - return getRelease(release.name, release.namespace); - });}, -}); - -export default releaseDetailsInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release-details.tsx b/src/renderer/components/+helm-releases/release-details/release-details.tsx index ee01070fbf..254d9e1edc 100644 --- a/src/renderer/components/+helm-releases/release-details/release-details.tsx +++ b/src/renderer/components/+helm-releases/release-details/release-details.tsx @@ -5,296 +5,35 @@ import "./release-details.scss"; -import React, { Component } from "react"; -import groupBy from "lodash/groupBy"; -import type { IComputedValue } from "mobx"; -import { computed, makeObservable, observable } from "mobx"; -import { Link } from "react-router-dom"; -import kebabCase from "lodash/kebabCase"; -import type { HelmRelease, HelmReleaseDetails, HelmReleaseUpdateDetails, HelmReleaseUpdatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api"; -import { HelmReleaseMenu } from "../release-menu"; -import { Drawer, DrawerItem, DrawerTitle } from "../../drawer"; -import { Badge } from "../../badge"; -import { cssNames, stopPropagation } from "../../../utils"; -import { Observer, observer } from "mobx-react"; -import { Spinner } from "../../spinner"; -import { Table, TableCell, TableHead, TableRow } from "../../table"; -import { Button } from "../../button"; -import { Notifications } from "../../notifications"; -import type { ThemeStore } from "../../../themes/store"; -import type { ApiManager } from "../../../../common/k8s-api/api-manager"; -import { SubTitle } from "../../layout/sub-title"; -import { Checkbox } from "../../checkbox"; -import { MonacoEditor } from "../../monaco-editor"; -import type { IAsyncComputed } from "@ogre-tools/injectable-react"; -import { withInjectables } from "@ogre-tools/injectable-react"; -import createUpgradeChartTabInjectable from "../../dock/upgrade-chart/create-upgrade-chart-tab.injectable"; -import updateReleaseInjectable from "../update-release/update-release.injectable"; -import releaseInjectable from "./release.injectable"; -import releaseDetailsInjectable from "./release-details.injectable"; -import releaseValuesInjectable from "./release-values.injectable"; -import userSuppliedValuesAreShownInjectable from "./user-supplied-values-are-shown.injectable"; -import { KubeObjectAge } from "../../kube-object/age"; -import type { KubeJsonApiData } from "../../../../common/k8s-api/kube-json-api"; -import { entries } from "../../../../common/utils/objects"; -import themeStoreInjectable from "../../../themes/store.injectable"; -import type { GetDetailsUrl } from "../../kube-detail-params/get-details-url.injectable"; -import apiManagerInjectable from "../../../../common/k8s-api/api-manager/manager.injectable"; -import getDetailsUrlInjectable from "../../kube-detail-params/get-details-url.injectable"; +import React from "react"; -export interface ReleaseDetailsProps { - hideDetails(): void; -} +import { observer } from "mobx-react"; +import { withInjectables } from "@ogre-tools/injectable-react"; + +import type { IComputedValue } from "mobx"; +import { ReleaseDetailsContent } from "./release-details-content"; +import type { TargetHelmRelease } from "./target-helm-release.injectable"; +import targetHelmReleaseInjectable from "./target-helm-release.injectable"; interface Dependencies { - release: IComputedValue; - releaseDetails: IAsyncComputed; - releaseValues: IAsyncComputed; - updateRelease: (name: string, namespace: string, payload: HelmReleaseUpdatePayload) => Promise; - createUpgradeChartTab: (release: HelmRelease) => void; - userSuppliedValuesAreShown: { toggle: () => void; value: boolean }; - themeStore: ThemeStore; - apiManager: ApiManager; - getDetailsUrl: GetDetailsUrl; + targetRelease: IComputedValue< + TargetHelmRelease | undefined + >; } -@observer -class NonInjectedReleaseDetails extends Component { - @observable saving = false; +const NonInjectedReleaseDetails = observer( + ({ targetRelease }: Dependencies) => { + const release = targetRelease.get(); - private nonSavedValues = ""; + return release ? : null; + }, +); - constructor(props: ReleaseDetailsProps & Dependencies) { - super(props); - makeObservable(this); - } - - @computed get details() { - return this.props.releaseDetails.value.get(); - } - - updateValues = async (release: HelmRelease) => { - const name = release.getName(); - const namespace = release.getNs(); - const data = { - chart: release.getChart(), - repo: await release.getRepo(), - version: release.getVersion(), - values: this.nonSavedValues, - }; - - this.saving = true; - - try { - await this.props.updateRelease(name, namespace, data); - Notifications.ok( -

- Release - {name} - {" successfully updated!"} -

, - ); - - this.props.releaseValues.invalidate(); - } catch (err) { - Notifications.checkedError(err, "Unknown error occured while updating release"); - } - this.saving = false; - }; - - upgradeVersion = (release: HelmRelease) => { - const { hideDetails, createUpgradeChartTab } = this.props; - - createUpgradeChartTab(release); - hideDetails(); - }; - - renderValues(release: HelmRelease) { - return ( - - {() => { - const { saving } = this; - - const releaseValuesArePending = - this.props.releaseValues.pending.get(); - - this.nonSavedValues = this.props.releaseValues.value.get(); - - return ( -
- Values -
- - (this.nonSavedValues = text)} - /> -
-
- ); - }} - - ); - } - - renderNotes() { - if (!this.details.info?.notes) return null; - const { notes } = this.details.info; - - return ( -
- {notes} -
- ); - } - - renderResources(resources: KubeJsonApiData[]) { - const { apiManager, getDetailsUrl } = this.props; - - return ( -
- { - entries(groupBy(resources, item => item.kind)) - .map(([kind, items]) => ( - - - - - Name - {items[0].metadata.namespace && Namespace} - Age - - {items.map(item => { - const { name, namespace, uid } = item.metadata; - const api = apiManager.getApi(api => api.kind === kind && api.apiVersionWithGroup == item.apiVersion); - const detailsUrl = api ? getDetailsUrl(api.getUrl({ name, namespace })) : ""; - - return ( - - - {detailsUrl ? {name} : name} - - {namespace && ( - - {namespace} - - )} - - - - - ); - })} -
- - )) - } -
- ); - } - - renderContent(release: HelmRelease) { - if (!this.details) { - return ; - } - - const { resources } = this.details; - - return ( -
- -
- {release.getChart()} -
- - - {release.getUpdated()} - {` ago (${release.updated})`} - - - {release.getNs()} - - -
- - {release.getVersion()} - -
- - - - - {this.renderValues(release)} - Notes - {this.renderNotes()} - Resources - {resources && this.renderResources(resources)} -
- ); - } - - render() { - const { hideDetails, themeStore } = this.props; - const release = this.props.release.get(); - - return ( - - )} - > - {release && this.renderContent(release)} - - ); - } -} - -export const ReleaseDetails = withInjectables(NonInjectedReleaseDetails, { - getProps: (di, props) => ({ - ...props, - release: di.inject(releaseInjectable), - releaseDetails: di.inject(releaseDetailsInjectable), - releaseValues: di.inject(releaseValuesInjectable), - userSuppliedValuesAreShown: di.inject(userSuppliedValuesAreShownInjectable), - updateRelease: di.inject(updateReleaseInjectable), - createUpgradeChartTab: di.inject(createUpgradeChartTabInjectable), - themeStore: di.inject(themeStoreInjectable), - apiManager: di.inject(apiManagerInjectable), - getDetailsUrl: di.inject(getDetailsUrlInjectable), - }), -}); +export const ReleaseDetails = withInjectables( + NonInjectedReleaseDetails, + { + getProps: (di) => ({ + targetRelease: di.inject(targetHelmReleaseInjectable), + }), + }, +); diff --git a/src/renderer/components/+helm-releases/release-details/release-values.injectable.ts b/src/renderer/components/+helm-releases/release-details/release-values.injectable.ts deleted file mode 100644 index 96cfd6c2dd..0000000000 --- a/src/renderer/components/+helm-releases/release-details/release-values.injectable.ts +++ /dev/null @@ -1,36 +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 { getReleaseValues } from "../../../../common/k8s-api/endpoints/helm-releases.api"; -import { asyncComputed } from "@ogre-tools/injectable-react"; -import releaseInjectable from "./release.injectable"; -import { Notifications } from "../../notifications"; -import userSuppliedValuesAreShownInjectable from "./user-supplied-values-are-shown.injectable"; - -const releaseValuesInjectable = getInjectable({ - id: "release-values", - - instantiate: (di) => - asyncComputed(async () => { - const release = di.inject(releaseInjectable).get(); - - // TODO: Figure out way to get rid of defensive code - if (!release) { - return ""; - } - - const userSuppliedValuesAreShown = di.inject(userSuppliedValuesAreShownInjectable).value; - - try { - return await getReleaseValues(release.getName(), release.getNs(), !userSuppliedValuesAreShown) ?? ""; - } catch (error) { - Notifications.error(`Failed to load values for ${release.getName()}: ${error}`); - - return ""; - } - }), -}); - -export default releaseValuesInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/release.injectable.ts b/src/renderer/components/+helm-releases/release-details/target-helm-release.injectable.ts similarity index 58% rename from src/renderer/components/+helm-releases/release-details/release.injectable.ts rename to src/renderer/components/+helm-releases/release-details/target-helm-release.injectable.ts index 981ffce517..809ed1ab5a 100644 --- a/src/renderer/components/+helm-releases/release-details/release.injectable.ts +++ b/src/renderer/components/+helm-releases/release-details/target-helm-release.injectable.ts @@ -3,29 +3,24 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; -import { matches } from "lodash/fp"; -import releasesInjectable from "../releases.injectable"; import { computed } from "mobx"; import helmReleasesRouteParametersInjectable from "../helm-releases-route-parameters.injectable"; -const releaseInjectable = getInjectable({ - id: "release", +export interface TargetHelmRelease { name: string; namespace: string } + +const targetHelmReleaseInjectable = getInjectable({ + id: "target-helm-release", instantiate: (di) => { - const releases = di.inject(releasesInjectable); const routeParameters = di.inject(helmReleasesRouteParametersInjectable); - return computed(() => { + return computed((): TargetHelmRelease | undefined => { const name = routeParameters.name.get(); const namespace = routeParameters.namespace.get(); - if (!name || !namespace) { - return null; - } - - return releases.value.get().find(matches({ name, namespace })); + return name && namespace ? { name, namespace } : undefined; }); }, }); -export default releaseInjectable; +export default targetHelmReleaseInjectable; diff --git a/src/renderer/components/+helm-releases/release-details/user-supplied-values-are-shown.injectable.ts b/src/renderer/components/+helm-releases/release-details/user-supplied-values-are-shown.injectable.ts deleted file mode 100644 index f0201ebee0..0000000000 --- a/src/renderer/components/+helm-releases/release-details/user-supplied-values-are-shown.injectable.ts +++ /dev/null @@ -1,27 +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 { observable } from "mobx"; - -const userSuppliedValuesAreShownInjectable = getInjectable({ - id: "user-supplied-values-are-shown", - - instantiate: () => { - const state = observable.box(false); - - return { - get value() { - return state.get(); - }, - - toggle: () => { - state.set(!state.get()); - }, - }; - }, -}); - -export default userSuppliedValuesAreShownInjectable; - diff --git a/src/renderer/components/+helm-releases/releases.injectable.ts b/src/renderer/components/+helm-releases/releases.injectable.ts index e23640de6d..694f0d379e 100644 --- a/src/renderer/components/+helm-releases/releases.injectable.ts +++ b/src/renderer/components/+helm-releases/releases.injectable.ts @@ -5,9 +5,13 @@ import { getInjectable } from "@ogre-tools/injectable"; import { asyncComputed } from "@ogre-tools/injectable-react"; import namespaceStoreInjectable from "../+namespaces/store.injectable"; -import { listReleases } from "../../../common/k8s-api/endpoints/helm-releases.api"; import clusterFrameContextInjectable from "../../cluster-frame-context/cluster-frame-context.injectable"; import releaseSecretsInjectable from "./release-secrets.injectable"; +import callForHelmReleasesInjectable from "./call-for-helm-releases/call-for-helm-releases.injectable"; +import type { HelmRelease, HelmReleaseDto } from "../../../common/k8s-api/endpoints/helm-releases.api"; +import { formatDuration } from "../../../common/utils"; +import { helmChartStore } from "../+helm-charts/helm-chart.store"; +import { capitalize } from "lodash/fp"; const releasesInjectable = getInjectable({ id: "releases", @@ -16,6 +20,7 @@ const releasesInjectable = getInjectable({ const clusterContext = di.inject(clusterFrameContextInjectable); const namespaceStore = di.inject(namespaceStoreInjectable); const releaseSecrets = di.inject(releaseSecretsInjectable); + const callForHelmReleases = di.inject(callForHelmReleasesInjectable); return asyncComputed(async () => { const contextNamespaces = namespaceStore.contextNamespaces || []; @@ -29,15 +34,83 @@ const releasesInjectable = getInjectable({ contextNamespaces.includes(namespace), ); - const releaseArrays = await (isLoadingAll ? listReleases() : Promise.all( + const releaseArrays = await (isLoadingAll ? callForHelmReleases() : Promise.all( contextNamespaces.map((namespace) => - listReleases(namespace), + callForHelmReleases(namespace), ), )); - return releaseArrays.flat(); + return releaseArrays.flat().map(toHelmRelease); }, []); }, }); +export const toHelmRelease = (release: HelmReleaseDto) : HelmRelease => ({ + ...release, + + getId() { + return `${this.namespace}/${this.name}`; + }, + + getName() { + return this.name; + }, + + getNs() { + return this.namespace; + }, + + getChart(withVersion = false) { + let chart = this.chart; + + if (!withVersion && this.getVersion() != "") { + const search = new RegExp(`-${this.getVersion()}`); + + chart = chart.replace(search, ""); + } + + return chart; + }, + + getRevision() { + return parseInt(this.revision, 10); + }, + + getStatus() { + return capitalize(this.status); + }, + + getVersion() { + const versions = this.chart.match(/(?<=-)(v?\d+)[^-].*$/); + + return versions?.[0] ?? ""; + }, + + getUpdated(humanize = true, compact = true) { + const updated = this.updated.replace(/\s\w*$/, ""); // 2019-11-26 10:58:09 +0300 MSK -> 2019-11-26 10:58:09 +0300 to pass into Date() + const updatedDate = new Date(updated).getTime(); + const diff = Date.now() - updatedDate; + + if (humanize) { + return formatDuration(diff, compact); + } + + return diff; + }, + + // Helm does not store from what repository the release is installed, + // so we have to try to guess it by searching charts + async getRepo() { + const chartName = this.getChart(); + const version = this.getVersion(); + const versions = await helmChartStore.getVersions(chartName); + const chartVersion = versions.find( + (chartVersion) => chartVersion.version === version, + ); + + return chartVersion ? chartVersion.repo : ""; + }, +}); + + export default releasesInjectable; diff --git a/src/renderer/components/+helm-releases/releases.tsx b/src/renderer/components/+helm-releases/releases.tsx index 38239e80c8..7b5fd99dac 100644 --- a/src/renderer/components/+helm-releases/releases.tsx +++ b/src/renderer/components/+helm-releases/releases.tsx @@ -16,7 +16,6 @@ import { NamespaceSelectFilter } from "../+namespaces/namespace-select-filter"; import { kebabCase } from "lodash/fp"; import { HelmReleaseMenu } from "./release-menu"; import { ReleaseRollbackDialog } from "./dialog/dialog"; -import { ReleaseDetails } from "./release-details/release-details"; import removableReleasesInjectable from "./removable-releases.injectable"; import type { RemovableHelmRelease } from "./removable-releases"; import type { IComputedValue } from "mobx"; @@ -145,6 +144,7 @@ class NonInjectedHelmReleases extends Component { isConfigurable tableId="helm_releases" className="HelmReleases" + customizeTableRowProps={(item) => ({ testId: `helm-release-row-for-${item.getId()}` })} sortingCallbacks={{ [columnId.name]: release => release.getName(), [columnId.namespace]: release => release.getNs(), @@ -204,10 +204,7 @@ class NonInjectedHelmReleases extends Component { message: this.renderRemoveDialogMessage(selectedItems), })} onDetails={this.onDetails} - /> - - diff --git a/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.global-override-for-injectable.ts b/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.global-override-for-injectable.ts new file mode 100644 index 0000000000..34cc147e8d --- /dev/null +++ b/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.global-override-for-injectable.ts @@ -0,0 +1,15 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ +import { getGlobalOverride } from "../../../../../common/test-utils/get-global-override"; +import callForHelmReleaseUpdateInjectable from "./call-for-helm-release-update.injectable"; + +export default getGlobalOverride( + callForHelmReleaseUpdateInjectable, + () => () => { + throw new Error( + "Tried to call for helm release update without explicit override.", + ); + }, +); diff --git a/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable.ts b/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable.ts new file mode 100644 index 0000000000..b3cc590163 --- /dev/null +++ b/src/renderer/components/+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable.ts @@ -0,0 +1,50 @@ +/** + * 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 { apiBase } from "../../../../../common/k8s-api"; +import { endpoint } from "../../../../../common/k8s-api/endpoints/helm-releases.api"; +import yaml from "js-yaml"; + +interface HelmReleaseUpdatePayload { + repo: string; + chart: string; + version: string; + values: string; +} + +export type CallForHelmReleaseUpdate = ( + name: string, + namespace: string, + payload: HelmReleaseUpdatePayload +) => Promise<{ updateWasSuccessful: true } | { updateWasSuccessful: false; error: unknown }>; + +const callForHelmReleaseUpdateInjectable = getInjectable({ + id: "call-for-helm-release-update", + + instantiate: + (): CallForHelmReleaseUpdate => async (name, namespace, payload) => { + const { repo, chart: rawChart, values: rawValues, ...data } = payload; + const chart = `${repo}/${rawChart}`; + const values = yaml.load(rawValues); + + try { + await apiBase.put(endpoint({ name, namespace }), { + data: { + chart, + values, + ...data, + }, + }); + } catch (e) { + return { updateWasSuccessful: false, error: e }; + } + + return { updateWasSuccessful: true }; + }, + + causesSideEffects: true, +}); + +export default callForHelmReleaseUpdateInjectable; diff --git a/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts b/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts index aa6aa9448d..dce16e2dd1 100644 --- a/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts +++ b/src/renderer/components/+helm-releases/update-release/update-release.injectable.ts @@ -3,26 +3,23 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; - -import type { - HelmReleaseUpdatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api"; -import { - updateRelease, -} from "../../../../common/k8s-api/endpoints/helm-releases.api"; import releasesInjectable from "../releases.injectable"; +import type { CallForHelmReleaseUpdate } from "./call-for-helm-release-update/call-for-helm-release-update.injectable"; +import callForHelmReleaseUpdateInjectable from "./call-for-helm-release-update/call-for-helm-release-update.injectable"; const updateReleaseInjectable = getInjectable({ id: "update-release", - instantiate: (di) => { + instantiate: (di): CallForHelmReleaseUpdate => { const releases = di.inject(releasesInjectable); + const callForHelmReleaseUpdate = di.inject(callForHelmReleaseUpdateInjectable); return async ( - name: string, - namespace: string, - payload: HelmReleaseUpdatePayload, + name, + namespace, + payload, ) => { - const result = await updateRelease(name, namespace, payload); + const result = await callForHelmReleaseUpdate(name, namespace, payload); releases.invalidate(); diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx index 1eba3195a9..4129817fa0 100644 --- a/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/src/renderer/components/cluster-manager/cluster-view.tsx @@ -68,6 +68,11 @@ class NonInjectedClusterView extends React.Component { bindEvents() { disposeOnUnmount(this, [ reaction(() => this.clusterId, async (clusterId) => { + // TODO: replace with better handling + if (clusterId && !this.props.entityRegistry.getById(clusterId)) { + return this.props.navigateToCatalog(); // redirect to catalog when the clusterId does not correspond to an entity + } + this.props.clusterFrames.setVisibleCluster(clusterId); this.props.clusterFrames.initView(clusterId); requestClusterActivation(clusterId, false); // activate and fetch cluster's state from main diff --git a/src/renderer/components/dock/__test__/dock-tabs.test.tsx b/src/renderer/components/dock/__test__/dock-tabs.test.tsx index 8c834061d8..0dbb548be7 100644 --- a/src/renderer/components/dock/__test__/dock-tabs.test.tsx +++ b/src/renderer/components/dock/__test__/dock-tabs.test.tsx @@ -17,7 +17,6 @@ import type { DiRender } from "../../test-utils/renderFor"; import { renderFor } from "../../test-utils/renderFor"; import directoryForUserDataInjectable from "../../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; import getConfigurationFileModelInjectable from "../../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../../common/get-configuration-file-model/app-version/app-version.injectable"; import assert from "assert"; import hostedClusterIdInjectable from "../../../cluster-frame-context/hosted-cluster-id.injectable"; @@ -84,7 +83,6 @@ describe("", () => { ); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); dockStore = di.inject(dockStoreInjectable); diff --git a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx index 5fd6161052..744be3fae9 100644 --- a/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx +++ b/src/renderer/components/dock/logs/__test__/log-resource-selector.test.tsx @@ -20,7 +20,6 @@ import type { TabId } from "../../dock/store"; import userEvent from "@testing-library/user-event"; import { SearchStore } from "../../../../search-store/search-store"; import getConfigurationFileModelInjectable from "../../../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../../../common/get-configuration-file-model/app-version/app-version.injectable"; import assert from "assert"; jest.mock("electron", () => ({ @@ -133,7 +132,6 @@ describe("", () => { di.override(callForLogsInjectable, () => () => Promise.resolve("some-logs")); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); render = renderFor(di); diff --git a/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts b/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts index 014e46760f..3233d08cb5 100644 --- a/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts +++ b/src/renderer/components/dock/upgrade-chart/create-upgrade-chart-tab.injectable.ts @@ -10,13 +10,15 @@ import type { DockStore, DockTabCreateSpecific, TabId } from "../dock/store"; import { TabKind } from "../dock/store"; import type { UpgradeChartTabStore } from "./store"; import { runInAction } from "mobx"; +import getRandomUpgradeChartTabIdInjectable from "./get-random-upgrade-chart-tab-id.injectable"; interface Dependencies { upgradeChartStore: UpgradeChartTabStore; dockStore: DockStore; + getRandomId: () => string; } -const createUpgradeChartTab = ({ upgradeChartStore, dockStore }: Dependencies) => (release: HelmRelease, tabParams: DockTabCreateSpecific = {}): TabId => { +const createUpgradeChartTab = ({ upgradeChartStore, dockStore, getRandomId }: Dependencies) => (release: HelmRelease, tabParams: DockTabCreateSpecific = {}): TabId => { const tabId = upgradeChartStore.getTabIdByRelease(release.getName()); if (tabId) { @@ -29,6 +31,7 @@ const createUpgradeChartTab = ({ upgradeChartStore, dockStore }: Dependencies) = return runInAction(() => { const tab = dockStore.createTab( { + id: getRandomId(), title: `Helm Upgrade: ${release.getName()}`, ...tabParams, kind: TabKind.UPGRADE_CHART, @@ -51,6 +54,7 @@ const createUpgradeChartTabInjectable = getInjectable({ instantiate: (di) => createUpgradeChartTab({ upgradeChartStore: di.inject(upgradeChartTabStoreInjectable), dockStore: di.inject(dockStoreInjectable), + getRandomId: di.inject(getRandomUpgradeChartTabIdInjectable), }), }); diff --git a/src/renderer/components/dock/upgrade-chart/get-random-upgrade-chart-tab-id.injectable.ts b/src/renderer/components/dock/upgrade-chart/get-random-upgrade-chart-tab-id.injectable.ts new file mode 100644 index 0000000000..167973060f --- /dev/null +++ b/src/renderer/components/dock/upgrade-chart/get-random-upgrade-chart-tab-id.injectable.ts @@ -0,0 +1,13 @@ +/** + * 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 getRandomIdInjectable from "../../../../common/utils/get-random-id.injectable"; + +const getRandomUpgradeChartTabIdInjectable = getInjectable({ + id: "get-random-upgrade-chart-tab-id", + instantiate: (di) => di.inject(getRandomIdInjectable), +}); + +export default getRandomUpgradeChartTabIdInjectable; diff --git a/src/renderer/components/dock/upgrade-chart/view.tsx b/src/renderer/components/dock/upgrade-chart/view.tsx index 9dc9d4ed4a..11d60b6c87 100644 --- a/src/renderer/components/dock/upgrade-chart/view.tsx +++ b/src/renderer/components/dock/upgrade-chart/view.tsx @@ -16,7 +16,7 @@ import { Spinner } from "../../spinner"; import { Badge } from "../../badge"; import { EditorPanel } from "../editor-panel"; import { helmChartStore, type ChartVersion } from "../../+helm-charts/helm-chart.store"; -import type { HelmRelease, HelmReleaseUpdateDetails, HelmReleaseUpdatePayload } from "../../../../common/k8s-api/endpoints/helm-releases.api"; +import type { HelmRelease } from "../../../../common/k8s-api/endpoints/helm-releases.api"; import type { SelectOption } from "../../select"; import { Select } from "../../select"; import type { IAsyncComputed } from "@ogre-tools/injectable-react"; @@ -24,6 +24,8 @@ import { withInjectables } from "@ogre-tools/injectable-react"; import upgradeChartTabStoreInjectable from "./store.injectable"; import updateReleaseInjectable from "../../+helm-releases/update-release/update-release.injectable"; import releasesInjectable from "../../+helm-releases/releases.injectable"; +import type { CallForHelmReleaseUpdate } from "../../+helm-releases/update-release/call-for-helm-release-update/call-for-helm-release-update.injectable"; +import { first } from "lodash/fp"; export interface UpgradeChartProps { className?: string; @@ -33,7 +35,7 @@ export interface UpgradeChartProps { interface Dependencies { releases: IAsyncComputed; upgradeChartTabStore: UpgradeChartTabStore; - updateRelease: (name: string, namespace: string, payload: HelmReleaseUpdatePayload) => Promise; + updateRelease: CallForHelmReleaseUpdate; } @observer @@ -96,7 +98,7 @@ export class NonInjectedUpgradeChart extends React.Component { diff --git a/src/renderer/components/drawer/drawer.tsx b/src/renderer/components/drawer/drawer.tsx index 61577e1bde..7a87d1a47f 100644 --- a/src/renderer/components/drawer/drawer.tsx +++ b/src/renderer/components/drawer/drawer.tsx @@ -39,6 +39,8 @@ export interface DrawerProps { onClose?: () => void; toolbar?: React.ReactNode; children?: SingleOrMany; + "data-testid"?: string; + testIdForClose?: string; } const defaultProps = { @@ -179,7 +181,7 @@ class NonInjectedDrawer extends React.Component this.contentElem = e} + data-testid={testId} >
@@ -211,6 +214,7 @@ class NonInjectedDrawer extends React.Component
", () => { di.permitSideEffects(hotbarStoreInjectable); di.permitSideEffects(getConfigurationFileModelInjectable); - di.permitSideEffects(appVersionInjectable); render = renderFor(di); }); diff --git a/src/renderer/components/item-object-list/content.tsx b/src/renderer/components/item-object-list/content.tsx index 30ee1c4102..8cff8f21bc 100644 --- a/src/renderer/components/item-object-list/content.tsx +++ b/src/renderer/components/item-object-list/content.tsx @@ -60,6 +60,8 @@ export interface ItemListLayoutContentProps Partial; + spinnerTestId?: string; + /** * Message to display when a store failed to load * @@ -221,7 +223,7 @@ class NonInjectedItemListLayoutContent< } if (!this.props.getIsReady()) { - return ; + return ; } if (this.props.getFilters().length > 0) { diff --git a/src/renderer/components/item-object-list/list-layout.tsx b/src/renderer/components/item-object-list/list-layout.tsx index 58662cd115..63fbc651f8 100644 --- a/src/renderer/components/item-object-list/list-layout.tsx +++ b/src/renderer/components/item-object-list/list-layout.tsx @@ -121,6 +121,8 @@ export type ItemListLayoutProps Partial; renderFooter?: (parent: NonInjectedItemListLayout) => React.ReactNode; + spinnerTestId?: string; + /** * Message to display when a store failed to load * @@ -321,6 +323,7 @@ class NonInjectedItemListLayout {this.props.renderFooter?.(this)} diff --git a/src/renderer/components/select/select.test.tsx b/src/renderer/components/select/select.test.tsx index d9bd53190a..acbb7e15d2 100644 --- a/src/renderer/components/select/select.test.tsx +++ b/src/renderer/components/select/select.test.tsx @@ -16,7 +16,6 @@ import rendererExtensionsInjectable from "../../../extensions/renderer-extension import { computed } from "mobx"; import type { LensRendererExtension } from "../../../extensions/lens-renderer-extension"; import getConfigurationFileModelInjectable from "../../../common/get-configuration-file-model/get-configuration-file-model.injectable"; -import appVersionInjectable from "../../../common/get-configuration-file-model/app-version/app-version.injectable"; jest.mock("electron", () => ({ ipcRenderer: { @@ -37,9 +36,8 @@ describe("