Merge branch 'master' into injectify-cluster-deactivate

Signed-off-by: Sebastian Malton <sebastian@malton.name>
2025-05-20 05:10:56 +00:00 · 2023-03-15 08:31:29 -04:00 · 2023-03-15 08:31:29 -04:00 · e03c2db9e8
commit e03c2db9e8
parent 9192678c71 497f63fde6
14 changed files with 1155 additions and 644 deletions
--- a/.github/workflows/bump-master-version.yaml
+++ b/.github/workflows/bump-master-version.yaml
@ -1,45 +0,0 @@
-name: Bump Version on master
-on:
-  pull_request:
-    types:
-      - closed
-    branches:
-      - master
-  workflow_dispatch:
-
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    if: ${{ github.event.pull_request.merged == true && contains(github.event.pull_request.labels.*.name, 'release') }}
-    steps:
-      - name: Checkout Release from lens
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Install dependencies
-        run: |
-          yarn install --frozen-lockfile
-      - name: Bump version to first alpha of next minor version
-        id: bump
-        run: |
-          CURRENT_VERSION=$(cat lerna.json | jq .version --raw-output)
-
-          if ! [[ "${CURRENT_VERSION}" =~ ^\d+\.\d+\.0$ ]]; then
-            echo "Not a minor release"
-            echo "status=skip" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
-          yarn bump-version preminor
-
-          echo "status=create" >> $GITHUB_OUTPUT
-      - uses: peter-evans/create-pull-request@v4
-        if: ${{ steps.bump.outputs.status == 'create' }}
-        with:
-          add-paths: lerna.json,packages/*/package.json
-          commit-message: Update package.json version to next preminor because of recent release
-          signoff: true
-          delete-branch: true
-          title: Update version to next preminor
-          labels: skip-changelog
--- a/.github/workflows/daily-alpha.yml
+++ b/.github/workflows/daily-alpha.yml
@ -29,7 +29,7 @@ jobs:
      - name: Bump version
        id: version
        run: |
-          node packages/bump-version-for-cron/dist/index.js --path lerna.json
+          node packages/bump-version-for-cron/dist/index.js --path packages/core/package.json
      - name: Check if branch already exists
        id: check-branch
        run: git ls-remote --exit-code --tags origin v${{ steps.version.outputs.VERSION }}
--- a/.github/workflows/publish-release-npm.yml
+++ b/.github/workflows/publish-release-npm.yml
@ -38,7 +38,7 @@ jobs:
      - name: Publish NPM packages
        run: |
          npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}"
-          VERSION=$(cat lerna.json | jq '.version' --raw-output)
+          VERSION=$(cat packages/core/package.json | jq '.version' --raw-output)
          echo ${VERSION}
          DIST_TAG=$(node packages/semver/dist/index.js --prerelease 0 ${VERSION})
          npx lerna \
--- a/package-lock.json
+++ b/package-lock.json
--- a/packages/core/package.json
+++ b/packages/core/package.json
@ -3,7 +3,7 @@
  "productName": "",
  "description": "Lens Desktop Core",
  "homepage": "https://github.com/lensapp/lens",
-  "version": "6.5.0-alpha.1",
+  "version": "6.5.0-alpha.2",
  "repository": {
    "type": "git",
    "url": "git+https://github.com/lensapp/lens.git"
--- a/packages/core/src/renderer/components/cluster-settings/tests/snapshots/icon-settings.test.tsx.snap
+++ b/packages/core/src/renderer/components/cluster-settings/tests/snapshots/icon-settings.test.tsx.snap
@ -0,0 +1,53 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`Icon settings given no external registrations for cluster settings menu injection token renders 1`] = `
+<body>
+  <div>
+    <div>
+      <div
+        class="file-loader flex flex-row items-center"
+      >
+        <div
+          class="mr-5"
+        >
+          <div
+            class="FilePicker"
+          >
+            <label
+              class="flex gaps align-center"
+              for="file-upload"
+            >
+              <div
+                class="Avatar rounded"
+                style="width: 53px; height: 53px; background: rgb(9, 124, 92);"
+              >
+                skc
+              </div>
+               
+            </label>
+            <input
+              accept="image/*"
+              id="file-upload"
+              name="FilePicker"
+              type="file"
+            />
+          </div>
+        </div>
+        <i
+          class="Icon material interactive focusable"
+          data-testid="icon-for-menu-actions-for-cluster-icon-settings-for-some-entity-id"
+          id="menu-actions-for-cluster-icon-settings-for-some-entity-id"
+          tabindex="0"
+        >
+          <span
+            class="icon"
+            data-icon-name="more_horiz"
+          >
+            more_horiz
+          </span>
+        </i>
+      </div>
+    </div>
+  </div>
+</body>
+`;
--- a/packages/core/src/renderer/components/cluster-settings/tests/icon-settings.test.tsx
+++ b/packages/core/src/renderer/components/cluster-settings/tests/icon-settings.test.tsx
@ -0,0 +1,101 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import type { DiContainer } from "@ogre-tools/injectable";
+import { getInjectable } from "@ogre-tools/injectable";
+import type { RenderResult } from "@testing-library/react";
+import React from "react";
+import { KubernetesCluster } from "../../../../common/catalog-entities";
+import { Cluster } from "../../../../common/cluster/cluster";
+import { getDiForUnitTesting } from "../../../getDiForUnitTesting";
+import { renderFor } from "../../test-utils/renderFor";
+import { ClusterIconSetting } from "../icon-settings";
+import { screen } from "@testing-library/react";
+import userEvent from "@testing-library/user-event";
+import { clusterIconSettingsMenuInjectionToken } from "../cluster-settings-menu-injection-token";
+import { runInAction } from "mobx";
+
+const cluster = new Cluster({
+  contextName: "some-context",
+  id: "some-id",
+  kubeConfigPath: "/some/path/to/kubeconfig",
+}, {
+  clusterServerUrl: "https://localhost:9999",
+});
+
+const clusterEntity = new KubernetesCluster({
+  metadata: {
+    labels: {},
+    name: "some-kubernetes-cluster",
+    uid: "some-entity-id",
+  },
+  spec: {
+    kubeconfigContext: "some-context",
+    kubeconfigPath: "/some/path/to/kubeconfig",
+  },
+  status: {
+    phase: "connecting",
+  },
+});
+
+const newMenuItem = getInjectable({
+  id: "cluster-icon-settings-menu-test-item",
+
+  instantiate: () => ({
+    id: "test-menu-item",
+    title: "Hello World",
+    onClick: (preferences) => {
+      preferences.clusterName = "Hello World";
+    },
+  }),
+
+  injectionToken: clusterIconSettingsMenuInjectionToken,
+});
+
+describe("Icon settings", () => {
+  let rendered: RenderResult;
+  let di: DiContainer;
+
+  beforeEach(() => {
+    di = getDiForUnitTesting();
+    
+    const render = renderFor(di);
+
+    rendered = render(
+      <ClusterIconSetting cluster={cluster} entity={clusterEntity} />,
+    );
+  });
+
+  describe("given no external registrations for cluster settings menu injection token", () => {
+    it("renders", () => {
+      expect(rendered.baseElement).toMatchSnapshot();
+    });
+
+    it("has predefined menu item", async () => {
+      userEvent.click(await screen.findByTestId("icon-for-menu-actions-for-cluster-icon-settings-for-some-entity-id"));
+
+      expect(rendered.getByText("Upload Icon")).toBeInTheDocument();
+    });
+
+    it("has menu item from build-in registration", async () => {
+      userEvent.click(await screen.findByTestId("icon-for-menu-actions-for-cluster-icon-settings-for-some-entity-id"));
+
+      expect(rendered.getByText("Clear")).toBeInTheDocument();
+    });
+  });
+
+  describe("given external registrations for cluster settings menu injection token", () => {
+    beforeEach(() => {
+      runInAction(() => {
+        di.register(newMenuItem);
+      });
+    });
+
+    it("has menu item from external registration", async () => {
+      userEvent.click(await screen.findByTestId("icon-for-menu-actions-for-cluster-icon-settings-for-some-entity-id"));
+
+      expect(rendered.getByText("Hello World")).toBeInTheDocument();
+    });
+  });
+});
--- a/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-clear-item.injectable.ts
+++ b/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-clear-item.injectable.ts
@ -0,0 +1,27 @@
+/**
+ * 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 { clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token";
+
+const clusterIconSettingsMenuClearItem = getInjectable({
+  id: "cluster-icon-settings-menu-clear-item",
+
+  instantiate: () => ({
+    id: "clear-icon-menu-item",
+    title: "Clear",
+    disabled: (preferences) => !preferences.icon,
+    onClick: (preferences) => {
+      /**
+       * NOTE: this needs to be `null` rather than `undefined` so that we can
+       * tell the difference between it not being there and being cleared.
+       */
+      preferences.icon = null;
+    },
+  }),
+
+  injectionToken: clusterIconSettingsMenuInjectionToken,
+});
+
+export default clusterIconSettingsMenuClearItem;
--- a/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-injection-token.ts
+++ b/packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-injection-token.ts
@ -0,0 +1,17 @@
+/**
+ * Copyright (c) OpenLens Authors. All rights reserved.
+ * Licensed under MIT License. See LICENSE in root directory for more information.
+ */
+import { getInjectionToken } from "@ogre-tools/injectable";
+import type { ClusterPreferences } from "../../../common/cluster-types";
+
+export interface ClusterIconMenuItem {
+  id: string;
+  title: string;
+  disabled?: (preferences: ClusterPreferences) => boolean;
+  onClick: (preferences: ClusterPreferences) => void;
+}
+
+export const clusterIconSettingsMenuInjectionToken = getInjectionToken<ClusterIconMenuItem>({
+  id: "cluster-icon-settings-menu-injection-token",
+});
--- a/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx
+++ b/packages/core/src/renderer/components/cluster-settings/icon-settings.tsx
@ -3,106 +3,109 @@
 * Licensed under MIT License. See LICENSE in root directory for more information.
 */

