hendrik/lens
1
0
Fork 0
mirror of https://github.com/lensapp/lens.git synced 2025-05-20 05:10:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into injectify-cluster-deactivate

Browse Source 
Signed-off-by: Sebastian Malton <sebastian@malton.name>
This commit is contained in:
Sebastian Malton 2023-03-15 08:31:29 -04:00 committed by GitHub
commit e03c2db9e8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 1155 additions and 644 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
.github/workflows/bump-master-version.yaml vendored
View File

@ -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

2
.github/workflows/daily-alpha.yml vendored
View File

@ -29,7 +29,7 @@ jobs:
- name: Bump version - name: Bump version
id: version id: version
run: | 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 - name: Check if branch already exists
id: check-branch id: check-branch
run: git ls-remote --exit-code --tags origin v${{ steps.version.outputs.VERSION }} run: git ls-remote --exit-code --tags origin v${{ steps.version.outputs.VERSION }}

2
.github/workflows/publish-release-npm.yml vendored
View File

@ -38,7 +38,7 @@ jobs:
- name: Publish NPM packages - name: Publish NPM packages
run: | run: |
npm config set '//registry.npmjs.org/:_authToken' "${NPM_TOKEN}" 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} echo ${VERSION}
DIST_TAG=$(node packages/semver/dist/index.js --prerelease 0 ${VERSION}) DIST_TAG=$(node packages/semver/dist/index.js --prerelease 0 ${VERSION})
npx lerna \ npx lerna \

1389
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

2
packages/core/package.json
View File

@ -3,7 +3,7 @@
"productName": "", "productName": "",
"description": "Lens Desktop Core", "description": "Lens Desktop Core",
"homepage": "https://github.com/lensapp/lens", "homepage": "https://github.com/lensapp/lens",
"version": "6.5.0-alpha.1", "version": "6.5.0-alpha.2",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/lensapp/lens.git" "url": "git+https://github.com/lensapp/lens.git"

53
packages/core/src/renderer/components/cluster-settings/__tests__/__snapshots__/icon-settings.test.tsx.snap Normal file
View File

