diff --git a/.github/workflows/publish-release-npm.yml b/.github/workflows/publish-release-npm.yml index 0ce928e3d1..8dbf9f52ba 100644 --- a/.github/workflows/publish-release-npm.yml +++ b/.github/workflows/publish-release-npm.yml @@ -1,8 +1,16 @@ name: Publish NPM Package Release on: - release: - types: - - published + workflow_call: + inputs: + version: + required: true + type: string + workflow_dispatch: + inputs: + version: + required: true + type: string + description: The version to release manually jobs: publish: name: Publish NPM Package Release @@ -15,6 +23,7 @@ jobs: uses: actions/checkout@v3 with: fetch-depth: 0 + ref: ${{ inputs.version }} - name: Using Node.js ${{ matrix.node-version }} uses: actions/setup-node@v3 @@ -26,7 +35,6 @@ jobs: make build-npm - name: publish new release - if: contains(github.ref, 'refs/tags/v') run: | make publish-npm env: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f66347a93f..2c5d84bf0e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -11,6 +11,8 @@ jobs: name: Release runs-on: ubuntu-latest if: ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release') }} + outputs: + version: ${{ steps.tagger.outputs.tagname }} steps: - name: Checkout Release from lens uses: actions/checkout@v3 @@ -28,3 +30,9 @@ jobs: commit: master tag: ${{ steps.tagger.outputs.tagname }} body: ${{ github.event.pull_request.body }} + publish-npm: + uses: ./.github/workflows/publish-release-npm.yml + needs: release + if: ${{ needs.release.outputs.version != '' }} + with: + version: ${{ needs.release.outputs.version }} diff --git a/package.json b/package.json index 0b60495378..222fe58033 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": "6.2.5", + "version": "6.2.6", "main": "static/build/main.js", "copyright": "© 2022 OpenLens Authors", "license": "MIT", diff --git a/src/common/k8s-api/endpoints/helm-charts.api/request-readme.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-readme.injectable.ts index c6815c4b93..a487672a92 100644 --- a/src/common/k8s-api/endpoints/helm-charts.api/request-readme.injectable.ts +++ b/src/common/k8s-api/endpoints/helm-charts.api/request-readme.injectable.ts @@ -3,12 +3,13 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import type { AsyncResult } from "../../../utils/async-result"; import { urlBuilderFor } from "../../../utils/buildUrl"; import { apiBaseInjectionToken } from "../../api-base"; const requestReadmeEndpoint = urlBuilderFor("/v2/charts/:repo/:name/readme"); -export type RequestHelmChartReadme = (repo: string, name: string, version?: string) => Promise; +export type RequestHelmChartReadme = (repo: string, name: string, version?: string) => Promise>; const requestHelmChartReadmeInjectable = getInjectable({ id: "request-helm-chart-readme", diff --git a/src/common/k8s-api/endpoints/helm-charts.api/request-values.injectable.ts b/src/common/k8s-api/endpoints/helm-charts.api/request-values.injectable.ts index ec927fc37a..59234a80f3 100644 --- a/src/common/k8s-api/endpoints/helm-charts.api/request-values.injectable.ts +++ b/src/common/k8s-api/endpoints/helm-charts.api/request-values.injectable.ts @@ -3,12 +3,13 @@ * Licensed under MIT License. See LICENSE in root directory for more information. */ import { getInjectable } from "@ogre-tools/injectable"; +import type { AsyncResult } from "../../../utils/async-result"; import { urlBuilderFor } from "../../../utils/buildUrl"; import { apiBaseInjectionToken } from "../../api-base"; const requestValuesEndpoint = urlBuilderFor("/v2/charts/:repo/:name/values"); -export type RequestHelmChartValues = (repo: string, name: string, version: string) => Promise; +export type RequestHelmChartValues = (repo: string, name: string, version: string) => Promise>; const requestHelmChartValuesInjectable = getInjectable({ id: "request-helm-chart-values", diff --git a/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap b/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap index e9a5c74a65..ed59b911b5 100644 --- a/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap +++ b/src/features/helm-charts/installing-chart/__snapshots__/opening-dock-tab-for-installing-helm-chart.test.ts.snap @@ -4631,6 +4631,919 @@ exports[`opening dock tab for installing helm chart given application is started `; +exports[`opening dock tab for installing helm chart given application is started, when navigating to helm charts when charts resolve when opening details of a chart when chart versions resolve when readme resolves when selecting different version when readme rejects renders 1`] = ` + +
+
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Workloads + + + + keyboard_arrow_down + + + +
+
+ + + + list + + + + Config + + +
+
+ + + + device_hub + + + + Network + + + + keyboard_arrow_down + + + +
+
+ + + + storage + + + + Storage + + +
+
+ + + + + + Helm + + + + keyboard_arrow_down + + + +
+
+ + + + security + + + + Access Control + + +
+
+ + + + extension + + + + Custom Resources + + + + keyboard_arrow_down + + + +
+
+
+
+
+
+
+
+ + +
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+ Name +
+ + + arrow_drop_down + + +
+
+
+ Description +
+
+
+
+ Version +
+
+
+
+ App Version +
+
+
+
+ Repository +
+ + + arrow_drop_down + + +
+
+
+ + + more_vert + + +
+
+
+
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + +
+
+
+
+ some-name +
+
+ some-description +
+
+ some-version +
+
+
+ some-repository +
+
+
+
+
+
+
+
+
+ + + + + + + + + + + + + +
+
+
+
+ some-other-name +
+
+ some-description +
+
+ some-version +
+
+
+ some-repository +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ + + add + + +
+ New tab +
+
+
+
+
+
+
+
+
+
+
+
+ Chart: some-repository/some-name + + + content_copy + + +
+ Copy +
+
+ + + close + + +
+ Close +
+
+
+
+
+ +
+
+ some-description + +
+
+ + Version + + +
+ + +
+
+
+ some-other-version +
+
+ +
+
+
+ + +
+
+
+ +
+
+ + Home + + + + +
+
+ + Maintainers + + +
  • + Some Foo<some@foo.com> +
    • +     +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +`; + exports[`opening dock tab for installing helm chart given application is started, when navigating to helm charts when charts resolve when opening details of a chart when chart versions resolve when readme resolves when selecting different version when readme resolves renders 1`] = `
    diff --git a/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts b/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts index 9d6c43790d..f7aef8dd88 100644 --- a/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts +++ b/src/features/helm-charts/installing-chart/installing-helm-chart-from-new-tab.test.ts @@ -178,7 +178,10 @@ describe("installing helm chart from new tab", () => { }), ]); - await requestHelmChartReadmeMock.resolve("some-readme"); + await requestHelmChartReadmeMock.resolve({ + callWasSuccessful: true, + response: "some-readme", + }); }); it("renders", () => { @@ -237,9 +240,10 @@ describe("installing helm chart from new tab", () => { describe("when default configuration and versions resolve", () => { beforeEach(async () => { - await requestHelmChartValuesMock.resolve( - "some-default-configuration", - ); + await requestHelmChartValuesMock.resolve({ + callWasSuccessful: true, + response: "some-default-configuration", + }); await requestHelmChartVersionsMock.resolve([ HelmChart.create({ @@ -472,7 +476,10 @@ describe("installing helm chart from new tab", () => { }), ]); - await requestHelmChartReadmeMock.resolve("some-readme"); + await requestHelmChartReadmeMock.resolve({ + callWasSuccessful: true, + response: "some-readme", + }); }); it("renders", () => { @@ -531,9 +538,10 @@ describe("installing helm chart from new tab", () => { describe("when configuration and versions resolve", () => { beforeEach(async () => { - await requestHelmChartValuesMock.resolve( - "some-other-default-configuration", - ); + await requestHelmChartValuesMock.resolve({ + callWasSuccessful: true, + response: "some-other-default-configuration", + }); await requestHelmChartVersionsMock.resolve([]); }); @@ -696,9 +704,10 @@ describe("installing helm chart from new tab", () => { describe("when default configuration resolves", () => { beforeEach(async () => { - await requestHelmChartValuesMock.resolve( - "some-default-configuration-for-other-version", - ); + await requestHelmChartValuesMock.resolve({ + callWasSuccessful: true, + response: "some-default-configuration-for-other-version", + }); }); it("renders", () => { @@ -841,9 +850,10 @@ describe("installing helm chart from new tab", () => { ) .selectOption("some-other-version"); - await requestHelmChartValuesMock.resolve( - "some-default-configuration-for-other-version", - ); + await requestHelmChartValuesMock.resolve({ + callWasSuccessful: true, + response: "some-default-configuration-for-other-version", + }); expect(installButton).not.toHaveAttribute("disabled"); }); @@ -914,9 +924,10 @@ describe("installing helm chart from new tab", () => { ) .selectOption("some-other-version"); - await requestHelmChartValuesMock.resolve( - "some-default-configuration-for-other-version", - ); + await requestHelmChartValuesMock.resolve({ + callWasSuccessful: true, + response: "some-default-configuration-for-other-version", + }); const input = rendered.getByTestId( "monaco-editor-for-some-first-tab-id", diff --git a/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts b/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts index 978e1635a7..0b4f749acc 100644 --- a/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts +++ b/src/features/helm-charts/installing-chart/installing-helm-chart-from-previously-opened-tab.test.ts @@ -149,9 +149,10 @@ describe("installing helm chart from previously opened tab", () => { describe("when configuration and version resolves", () => { beforeEach(async () => { - await requestHelmChartValuesMock.resolve( - "some-default-configuration", - ); + await requestHelmChartValuesMock.resolve({ + callWasSuccessful: true, + response: "some-default-configuration", + }); await requestHelmChartVersionsMock.resolve([ HelmChart.create({ diff --git a/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts b/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts index c41a7f14ad..3fd6a7deb7 100644 --- a/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts +++ b/src/features/helm-charts/installing-chart/opening-dock-tab-for-installing-helm-chart.test.ts @@ -230,7 +230,10 @@ describe("opening dock tab for installing helm chart", () => { describe("when readme resolves", () => { beforeEach(async () => { - await requestHelmChartReadmeMock.resolve("some-readme"); + await requestHelmChartReadmeMock.resolve({ + callWasSuccessful: true, + response: "some-readme", + }); }); it("renders", () => { @@ -276,7 +279,10 @@ describe("opening dock tab for installing helm chart", () => { describe("when readme resolves", () => { beforeEach(async () => { - await requestHelmChartReadmeMock.resolve("some-readme"); + await requestHelmChartReadmeMock.resolve({ + callWasSuccessful: true, + response: "some-readme", + }); }); it("renders", () => { @@ -299,6 +305,19 @@ describe("opening dock tab for installing helm chart", () => { ); }); }); + + describe("when readme rejects", () => { + beforeEach(async () => { + await requestHelmChartReadmeMock.resolve({ + callWasSuccessful: false, + error: "some-error", + }); + }); + + it("renders", () => { + expect(rendered.baseElement).toMatchSnapshot(); + }); + }); }); describe("when selecting to install the chart", () => { diff --git a/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts b/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts index fe501d4750..dc80998de0 100644 --- a/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts +++ b/src/main/electron-app/runnables/setup-runnables-after-window-is-opened.injectable.ts @@ -18,7 +18,9 @@ const setupRunnablesAfterWindowIsOpenedInjectable = getInjectable({ return { id: "setup-runnables-after-window-is-opened", run: () => { - app.on("browser-window-created", () => afterWindowIsOpened); + app.on("browser-window-created", () => { + afterWindowIsOpened(); + }); return undefined; }, diff --git a/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts b/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts index 839493bed3..8aa61a74da 100644 --- a/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts +++ b/src/renderer/components/+helm-charts/details/readme-of-selected-helm-chart.injectable.ts @@ -26,11 +26,13 @@ const readmeOfSelectedHelmChartInjectable = getInjectable({ return ""; } - return await requestHelmChartReadme( + const result = await requestHelmChartReadme( chartVersion.getRepository(), chartVersion.getName(), chartVersion.getVersion(), ); + + return result.callWasSuccessful ? result.response : ""; }, valueWhenPending: "", diff --git a/src/renderer/components/+nodes/details.tsx b/src/renderer/components/+nodes/details.tsx index f71d5bfa5f..ba363f160c 100644 --- a/src/renderer/components/+nodes/details.tsx +++ b/src/renderer/components/+nodes/details.tsx @@ -21,7 +21,7 @@ import { KubeObjectMeta } from "../kube-object-meta"; import { ClusterMetricsResourceType } from "../../../common/cluster-types"; import { NodeDetailsResources } from "./details-resources"; import { DrawerTitle } from "../drawer/drawer-title"; -import logger from "../../../common/logger"; +import type { Logger } from "../../../common/logger"; import { withInjectables } from "@ogre-tools/injectable-react"; import type { SubscribeStores } from "../../kube-watch-api/kube-watch-api"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; @@ -31,6 +31,8 @@ import type { GetActiveClusterEntity } from "../../api/catalog/entity/get-active import getActiveClusterEntityInjectable from "../../api/catalog/entity/get-active-cluster-entity.injectable"; import type { ClusterMetricData, RequestClusterMetricsByNodeNames } from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable"; import requestClusterMetricsByNodeNamesInjectable from "../../../common/k8s-api/endpoints/metrics.api/request-cluster-metrics-by-node-names.injectable"; +import loggerInjectable from "../../../common/logger.injectable"; +import loadPodsFromAllNamespacesInjectable from "../+workloads-pods/load-pods-from-all-namespaces.injectable"; export interface NodeDetailsProps extends KubeObjectDetailsProps { } @@ -40,6 +42,8 @@ interface Dependencies { podStore: PodStore; getActiveClusterEntity: GetActiveClusterEntity; requestClusterMetricsByNodeNames: RequestClusterMetricsByNodeNames; + logger: Logger; + loadPodsFromAllNamespaces: () => void; } @observer @@ -61,6 +65,8 @@ class NonInjectedNodeDetails extends React.Component { @@ -77,7 +83,7 @@ class NonInjectedNodeDetails extends React.Component(NonIn podStore: di.inject(podStoreInjectable), getActiveClusterEntity: di.inject(getActiveClusterEntityInjectable), requestClusterMetricsByNodeNames: di.inject(requestClusterMetricsByNodeNamesInjectable), + logger: di.inject(loggerInjectable), + loadPodsFromAllNamespaces: di.inject(loadPodsFromAllNamespacesInjectable), }), }); diff --git a/src/renderer/components/+workloads-pods/load-pods-from-all-namespaces.injectable.ts b/src/renderer/components/+workloads-pods/load-pods-from-all-namespaces.injectable.ts new file mode 100644 index 0000000000..f6e96d5b79 --- /dev/null +++ b/src/renderer/components/+workloads-pods/load-pods-from-all-namespaces.injectable.ts @@ -0,0 +1,28 @@ +/** + * 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 namespaceStoreInjectable from "../+namespaces/store.injectable"; +import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable"; +import podStoreInjectable from "./store.injectable"; + +const loadPodsFromAllNamespacesInjectable = getInjectable({ + id: "load-pods-from-all-namespaces", + instantiate: (di) => { + const podStore = di.inject(podStoreInjectable); + const namespaceStore = di.inject(namespaceStoreInjectable); + const showErrorNotification = di.inject(showErrorNotificationInjectable); + + return () => { + podStore.loadAll({ + namespaces: [...namespaceStore.getItems().map(ns => ns.getName())], + onLoadFailure: error => + showErrorNotification(`Can not load Pods. ${String(error)}`), + }); + }; + }, +}); + +export default loadPodsFromAllNamespacesInjectable; diff --git a/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx b/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx index 0db94fbd59..b0bfcfcacc 100644 --- a/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx +++ b/src/renderer/components/dock/install-chart/install-chart-model.injectable.tsx @@ -122,14 +122,18 @@ export class InstallChartModel { this.configuration.isLoading.set(true); }); - const configuration = await this.dependencies.requestHelmChartValues( + const chartValuesRequest = await this.dependencies.requestHelmChartValues( this.chart.repo, this.chart.name, version, ); + if (!chartValuesRequest.callWasSuccessful) { + throw chartValuesRequest.error; + } + runInAction(() => { - this.configuration.onChange(configuration); + this.configuration.onChange(chartValuesRequest.response); this.configuration.isLoading.set(false); }); }, @@ -187,7 +191,7 @@ export class InstallChartModel { load = async () => { await this.dependencies.waitForChart(); - const [defaultConfiguration, versions] = await Promise.all([ + const [defaultConfigurationRequest, versions] = await Promise.all([ this.dependencies.requestHelmChartValues( this.chart.repo, this.chart.name, @@ -203,13 +207,14 @@ export class InstallChartModel { runInAction(() => { // TODO: Make "default" not hard-coded const namespace = this.chart.namespace || "default"; + const values = this.chart.values || (defaultConfigurationRequest.callWasSuccessful ? defaultConfigurationRequest.response : ""); this.versions.replace(versions); this.save({ version: this.chart.version, namespace, - values: this.chart.values || defaultConfiguration, + values, releaseName: this.chart.releaseName, }); }); diff --git a/src/renderer/components/table/table-head.scss b/src/renderer/components/table/table-head.scss index 381fb68b9c..ff9c6afec7 100644 --- a/src/renderer/components/table/table-head.scss +++ b/src/renderer/components/table/table-head.scss @@ -4,18 +4,14 @@ */ .TableHead { - $border: 1px solid var(--tableHeaderBorderColor); - background-color: var(--tableHeaderBackground); - border-bottom-width: var(--tableHeaderBorderWidth); - border-bottom-style: solid; - border-bottom-color: var(--tableHeaderBorderColor); + border-bottom: 1px solid var(--borderFaintColor); color: var(--tableHeaderColor); display: flex; flex-shrink: 0; &.topLine { - border-top: $border; + border-top: 1px solid var(--borderFaintColor); } &.sticky { diff --git a/src/renderer/themes/lens-dark.ts b/src/renderer/themes/lens-dark.ts index da4d9dc0c9..8eea180e86 100644 --- a/src/renderer/themes/lens-dark.ts +++ b/src/renderer/themes/lens-dark.ts @@ -45,8 +45,6 @@ const lensDarkTheme: LensTheme = { "tableBgcStripe": "#2a2d33", "tableBgcSelected": "#383c42", "tableHeaderBackground": "#262b2f", - "tableHeaderBorderWidth": "1px", - "tableHeaderBorderColor": "#36393e", "tableHeaderColor": "#ffffff", "tableSelectedRowColor": "#ffffff", "helmLogoBackground": "#ffffff", diff --git a/src/renderer/themes/lens-light.ts b/src/renderer/themes/lens-light.ts index f7fcbc23e2..70951b896c 100644 --- a/src/renderer/themes/lens-light.ts +++ b/src/renderer/themes/lens-light.ts @@ -44,8 +44,6 @@ const lensLightTheme: LensTheme = { "tableBgcStripe": "#f8f8f8", "tableBgcSelected": "#f4f5f5", "tableHeaderBackground": "#f1f1f1", - "tableHeaderBorderWidth": "2px", - "tableHeaderBorderColor": "#3d90ce", "tableHeaderColor": "#555555", "tableSelectedRowColor": "#222222", "helmLogoBackground": "#ffffff", diff --git a/src/renderer/themes/theme-vars.css b/src/renderer/themes/theme-vars.css index 5c0c275bca..ab117246e6 100644 --- a/src/renderer/themes/theme-vars.css +++ b/src/renderer/themes/theme-vars.css @@ -1,5 +1,5 @@ -/* +/* Generated Lens theme CSS-variables, don't edit manually. To refresh file run $: yarn run ts-node build/build_theme_vars.ts */ @@ -38,8 +38,6 @@ --tableBgcStripe: #2a2d33; --tableBgcSelected: #383c42; --tableHeaderBackground: #262b2f; ---tableHeaderBorderWidth: 1px; ---tableHeaderBorderColor: #36393e; --tableHeaderColor: #ffffff; --tableSelectedRowColor: #ffffff; --helmLogoBackground: #ffffff;