-import React from "react";
-import type { Cluster } from "../../../common/cluster/cluster";
-import { observable } from "mobx";
+import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
+import { withInjectables } from "@ogre-tools/injectable-react";
+import type { IComputedValue } from "mobx";
 import { observer } from "mobx-react";
+import React from "react";
 import type { KubernetesCluster } from "../../../common/catalog-entities";
+import type { Cluster } from "../../../common/cluster/cluster";
+import { Avatar } from "../avatar";
 import { FilePicker, OverSizeLimitStyle } from "../file-picker";
 import { MenuActions, MenuItem } from "../menu";
-import { Avatar } from "../avatar";
-import autoBindReact from "auto-bind/react";
-
-enum GeneralInputStatus {
-  CLEAN = "clean",
-  ERROR = "error",
-}
+import type { ShowNotification } from "../notifications";
+import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";
+import type { ClusterIconMenuItem } from "./cluster-settings-menu-injection-token";
+import { clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token";

 export interface ClusterIconSettingProps {
  cluster: Cluster;
  entity: KubernetesCluster;
 }

-@observer
-export class ClusterIconSetting extends React.Component<ClusterIconSettingProps> {
-  @observable status = GeneralInputStatus.CLEAN;
-  @observable errorText?: string;
+interface Dependencies {
+  menuItems: IComputedValue<ClusterIconMenuItem[]>;
+  showErrorNotification: ShowNotification;
+}

-  constructor(props: ClusterIconSettingProps) {
-    super(props);
-    autoBindReact(this);
-  }

-  private element = React.createRef<HTMLDivElement>();
+const NonInjectedClusterIconSetting = observer((props: ClusterIconSettingProps & Dependencies) => {
+  const element = React.createRef<HTMLDivElement>();
+  const { cluster, entity } = props;
+  const menuId = `menu-actions-for-cluster-icon-settings-for-${entity.getId()}`;

-  async onIconPick([file]: File[]) {
+  const onIconPick = async ([file]: File[]) => {
    if (!file) {
      return;
    }

-    const { cluster } = this.props;
-
    try {
      const buf = Buffer.from(await file.arrayBuffer());

      cluster.preferences.icon = `data:${file.type};base64,${buf.toString("base64")}`;
    } catch (e) {
-      this.errorText = String(e);
-      this.status = GeneralInputStatus.ERROR;
+      props.showErrorNotification(String(e));
    }
-  }
+  };

-  clearIcon() {
-    /**
-     * NOTE: this needs to be `null` rather than `undefined` so that we can
-     * tell the difference between it not being there and being cleared.
-     */
-    this.props.cluster.preferences.icon = null;
-  }
-
-  onUploadClick() {
-    this.element
+  const onUploadClick = () => {
+    element
      .current
      ?.querySelector<HTMLInputElement>("input[type=file]")
      ?.click();
-  }
+  };

-  render() {
-    const { entity } = this.props;
-
-    return (
-      <div ref={this.element}>
-        <div className="file-loader flex flex-row items-center">
-          <div className="mr-5">
-            <FilePicker
-              accept="image/*"
-              label={(
-                <Avatar
-                  colorHash={`${entity.getName()}-${entity.metadata.source}`}
-                  title={entity.getName()}
-                  src={entity.spec.icon?.src}
-                  size={53}
-                />
-              )}
-              onOverSizeLimit={OverSizeLimitStyle.FILTER}
-              handler={this.onIconPick}
-            />
-          </div>
-          <MenuActions
-            id={`menu-actions-for-cluster-icon-settings-for-${entity.getId()}`}
-            toolbar={false}
-            autoCloseOnSelect={true}
-            triggerIcon={{ material: "more_horiz" }}
-          >
-            <MenuItem onClick={this.onUploadClick}>
-              Upload Icon
-            </MenuItem>
-            <MenuItem onClick={() => this.clearIcon()} disabled={!this.props.cluster.preferences.icon}>
-              Clear
-            </MenuItem>
-          </MenuActions>
+  return (
+    <div ref={element}>
+      <div className="file-loader flex flex-row items-center">
+        <div className="mr-5">
+          <FilePicker
+            accept="image/*"
+            label={(
+              <Avatar
+                colorHash={`${entity.getName()}-${entity.metadata.source}`}
+                title={entity.getName()}
+                src={entity.spec.icon?.src}
+                size={53}
+              />
+            )}
+            onOverSizeLimit={OverSizeLimitStyle.FILTER}
+            handler={onIconPick}
+          />
        </div>
+        <MenuActions
+          id={menuId}
+          data-testid={menuId}
+          toolbar={false}
+          autoCloseOnSelect={true}
+          triggerIcon={{ material: "more_horiz" }}
+        >
+          <MenuItem onClick={onUploadClick}>
+            Upload Icon
+          </MenuItem>
+          {props.menuItems.get().map(item => (
+            <MenuItem
+              onClick={() => item.onClick(cluster.preferences)}
+              key={item.id}
+              disabled={item.disabled?.(cluster.preferences)}>
+              {item.title}
+            </MenuItem>
+          ),
+          )}
+        </MenuActions>
      </div>
-    );
-  }
-}
+    </div>
+  );
+});
+
+export const ClusterIconSetting = withInjectables<Dependencies, ClusterIconSettingProps>(NonInjectedClusterIconSetting, {
+  getProps: (di, props) => {
+    const computedInjectMany = di.inject(computedInjectManyInjectable);
+   
+    return {
+      ...props,
+      menuItems: computedInjectMany(clusterIconSettingsMenuInjectionToken),
+      showErrorNotification: di.inject(showErrorNotificationInjectable),
+    };
+  },
+});
--- a/packages/extension-api/package.json
+++ b/packages/extension-api/package.json
@ -2,7 +2,7 @@
  "name": "@k8slens/extensions",
  "productName": "OpenLens extensions",
  "description": "OpenLens - Open Source Kubernetes IDE: extensions",
-  "version": "6.5.0-alpha.1",
+  "version": "6.5.0-alpha.2",
  "copyright": "© 2022 OpenLens Authors",
  "license": "MIT",
  "main": "dist/extension-api.js",
@ -26,7 +26,7 @@
    "prepare:dev": "npm run build"
  },
  "dependencies": {
-    "@k8slens/core": "^6.5.0-alpha.1"
+    "@k8slens/core": "^6.5.0-alpha.2"
  },
  "devDependencies": {
    "@types/node": "^16.18.6",
--- a/packages/open-lens/package.json
+++ b/packages/open-lens/package.json
@ -4,7 +4,7 @@
  "productName": "OpenLens",
  "description": "OpenLens - Open Source IDE for Kubernetes",
  "homepage": "https://github.com/lensapp/lens",
-  "version": "6.5.0-alpha.1",
+  "version": "6.5.0-alpha.2",
  "repository": {
    "type": "git",
    "url": "git+https://github.com/lensapp/lens.git"
@ -197,7 +197,7 @@
  "dependencies": {
    "@k8slens/application": "^6.5.0-alpha.1",
    "@k8slens/application-for-electron-main": "^6.5.0-alpha.1",
-    "@k8slens/core": "^6.5.0-alpha.1",
+    "@k8slens/core": "^6.5.0-alpha.2",
    "@k8slens/ensure-binaries": "^6.5.0-alpha.1",
    "@k8slens/feature-core": "^6.5.0-alpha.1",
    "@k8slens/generate-tray-icons": "^6.5.0-alpha.1",
--- a/packages/release-tool/package.json
+++ b/packages/release-tool/package.json
@ -1,6 +1,6 @@
 {
  "name": "@k8slens/release-tool",
-  "version": "6.5.0-alpha.1",
+  "version": "6.5.0-alpha.2",
  "description": "Release tool for lens monorepo",
  "main": "dist/index.mjs",
  "license": "MIT",
--- a/packages/release-tool/src/index.ts
+++ b/packages/release-tool/src/index.ts
@ -158,7 +158,7 @@ async function createReleaseBranchAndCommit(prBase: string, version: SemVer, prB
  const prBranch = `release/v${version.format()}`;

  await pipeExecFile("git", ["checkout", "-b", prBranch]);
-  await pipeExecFile("git", ["add", "lerna.json", "packages/*/package.json"]);
+  await pipeExecFile("git", ["add", "packages/*/package.json"]);
  await pipeExecFile("git", ["commit", "-sm", `Release ${version.format()}`]);
  await pipeExecFile("git", ["push", "--set-upstream", "origin", prBranch]);