@ -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>
`;

101
packages/core/src/renderer/components/cluster-settings/__tests__/icon-settings.test.tsx Normal file
View File

@ -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();
});
});
});

27
packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-clear-item.injectable.ts Normal file
View File

@ -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;

17
packages/core/src/renderer/components/cluster-settings/cluster-settings-menu-injection-token.ts Normal file
View File

@ -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",
});

97
packages/core/src/renderer/components/cluster-settings/icon-settings.tsx
View File

@ -3,75 +3,60 @@
* Licensed under MIT License. See LICENSE in root directory for more information. * Licensed under MIT License. See LICENSE in root directory for more information.
*/ */
import React from "react"; import { computedInjectManyInjectable } from "@ogre-tools/injectable-extension-for-mobx";
import type { Cluster } from "../../../common/cluster/cluster"; import { withInjectables } from "@ogre-tools/injectable-react";
import { observable } from "mobx"; import type { IComputedValue } from "mobx";
import { observer } from "mobx-react"; import { observer } from "mobx-react";
import React from "react";
import type { KubernetesCluster } from "../../../common/catalog-entities"; 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 { FilePicker, OverSizeLimitStyle } from "../file-picker";
import { MenuActions, MenuItem } from "../menu"; import { MenuActions, MenuItem } from "../menu";
import { Avatar } from "../avatar"; import type { ShowNotification } from "../notifications";
import autoBindReact from "auto-bind/react"; import showErrorNotificationInjectable from "../notifications/show-error-notification.injectable";
import type { ClusterIconMenuItem } from "./cluster-settings-menu-injection-token";
enum GeneralInputStatus { import { clusterIconSettingsMenuInjectionToken } from "./cluster-settings-menu-injection-token";
CLEAN = "clean",
ERROR = "error",
}
export interface ClusterIconSettingProps { export interface ClusterIconSettingProps {
cluster: Cluster; cluster: Cluster;
entity: KubernetesCluster; entity: KubernetesCluster;
} }
@observer interface Dependencies {
export class ClusterIconSetting extends React.Component<ClusterIconSettingProps> { menuItems: IComputedValue<ClusterIconMenuItem[]>;
@observable status = GeneralInputStatus.CLEAN; showErrorNotification: ShowNotification;
@observable errorText?: string; }
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) { if (!file) {
return; return;
} }
const { cluster } = this.props;
try { try {
const buf = Buffer.from(await file.arrayBuffer()); const buf = Buffer.from(await file.arrayBuffer());
cluster.preferences.icon = `data:${file.type};base64,${buf.toString("base64")}`; cluster.preferences.icon = `data:${file.type};base64,${buf.toString("base64")}`;
} catch (e) { } catch (e) {
this.errorText = String(e); props.showErrorNotification(String(e));
this.status = GeneralInputStatus.ERROR;
}
} }
};
clearIcon() { const onUploadClick = () => {
/** element
* 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
.current .current
?.querySelector<HTMLInputElement>("input[type=file]") ?.querySelector<HTMLInputElement>("input[type=file]")
?.click(); ?.click();
} };
render() {
const { entity } = this.props;
return ( return (
<div ref={this.element}> <div ref={element}>
<div className="file-loader flex flex-row items-center"> <div className="file-loader flex flex-row items-center">
<div className="mr-5"> <div className="mr-5">
<FilePicker <FilePicker
@ -85,24 +70,42 @@ export class ClusterIconSetting extends React.Component<ClusterIconSettingProps>
/> />
)} )}
onOverSizeLimit={OverSizeLimitStyle.FILTER} onOverSizeLimit={OverSizeLimitStyle.FILTER}
handler={this.onIconPick} handler={onIconPick}
/> />
</div> </div>
<MenuActions <MenuActions
id={`menu-actions-for-cluster-icon-settings-for-${entity.getId()}`} id={menuId}
data-testid={menuId}
toolbar={false} toolbar={false}
autoCloseOnSelect={true} autoCloseOnSelect={true}
triggerIcon={{ material: "more_horiz" }} triggerIcon={{ material: "more_horiz" }}
> >
<MenuItem onClick={this.onUploadClick}> <MenuItem onClick={onUploadClick}>
Upload Icon Upload Icon
</MenuItem> </MenuItem>
<MenuItem onClick={() => this.clearIcon()} disabled={!this.props.cluster.preferences.icon}> {props.menuItems.get().map(item => (
Clear <MenuItem
onClick={() => item.onClick(cluster.preferences)}
key={item.id}
disabled={item.disabled?.(cluster.preferences)}>
{item.title}
</MenuItem> </MenuItem>
),
)}
</MenuActions> </MenuActions>
</div> </div>
</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),
};
},
});

4
packages/extension-api/package.json
View File

@ -2,7 +2,7 @@
"name": "@k8slens/extensions", "name": "@k8slens/extensions",
"productName": "OpenLens extensions", "productName": "OpenLens extensions",
"description": "OpenLens - Open Source Kubernetes IDE: extensions", "description": "OpenLens - Open Source Kubernetes IDE: extensions",
"version": "6.5.0-alpha.1", "version": "6.5.0-alpha.2",
"copyright": "© 2022 OpenLens Authors", "copyright": "© 2022 OpenLens Authors",
"license": "MIT", "license": "MIT",
"main": "dist/extension-api.js", "main": "dist/extension-api.js",
@ -26,7 +26,7 @@
"prepare:dev": "npm run build" "prepare:dev": "npm run build"
}, },
"dependencies": { "dependencies": {
"@k8slens/core": "^6.5.0-alpha.1" "@k8slens/core": "^6.5.0-alpha.2"
}, },
"devDependencies": { "devDependencies": {
"@types/node": "^16.18.6", "@types/node": "^16.18.6",

4
packages/open-lens/package.json
View File

@ -4,7 +4,7 @@
"productName": "OpenLens", "productName": "OpenLens",
"description": "OpenLens - Open Source IDE for Kubernetes", "description": "OpenLens - Open Source IDE for Kubernetes",
"homepage": "https://github.com/lensapp/lens", "homepage": "https://github.com/lensapp/lens",
"version": "6.5.0-alpha.1", "version": "6.5.0-alpha.2",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/lensapp/lens.git" "url": "git+https://github.com/lensapp/lens.git"
@ -197,7 +197,7 @@
"dependencies": { "dependencies": {
"@k8slens/application": "^6.5.0-alpha.1", "@k8slens/application": "^6.5.0-alpha.1",
"@k8slens/application-for-electron-main": "^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/ensure-binaries": "^6.5.0-alpha.1",
"@k8slens/feature-core": "^6.5.0-alpha.1", "@k8slens/feature-core": "^6.5.0-alpha.1",
"@k8slens/generate-tray-icons": "^6.5.0-alpha.1", "@k8slens/generate-tray-icons": "^6.5.0-alpha.1",

2
packages/release-tool/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@k8slens/release-tool", "name": "@k8slens/release-tool",
"version": "6.5.0-alpha.1", "version": "6.5.0-alpha.2",
"description": "Release tool for lens monorepo", "description": "Release tool for lens monorepo",
"main": "dist/index.mjs", "main": "dist/index.mjs",
"license": "MIT", "license": "MIT",

2
packages/release-tool/src/index.ts
View File

@ -158,7 +158,7 @@ async function createReleaseBranchAndCommit(prBase: string, version: SemVer, prB
const prBranch = `release/v${version.format()}`; const prBranch = `release/v${version.format()}`;
await pipeExecFile("git", ["checkout", "-b", prBranch]); 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", ["commit", "-sm", `Release ${version.format()}`]);
await pipeExecFile("git", ["push", "--set-upstream", "origin", prBranch]); await pipeExecFile("git", ["push", "--set-upstream", "origin", prBranch]);