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 remote-tracking branch 'origin/master' into monaco_editor_refactoring

Browse Source 
# Conflicts:
#	src/common/user-store/preferences-helpers.ts
#	src/common/user-store/user-store.ts
#	src/renderer/bootstrap.tsx
#	src/renderer/components/+add-cluster/add-cluster.tsx
#	src/renderer/components/+apps-releases/release-details.tsx
#	src/renderer/components/+custom-resources/crd-details.tsx
#	src/renderer/components/+preferences/editor.tsx
#	src/renderer/components/+workloads-pods/pod-details-affinities.tsx
#	src/renderer/components/dock/create-resource.store.ts
#	src/renderer/components/dock/create-resource.tsx
#	src/renderer/components/dock/dock.store.ts
#	src/renderer/components/dock/edit-resource.store.ts
#	src/renderer/components/dock/editor-panel.tsx
#	src/renderer/components/dock/monaco-model-manager.ts
#	src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
This commit is contained in:
Roman 2021-11-02 10:26:48 +02:00
commit 5f90caa112
93 changed files with 361 additions and 288 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
.eslintrc.js
View File

@ -59,6 +59,11 @@ module.exports = {
"SwitchCase": 1,
}],
"no-unused-vars": "off",
"space-before-function-paren": ["error", {
"anonymous": "always",
"named": "never",
"asyncArrow": "always",
}],
"unused-imports/no-unused-imports": "error",
"unused-imports/no-unused-vars": [
"warn", {
@ -71,12 +76,17 @@ module.exports = {
"avoidEscape": true,
"allowTemplateLiterals": true,
}],
"object-curly-spacing": ["error", "always", {
"objectsInObjects": false,
"arraysInObjects": true,
}],
"linebreak-style": ["error", "unix"],
"eol-last": ["error", "always"],
"semi": ["error", "always"],
"object-shorthand": "error",
"prefer-template": "error",
"template-curly-spacing": "error",
"no-unused-expressions": "error",
"padding-line-between-statements": [
"error",
{ "blankLine": "always", "prev": "*", "next": "return" },
@ -84,8 +94,9 @@ module.exports = {
{ "blankLine": "always", "prev": "*", "next": "function" },
{ "blankLine": "always", "prev": "*", "next": "class" },
{ "blankLine": "always", "prev": ["const", "let", "var"], "next": "*" },
{ "blankLine": "any", "prev": ["const", "let", "var"], "next": ["const", "let", "var"]},
]
{ "blankLine": "any", "prev": ["const", "let", "var"], "next": ["const", "let", "var"] },
],
"no-template-curly-in-string": "error",
}
},
{
@ -115,6 +126,12 @@ module.exports = {
"@typescript-eslint/ban-ts-comment": "off",
"@typescript-eslint/no-empty-interface": "off",
"@typescript-eslint/no-unused-vars": "off",
"space-before-function-paren": "off",
"@typescript-eslint/space-before-function-paren": ["error", {
"anonymous": "always",
"named": "never",
"asyncArrow": "always",
}],
"unused-imports/no-unused-imports-ts": process.env.PROD === "true" ? "error" : "warn",
"unused-imports/no-unused-vars-ts": [
"warn", {
@ -130,6 +147,11 @@ module.exports = {
"avoidEscape": true,
"allowTemplateLiterals": true,
}],
"object-curly-spacing": "off",
"@typescript-eslint/object-curly-spacing": ["error", "always", {
"objectsInObjects": false,
"arraysInObjects": true,
}],
"react/prop-types": "off",
"semi": "off",
"@typescript-eslint/semi": ["error"],
@ -138,6 +160,8 @@ module.exports = {
"object-shorthand": "error",
"prefer-template": "error",
"template-curly-spacing": "error",
"no-unused-expressions": "off",
"@typescript-eslint/no-unused-expressions": "error",
"padding-line-between-statements": [
"error",
{ "blankLine": "always", "prev": "*", "next": "return" },
@ -145,8 +169,9 @@ module.exports = {
{ "blankLine": "always", "prev": "*", "next": "function" },
{ "blankLine": "always", "prev": "*", "next": "class" },
{ "blankLine": "always", "prev": ["const", "let", "var"], "next": "*" },
{ "blankLine": "any", "prev": ["const", "let", "var"], "next": ["const", "let", "var"]},
]
{ "blankLine": "any", "prev": ["const", "let", "var"], "next": ["const", "let", "var"] },
],
"no-template-curly-in-string": "error",
},
},
{
@ -183,6 +208,12 @@ module.exports = {
"@typescript-eslint/no-empty-function": "off",
"react/display-name": "off",
"@typescript-eslint/no-unused-vars": "off",
"space-before-function-paren": "off",
"@typescript-eslint/space-before-function-paren": ["error", {
"anonymous": "always",
"named": "never",
"asyncArrow": "always",
}],
"unused-imports/no-unused-imports-ts": process.env.PROD === "true" ? "error" : "warn",
"unused-imports/no-unused-vars-ts": [
"warn", {
@ -198,6 +229,11 @@ module.exports = {
"avoidEscape": true,
"allowTemplateLiterals": true,
}],
"object-curly-spacing": "off",
"@typescript-eslint/object-curly-spacing": ["error", "always", {
"objectsInObjects": false,
"arraysInObjects": true,
}],
"react/prop-types": "off",
"semi": "off",
"@typescript-eslint/semi": ["error"],
@ -206,6 +242,8 @@ module.exports = {
"object-shorthand": "error",
"prefer-template": "error",
"template-curly-spacing": "error",
"no-unused-expressions": "off",
"@typescript-eslint/no-unused-expressions": "error",
"padding-line-between-statements": [
"error",
{ "blankLine": "always", "prev": "*", "next": "return" },
@ -213,10 +251,11 @@ module.exports = {
{ "blankLine": "always", "prev": "*", "next": "function" },
{ "blankLine": "always", "prev": "*", "next": "class" },
{ "blankLine": "always", "prev": ["const", "let", "var"], "next": "*" },
{ "blankLine": "any", "prev": ["const", "let", "var"], "next": ["const", "let", "var"]},
{ "blankLine": "any", "prev": ["const", "let", "var"], "next": ["const", "let", "var"] },
],
"react-hooks/rules-of-hooks": "error",
"react-hooks/exhaustive-deps": "off"
"react-hooks/exhaustive-deps": "off",
"no-template-curly-in-string": "error",
},
}
]

2
extensions/metrics-cluster-feature/renderer.tsx
View File

@ -31,7 +31,7 @@ export default class ClusterMetricsFeatureExtension extends Renderer.LensExtensi
title: "Lens Metrics",
priority: 5,
components: {
View: ({ entity = null }: { entity: Common.Catalog.KubernetesCluster}) => {
View: ({ entity = null }: { entity: Common.Catalog.KubernetesCluster }) => {
return (
<MetricsSettings cluster={entity} />
);

4
extensions/metrics-cluster-feature/src/metrics-feature.ts
View File

@ -92,11 +92,11 @@ export class MetricsFeature {
}
async getStatus(): Promise<MetricsStatus> {
const status: MetricsStatus = { installed: false, canUpgrade: false};
const status: MetricsStatus = { installed: false, canUpgrade: false };
try {
const namespaceApi = forCluster(this.cluster, Namespace);
const namespace = await namespaceApi.get({name: "lens-metrics"});
const namespace = await namespaceApi.get({ name: "lens-metrics" });
if (namespace?.kind) {
const currentVersion = namespace.metadata.annotations?.extensionVersion || "0.0.0";

10
extensions/metrics-cluster-feature/src/metrics-settings.tsx
View File

@ -114,7 +114,7 @@ export class MetricsSettings extends React.Component<Props> {
const statefulSet = forCluster(this.props.cluster, StatefulSet);
try {
await statefulSet.get({name: "prometheus", namespace: "lens-metrics"});
await statefulSet.get({ name: "prometheus", namespace: "lens-metrics" });
this.featureStates.prometheus = true;
} catch(e) {
if (e?.error?.code === 404) {
@ -127,7 +127,7 @@ export class MetricsSettings extends React.Component<Props> {
const deployment = forCluster(this.props.cluster, Deployment);
try {
await deployment.get({name: "kube-state-metrics", namespace: "lens-metrics"});
await deployment.get({ name: "kube-state-metrics", namespace: "lens-metrics" });
this.featureStates.kubeStateMetrics = true;
} catch(e) {
if (e?.error?.code === 404) {
@ -140,7 +140,7 @@ export class MetricsSettings extends React.Component<Props> {
const daemonSet = forCluster(this.props.cluster, DaemonSet);
try {
await daemonSet.get({name: "node-exporter", namespace: "lens-metrics"});
await daemonSet.get({ name: "node-exporter", namespace: "lens-metrics" });
this.featureStates.nodeExporter = true;
} catch(e) {
if (e?.error?.code === 404) {
@ -207,14 +207,14 @@ export class MetricsSettings extends React.Component<Props> {
<>
{ this.props.cluster.status.phase !== "connected" && (
<section>
<p style={ {color: "var(--colorError)"} }>
<p style={ { color: "var(--colorError)" } }>
Lens Metrics settings requires established connection to the cluster.
</p>
</section>
)}
{ !this.isActiveMetricsProvider && (
<section>
<p style={ {color: "var(--colorError)"} }>
<p style={ { color: "var(--colorError)" } }>
Other metrics provider is currently active. See &quot;Metrics&quot; tab for details.
</p>
</section>

4
package.json
View File

@ -297,7 +297,7 @@
"@types/request-promise-native": "^1.0.18",
"@types/semver": "^7.3.9",
"@types/sharp": "^0.29.2",
"@types/spdy": "^3.4.4",
"@types/spdy": "^3.4.5",
"@types/tar": "^4.0.5",
"@types/tcp-port-used": "^1.0.0",
"@types/tempy": "^0.3.0",
@ -378,7 +378,7 @@
"webpack-dev-server": "^3.11.2",
"webpack-node-externals": "^1.7.2",
"what-input": "^5.2.10",
"xterm": "^4.12.0",
"xterm": "^4.14.1",
"xterm-addon-fit": "^0.5.0"
}
}

2
src/common/__tests__/event-bus.test.ts
View File

@ -34,7 +34,7 @@ describe("event bus tests", () => {
event = data;
});
appEventBus.emit({name: "foo", action: "bar"});
appEventBus.emit({ name: "foo", action: "bar" });
expect(event.name).toBe("foo");
});
});

12
src/common/__tests__/kube-helpers.test.ts
View File

@ -174,7 +174,7 @@ describe("kube helpers", () => {
});
it("multiple context is ok", async () => {
mockKubeConfig.contexts.push({context: {cluster: "cluster-2", user: "cluster-2"}, name: "cluster-2"});
mockKubeConfig.contexts.push({ context: { cluster: "cluster-2", user: "cluster-2" }, name: "cluster-2" });
const { config } = loadConfigFromString(JSON.stringify(mockKubeConfig));
expect(config.getCurrentContext()).toBe("minikube");
@ -209,7 +209,7 @@ describe("kube helpers", () => {
});
it("empty name in context causes it to be removed", async () => {
mockKubeConfig.contexts.push({context: {cluster: "cluster-2", user: "cluster-2"}, name: ""});
mockKubeConfig.contexts.push({ context: { cluster: "cluster-2", user: "cluster-2" }, name: "" });
expect(mockKubeConfig.contexts.length).toBe(2);
const { config } = loadConfigFromString(JSON.stringify(mockKubeConfig));
@ -218,7 +218,7 @@ describe("kube helpers", () => {
});
it("empty cluster in context causes it to be removed", async () => {
mockKubeConfig.contexts.push({context: {cluster: "", user: "cluster-2"}, name: "cluster-2"});
mockKubeConfig.contexts.push({ context: { cluster: "", user: "cluster-2" }, name: "cluster-2" });
expect(mockKubeConfig.contexts.length).toBe(2);
const { config } = loadConfigFromString(JSON.stringify(mockKubeConfig));
@ -227,7 +227,7 @@ describe("kube helpers", () => {
});
it("empty user in context causes it to be removed", async () => {
mockKubeConfig.contexts.push({context: {cluster: "cluster-2", user: ""}, name: "cluster-2"});
mockKubeConfig.contexts.push({ context: { cluster: "cluster-2", user: "" }, name: "cluster-2" });
expect(mockKubeConfig.contexts.length).toBe(2);
const { config } = loadConfigFromString(JSON.stringify(mockKubeConfig));
@ -236,8 +236,8 @@ describe("kube helpers", () => {
});
it("invalid context in between valid contexts is removed", async () => {
mockKubeConfig.contexts.push({context: {cluster: "cluster-2", user: ""}, name: "cluster-2"});
mockKubeConfig.contexts.push({context: {cluster: "cluster-3", user: "cluster-3"}, name: "cluster-3"});
mockKubeConfig.contexts.push({ context: { cluster: "cluster-2", user: "" }, name: "cluster-2" });
mockKubeConfig.contexts.push({ context: { cluster: "cluster-3", user: "cluster-3" }, name: "cluster-3" });
expect(mockKubeConfig.contexts.length).toBe(3);
const { config } = loadConfigFromString(JSON.stringify(mockKubeConfig));

2
src/common/__tests__/user-store.test.ts
View File

@ -52,7 +52,7 @@ AppPaths.init();
describe("user store tests", () => {
describe("for an empty config", () => {
beforeEach(() => {
mockFs({ tmp: { "config.json": "{}", "kube_config": "{}" } });
mockFs({ tmp: { "config.json": "{}", "kube_config": "{}" }});
(UserStore.createInstance() as any).refreshNewContexts = jest.fn(() => Promise.resolve());
});

6
src/common/getTSLoader.ts
View File

@ -32,11 +32,9 @@ import esbuild from "esbuild";
const getTSLoader = (
testRegExp: RegExp, transpileOnly = true
) => {
const useEsbuildLoader = process.env.LENS_DEV_USE_ESBUILD_LOADER === "true";
if (process.env.LENS_DEV_USE_ESBUILD_LOADER === "true") {
console.info(`\n🚀 using esbuild-loader for ts(x)`);
useEsbuildLoader && console.info(`\n🚀 using esbuild-loader for ts(x)`);
if (useEsbuildLoader) {
return {
test: testRegExp,
loader: "esbuild-loader",

4
src/common/hotbar-store.ts
View File

@ -73,8 +73,8 @@ export class HotbarStore extends BaseStore<HotbarStoreModel> {
protected fromStore(data: Partial<HotbarStoreModel> = {}) {
if (!data.hotbars || !data.hotbars.length) {
const hotbar = getEmptyHotbar("Default");
const { metadata: { uid, name, source } } = catalogEntity;
const initialItem = { entity: { uid, name, source } };
const { metadata: { uid, name, source }} = catalogEntity;
const initialItem = { entity: { uid, name, source }};
hotbar.items[0] = initialItem;

2
src/common/k8s-api/__tests__/deployment.api.test.ts
View File

@ -41,7 +41,7 @@ describe("DeploymentApi", () => {
it("requests Kubernetes API with PATCH verb and correct amount of replicas", () => {
const patchSpy = jest.spyOn(requestMock, "patch");
sub.scale({ namespace: "default", name: "deployment-1"}, 5);
sub.scale({ namespace: "default", name: "deployment-1" }, 5);
expect(patchSpy).toHaveBeenCalledWith("/apis/apps/v1/namespaces/default/deployments/deployment-1/scale", {
data: {

104
src/common/k8s-api/__tests__/kube-object.test.ts
View File

@ -45,12 +45,12 @@ describe("KubeObject", () => {
{
type TestCase = [string, any];
const tests: TestCase[] = [
["kind", { apiVersion: "", metadata: {uid: "", name: "", resourceVersion: "", selfLink: ""} }],
["apiVersion", { kind: "", metadata: {uid: "", name: "", resourceVersion: "", selfLink: ""} }],
["kind", { apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "" }}],
["apiVersion", { kind: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "" }}],
["metadata", { kind: "", apiVersion: "" }],
["metadata.uid", { kind: "", apiVersion: "", metadata: { name: "", resourceVersion: "", selfLink: ""} }],
["metadata.name", { kind: "", apiVersion: "", metadata: { uid: "", resourceVersion: "", selfLink: "" } }],
["metadata.resourceVersion", { kind: "", apiVersion: "", metadata: { uid: "", name: "", selfLink: "" } }],
["metadata.uid", { kind: "", apiVersion: "", metadata: { name: "", resourceVersion: "", selfLink: "" }}],
["metadata.name", { kind: "", apiVersion: "", metadata: { uid: "", resourceVersion: "", selfLink: "" }}],
["metadata.resourceVersion", { kind: "", apiVersion: "", metadata: { uid: "", name: "", selfLink: "" }}],
];
it.each(tests)("should reject with missing: %s", (missingField, input) => {
@ -61,23 +61,23 @@ describe("KubeObject", () => {
{
type TestCase = [string, any];
const tests: TestCase[] = [
["kind", { kind: 1, apiVersion: "", metadata: {} }],
["apiVersion", { apiVersion: 1, kind: "", metadata: {} }],
["kind", { kind: 1, apiVersion: "", metadata: {}}],
["apiVersion", { apiVersion: 1, kind: "", metadata: {}}],
["metadata", { kind: "", apiVersion: "", metadata: "" }],
["metadata.uid", { kind: "", apiVersion: "", metadata: { uid: 1 } }],
["metadata.name", { kind: "", apiVersion: "", metadata: { uid: "", name: 1 } }],
["metadata.resourceVersion", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: 1 } }],
["metadata.selfLink", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: 1 } }],
["metadata.namespace", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", namespace: 1 } }],
["metadata.creationTimestamp", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", creationTimestamp: 1 } }],
["metadata.continue", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", continue: 1 } }],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: 1 } }],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: [1] } }],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: {} } }],
["metadata.labels", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", labels: 1 } }],
["metadata.labels", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", labels: { food: 1 } } }],
["metadata.annotations", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: 1 } }],
["metadata.annotations", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: { food: 1 } } }],
["metadata.uid", { kind: "", apiVersion: "", metadata: { uid: 1 }}],
["metadata.name", { kind: "", apiVersion: "", metadata: { uid: "", name: 1 }}],
["metadata.resourceVersion", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: 1 }}],
["metadata.selfLink", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: 1 }}],
["metadata.namespace", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", namespace: 1 }}],
["metadata.creationTimestamp", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", creationTimestamp: 1 }}],
["metadata.continue", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", continue: 1 }}],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: 1 }}],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: [1] }}],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: {}}}],
["metadata.labels", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", labels: 1 }}],
["metadata.labels", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", labels: { food: 1 }}}],
["metadata.annotations", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: 1 }}],
["metadata.annotations", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: { food: 1 }}}],
];
it.each(tests)("should reject with wrong type for field: %s", (missingField, input) => {
@ -86,7 +86,7 @@ describe("KubeObject", () => {
}
it("should accept valid KubeJsonApiData (ignoring other fields)", () => {
const valid = { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: { food: "" } } };
const valid = { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: { food: "" }}};
expect(KubeObject.isJsonApiData(valid)).toBe(true);
});
@ -118,8 +118,8 @@ describe("KubeObject", () => {
{
type TestCase = [string, any];
const tests: TestCase[] = [
["kind", { apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "" } }],
["apiVersion", { kind: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "" } }],
["kind", { apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "" }}],
["apiVersion", { kind: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "" }}],
["metadata", { kind: "", apiVersion: "" }],
];
@ -131,23 +131,23 @@ describe("KubeObject", () => {
{
type TestCase = [string, any];
const tests: TestCase[] = [
["kind", { kind: 1, apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "" } }],
["apiVersion", { apiVersion: 1, kind: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "" } }],
["kind", { kind: 1, apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "" }}],
["apiVersion", { apiVersion: 1, kind: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "" }}],
["metadata", { kind: "", apiVersion: "", metadata: "" }],
["metadata.uid", { kind: "", apiVersion: "", metadata: { uid: 1, name: "", resourceVersion: "", selfLink: "" } }],
["metadata.name", { kind: "", apiVersion: "", metadata: { uid: "", name: 1, resourceVersion: "", selfLink: "" } }],
["metadata.resourceVersion", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: 1, selfLink: "" } }],
["metadata.selfLink", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: 1 } }],
["metadata.namespace", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", namespace: 1 } }],
["metadata.creationTimestamp", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", creationTimestamp: 1 } }],
["metadata.continue", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", continue: 1 } }],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: 1 } }],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: [1] } }],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: {} } }],
["metadata.labels", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", labels: 1 } }],
["metadata.labels", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", labels: { food: 1 } } }],
["metadata.annotations", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: 1 } }],
["metadata.annotations", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: { food: 1 } } }],
["metadata.uid", { kind: "", apiVersion: "", metadata: { uid: 1, name: "", resourceVersion: "", selfLink: "" }}],
["metadata.name", { kind: "", apiVersion: "", metadata: { uid: "", name: 1, resourceVersion: "", selfLink: "" }}],
["metadata.resourceVersion", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: 1, selfLink: "" }}],
["metadata.selfLink", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: 1 }}],
["metadata.namespace", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", namespace: 1 }}],
["metadata.creationTimestamp", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", creationTimestamp: 1 }}],
["metadata.continue", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", continue: 1 }}],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: 1 }}],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: [1] }}],
["metadata.finalizers", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", finalizers: {}}}],
["metadata.labels", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", labels: 1 }}],
["metadata.labels", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", labels: { food: 1 }}}],
["metadata.annotations", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: 1 }}],
["metadata.annotations", { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: { food: 1 }}}],
];
it.each(tests)("should reject with wrong type for field: %s", (missingField, input) => {
@ -156,7 +156,7 @@ describe("KubeObject", () => {
}
it("should accept valid Partial<KubeJsonApiData> (ignoring other fields)", () => {
const valid = { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: { food: "" } } };
const valid = { kind: "", apiVersion: "", metadata: { uid: "", name: "", resourceVersion: "", selfLink: "", annotations: { food: "" }}};
expect(KubeObject.isPartialJsonApiData(valid)).toBe(true);
});
@ -197,8 +197,8 @@ describe("KubeObject", () => {
{
type TestCase = [string, any];
const tests: TestCase[] = [
["kind", { apiVersion: "", items: [], metadata: { resourceVersion: "", selfLink: "" } }],
["apiVersion", { kind: "", items: [], metadata: { resourceVersion: "", selfLink: "" } }],
["kind", { apiVersion: "", items: [], metadata: { resourceVersion: "", selfLink: "" }}],
["apiVersion", { kind: "", items: [], metadata: { resourceVersion: "", selfLink: "" }}],
["metadata", { kind: "", items: [], apiVersion: "" }],
];
@ -210,15 +210,15 @@ describe("KubeObject", () => {
{
type TestCase = [string, any];
const tests: TestCase[] = [
["kind", { kind: 1, items: [], apiVersion: "", metadata: { resourceVersion: "", selfLink: "" } }],
["apiVersion", { kind: "", items: [], apiVersion: 1, metadata: { resourceVersion: "", selfLink: "" } }],
["kind", { kind: 1, items: [], apiVersion: "", metadata: { resourceVersion: "", selfLink: "" }}],
["apiVersion", { kind: "", items: [], apiVersion: 1, metadata: { resourceVersion: "", selfLink: "" }}],
["metadata", { kind: "", items: [], apiVersion: "", metadata: 1 }],
["metadata.resourceVersion", { kind: "", items: [], apiVersion: "", metadata: { resourceVersion: 1, selfLink: "" } }],
["metadata.selfLink", { kind: "", items: [], apiVersion: "", metadata: { resourceVersion: "", selfLink: 1 } }],
["items", { kind: "", items: 1, apiVersion: "", metadata: { resourceVersion: "", selfLink: "" } }],
["items", { kind: "", items: "", apiVersion: "", metadata: { resourceVersion: "", selfLink: "" } }],
["items", { kind: "", items: {}, apiVersion: "", metadata: { resourceVersion: "", selfLink: "" } }],
["items[0]", { kind: "", items: [""], apiVersion: "", metadata: { resourceVersion: "", selfLink: "" } }],
["metadata.resourceVersion", { kind: "", items: [], apiVersion: "", metadata: { resourceVersion: 1, selfLink: "" }}],
["metadata.selfLink", { kind: "", items: [], apiVersion: "", metadata: { resourceVersion: "", selfLink: 1 }}],
["items", { kind: "", items: 1, apiVersion: "", metadata: { resourceVersion: "", selfLink: "" }}],
["items", { kind: "", items: "", apiVersion: "", metadata: { resourceVersion: "", selfLink: "" }}],
["items", { kind: "", items: {}, apiVersion: "", metadata: { resourceVersion: "", selfLink: "" }}],
["items[0]", { kind: "", items: [""], apiVersion: "", metadata: { resourceVersion: "", selfLink: "" }}],
];
it.each(tests)("should reject with wrong type for field: %s", (missingField, input) => {
@ -227,7 +227,7 @@ describe("KubeObject", () => {
}
it("should accept valid KubeJsonApiDataList (ignoring other fields)", () => {
const valid = { kind: "", items: [false], apiVersion: "", metadata: { resourceVersion: "", selfLink: "" } };
const valid = { kind: "", items: [false], apiVersion: "", metadata: { resourceVersion: "", selfLink: "" }};
expect(KubeObject.isJsonApiDataList(valid, isBoolean)).toBe(true);
});

2
src/common/k8s-api/__tests__/stateful-set.api.test.ts
View File

@ -41,7 +41,7 @@ describe("StatefulSetApi", () => {
it("requests Kubernetes API with PATCH verb and correct amount of replicas", () => {
const patchSpy = jest.spyOn(requestMock, "patch");
sub.scale({ namespace: "default", name: "statefulset-1"}, 5);
sub.scale({ namespace: "default", name: "statefulset-1" }, 5);
expect(patchSpy).toHaveBeenCalledWith("/apis/apps/v1/namespaces/default/statefulsets/statefulset-1/scale", {
data: {

2
src/common/k8s-api/endpoints/crd.api.ts
View File

@ -163,7 +163,7 @@ export class CustomResourceDefinition extends KubeObject {
}
} else if (this.spec.version) {
const { additionalPrinterColumns: apc } = this.spec;
const additionalPrinterColumns = apc?.map(({ JSONPath, ...apc}) => ({ ...apc, jsonPath: JSONPath }));
const additionalPrinterColumns = apc?.map(({ JSONPath, ...apc }) => ({ ...apc, jsonPath: JSONPath }));
return {
name: this.spec.version,

4
src/common/k8s-api/endpoints/deployment.api.ts
View File

@ -61,7 +61,7 @@ export class DeploymentApi extends KubeApi<Deployment> {
spec: {
template: {
metadata: {
annotations: {"kubectl.kubernetes.io/restartedAt" : moment.utc().format()}
annotations: { "kubectl.kubernetes.io/restartedAt" : moment.utc().format() }
}
}
}
@ -122,7 +122,7 @@ export class Deployment extends WorkloadKubeObject {
declare spec: {
replicas: number;
selector: { matchLabels: { [app: string]: string } };
selector: { matchLabels: { [app: string]: string }};
template: {
metadata: {
creationTimestamp?: string;

2
src/common/k8s-api/endpoints/endpoint.api.ts
View File

@ -83,7 +83,7 @@ export class EndpointAddress implements IEndpointAddress {
getTargetRef(): ITargetRef {
if (this.targetRef) {
return Object.assign(this.targetRef, {apiVersion: "v1"});
return Object.assign(this.targetRef, { apiVersion: "v1" });
} else {
return null;
}

8
src/common/k8s-api/endpoints/ingress.api.ts
View File

@ -128,7 +128,7 @@ export class Ingress extends KubeObject {
}
getRoutes() {
const { spec: { tls, rules } } = this;
const { spec: { tls, rules }} = this;
if (!rules) return [];
@ -165,7 +165,7 @@ export class Ingress extends KubeObject {
}
getHosts() {
const { spec: { rules } } = this;
const { spec: { rules }} = this;
if (!rules) return [];
@ -174,7 +174,7 @@ export class Ingress extends KubeObject {
getPorts() {
const ports: number[] = [];
const { spec: { tls, rules, backend, defaultBackend } } = this;
const { spec: { tls, rules, backend, defaultBackend }} = this;
const httpPort = 80;
const tlsPort = 443;
// Note: not using the port name (string)
@ -196,7 +196,7 @@ export class Ingress extends KubeObject {
}
getLoadBalancers() {
const { status: { loadBalancer = { ingress: [] } } } = this;
const { status: { loadBalancer = { ingress: [] }}} = this;
return (loadBalancer.ingress ?? []).map(address => (
address.hostname || address.ip

2
src/common/k8s-api/endpoints/nodes.api.ts
View File

@ -30,7 +30,7 @@ export class NodesApi extends KubeApi<Node> {
}
export function getMetricsForAllNodes(): Promise<INodeMetrics> {
const opts = { category: "nodes"};
const opts = { category: "nodes" };
return metricsApi.getMetrics({
memoryUsage: opts,

2
src/common/k8s-api/endpoints/poddisruptionbudget.api.ts
View File

@ -29,7 +29,7 @@ export interface PodDisruptionBudget {
spec: {
minAvailable: string;
maxUnavailable: string;
selector: { matchLabels: { [app: string]: string } };
selector: { matchLabels: { [app: string]: string }};
};
status: {
currentHealthy: number

2
src/common/k8s-api/endpoints/pods.api.ts
View File

@ -411,7 +411,7 @@ export class Pod extends WorkloadKubeObject {
}
getNodeSelectors(): string[] {
const { nodeSelector = {} } = this.spec;
const { nodeSelector = {}} = this.spec;
return Object.entries(nodeSelector).map(values => values.join(": "));
}

2
src/common/k8s-api/endpoints/replica-set.api.ts
View File

@ -78,7 +78,7 @@ export class ReplicaSet extends WorkloadKubeObject {
declare spec: {
replicas?: number;
selector: { matchLabels: { [app: string]: string } };
selector: { matchLabels: { [app: string]: string }};
template?: {
metadata: {
labels: {

10
src/common/k8s-api/endpoints/service.api.ts
View File

@ -53,7 +53,7 @@ export interface Service {
clusterIP: string;
clusterIPs?: string[];
externalTrafficPolicy?: string;
externalName: string;
externalName?: string;
loadBalancerIP?: string;
loadBalancerSourceRanges?: string[];
sessionAffinity: string;
@ -100,11 +100,15 @@ export class Service extends KubeObject {
getExternalIps() {
const lb = this.getLoadBalancer();
if (lb && lb.ingress) {
if (lb?.ingress) {
return lb.ingress.map(val => val.ip || val.hostname);
}
return this.spec.externalIPs || [];
if (Array.isArray(this.spec?.externalIPs)) {
return this.spec.externalIPs;
}
return [];
}
getType() {

4
src/common/k8s-api/kube-object.store.ts
View File

@ -376,8 +376,8 @@ export abstract class KubeObjectStore<T extends KubeObject> extends ItemStore<T>
timedRetry = setTimeout(() => {
(
namespace
? this.loadAll({ namespaces: [namespace], reqInit: { signal } })
: this.loadAll({ merge: false, reqInit: { signal } })
? this.loadAll({ namespaces: [namespace], reqInit: { signal }})
: this.loadAll({ merge: false, reqInit: { signal }})
).then(watch);
}, 1000);
} else if (error) { // not sure what to do, best to retry

2
src/common/k8s-api/kube-watch-api.ts
View File

@ -134,7 +134,7 @@ export class KubeWatchApi {
};
}
protected log({ message, cssStyle = "", meta = {} }: IKubeWatchLog) {
protected log({ message, cssStyle = "", meta = {}}: IKubeWatchLog) {
if (isProduction && !isDebugging) {
return;
}

2
src/common/utils/autobind.ts
View File

@ -19,7 +19,7 @@
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
import {boundMethod, boundClass} from "autobind-decorator";
import { boundMethod, boundClass } from "autobind-decorator";
import autoBindClass, { Options } from "auto-bind";
import autoBindReactClass from "auto-bind/react";

2
src/common/utils/buildUrl.ts
View File

@ -45,7 +45,7 @@ export function buildURL<P extends object = {}, Q extends object = {}>(path: str
export function buildURLPositional<P extends object = {}, Q extends object = {}>(path: string | any) {
const builder = buildURL(path);
return function(params?: P, query?: Q, fragment?: string): string {
return function (params?: P, query?: Q, fragment?: string): string {
return builder({ params, query, fragment });
};
}

8
src/extensions/__tests__/extension-compatibility.test.ts
View File

@ -37,7 +37,7 @@ describe("extension compatibility", () => {
});
it("has no extension comparator", () => {
const manifest = { name: "extensionName", version: "0.0.1"};
const manifest = { name: "extensionName", version: "0.0.1" };
expect(isCompatibleExtension(manifest,)).toBe(false);
});
@ -76,7 +76,7 @@ describe("extension compatibility", () => {
expected: false,
},
])("extension comparator test: %p", ({ comparator, expected }) => {
const manifest: LensExtensionManifest = { name: "extensionName", version: "0.0.1", engines: { lens: comparator}};
const manifest: LensExtensionManifest = { name: "extensionName", version: "0.0.1", engines: { lens: comparator }};
expect(isCompatibleExtension(manifest,)).toBe(expected);
});
@ -91,7 +91,7 @@ describe("extension compatibility", () => {
});
it("has no extension comparator", () => {
const manifest = { name: "extensionName", version: "0.0.1"};
const manifest = { name: "extensionName", version: "0.0.1" };
expect(isCompatibleExtension(manifest,)).toBe(false);
});
@ -130,7 +130,7 @@ describe("extension compatibility", () => {
expected: false,
},
])("extension comparator test: %p", ({ comparator, expected }) => {
const manifest: LensExtensionManifest = { name: "extensionName", version: "0.0.1", engines: { lens: comparator}};
const manifest: LensExtensionManifest = { name: "extensionName", version: "0.0.1", engines: { lens: comparator }};
expect(isCompatibleExtension(manifest,)).toBe(expected);
});

4
src/extensions/extensions-store.ts
View File

@ -45,8 +45,8 @@ export class ExtensionsStore extends BaseStore<LensExtensionsStoreModel> {
@computed
get enabledExtensions() {
return Array.from(this.state.values())
.filter(({enabled}) => enabled)
.map(({name}) => name);
.filter(({ enabled }) => enabled)
.map(({ name }) => name);
}
protected state = observable.map<LensExtensionId, LensExtensionState>();

8
src/extensions/ipc/ipc-main.ts
View File

@ -44,12 +44,12 @@ export abstract class IpcMain extends IpcRegistrar {
listen(channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => any): Disposer {
const prefixedChannel = `extensions@${this[IpcPrefix]}:${channel}`;
const cleanup = once(() => {
logger.info(`[IPC-RENDERER]: removing extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version } });
logger.info(`[IPC-RENDERER]: removing extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }});
return ipcMain.removeListener(prefixedChannel, listener);
});
logger.info(`[IPC-RENDERER]: adding extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version } });
logger.info(`[IPC-RENDERER]: adding extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }});
ipcMain.addListener(prefixedChannel, listener);
this.extension[Disposers].push(cleanup);
@ -64,10 +64,10 @@ export abstract class IpcMain extends IpcRegistrar {
handle(channel: string, handler: (event: Electron.IpcMainInvokeEvent, ...args: any[]) => any): void {
const prefixedChannel = `extensions@${this[IpcPrefix]}:${channel}`;
logger.info(`[IPC-RENDERER]: adding extension handler`, { channel, extension: { name: this.extension.name, version: this.extension.version } });
logger.info(`[IPC-RENDERER]: adding extension handler`, { channel, extension: { name: this.extension.name, version: this.extension.version }});
ipcMainHandle(prefixedChannel, handler);
this.extension[Disposers].push(() => {
logger.info(`[IPC-RENDERER]: removing extension handler`, { channel, extension: { name: this.extension.name, version: this.extension.version } });
logger.info(`[IPC-RENDERER]: removing extension handler`, { channel, extension: { name: this.extension.name, version: this.extension.version }});
return ipcMain.removeHandler(prefixedChannel);
});

4
src/extensions/ipc/ipc-renderer.ts
View File

@ -44,12 +44,12 @@ export abstract class IpcRenderer extends IpcRegistrar {
listen(channel: string, listener: (event: Electron.IpcRendererEvent, ...args: any[]) => any): Disposer {
const prefixedChannel = `extensions@${this[IpcPrefix]}:${channel}`;
const cleanup = once(() => {
console.info(`[IPC-RENDERER]: removing extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version } });
console.info(`[IPC-RENDERER]: removing extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }});
return ipcRenderer.removeListener(prefixedChannel, listener);
});
console.info(`[IPC-RENDERER]: adding extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version } });
console.info(`[IPC-RENDERER]: adding extension listener`, { channel, extension: { name: this.extension.name, version: this.extension.version }});
ipcRenderer.addListener(prefixedChannel, listener);
this.extension[Disposers].push(cleanup);

2
src/extensions/registries/page-registry.ts
View File

@ -66,7 +66,7 @@ export interface RegisteredPage {
}
export function getExtensionPageUrl(target: PageTarget): string {
const { extensionId, pageId = "", params: targetParams = {} } = target;
const { extensionId, pageId = "", params: targetParams = {}} = target;
const pagePath = ["/extension", sanitizeExtensionName(extensionId), pageId]
.filter(Boolean)

2
src/main/catalog-sources/kubeconfig-sync.ts
View File

@ -212,7 +212,7 @@ export function computeDiff(contents: string, source: RootSource, filePath: stri
// add new clusters to the source
try {
const clusterId = createHash("md5").update(`${filePath}:${contextName}`).digest("hex");
const cluster = ClusterStore.getInstance().getById(clusterId) || new Cluster({ ...model, id: clusterId});
const cluster = ClusterStore.getInstance().getById(clusterId) || new Cluster({ ...model, id: clusterId });
if (!cluster.apiUrl) {
throw new Error("Cluster constructor failed, see above error");

2
src/main/catalog-sources/weblinks.ts
View File

@ -100,7 +100,7 @@ export function syncWeblinks() {
webLinkEntities.delete(weblinkId);
}
}
}, {fireImmediately: true});
}, { fireImmediately: true });
catalogEntityRegistry.addComputedSource("weblinks", computed(() => Array.from(webLinkEntities.values(), ([link]) => link)));
}

2
src/main/cluster-detectors/detector-registry.ts
View File

@ -35,7 +35,7 @@ export class DetectorRegistry extends Singleton {
}
async detectForCluster(cluster: Cluster): Promise<ClusterMetadata> {
const results: {[key: string]: ClusterDetectionResult } = {};
const results: { [key: string]: ClusterDetectionResult } = {};
for (const detectorClass of this.registry) {
const detector = new detectorClass(cluster);

42
src/main/cluster-detectors/distribution-detector.ts
View File

@ -30,86 +30,86 @@ export class DistributionDetector extends BaseClusterDetector {
this.version = await this.getKubernetesVersion();
if (this.isRke()) {
return { value: "rke", accuracy: 80};
return { value: "rke", accuracy: 80 };
}
if (this.isRancherDesktop()) {
return { value: "rancher-desktop", accuracy: 80};
return { value: "rancher-desktop", accuracy: 80 };
}
if (this.isK3s()) {
return { value: "k3s", accuracy: 80};
return { value: "k3s", accuracy: 80 };
}
if (this.isGKE()) {
return { value: "gke", accuracy: 80};
return { value: "gke", accuracy: 80 };
}
if (this.isEKS()) {
return { value: "eks", accuracy: 80};
return { value: "eks", accuracy: 80 };
}
if (this.isIKS()) {
return { value: "iks", accuracy: 80};
return { value: "iks", accuracy: 80 };
}
if (this.isAKS()) {
return { value: "aks", accuracy: 80};
return { value: "aks", accuracy: 80 };
}
if (this.isDigitalOcean()) {
return { value: "digitalocean", accuracy: 90};
return { value: "digitalocean", accuracy: 90 };
}
if (this.isK0s()) {
return { value: "k0s", accuracy: 80};
return { value: "k0s", accuracy: 80 };
}
if (this.isVMWare()) {
return { value: "vmware", accuracy: 90};
return { value: "vmware", accuracy: 90 };
}
if (this.isMirantis()) {
return { value: "mirantis", accuracy: 90};
return { value: "mirantis", accuracy: 90 };
}
if (this.isAlibaba()) {
return { value: "alibaba", accuracy: 90};
return { value: "alibaba", accuracy: 90 };
}
if (this.isHuawei()) {
return { value: "huawei", accuracy: 90};
return { value: "huawei", accuracy: 90 };
}
if (this.isTke()) {
return { value: "tencent", accuracy: 90};
return { value: "tencent", accuracy: 90 };
}
if (this.isMinikube()) {
return { value: "minikube", accuracy: 80};
return { value: "minikube", accuracy: 80 };
}
if (this.isMicrok8s()) {
return { value: "microk8s", accuracy: 80};
return { value: "microk8s", accuracy: 80 };
}
if (this.isKind()) {
return { value: "kind", accuracy: 70};
return { value: "kind", accuracy: 70 };
}
if (this.isDockerDesktop()) {
return { value: "docker-desktop", accuracy: 80};
return { value: "docker-desktop", accuracy: 80 };
}
if (this.isCustom() && await this.isOpenshift()) {
return { value: "openshift", accuracy: 90};
return { value: "openshift", accuracy: 90 };
}
if (this.isCustom()) {
return { value: "custom", accuracy: 10};
return { value: "custom", accuracy: 10 };
}
return { value: "unknown", accuracy: 10};
return { value: "unknown", accuracy: 10 };
}
public async getKubernetesVersion() {

2
src/main/cluster-detectors/nodes-count-detector.ts
View File

@ -29,7 +29,7 @@ export class NodesCountDetector extends BaseClusterDetector {
if (!this.cluster.accessible) return null;
const nodeCount = await this.getNodeCount();
return { value: nodeCount, accuracy: 100};
return { value: nodeCount, accuracy: 100 };
}
protected async getNodeCount(): Promise<number> {

2
src/main/cluster-detectors/version-detector.ts
View File

@ -29,7 +29,7 @@ export class VersionDetector extends BaseClusterDetector {
public async detect() {
const version = await this.getKubernetesVersion();
return { value: version, accuracy: 100};
return { value: version, accuracy: 100 };
}
public async getKubernetesVersion() {

2
src/main/cluster.ts
View File

@ -651,7 +651,7 @@ export class Cluster implements ClusterModel, ClusterState {
const api = (await this.getProxyKubeconfig()).makeApiClient(CoreV1Api);
try {
const { body: { items } } = await api.listNamespace();
const { body: { items }} = await api.listNamespace();
const namespaces = items.map(ns => ns.metadata.name);
return namespaces;

2
src/main/extension-filesystem.ts
View File

@ -68,7 +68,7 @@ export class FilesystemProvisionerStore extends BaseStore<FSProvisionModel> {
}
@action
protected fromStore({ extensions }: FSProvisionModel = { extensions: {} }): void {
protected fromStore({ extensions }: FSProvisionModel = { extensions: {}}): void {
this.registeredExtensions.merge(extensions);
}

22
src/main/kubectl.ts
View File

@ -346,10 +346,10 @@ export class Kubectl {
bashScript += `export PATH="${helmPath}:${kubectlPath}:$PATH"\n`;
bashScript += "export KUBECONFIG=\"$tempkubeconfig\"\n";
bashScript += "NO_PROXY=\",${NO_PROXY:-localhost},\"\n";
bashScript += "NO_PROXY=\"${NO_PROXY//,localhost,/,}\"\n";
bashScript += "NO_PROXY=\"${NO_PROXY//,127.0.0.1,/,}\"\n";
bashScript += "NO_PROXY=\"localhost,127.0.0.1${NO_PROXY%,}\"\n";
bashScript += `NO_PROXY=\",\${NO_PROXY:-localhost},\"\n`;
bashScript += `NO_PROXY=\"\${NO_PROXY//,localhost,/,}\"\n`;
bashScript += `NO_PROXY=\"\${NO_PROXY//,127.0.0.1,/,}\"\n`;
bashScript += `NO_PROXY=\"localhost,127.0.0.1\${NO_PROXY%,}\"\n`;
bashScript += "export NO_PROXY\n";
bashScript += "unset tempkubeconfig\n";
await fsPromises.writeFile(bashScriptPath, bashScript.toString(), { mode: 0o644 });
@ -371,14 +371,14 @@ export class Kubectl {
zshScript += `helmpath=\"${helmPath}"\n`;
zshScript += "p=\":$kubectlpath:\"\n";
zshScript += "d=\":$PATH:\"\n";
zshScript += "d=${d//$p/:}\n";
zshScript += "d=${d/#:/}\n";
zshScript += "export PATH=\"$helmpath:$kubectlpath:${d/%:/}\"\n";
zshScript += `d=\${d//$p/:}\n`;
zshScript += `d=\${d/#:/}\n`;
zshScript += `export PATH=\"$helmpath:$kubectlpath:\${d/%:/}\"\n`;
zshScript += "export KUBECONFIG=\"$tempkubeconfig\"\n";
zshScript += "NO_PROXY=\",${NO_PROXY:-localhost},\"\n";
zshScript += "NO_PROXY=\"${NO_PROXY//,localhost,/,}\"\n";
zshScript += "NO_PROXY=\"${NO_PROXY//,127.0.0.1,/,}\"\n";
zshScript += "NO_PROXY=\"localhost,127.0.0.1${NO_PROXY%,}\"\n";
zshScript += `NO_PROXY=\",\${NO_PROXY:-localhost},\"\n`;
zshScript += `NO_PROXY=\"\${NO_PROXY//,localhost,/,}\"\n`;
zshScript += `NO_PROXY=\"\${NO_PROXY//,127.0.0.1,/,}\"\n`;
zshScript += `NO_PROXY=\"localhost,127.0.0.1\${NO_PROXY%,}\"\n`;
zshScript += "export NO_PROXY\n";
zshScript += "unset tempkubeconfig\n";
zshScript += "unset OLD_ZDOTDIR\n";

2
src/main/prometheus/provider-registry.ts
View File

@ -46,7 +46,7 @@ export abstract class PrometheusProvider {
protected async getFirstNamespacedServer(client: CoreV1Api, ...selectors: string[]): Promise<PrometheusService | undefined> {
try {
for (const selector of selectors) {
const { body: { items: [service] } } = await client.listServiceForAllNamespaces(null, null, null, selector);
const { body: { items: [service] }} = await client.listServiceForAllNamespaces(null, null, null, selector);
if (service) {
return {

2
src/main/router.ts
View File

@ -122,7 +122,7 @@ export class Router {
};
}
protected static async handleStaticFile({ params, response, raw: { req } }: LensApiRequest): Promise<void> {
protected static async handleStaticFile({ params, response, raw: { req }}: LensApiRequest): Promise<void> {
let filePath = params.path;
for (let retryCount = 0; retryCount < 5; retryCount += 1) {

2
src/main/routes/kubeconfig-route.ts
View File

@ -63,7 +63,7 @@ function generateKubeConfig(username: string, secret: V1Secret, cluster: Cluster
export class KubeconfigRoute {
static async routeServiceAccountRoute(request: LensApiRequest) {
const { params, response, cluster} = request;
const { params, response, cluster } = request;
const client = (await cluster.getProxyKubeconfig()).makeApiClient(CoreV1Api);
const secretList = await client.listNamespacedSecret(params.namespace);
const secret = secretList.body.items.find(secret => {

2
src/main/routes/version-route.ts
View File

@ -27,6 +27,6 @@ export class VersionRoute {
static async getVersion(request: LensApiRequest) {
const { response } = request;
respondJson(response, { version: getAppVersion()}, 200);
respondJson(response, { version: getAppVersion() }, 200);
}
}

2
src/migrations/cluster-store/2.4.1.ts
View File

@ -32,7 +32,7 @@ export default {
if (contextName === "__internal__") continue;
const cluster = value[1];
store.set(contextName, { kubeConfig: cluster.kubeConfig, icon: cluster.icon || null, preferences: cluster.preferences || {} });
store.set(contextName, { kubeConfig: cluster.kubeConfig, icon: cluster.icon || null, preferences: cluster.preferences || {}});
}
}
} as MigrationDeclaration;

4
src/migrations/hotbar-store/5.0.0-alpha.0.ts
View File

@ -28,9 +28,9 @@ export default {
version: "5.0.0-alpha.0",
run(store) {
const hotbar = getEmptyHotbar("default");
const { metadata: { uid, name, source } } = catalogEntity;
const { metadata: { uid, name, source }} = catalogEntity;
hotbar.items[0] = { entity: { uid, name, source } };
hotbar.items[0] = { entity: { uid, name, source }};
store.set("hotbars", [hotbar]);
}

12
src/migrations/hotbar-store/5.0.0-beta.10.ts
View File

@ -53,9 +53,9 @@ export default {
// Hotbars might be empty, if some of the previous migrations weren't run
if (hotbars.length === 0) {
const hotbar = getEmptyHotbar("default");
const { metadata: { uid, name, source } } = catalogEntity;
const { metadata: { uid, name, source }} = catalogEntity;
hotbar.items[0] = { entity: { uid, name, source } };
hotbar.items[0] = { entity: { uid, name, source }};
hotbars.push(hotbar);
}
@ -132,7 +132,7 @@ export default {
if (hotbars.every(hotbar => hotbar.items.every(item => item?.entity?.uid !== "catalog-entity"))) {
// note, we will add a new whole hotbar here called "default" if that was previously removed
const defaultHotbar = hotbars.find(hotbar => hotbar.name === "default");
const { metadata: { uid, name, source } } = catalogEntity;
const { metadata: { uid, name, source }} = catalogEntity;
if (defaultHotbar) {
const freeIndex = defaultHotbar.items.findIndex(isNull);
@ -142,15 +142,15 @@ export default {
// called "default" is full than overriding a hotbar item
const hotbar = getEmptyHotbar("initial");
hotbar.items[0] = { entity: { uid, name, source } };
hotbar.items[0] = { entity: { uid, name, source }};
hotbars.unshift(hotbar);
} else {
defaultHotbar.items[freeIndex] = { entity: { uid, name, source } };
defaultHotbar.items[freeIndex] = { entity: { uid, name, source }};
}
} else {
const hotbar = getEmptyHotbar("default");
hotbar.items[0] = { entity: { uid, name, source } };
hotbar.items[0] = { entity: { uid, name, source }};
hotbars.unshift(hotbar);
}
}

2
src/renderer/components/+apps-helm-charts/helm-chart-details.tsx
View File

@ -91,7 +91,7 @@ export class HelmChartDetails extends Component<Props> {
try {
this.abortController?.abort();
this.abortController = new AbortController();
const { chart: { name, repo } } = this.props;
const { chart: { name, repo }} = this.props;
const { readme } = await getChartDetails(repo, name, { version: chart.version, reqInit: { signal: this.abortController.signal }});
this.readme = readme;

2
src/renderer/components/+apps-helm-charts/helm-charts.tsx
View File

@ -50,7 +50,7 @@ export class HelmCharts extends Component<Props> {
}
get selectedChart() {
const { match: { params: { chartName, repo } } } = this.props;
const { match: { params: { chartName, repo }}} = this.props;
return helmChartStore.getByName(chartName, repo);
}

4
src/renderer/components/+apps-releases/releases.tsx
View File

@ -55,7 +55,7 @@ interface Props extends RouteComponentProps<ReleaseRouteParams> {
@observer
export class HelmReleases extends Component<Props> {
componentDidMount() {
const { match: { params: { namespace } } } = this.props;
const { match: { params: { namespace }}} = this.props;
if (namespace) {
namespaceStore.selectNamespaces(namespace);
@ -68,7 +68,7 @@ export class HelmReleases extends Component<Props> {
}
get selectedRelease() {
const { match: { params: { name, namespace } } } = this.props;
const { match: { params: { name, namespace }}} = this.props;
return releaseStore.items.find(release => {
return release.getName() == name && release.getNs() == namespace;

2
src/renderer/components/+catalog/catalog-entity.store.tsx
View File

@ -52,7 +52,7 @@ export class CatalogEntityStore extends ItemStore<CatalogEntityItem<CatalogEntit
watch() {
return disposer(
reaction(() => this.entities, () => this.loadAll()),
reaction(() => this.activeCategory, () => this.loadAll(), { delay: 100}),
reaction(() => this.activeCategory, () => this.loadAll(), { delay: 100 }),
);
}

4
src/renderer/components/+catalog/catalog.tsx
View File

@ -109,7 +109,7 @@ export class Catalog extends React.Component<Props> {
console.error(error);
Notifications.error(<p>Unknown category: {routeTab}</p>);
}
}, {fireImmediately: true}),
}, { fireImmediately: true }),
]);
// If active category is filtered out, automatically switch to the first category
@ -169,7 +169,7 @@ export class Catalog extends React.Component<Props> {
const activeCategory = this.categories.find(category => category.getId() === tabId);
if (activeCategory) {
navigate(catalogURL({ params: {group: activeCategory.spec.group, kind: activeCategory.spec.names.kind }}));
navigate(catalogURL({ params: { group: activeCategory.spec.group, kind: activeCategory.spec.names.kind }}));
} else {
navigate(catalogURL({ params: { group: browseCatalogTab }}));
}

11
src/renderer/components/+catalog/hotbar-toggle-menu-item.tsx
View File

@ -27,14 +27,17 @@ import type { CatalogEntity } from "../../api/catalog-entity";
export function HotbarToggleMenuItem(props: { entity: CatalogEntity, addContent: ReactNode, removeContent: ReactNode }) {
const store = HotbarStore.getInstance();
const add = () => store.addToHotbar(props.entity);
const remove = () => store.removeFromHotbar(props.entity.getId());
const [itemInHotbar, setItemInHotbar] = useState(store.isAddedToActive(props.entity));
return (
<MenuItem onClick={() => {
itemInHotbar ? remove() : add();
setItemInHotbar(!itemInHotbar);
if (itemInHotbar) {
store.removeFromHotbar(props.entity.getId());
setItemInHotbar(false);
} else {
store.addToHotbar(props.entity);
setItemInHotbar(true);
}
}}>
{itemInHotbar ? props.removeContent : props.addContent }
</MenuItem>

2
src/renderer/components/+config-resource-quotas/resource-quota-details.tsx
View File

@ -48,7 +48,7 @@ function transformUnit(name: string, value: string): number {
}
function renderQuotas(quota: ResourceQuota): JSX.Element[] {
const { hard = {}, used = {} } = quota.status;
const { hard = {}, used = {}} = quota.status;
return Object.entries(hard)
.filter(([name]) => used[name])

2
src/renderer/components/+custom-resources/crd-details.tsx
View File

@ -153,7 +153,7 @@ export class CRDDetails extends React.Component<Props> {
{validation &&
<>
<DrawerTitle title="Validation"/>
<MonacoEditor readOnly value={validation}/>
<MonacoEditor readOnly value={validation}/>
</>
}
</div>

2
src/renderer/components/+custom-resources/crd-resource-details.tsx
View File

@ -96,7 +96,7 @@ export class CrdResourceDetails extends React.Component<Props> {
}
render() {
const { props: { object, crd } } = this;
const { props: { object, crd }} = this;
if (!object || !crd) {
return null;

6
src/renderer/components/+extensions/extensions.tsx
View File

@ -246,7 +246,7 @@ async function createTempFilesAndValidate({ fileName, dataP }: InstallRequest):
}
async function unpackExtension(request: InstallRequestValidated, disposeDownloading?: Disposer) {
const { id, fileName, tempFile, manifest: { name, version } } = request;
const { id, fileName, tempFile, manifest: { name, version }} = request;
ExtensionInstallationStateStore.setInstalling(id);
disposeDownloading?.();
@ -386,7 +386,7 @@ async function attemptInstall(request: InstallRequest, d?: ExtendableDisposer):
// install extension if not yet exists
await unpackExtension(validatedRequest, dispose);
} else {
const { manifest: { version: oldVersion } } = ExtensionLoader.getInstance().getExtension(validatedRequest.id);
const { manifest: { version: oldVersion }} = ExtensionLoader.getInstance().getExtension(validatedRequest.id);
// otherwise confirmation required (re-install / update)
const removeNotification = Notifications.info(
@ -451,7 +451,7 @@ async function installFromInput(input: string) {
await attemptInstall({ fileName, dataP: readFileNotify(input) });
} else if (InputValidators.isExtensionNameInstall.validate(input)) {
const [{ groups: { name, version } }] = [...input.matchAll(InputValidators.isExtensionNameInstallRegex)];
const [{ groups: { name, version }}] = [...input.matchAll(InputValidators.isExtensionNameInstallRegex)];
await attemptInstallByInfo({ name, version });
}

2
src/renderer/components/+extensions/installed-extensions.tsx
View File

@ -106,7 +106,7 @@ export const InstalledExtensions = observer(({ extensions, uninstall, enable, di
),
version,
status: (
<div className={cssNames({[styles.enabled]: isEnabled, [styles.invalid]: !isCompatible})}>
<div className={cssNames({ [styles.enabled]: isEnabled, [styles.invalid]: !isCompatible })}>
{getStatus(extension)}
</div>
),

4
src/renderer/components/+network-endpoints/endpoint-subset-list.tsx
View File

@ -23,7 +23,7 @@ import "./endpoint-subset-list.scss";
import React from "react";
import { observer } from "mobx-react";
import { EndpointSubset, Endpoint, EndpointAddress} from "../../../common/k8s-api/endpoints";
import { EndpointSubset, Endpoint, EndpointAddress } from "../../../common/k8s-api/endpoints";
import { Table, TableCell, TableHead, TableRow } from "../table";
import { boundMethod } from "../../utils";
import { apiManager } from "../../../common/k8s-api/api-manager";
@ -47,7 +47,7 @@ export class EndpointSubsetList extends React.Component<Props> {
@boundMethod
getNotReadyAddressTableRow(ip: string) {
const { subset} = this.props;
const { subset } = this.props;
const address = subset.getNotReadyAddresses().find(address => address.getId() == ip);
return this.renderAddressTableRow(address);

2
src/renderer/components/+network-ingresses/ingress-details.tsx
View File

@ -62,7 +62,7 @@ export class IngressDetails extends React.Component<Props> {
}
renderPaths(ingress: Ingress) {
const { spec: { rules } } = ingress;
const { spec: { rules }} = ingress;
if (!rules || !rules.length) return null;

2
src/renderer/components/+network-policies/network-policy-details.tsx
View File

@ -95,7 +95,7 @@ export class NetworkPolicyDetails extends React.Component<Props> {
<>
<SubTitle title="To"/>
{to.map(item => {
const { ipBlock: { cidr, except } = {} } = item;
const { ipBlock: { cidr, except } = {}} = item;
if (!cidr) return null;

2
src/renderer/components/+network-port-forwards/port-forwards.tsx
View File

@ -54,7 +54,7 @@ export class PortForwards extends React.Component<Props> {
}
get selectedPortForward() {
const { match: { params: { forwardport } } } = this.props;
const { match: { params: { forwardport }}} = this.props;
return portForwardStore.getById(forwardport);
}

9
src/renderer/components/+network-services/service-details.tsx
View File

@ -67,6 +67,11 @@ export class ServiceDetails extends React.Component<Props> {
const { spec } = service;
const endpoint = endpointStore.getByName(service.getName(), service.getNs());
const externalIps = service.getExternalIps();
if (externalIps.length === 0 && spec?.externalName) {
externalIps.push(spec.externalName);
}
return (
<div className="ServicesDetails">
@ -106,9 +111,9 @@ export class ServiceDetails extends React.Component<Props> {
{service.getIpFamilyPolicy()}
</DrawerItem>
{service.getExternalIps().length > 0 && (
{externalIps.length > 0 && (
<DrawerItem name="External IPs">
{service.getExternalIps().map(ip => <div key={ip}>{ip}</div>)}
{externalIps.map(ip => <div key={ip}>{ip}</div>)}
</DrawerItem>
)}

32
src/renderer/components/+network-services/services.tsx
View File

@ -81,18 +81,26 @@ export class Services extends React.Component<Props> {
{ title: "Age", className: "age", sortBy: columnId.age, id: columnId.age },
{ title: "Status", className: "status", sortBy: columnId.status, id: columnId.status },
]}
renderTableContents={service => [
service.getName(),
<KubeObjectStatusIcon key="icon" object={service} />,
service.getNs(),
service.getType(),
service.getClusterIp(),
service.getPorts().join(", "),
service.getExternalIps().join(", ") || "-",
service.getSelector().map(label => <Badge key={label} label={label}/>),
service.getAge(),
{ title: service.getStatus(), className: service.getStatus().toLowerCase() },
]}
renderTableContents={service => {
const externalIps = service.getExternalIps();
if (externalIps.length === 0 && service.spec?.externalName) {
externalIps.push(service.spec.externalName);
}
return [
service.getName(),
<KubeObjectStatusIcon key="icon" object={service} />,
service.getNs(),
service.getType(),
service.getClusterIp(),
service.getPorts().join(", "),
externalIps.join(", ") || "-",
service.getSelector().map(label => <Badge key={label} label={label} />),
service.getAge(),
{ title: service.getStatus(), className: service.getStatus().toLowerCase() },
];
}}
/>
);
}

6
src/renderer/components/+preferences/add-helm-repo-dialog.tsx
View File

@ -53,7 +53,7 @@ const dialogState = observable.object({
@observer
export class AddHelmRepoDialog extends React.Component<Props> {
private emptyRepo = {name: "", url: "", username: "", password: "", insecureSkipTlsVerify: false, caFile:"", keyFile: "", certFile: ""};
private emptyRepo = { name: "", url: "", username: "", password: "", insecureSkipTlsVerify: false, caFile:"", keyFile: "", certFile: "" };
private static keyExtensions = ["key", "keystore", "jks", "p12", "pfx", "pem"];
private static certExtensions = ["crt", "cer", "ca-bundle", "p7b", "p7c" , "p7s", "p12", "pfx", "pem"];
@ -96,7 +96,7 @@ export class AddHelmRepoDialog extends React.Component<Props> {
buttonLabel: `Use file`,
filters: [
fileFilter,
{ name: "Any", extensions: ["*"]}
{ name: "Any", extensions: ["*"] }
]
});
@ -128,7 +128,7 @@ export class AddHelmRepoDialog extends React.Component<Props> {
/>
<Icon
material="folder"
onClick={() => this.selectFileDialog(fileType, {name: placeholder, extensions: fileExtensions})}
onClick={() => this.selectFileDialog(fileType, { name: placeholder, extensions: fileExtensions })}
tooltip="Browse"
/>
</div>);

2
src/renderer/components/+preferences/kubeconfig-syncs.tsx
View File

@ -46,7 +46,7 @@ interface Value {
info: SyncInfo;
}
async function getMapEntry({ filePath, ...data}: KubeconfigSyncEntry): Promise<[string, Value]> {
async function getMapEntry({ filePath, ...data }: KubeconfigSyncEntry): Promise<[string, Value]> {
try {
// stat follows the stat(2) linux syscall spec, namely it follows symlinks
const stats = await fse.stat(filePath);

2
src/renderer/components/+preferences/preferences.tsx
View File

@ -106,7 +106,7 @@ export class Preferences extends React.Component {
}
}
export function ExtensionSettings({ title, id, components: { Hint, Input } }: RegisteredAppPreference) {
export function ExtensionSettings({ title, id, components: { Hint, Input }}: RegisteredAppPreference) {
return (
<React.Fragment>
<section id={id} className="small">

2
src/renderer/components/+preferences/removable-item.tsx
View File

@ -31,7 +31,7 @@ interface Props extends DOMAttributes<any>{
className?: string;
}
export function RemovableItem({icon, onRemove, children, className, ...rest}: Props) {
export function RemovableItem({ icon, onRemove, children, className, ...rest }: Props) {
return (
<div className={cssNames(styles.item, "flex gaps align-center justify-space-between", className)} {...rest}>
{icon && (

2
src/renderer/components/+user-management/+service-accounts/details.tsx
View File

@ -59,7 +59,7 @@ export class ServiceAccountsDetails extends React.Component<Props> {
});
this.secrets = await Promise.all(secrets);
const imagePullSecrets = serviceAccount.getImagePullSecrets().map(async({ name }) => {
const imagePullSecrets = serviceAccount.getImagePullSecrets().map(async ({ name }) => {
return secretsStore.load({ name, namespace }).catch(() => this.generateDummySecretObject(name));
});

2
src/renderer/components/+workloads-deployments/deployment-scale-dialog.test.tsx
View File

@ -39,7 +39,7 @@ const dummyDeployment: Deployment = {
selfLink: "link",
spec: {
replicas: 1,
selector: { matchLabels: { dummy: "label" } },
selector: { matchLabels: { dummy: "label" }},
template: {
metadata: {
labels: { dummy: "label" },

6
src/renderer/components/+workloads-deployments/deployment-scale-dialog.tsx
View File

@ -118,12 +118,14 @@ export class DeploymentScaleDialog extends Component<Props> {
}
};
private readonly scaleMin = 0;
desiredReplicasUp = () => {
this.desiredReplicas < this.scaleMax && this.desiredReplicas++;
this.desiredReplicas = Math.min(this.scaleMax, this.desiredReplicas + 1);
};
desiredReplicasDown = () => {
this.desiredReplicas > 0 && this.desiredReplicas--;
this.desiredReplicas = Math.max(this.scaleMin, this.desiredReplicas - 1);
};
renderContents() {

37
src/renderer/components/+workloads-pods/pod-container-env.tsx
View File

@ -40,30 +40,23 @@ interface Props {
export const ContainerEnvironment = observer((props: Props) => {
const { container: { env, envFrom }, namespace } = props;
useEffect(
() =>
autorun(() => {
env && env.forEach(variable => {
const { valueFrom } = variable;
useEffect( () => autorun(() => {
for (const { valueFrom } of env ?? []) {
if (valueFrom?.configMapKeyRef) {
configMapsStore.load({ name: valueFrom.configMapKeyRef.name, namespace });
}
}
if (valueFrom && valueFrom.configMapKeyRef) {
configMapsStore.load({ name: valueFrom.configMapKeyRef.name, namespace });
}
});
envFrom && envFrom.forEach(item => {
const { configMapRef, secretRef } = item;
for (const { configMapRef, secretRef } of envFrom ?? []) {
if (secretRef?.name) {
secretsStore.load({ name: secretRef.name, namespace });
}
if (secretRef && secretRef.name) {
secretsStore.load({ name: secretRef.name, namespace });
}
if (configMapRef && configMapRef.name) {
configMapsStore.load({ name: configMapRef.name, namespace });
}
});
}),
[]
);
if (configMapRef?.name) {
configMapsStore.load({ name: configMapRef.name, namespace });
}
}
}), []);
const renderEnv = () => {
const orderedEnv = _.sortBy(env, "name");

2
src/renderer/components/+workloads-pods/pod-details-affinities.tsx
View File

@ -41,7 +41,7 @@ export class PodDetailsAffinities extends React.Component<Props> {
<DrawerItem name="Affinities" className="PodDetailsAffinities">
<DrawerParamToggler label={affinitiesNum}>
<div style={{ height: 200 }}>
<MonacoEditor readOnly value={yaml.dump(affinities)}/>
<MonacoEditor readOnly value={yaml.dump(affinities)}/>
</div>
</DrawerParamToggler>
</DrawerItem>

6
src/renderer/components/+workloads-replicasets/replicaset-scale-dialog.tsx
View File

@ -118,12 +118,14 @@ export class ReplicaSetScaleDialog extends Component<Props> {
}
};
private readonly scaleMin = 0;
desiredReplicasUp = () => {
this.desiredReplicas < this.scaleMax && this.desiredReplicas++;
this.desiredReplicas = Math.min(this.scaleMax, this.desiredReplicas + 1);
};
desiredReplicasDown = () => {
this.desiredReplicas > 0 && this.desiredReplicas--;
this.desiredReplicas = Math.max(this.scaleMin, this.desiredReplicas - 1);
};
renderContents() {

6
src/renderer/components/+workloads-statefulsets/statefulset-scale-dialog.tsx
View File

@ -117,12 +117,14 @@ export class StatefulSetScaleDialog extends Component<Props> {
}
};
private readonly scaleMin = 0;
desiredReplicasUp = () => {
this.desiredReplicas < this.scaleMax && this.desiredReplicas++;
this.desiredReplicas = Math.min(this.scaleMax, this.desiredReplicas + 1);
};
desiredReplicasDown = () => {
this.desiredReplicas > 0 && this.desiredReplicas--;
this.desiredReplicas = Math.max(this.scaleMin, this.desiredReplicas - 1);
};
renderContents() {

6
src/renderer/components/__tests__/deployments.store.test.ts
View File

@ -60,7 +60,7 @@ const runningDeployment = new Deployment({
runningDeployment.spec = {
replicas: 1,
selector: { matchLabels: {} },
selector: { matchLabels: {}},
strategy: {
type: "test",
rollingUpdate: {
@ -91,7 +91,7 @@ const failedDeployment = new Deployment({
failedDeployment.spec = {
replicas: 1,
selector: { matchLabels: {} },
selector: { matchLabels: {}},
strategy: {
type: "test",
rollingUpdate: {
@ -122,7 +122,7 @@ const pendingDeployment = new Deployment({
pendingDeployment.spec = {
replicas: 1,
selector: { matchLabels: {} },
selector: { matchLabels: {}},
strategy: {
type: "test",
rollingUpdate: {

2
src/renderer/components/cluster-manager/cluster-manager.tsx
View File

@ -67,7 +67,7 @@ export class ClusterManager extends React.Component {
<Route component={EntitySettings} {...routes.entitySettingsRoute} />
{
GlobalPageRegistry.getInstance().getItems()
.map(({ url, components: { Page } }) => (
.map(({ url, components: { Page }}) => (
<Route key={url} path={url} component={Page} />
))
}

2
src/renderer/components/cluster-settings/cluster-settings.tsx
View File

@ -119,7 +119,7 @@ export function MetricsSettings({ entity }: EntitySettingViewProps) {
);
}
export function NodeShellSettings({entity}: EntitySettingViewProps) {
export function NodeShellSettings({ entity }: EntitySettingViewProps) {
const cluster = getClusterForEntity(entity);
if(!cluster) {

6
src/renderer/components/drawer/drawer.tsx
View File

@ -109,7 +109,7 @@ export class Drawer extends React.Component<DrawerProps> {
};
onClickOutside = (evt: MouseEvent) => {
const { contentElem, mouseDownTarget, close, props: { open } } = this;
const { contentElem, mouseDownTarget, close, props: { open }} = this;
if (!open || evt.defaultPrevented || contentElem.contains(mouseDownTarget)) {
return;
@ -139,9 +139,9 @@ export class Drawer extends React.Component<DrawerProps> {
const k8sObjName = title.split(":")[1] || title; // copy whole if no :
clipboard.writeText(k8sObjName.trim());
this.setState({isCopied: true});
this.setState({ isCopied: true });
setTimeout(() => {
this.setState({isCopied: false});
this.setState({ isCopied: false });
}, 3000);
};

2
src/renderer/components/hotbar/__tests__/hotbar-remove-command.test.tsx
View File

@ -47,7 +47,7 @@ jest.mock("electron", () => ({
AppPaths.init();
const mockHotbars: {[id: string]: any} = {
const mockHotbars: { [id: string]: any } = {
"1": {
id: "1",
name: "Default",

2
src/renderer/components/hotbar/hotbar-entity-icon.tsx
View File

@ -74,7 +74,7 @@ export class HotbarEntityIcon extends React.Component<Props> {
return null;
}
const className = cssNames("led", { online: this.props.entity.status.phase === LensKubernetesClusterStatus.CONNECTED}); // TODO: make it more generic
const className = cssNames("led", { online: this.props.entity.status.phase === LensKubernetesClusterStatus.CONNECTED }); // TODO: make it more generic
return <div className={className} />;
}

4
src/renderer/components/hotbar/hotbar-icon.tsx
View File

@ -65,7 +65,7 @@ function onMenuItemClick(menuItem: CatalogEntityContextMenu) {
}
}
export const HotbarIcon = observer(({menuItems = [], size = 40, tooltip, ...props}: HotbarIconProps) => {
export const HotbarIcon = observer(({ menuItems = [], size = 40, tooltip, ...props }: HotbarIconProps) => {
const { uid, title, src, material, active, className, source, disabled, onMenuOpen, onClick, children, ...rest } = props;
const id = `hotbarIcon-${uid}`;
const [menuOpen, setMenuOpen] = useState(false);
@ -104,7 +104,7 @@ export const HotbarIcon = observer(({menuItems = [], size = 40, tooltip, ...prop
className="HotbarIconMenu"
isOpen={menuOpen}
toggleEvent="contextmenu"
position={{right: true, bottom: true }} // FIXME: position does not work
position={{ right: true, bottom: true }} // FIXME: position does not work
open={() => {
onMenuOpen?.();
toggleMenu();

2
src/renderer/components/kube-object-menu/kube-object-menu.tsx
View File

@ -89,7 +89,7 @@ export class KubeObjectMenu<T extends KubeObject> extends React.Component<KubeOb
return KubeObjectMenuRegistry
.getInstance()
.getItemsForKind(object.kind, object.apiVersion)
.map(({components: { MenuItem }}, index) => (
.map(({ components: { MenuItem }}, index) => (
<MenuItem
object={object}
key={`menu-item-${index}`}

2
src/renderer/components/kubeconfig-dialog/kubeconfig-dialog.tsx
View File

@ -127,7 +127,7 @@ export class KubeConfigDialog extends React.Component<Props> {
>
<Wizard header={header}>
<WizardStep customButtons={buttons} prev={this.close}>
<MonacoEditor readOnly={true} value={yamlConfig}/>
<MonacoEditor readOnly={true} value={yamlConfig}/>
<textarea
className="config-copy"
readOnly defaultValue={yamlConfig}

2
src/renderer/components/layout/sidebar.tsx
View File

@ -86,7 +86,7 @@ export class Sidebar extends React.Component<Props> {
return Object.entries(crdStore.groups).map(([group, crds]) => {
const id = `crd-group:${group}`;
const crdGroupsPageUrl = routes.crdURL({ query: { groups: group } });
const crdGroupsPageUrl = routes.crdURL({ query: { groups: group }});
return (
<SidebarItem key={id} id={id} text={group} url={crdGroupsPageUrl}>

25
src/renderer/components/menu/menu.tsx
View File

@ -90,6 +90,10 @@ export class Menu extends React.Component<MenuProps, State> {
return !!this.props.isOpen;
}
get isClosed() {
return !this.isOpen;
}
componentDidMount() {
if (!this.props.usePortal) {
const parent = this.elem.parentElement;
@ -202,19 +206,32 @@ export class Menu extends React.Component<MenuProps, State> {
};
open() {
if (this.isOpen) return;
if (this.isOpen) {
return;
}
this.props.open();
this.refreshPosition();
if (this.props.autoFocus) this.focusNextItem();
if (this.props.autoFocus) {
this.focusNextItem();
}
}
close() {
if (!this.isOpen) return;
if (this.isClosed) {
return;
}
this.props.close();
}
toggle() {
this.isOpen ? this.close() : this.open();
if (this.isOpen) {
this.close();
} else {
this.open();
}
}
onKeyDown(evt: KeyboardEvent) {

2
src/renderer/components/table/react-table.tsx
View File

@ -102,7 +102,7 @@ export function ReactTable({ columns, data, headless }: Props) {
</div>}
<div {...getTableBodyProps()}>
{rows.map((row, index) => RenderRow({index}))}
{rows.map((row, index) => RenderRow({ index }))}
</div>
</div>
);

2
src/renderer/components/tree-view/tree-view.tsx
View File

@ -85,7 +85,7 @@ export function RecursiveTreeView({ data }: Props) {
nodeId={node.id}
label={node.name}
onLabelClick={(event) => onLabelClick(event, node.id)}
className={cssNames({selected: node.selected})}
className={cssNames({ selected: node.selected })}
title={node.name}
>
{Array.isArray(node.children) ? node.children.map((node) => renderTree([node])) : null}

2
src/renderer/initializers/welcome-menu-registry.ts
View File

@ -29,7 +29,7 @@ export function initWelcomeMenuRegistry() {
{
title: "Browse Clusters in Catalog",
icon: "view_list",
click: () => navigate(catalogURL({ params: { group: "entity.k8slens.dev", kind: "KubernetesCluster" } } )),
click: () => navigate(catalogURL({ params: { group: "entity.k8slens.dev", kind: "KubernetesCluster" }} )),
}
]);
}

16
src/renderer/protocol-handler/app-handlers.tsx
View File

@ -50,7 +50,7 @@ export function bindProtocolAddRouteHandlers() {
.addInternalHandler("/landing", () => {
navigate(routes.catalogURL());
})
.addInternalHandler("/landing/view/:group/:kind", ({ pathname: { group, kind } }) => {
.addInternalHandler("/landing/view/:group/:kind", ({ pathname: { group, kind }}) => {
navigate(routes.catalogURL({
params: {
group, kind
@ -60,11 +60,11 @@ export function bindProtocolAddRouteHandlers() {
.addInternalHandler("/cluster", () => {
navigate(routes.addClusterURL());
})
.addInternalHandler("/entity/:entityId/settings", ({ pathname: { entityId } }) => {
.addInternalHandler("/entity/:entityId/settings", ({ pathname: { entityId }}) => {
const entity = catalogEntityRegistry.getById(entityId);
if (entity) {
navigate(routes.entitySettingsURL({ params: { entityId } }));
navigate(routes.entitySettingsURL({ params: { entityId }}));
} else {
Notifications.shortInfo(
<p>
@ -74,11 +74,11 @@ export function bindProtocolAddRouteHandlers() {
}
})
// Handlers below are deprecated and only kept for backward compact purposes
.addInternalHandler("/cluster/:clusterId", ({ pathname: { clusterId } }) => {
.addInternalHandler("/cluster/:clusterId", ({ pathname: { clusterId }}) => {
const cluster = ClusterStore.getInstance().getById(clusterId);
if (cluster) {
navigate(routes.clusterViewURL({ params: { clusterId } }));
navigate(routes.clusterViewURL({ params: { clusterId }}));
} else {
Notifications.shortInfo(
<p>
@ -87,11 +87,11 @@ export function bindProtocolAddRouteHandlers() {
);
}
})
.addInternalHandler("/cluster/:clusterId/settings", ({ pathname: { clusterId } }) => {
.addInternalHandler("/cluster/:clusterId/settings", ({ pathname: { clusterId }}) => {
const cluster = ClusterStore.getInstance().getById(clusterId);
if (cluster) {
navigate(routes.entitySettingsURL({ params: { entityId: clusterId } }));
navigate(routes.entitySettingsURL({ params: { entityId: clusterId }}));
} else {
Notifications.shortInfo(
<p>
@ -103,7 +103,7 @@ export function bindProtocolAddRouteHandlers() {
.addInternalHandler("/extensions", () => {
navigate(routes.extensionsURL());
})
.addInternalHandler(`/extensions/install${LensProtocolRouter.ExtensionUrlSchema}`, ({ pathname, search: { version } }) => {
.addInternalHandler(`/extensions/install${LensProtocolRouter.ExtensionUrlSchema}`, ({ pathname, search: { version }}) => {
const name = [
pathname[EXTENSION_PUBLISHER_MATCH],
pathname[EXTENSION_NAME_MATCH],

6
src/renderer/utils/interval.ts
View File

@ -28,7 +28,7 @@ export function interval(timeSec = 1, callback: IntervalCallback, autoRun = fals
let timer = -1;
let isRunning = false;
const intervalManager = {
start (runImmediately = false) {
start(runImmediately = false) {
if (isRunning) return;
const tick = () => callback(++count);
@ -36,12 +36,12 @@ export function interval(timeSec = 1, callback: IntervalCallback, autoRun = fals
timer = window.setInterval(tick, 1000 * timeSec);
if (runImmediately) tick();
},
stop () {
stop() {
count = 0;
isRunning = false;
clearInterval(timer);
},
restart (runImmediately = false) {
restart(runImmediately = false) {
this.stop();
this.start(runImmediately);
},

2
webpack.main.ts
View File

@ -28,7 +28,7 @@ import ProgressBarPlugin from "progress-bar-webpack-plugin";
import * as vars from "./src/common/vars";
import getTSLoader from "./src/common/getTSLoader";
const configs: {(): webpack.Configuration}[] = [];
const configs: { (): webpack.Configuration }[] = [];
configs.push((): webpack.Configuration => {
console.info("WEBPACK:main", vars);

16
yarn.lock
View File

@ -1856,10 +1856,10 @@
resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
"@types/spdy@^3.4.4":
version "3.4.4"
resolved "https://registry.yarnpkg.com/@types/spdy/-/spdy-3.4.4.tgz#3282fd4ad8c4603aa49f7017dd520a08a345b2bc"
integrity sha512-N9LBlbVRRYq6HgYpPkqQc3a9HJ/iEtVZToW6xlTtJiMhmRJ7jJdV7TaZQJw/Ve/1ePUsQiCTDc4JMuzzag94GA==
"@types/spdy@^3.4.5":
version "3.4.5"
resolved "https://registry.yarnpkg.com/@types/spdy/-/spdy-3.4.5.tgz#194dc132312ddcd31e8053789ae83a7bb32a8aaf"
integrity sha512-/33fIRK/aqkKNxg9BSjpzt1ucmvPremgeDywm9z2C2mOlIh5Ljjvgc3UhQHqwXsSLDLHPT9jlsnrjKQ1XiVJzA==
dependencies:
"@types/node" "*"
@ -14602,10 +14602,10 @@ xterm-addon-fit@^0.5.0:
resolved "https://registry.yarnpkg.com/xterm-addon-fit/-/xterm-addon-fit-0.5.0.tgz#2d51b983b786a97dcd6cde805e700c7f913bc596"
integrity sha512-DsS9fqhXHacEmsPxBJZvfj2la30Iz9xk+UKjhQgnYNkrUIN5CYLbw7WEfz117c7+S86S/tpHPfvNxJsF5/G8wQ==
xterm@^4.12.0:
version "4.12.0"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.12.0.tgz#db09b425b4dcae5b96f8cbbaaa93b3bc60997ca9"
integrity sha512-K5mF/p3txUV18mjiZFlElagoHFpqXrm5OYHeoymeXSu8GG/nMaOO/+NRcNCwfdjzAbdQ5VLF32hEHiWWKKm0bw==
xterm@^4.14.1:
version "4.14.1"
resolved "https://registry.yarnpkg.com/xterm/-/xterm-4.14.1.tgz#6884cb8fb3b83353b1a98139ea23daedf8e35796"
integrity sha512-jgzNg5BuGPwq5/M4dGnmbghZvHx2jaj+9crSEt15bV34Za49VziBmCu7zIy88zUKKiGTxeo7aVzirFSJArIMFw==
y18n@^3.2.1:
version "3.2.2"