From 78d985024d47a0bfdbbc8a73205d8e90912eb322 Mon Sep 17 00:00:00 2001 From: DingRui Yang Date: Mon, 20 Jun 2022 21:34:00 +0800 Subject: [PATCH 1/8] Update README.md (#5675) Fix getting started link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cb9f44b35d..5e97035d0f 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ Lens IDE a standalone application for MacOS, Windows and Linux operating systems ## Installation -See [Getting Started](https://docs.k8slens.dev/latest/getting-started/) page. +See [Getting Started](https://docs.k8slens.dev/main/getting-started/install-lens/) page. ## Development From f8b008612fa2a243c08352f24c06f9f9b28166b2 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Mon, 20 Jun 2022 18:49:59 +0300 Subject: [PATCH 2/8] Trivial tweaks accidentally left from other PR (#5679) Co-authored-by: Mikko Aspiala --- .../extension-installation-counter.injectable.ts | 12 ------------ .../extension-loader/extension-loader.injectable.ts | 2 -- src/extensions/extension-loader/extension-loader.ts | 9 ++++----- .../extension/extension.injectable.ts | 2 +- .../test-utils/get-application-builder.tsx | 4 ++-- 5 files changed, 7 insertions(+), 22 deletions(-) delete mode 100644 src/extensions/extension-loader/extension-installation-counter.injectable.ts diff --git a/src/extensions/extension-loader/extension-installation-counter.injectable.ts b/src/extensions/extension-loader/extension-installation-counter.injectable.ts deleted file mode 100644 index 2510a679dc..0000000000 --- a/src/extensions/extension-loader/extension-installation-counter.injectable.ts +++ /dev/null @@ -1,12 +0,0 @@ -/** - * Copyright (c) OpenLens Authors. All rights reserved. - * Licensed under MIT License. See LICENSE in root directory for more information. - */ -import { getInjectable } from "@ogre-tools/injectable"; - -const extensionInstallationCounterInjectable = getInjectable({ - id: "extension-installation-counter", - instantiate: () => new Map(), -}); - -export default extensionInstallationCounterInjectable; diff --git a/src/extensions/extension-loader/extension-loader.injectable.ts b/src/extensions/extension-loader/extension-loader.injectable.ts index a1c592ffdd..7fe1cd5421 100644 --- a/src/extensions/extension-loader/extension-loader.injectable.ts +++ b/src/extensions/extension-loader/extension-loader.injectable.ts @@ -5,7 +5,6 @@ import { getInjectable } from "@ogre-tools/injectable"; import { ExtensionLoader } from "./extension-loader"; import updateExtensionsStateInjectable from "./update-extensions-state/update-extensions-state.injectable"; -import extensionInstallationCounterInjectable from "./extension-installation-counter.injectable"; import { createExtensionInstanceInjectionToken } from "./create-extension-instance.token"; import extensionInstancesInjectable from "./extension-instances.injectable"; import type { LensExtension } from "../lens-extension"; @@ -17,7 +16,6 @@ const extensionLoaderInjectable = getInjectable({ instantiate: (di) => new ExtensionLoader({ updateExtensionsState: di.inject(updateExtensionsStateInjectable), createExtensionInstance: di.inject(createExtensionInstanceInjectionToken), - extensionInstallationCounter: di.inject(extensionInstallationCounterInjectable), extensionInstances: di.inject(extensionInstancesInjectable), getExtension: (instance: LensExtension) => di.inject(extensionInjectable, instance), }), diff --git a/src/extensions/extension-loader/extension-loader.ts b/src/extensions/extension-loader/extension-loader.ts index 9ed691002d..68399dc6ad 100644 --- a/src/extensions/extension-loader/extension-loader.ts +++ b/src/extensions/extension-loader/extension-loader.ts @@ -30,7 +30,6 @@ const logModule = "[EXTENSIONS-LOADER]"; interface Dependencies { updateExtensionsState: (extensionsState: Record) => void; createExtensionInstance: CreateExtensionInstance; - readonly extensionInstallationCounter: Map; readonly extensionInstances: ObservableMap; getExtension: (instance: LensExtension) => Extension; } @@ -171,9 +170,9 @@ export class ExtensionLoader { try { instance.disable(); - const registeredExtension = this.dependencies.getExtension(instance); + const extension = this.dependencies.getExtension(instance); - registeredExtension.deregister(); + extension.deregister(); this.onRemoveExtensionId.emit(instance.id); this.dependencies.extensionInstances.delete(lensExtensionId); @@ -360,9 +359,9 @@ export class ExtensionLoader { ); extensions.forEach(({ instance }) => { - const getExtension = this.dependencies.getExtension(instance); + const extension = this.dependencies.getExtension(instance); - getExtension.register(); + extension.register(); }); // Return ExtensionLoading[] diff --git a/src/extensions/extension-loader/extension/extension.injectable.ts b/src/extensions/extension-loader/extension/extension.injectable.ts index 1473c8db12..ba1bb6aea8 100644 --- a/src/extensions/extension-loader/extension/extension.injectable.ts +++ b/src/extensions/extension-loader/extension/extension.injectable.ts @@ -43,7 +43,7 @@ const extensionInjectable = getInjectable({ }, lifecycle: lifecycleEnum.keyedSingleton({ - getInstanceKey: (di, extension: LensExtension) => extension, + getInstanceKey: (di, instance: LensExtension) => instance, }), }); diff --git a/src/renderer/components/test-utils/get-application-builder.tsx b/src/renderer/components/test-utils/get-application-builder.tsx index 32a4bba41f..ae54d4f71c 100644 --- a/src/renderer/components/test-utils/get-application-builder.tsx +++ b/src/renderer/components/test-utils/get-application-builder.tsx @@ -543,9 +543,9 @@ const disableExtensionsFor = ( extensionInstances.forEach((instance) => { const extension = getExtension(instance); - extension.deregister(); - runInAction(() => { + extension.deregister(); + extensionState.delete(extension); }); }); From dce7e89878ab520e49a2bbe99b802b5f69b7c282 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 11:51:52 -0400 Subject: [PATCH 3/8] Bump @types/node-fetch from 2.6.1 to 2.6.2 (#5647) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 04543ae784..34edff0b63 100644 --- a/package.json +++ b/package.json @@ -321,7 +321,7 @@ "@types/mini-css-extract-plugin": "^2.4.0", "@types/mock-fs": "^4.13.1", "@types/node": "^16.11.40", - "@types/node-fetch": "^2.6.1", + "@types/node-fetch": "^2.6.2", "@types/npm": "^2.0.32", "@types/proper-lockfile": "^4.1.2", "@types/randomcolor": "^0.5.6", diff --git a/yarn.lock b/yarn.lock index 7e4429e9a0..18038b43af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2045,10 +2045,10 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== -"@types/node-fetch@^2.6.1": - version "2.6.1" - resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.1.tgz#8f127c50481db65886800ef496f20bbf15518975" - integrity sha512-oMqjURCaxoSIsHSr1E47QHzbmzNR5rK8McHuNb11BOM9cHcIK3Avy0s/b2JlXHoQGTYS3NsvWzV1M0iK7l0wbA== +"@types/node-fetch@^2.6.2": + version "2.6.2" + resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.6.2.tgz#d1a9c5fd049d9415dce61571557104dec3ec81da" + integrity sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A== dependencies: "@types/node" "*" form-data "^3.0.0" From 0a95eda658deb0b8abf9be16c662d42142bf7f23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 13:54:31 -0400 Subject: [PATCH 4/8] Bump mini-css-extract-plugin from 2.6.0 to 2.6.1 (#5649) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 34edff0b63..c77f2be693 100644 --- a/package.json +++ b/package.json @@ -386,7 +386,7 @@ "jest-fetch-mock": "^3.0.3", "jest-mock-extended": "^2.0.6", "make-plural": "^6.2.2", - "mini-css-extract-plugin": "^2.6.0", + "mini-css-extract-plugin": "^2.6.1", "mock-http": "^1.1.0", "node-gyp": "7.1.2", "node-loader": "^2.0.0", diff --git a/yarn.lock b/yarn.lock index 18038b43af..4be5eb6e44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8972,10 +8972,10 @@ mini-create-react-context@^0.4.0: "@babel/runtime" "^7.12.1" tiny-warning "^1.0.3" -mini-css-extract-plugin@*, mini-css-extract-plugin@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.0.tgz#578aebc7fc14d32c0ad304c2c34f08af44673f5e" - integrity sha512-ndG8nxCEnAemsg4FSgS+yNyHKgkTB4nPKqCOgh65j3/30qqC5RaSQQXMm++Y6sb6E1zRSxPkztj9fqxhS1Eo6w== +mini-css-extract-plugin@*, mini-css-extract-plugin@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.6.1.tgz#9a1251d15f2035c342d99a468ab9da7a0451b71e" + integrity sha512-wd+SD57/K6DiV7jIR34P+s3uckTRuQvx0tKPcvjFlrEylk6P4mQ2KSWk1hblj1Kxaqok7LogKOieygXqBczNlg== dependencies: schema-utils "^4.0.0" From 1030d20ff8486ef57437eb81ad9962a22abd09e2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 13:54:43 -0400 Subject: [PATCH 5/8] Bump @typescript-eslint/parser from 5.27.0 to 5.28.0 (#5648) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 48 +++++++----------------------------------------- 2 files changed, 8 insertions(+), 42 deletions(-) diff --git a/package.json b/package.json index c77f2be693..89260109b5 100644 --- a/package.json +++ b/package.json @@ -351,7 +351,7 @@ "@types/webpack-env": "^1.17.0", "@types/webpack-node-externals": "^2.5.3", "@typescript-eslint/eslint-plugin": "^5.28.0", - "@typescript-eslint/parser": "^5.27.0", + "@typescript-eslint/parser": "^5.28.0", "ansi_up": "^5.1.0", "chart.js": "^2.9.4", "circular-dependency-plugin": "^5.2.2", diff --git a/yarn.lock b/yarn.lock index 4be5eb6e44..d7a3862870 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2521,24 +2521,16 @@ semver "^7.3.7" tsutils "^3.21.0" -"@typescript-eslint/parser@^5.27.0": - version "5.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.27.0.tgz#62bb091ed5cf9c7e126e80021bb563dcf36b6b12" - integrity sha512-8oGjQF46c52l7fMiPPvX4It3u3V3JipssqDfHQ2hcR0AeR8Zge+OYyKUCm5b70X72N1qXt0qgHenwN6Gc2SXZA== +"@typescript-eslint/parser@^5.28.0": + version "5.28.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.28.0.tgz#639b101cad2bfb7ae16e69710ac95c42bd4eae33" + integrity sha512-ekqoNRNK1lAcKhZESN/PdpVsWbP9jtiNqzFWkp/yAUdZvJalw2heCYuqRmM5eUJSIYEkgq5sGOjq+ZqsLMjtRA== dependencies: - "@typescript-eslint/scope-manager" "5.27.0" - "@typescript-eslint/types" "5.27.0" - "@typescript-eslint/typescript-estree" "5.27.0" + "@typescript-eslint/scope-manager" "5.28.0" + "@typescript-eslint/types" "5.28.0" + "@typescript-eslint/typescript-estree" "5.28.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.27.0": - version "5.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.27.0.tgz#a272178f613050ed62f51f69aae1e19e870a8bbb" - integrity sha512-VnykheBQ/sHd1Vt0LJ1JLrMH1GzHO+SzX6VTXuStISIsvRiurue/eRkTqSrG0CexHQgKG8shyJfR4o5VYioB9g== - dependencies: - "@typescript-eslint/types" "5.27.0" - "@typescript-eslint/visitor-keys" "5.27.0" - "@typescript-eslint/scope-manager@5.28.0": version "5.28.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.28.0.tgz#ef9a5c68fecde72fd2ff8a84b9c120324826c1b9" @@ -2556,29 +2548,11 @@ debug "^4.3.4" tsutils "^3.21.0" -"@typescript-eslint/types@5.27.0": - version "5.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.27.0.tgz#c3f44b9dda6177a9554f94a74745ca495ba9c001" - integrity sha512-lY6C7oGm9a/GWhmUDOs3xAVRz4ty/XKlQ2fOLr8GAIryGn0+UBOoJDWyHer3UgrHkenorwvBnphhP+zPmzmw0A== - "@typescript-eslint/types@5.28.0": version "5.28.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.28.0.tgz#cffd9bcdce28db6daaa146e48a0be4387a6f4e9d" integrity sha512-2OOm8ZTOQxqkPbf+DAo8oc16sDlVR5owgJfKheBkxBKg1vAfw2JsSofH9+16VPlN9PWtv8Wzhklkqw3k/zCVxA== -"@typescript-eslint/typescript-estree@5.27.0": - version "5.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.27.0.tgz#7965f5b553c634c5354a47dcce0b40b94611e995" - integrity sha512-QywPMFvgZ+MHSLRofLI7BDL+UczFFHyj0vF5ibeChDAJgdTV8k4xgEwF0geFhVlPc1p8r70eYewzpo6ps+9LJQ== - dependencies: - "@typescript-eslint/types" "5.27.0" - "@typescript-eslint/visitor-keys" "5.27.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.3.7" - tsutils "^3.21.0" - "@typescript-eslint/typescript-estree@5.28.0": version "5.28.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.28.0.tgz#3487d158d091ca2772b285e67412ff6d9797d863" @@ -2604,14 +2578,6 @@ eslint-scope "^5.1.1" eslint-utils "^3.0.0" -"@typescript-eslint/visitor-keys@5.27.0": - version "5.27.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.27.0.tgz#97aa9a5d2f3df8215e6d3b77f9d214a24db269bd" - integrity sha512-46cYrteA2MrIAjv9ai44OQDUoCZyHeGIc4lsjCUX2WT6r4C+kidz1bNiR4017wHOPUythYeH+Sc7/cFP97KEAA== - dependencies: - "@typescript-eslint/types" "5.27.0" - eslint-visitor-keys "^3.3.0" - "@typescript-eslint/visitor-keys@5.28.0": version "5.28.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.28.0.tgz#982bb226b763c48fc1859a60de33fbf939d40a0f" From 9adf0a6448fc2ee9f543791c7ce424b90755eb5f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 20 Jun 2022 13:55:11 -0400 Subject: [PATCH 6/8] Bump tailwindcss from 3.0.24 to 3.1.3 (#5650) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 73 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index 89260109b5..7eb73f7a61 100644 --- a/package.json +++ b/package.json @@ -407,7 +407,7 @@ "sass-loader": "^12.6.0", "sharp": "^0.30.6", "style-loader": "^3.3.1", - "tailwindcss": "^3.0.23", + "tailwindcss": "^3.1.3", "tar-stream": "^2.2.0", "ts-loader": "^9.2.8", "ts-node": "^10.8.1", diff --git a/yarn.lock b/yarn.lock index d7a3862870..cdbf083594 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2785,7 +2785,7 @@ acorn-jsx@^5.3.2: resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ== -acorn-node@^1.6.1: +acorn-node@^1.8.2: version "1.8.2" resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.8.2.tgz#114c95d64539e53dede23de8b9d96df7c7ae2af8" integrity sha512-8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A== @@ -3041,10 +3041,10 @@ arg@^4.1.0: resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089" integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA== -arg@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.1.tgz#eb0c9a8f77786cad2af8ff2b862899842d7b6adb" - integrity sha512-e0hDa9H2Z9AwFkk2qDlwhoMYE4eToKarchkQHovNdLTCYMHZHeRjI71crOh+dio4K6u1IcwubQqo79Ga4CyAQA== +arg@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/arg/-/arg-5.0.2.tgz#c81433cc427c92c4dcf4865142dbca6f15acd59c" + integrity sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg== argparse@^1.0.7: version "1.0.10" @@ -4730,14 +4730,14 @@ detect-node@^2.0.4: resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1" integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g== -detective@^5.2.0: - version "5.2.0" - resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.0.tgz#feb2a77e85b904ecdea459ad897cc90a99bd2a7b" - integrity sha512-6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg== +detective@^5.2.1: + version "5.2.1" + resolved "https://registry.yarnpkg.com/detective/-/detective-5.2.1.tgz#6af01eeda11015acb0e73f933242b70f24f91034" + integrity sha512-v9XE1zRnz1wRtgurGu0Bs8uHKFSTdteYZNbIPFVhUZ39L/S79ppMpdmVOZAnoz1jfEFodc48n6MX483Xo3t1yw== dependencies: - acorn-node "^1.6.1" + acorn-node "^1.8.2" defined "^1.0.0" - minimist "^1.1.1" + minimist "^1.2.6" dezalgo@^1.0.0, dezalgo@~1.0.3: version "1.0.4" @@ -7147,7 +7147,7 @@ is-cidr@^3.0.0: dependencies: cidr-regex "^2.0.10" -is-core-module@^2.2.0, is-core-module@^2.8.1: +is-core-module@^2.2.0, is-core-module@^2.8.1, is-core-module@^2.9.0: version "2.9.0" resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.9.0.tgz#e1c34429cd51c6dd9e09e0799e396e27b19a9c69" integrity sha512-+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A== @@ -8971,7 +8971,7 @@ minimatch@^5.0.0, minimatch@^5.0.1, minimatch@^5.1.0: dependencies: brace-expansion "^2.0.1" -minimist@^1.1.1, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: +minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: version "1.2.6" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== @@ -10167,7 +10167,7 @@ picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.3, picomatch@^2.3.1: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42" integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA== -pify@^2.0.0: +pify@^2.0.0, pify@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw= @@ -10253,6 +10253,15 @@ postcss-icss-selectors@^2.0.3: lodash "^4.17.4" postcss "^6.0.2" +postcss-import@^14.1.0: + version "14.1.0" + resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.1.0.tgz#a7333ffe32f0b8795303ee9e40215dac922781f0" + integrity sha512-flwI+Vgm4SElObFVPpTIT7SU7R3qk2L7PyduMcokiaVKuWv9d/U+Gm/QAd8NDLuykTWTkcrjOeD2Pp1rMeBTGw== + dependencies: + postcss-value-parser "^4.0.0" + read-cache "^1.0.0" + resolve "^1.1.7" + postcss-js@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/postcss-js/-/postcss-js-4.0.0.tgz#31db79889531b80dc7bc9b0ad283e418dce0ac00" @@ -10325,7 +10334,7 @@ postcss-value-parser@^3.3.0: resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281" integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ== -postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: +postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz#723c09920836ba6d3e5af019f92bc0971c02e514" integrity sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ== @@ -10339,7 +10348,7 @@ postcss@^6.0.14, postcss@^6.0.2: source-map "^0.6.1" supports-color "^5.4.0" -postcss@^8.3.0, postcss@^8.4.12, postcss@^8.4.14, postcss@^8.4.7: +postcss@^8.3.0, postcss@^8.4.14, postcss@^8.4.7: version "8.4.14" resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.4.14.tgz#ee9274d5622b4858c1007a74d76e42e56fd21caf" integrity sha512-E398TUmfAYFPBSdzgeieK2Y1+1cpdxJx8yXbK/m57nRhKSmk1GB2tO4lbLBtlkfPQTDKfe4Xqv1ASWPpayPEig== @@ -10818,6 +10827,13 @@ react@^17.0.2: loose-envify "^1.1.0" object-assign "^4.1.1" +read-cache@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774" + integrity sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA== + dependencies: + pify "^2.3.0" + read-cmd-shim@^1.0.1, read-cmd-shim@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16" @@ -11144,12 +11160,12 @@ resolve.exports@^1.1.0: resolved "https://registry.yarnpkg.com/resolve.exports/-/resolve.exports-1.1.0.tgz#5ce842b94b05146c0e03076985d1d0e7e48c90c9" integrity sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ== -resolve@^1.1.6, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.9.0: - version "1.22.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.0.tgz#5e0b8c67c15df57a89bdbabe603a002f21731198" - integrity sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw== +resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.12.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.9.0: + version "1.22.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.1.tgz#27cb2ebb53f91abb49470a928bba7558066ac177" + integrity sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw== dependencies: - is-core-module "^2.8.1" + is-core-module "^2.9.0" path-parse "^1.0.7" supports-preserve-symlinks-flag "^1.0.0" @@ -12133,15 +12149,15 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== -tailwindcss@^3.0.23: - version "3.0.24" - resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.0.24.tgz#22e31e801a44a78a1d9a81ecc52e13b69d85704d" - integrity sha512-H3uMmZNWzG6aqmg9q07ZIRNIawoiEcNFKDfL+YzOPuPsXuDXxJxB9icqzLgdzKNwjG3SAro2h9SYav8ewXNgig== +tailwindcss@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.3.tgz#b9ef2c1ae537c339679e8e89635af8e143d1c7eb" + integrity sha512-PRJNYdSIthrb8hjmAyymEyEN8Yo61TMXpzyFUpxULeeyRn3Y3gpvuw6FlRTKrJvK7thSGKRnhT36VovVx4WeMA== dependencies: - arg "^5.0.1" + arg "^5.0.2" chokidar "^3.5.3" color-name "^1.1.4" - detective "^5.2.0" + detective "^5.2.1" didyoumean "^1.2.2" dlv "^1.1.3" fast-glob "^3.2.11" @@ -12151,7 +12167,8 @@ tailwindcss@^3.0.23: normalize-path "^3.0.0" object-hash "^3.0.0" picocolors "^1.0.0" - postcss "^8.4.12" + postcss "^8.4.14" + postcss-import "^14.1.0" postcss-js "^4.0.0" postcss-load-config "^3.1.4" postcss-nested "5.0.6" From 8c31e564622e40d8aa401d9e9b3044d290389cec Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 20 Jun 2022 14:45:33 -0400 Subject: [PATCH 7/8] release 5.6.0-alpha.3 (#5668) --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7eb73f7a61..13aef1321c 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "OpenLens", "description": "OpenLens - Open Source IDE for Kubernetes", "homepage": "https://github.com/lensapp/lens", - "version": "5.6.0-alpha.2", + "version": "5.6.0-alpha.3", "main": "static/build/main.js", "copyright": "© 2022 OpenLens Authors", "license": "MIT", From de43df1cca233a42051be78ec8067775c1c8a08e Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Mon, 20 Jun 2022 22:23:15 -0400 Subject: [PATCH 8/8] Fix cluster frame display issue (#5518) * Fix cluster frame display issue - Add some defensive code to prevent this sort of infinite loop - Add some unit tests Signed-off-by: Sebastian Malton * fix unit tests Signed-off-by: Sebastian Malton * Fix build Signed-off-by: Sebastian Malton * Fix lint Signed-off-by: Sebastian Malton * Factor out injectable for getting of cluster config data Signed-off-by: Sebastian Malton --- .../order-of-sidebar-items.test.tsx.snap | 92 +- ...-and-tab-navigation-for-core.test.tsx.snap | 236 +-- ...ab-navigation-for-extensions.test.tsx.snap | 288 +--- .../visibility-of-sidebar-items.test.tsx.snap | 64 +- .../cluster/order-of-sidebar-items.test.tsx | 35 +- ...debar-and-tab-navigation-for-core.test.tsx | 37 +- ...and-tab-navigation-for-extensions.test.tsx | 73 +- .../visibility-of-sidebar-items.test.tsx | 9 +- .../navigation-to-helm-charts.test.ts.snap | 28 +- src/behaviours/utils.ts | 12 - src/common/__tests__/cluster-store.test.ts | 12 +- src/common/__tests__/kube-helpers.test.ts | 8 +- .../cluster-store/cluster-store.injectable.ts | 2 + src/common/cluster-store/cluster-store.ts | 15 +- .../read-cluster-config.injectable.ts | 31 + src/common/cluster-types.ts | 9 + src/common/cluster/cluster.ts | 24 +- .../cluster/create-cluster-injection-token.ts | 4 +- src/common/fs/read-file-sync.injectable.ts | 19 + src/common/kube-helpers.ts | 41 +- src/jest-after-env.setup.ts | 3 +- src/main/__test__/cluster.test.ts | 39 +- src/main/__test__/kube-auth-proxy.test.ts | 12 +- src/main/__test__/kubeconfig-manager.test.ts | 6 +- .../__test__/kubeconfig-sync.test.ts | 20 +- .../kubeconfig-sync/manager.ts | 42 +- .../create-cluster.injectable.ts | 2 +- .../components/+add-cluster/add-cluster.tsx | 4 +- .../components/+cluster/cluster-overview.tsx | 9 +- .../command-palette/command-container.tsx | 46 +- .../__tests__/delete-cluster-dialog.test.tsx | 28 +- .../components/layout/sidebar-item.tsx | 4 +- .../create-cluster.injectable.ts | 2 +- .../__snapshots__/cluster-frame.test.tsx.snap | 1490 +++++++++++++++++ .../cluster-frame/cluster-frame.module.css | 11 + .../cluster-frame/cluster-frame.test.tsx | 124 ++ .../frames/cluster-frame/cluster-frame.tsx | 20 +- .../cluster-frame/start-url.injectable.ts | 23 +- .../ipc/legacy-channel-listen.injectable.ts | 15 + .../window/event-listener.injectable.ts | 2 + 40 files changed, 2126 insertions(+), 815 deletions(-) delete mode 100644 src/behaviours/utils.ts create mode 100644 src/common/cluster-store/read-cluster-config.injectable.ts create mode 100644 src/common/fs/read-file-sync.injectable.ts create mode 100644 src/renderer/frames/cluster-frame/__snapshots__/cluster-frame.test.tsx.snap create mode 100644 src/renderer/frames/cluster-frame/cluster-frame.module.css create mode 100644 src/renderer/frames/cluster-frame/cluster-frame.test.tsx create mode 100644 src/renderer/ipc/legacy-channel-listen.injectable.ts diff --git a/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap b/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap index 9af01f0969..db6d5e7f36 100644 --- a/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap +++ b/src/behaviours/cluster/__snapshots__/order-of-sidebar-items.test.tsx.snap @@ -24,10 +24,8 @@ exports[`cluster - order of sidebar items when rendered renders 1`] = ` >
+ + + + + Nodes + + +
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ An error has occured. No route can be found matching the current route, which is also the starting route. +
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+
+`; + +exports[` given cluster with list nodes and namespaces permissions renders 1`] = ` +
+
+
+
+
+
+ ?? +
+
+
+
+
+ + + + + + Cluster + + +
+
+ + + + + + Nodes + + +
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+
+`; + +exports[` given cluster without list nodes, but with namespaces permissions renders 1`] = ` +
+
+
+
+
+
+ ?? +
+
+
+
+
+ +
+
+ + + + list + + + + Config + + +
+
+ +
+
+ + + + storage + + + + Storage + + +
+
+ + + + layers + + + + Namespaces + + +
+
+ +
+
+ + + + security + + + + Access Control + + +
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ Overview +
+
+
+ + +
+
+
+ All namespaces +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + + add + +
+ +
+ + + fullscreen + +
+ + + + keyboard_arrow_up + +
+ +
+
+
+
+
+
+
+`; diff --git a/src/renderer/frames/cluster-frame/cluster-frame.module.css b/src/renderer/frames/cluster-frame/cluster-frame.module.css new file mode 100644 index 0000000000..ff2a87a9bf --- /dev/null +++ b/src/renderer/frames/cluster-frame/cluster-frame.module.css @@ -0,0 +1,11 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +.centering { + height: 100%; + display: flex; + justify-content: center; + align-items: center; +} diff --git a/src/renderer/frames/cluster-frame/cluster-frame.test.tsx b/src/renderer/frames/cluster-frame/cluster-frame.test.tsx new file mode 100644 index 0000000000..5ec0d0894f --- /dev/null +++ b/src/renderer/frames/cluster-frame/cluster-frame.test.tsx @@ -0,0 +1,124 @@ +/** + * 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 type { RenderResult } from "@testing-library/react"; +import { getDiForUnitTesting } from "../../getDiForUnitTesting"; +import { render as testingLibraryRender } from "@testing-library/react"; +import React from "react"; +import { DiContextProvider } from "@ogre-tools/injectable-react"; +import { Router } from "react-router"; +import { DefaultProps } from "../../mui-base-theme"; +import { ClusterFrame } from "./cluster-frame"; +import historyInjectable from "../../navigation/history.injectable"; +import { computed } from "mobx"; +import type { Cluster } from "../../../common/cluster/cluster"; +import createClusterInjectable from "../../create-cluster/create-cluster.injectable"; +import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; +import directoryForUserDataInjectable from "../../../common/app-paths/directory-for-user-data/directory-for-user-data.injectable"; +import storesAndApisCanBeCreatedInjectable from "../../stores-apis-can-be-created.injectable"; +import legacyOnChannelListenInjectable from "../../ipc/legacy-channel-listen.injectable"; +import currentRouteComponentInjectable from "../../routes/current-route-component.injectable"; +import allowedResourcesInjectable from "../../cluster-frame-context/allowed-resources.injectable"; +import hostedClusterIdInjectable from "../../cluster-frame-context/hosted-cluster-id.injectable"; +import hostedClusterInjectable from "../../cluster-frame-context/hosted-cluster.injectable"; + +describe("", () => { + let render: () => RenderResult; + let di: DiContainer; + let cluster: Cluster; + + beforeEach(() => { + di = getDiForUnitTesting({ doGeneralOverrides: true }); + render = () => testingLibraryRender(( + + + {DefaultProps(ClusterFrame)} + + + )); + + di.override(subscribeStoresInjectable, () => jest.fn().mockImplementation(() => jest.fn())); + di.override(legacyOnChannelListenInjectable, () => jest.fn().mockImplementation(() => jest.fn())); + di.override(directoryForUserDataInjectable, () => "/some/irrelavent/path"); + di.override(storesAndApisCanBeCreatedInjectable, () => true); + + const createCluster = di.inject(createClusterInjectable); + + cluster = createCluster( + { + contextName: "my-cluster", + id: "123456", + kubeConfigPath: "/irrelavent", + }, + { + clusterServerUrl: "https://localhost", + }, + ); + + di.override(hostedClusterInjectable, () => cluster); + di.override(hostedClusterIdInjectable, () => cluster.id); + }); + + describe("given cluster with list nodes and namespaces permissions", () => { + beforeEach(() => { + di.override(allowedResourcesInjectable, () => computed(() => new Set(["nodes", "namespaces"]))); + }); + + it("renders", () => { + const result = render(); + + expect(result.container).toMatchSnapshot(); + }); + + it("shows cluster overview sidebar item as active", () => { + const result = render(); + const clusterOverviewSidebarItem = result.getByTestId("sidebar-item-cluster-overview"); + + expect(clusterOverviewSidebarItem.getAttribute("data-is-active-test")).toBe("true"); + }); + + describe("given no matching component", () => { + beforeEach(() => { + di.override(currentRouteComponentInjectable, () => computed(() => undefined)); + }); + + describe("given current url is starting url", () => { + it("renders", () => { + const result = render(); + + expect(result.container).toMatchSnapshot(); + }); + + it("shows warning message", () => { + const result = render(); + + expect( + result.getByText("An error has occured. No route can be found matching the current route, which is also the starting route."), + ).toBeInTheDocument(); + }); + }); + }); + }); + + describe("given cluster without list nodes, but with namespaces permissions", () => { + beforeEach(() => { + di.override(allowedResourcesInjectable, () => computed(() => new Set(["namespaces"]))); + }); + + it("renders", () => { + const result = render(); + + expect(result.container).toMatchSnapshot(); + }); + + it("shows workloads overview sidebar item as active", () => { + const result = render(); + const workloadsOverviewSidebarItem = result.getByTestId("sidebar-item-workloads"); + + expect(workloadsOverviewSidebarItem.getAttribute("data-is-active-test")).toBe("true"); + }); + }); +}); diff --git a/src/renderer/frames/cluster-frame/cluster-frame.tsx b/src/renderer/frames/cluster-frame/cluster-frame.tsx index 4ed984ce4d..73a47c43aa 100755 --- a/src/renderer/frames/cluster-frame/cluster-frame.tsx +++ b/src/renderer/frames/cluster-frame/cluster-frame.tsx @@ -2,6 +2,7 @@ * Copyright (c) OpenLens Authors. All rights reserved. * Licensed under MIT License. See LICENSE in root directory for more information. */ +import styles from "./cluster-frame.module.css"; import React, { useEffect } from "react"; import type { IComputedValue } from "mobx"; import { observer } from "mobx-react"; @@ -30,12 +31,14 @@ import { disposer } from "../../utils"; import currentRouteComponentInjectable from "../../routes/current-route-component.injectable"; import startUrlInjectable from "./start-url.injectable"; import subscribeStoresInjectable from "../../kube-watch-api/subscribe-stores.injectable"; +import currentPathInjectable from "../../routes/current-path.injectable"; interface Dependencies { namespaceStore: NamespaceStore; - currentRouteComponent: IComputedValue | undefined | null>; + currentRouteComponent: IComputedValue | undefined>; startUrl: IComputedValue; subscribeStores: SubscribeStores; + currentPath: IComputedValue; } export const NonInjectedClusterFrame = observer(({ @@ -43,6 +46,7 @@ export const NonInjectedClusterFrame = observer(({ currentRouteComponent, startUrl, subscribeStores, + currentPath, }: Dependencies) => { useEffect(() => disposer( subscribeStores([ @@ -52,6 +56,8 @@ export const NonInjectedClusterFrame = observer(({ ), []); const Component = currentRouteComponent.get(); + const starting = startUrl.get(); + const current = currentPath.get(); return ( @@ -62,7 +68,16 @@ export const NonInjectedClusterFrame = observer(({ { Component ? - : + // NOTE: this check is to prevent an infinite loop + : starting !== current + ? + : ( +
+
+ An error has occured. No route can be found matching the current route, which is also the starting route. +
+
+ ) } @@ -87,6 +102,7 @@ export const ClusterFrame = withInjectables(NonInjectedClusterFram subscribeStores: di.inject(subscribeStoresInjectable), startUrl: di.inject(startUrlInjectable), currentRouteComponent: di.inject(currentRouteComponentInjectable), + currentPath: di.inject(currentPathInjectable), }), }); diff --git a/src/renderer/frames/cluster-frame/start-url.injectable.ts b/src/renderer/frames/cluster-frame/start-url.injectable.ts index 28ef270e8e..fe1f81163d 100644 --- a/src/renderer/frames/cluster-frame/start-url.injectable.ts +++ b/src/renderer/frames/cluster-frame/start-url.injectable.ts @@ -4,29 +4,30 @@ */ import { getInjectable } from "@ogre-tools/injectable"; import { computed } from "mobx"; -import type { KubeResource } from "../../../common/rbac"; -import isAllowedResourceInjectable from "../../../common/utils/is-allowed-resource.injectable"; import clusterOverviewRouteInjectable from "../../../common/front-end-routing/routes/cluster/overview/cluster-overview-route.injectable"; import workloadsOverviewRouteInjectable from "../../../common/front-end-routing/routes/cluster/workloads/overview/workloads-overview-route.injectable"; -import { buildURL } from "../../../common/utils/buildUrl"; const startUrlInjectable = getInjectable({ id: "start-url", instantiate: (di) => { - const isAllowedResource = (resourceName: string) => di.inject(isAllowedResourceInjectable, resourceName); - const clusterOverviewRoute = di.inject(clusterOverviewRouteInjectable); const workloadOverviewRoute = di.inject(workloadsOverviewRouteInjectable); - const clusterOverviewUrl = buildURL(clusterOverviewRoute.path); - const workloadOverviewUrl = buildURL(workloadOverviewRoute.path); return computed(() => { - const resources: KubeResource[] = ["events", "nodes", "pods"]; + if (clusterOverviewRoute.isEnabled.get()) { + return clusterOverviewRoute.path; + } - return resources.every((resourceName) => isAllowedResource(resourceName)) - ? clusterOverviewUrl - : workloadOverviewUrl; + if (workloadOverviewRoute.isEnabled.get()) { + return workloadOverviewRoute.path; + } + + /** + * NOTE: This will never be executed as `workloadOverviewRoute.isEnabled` always is true. It + * is here is guard against accidental changes at a distance within `workloadOverviewRoute`. + */ + throw new Error("Exhausted all possible starting locations and none are active. This is a bug."); }); }, }); diff --git a/src/renderer/ipc/legacy-channel-listen.injectable.ts b/src/renderer/ipc/legacy-channel-listen.injectable.ts new file mode 100644 index 0000000000..254ea0b9cc --- /dev/null +++ b/src/renderer/ipc/legacy-channel-listen.injectable.ts @@ -0,0 +1,15 @@ +/** + * Copyright (c) OpenLens Authors. All rights reserved. + * Licensed under MIT License. See LICENSE in root directory for more information. + */ + +import { getInjectable } from "@ogre-tools/injectable"; +import { ipcRendererOn } from "../../common/ipc"; + +const legacyOnChannelListenInjectable = getInjectable({ + id: "legacy-on-channel-listen", + instantiate: () => ipcRendererOn, + causesSideEffects: true, +}); + +export default legacyOnChannelListenInjectable; diff --git a/src/renderer/window/event-listener.injectable.ts b/src/renderer/window/event-listener.injectable.ts index 5f682d956d..84803cbd86 100644 --- a/src/renderer/window/event-listener.injectable.ts +++ b/src/renderer/window/event-listener.injectable.ts @@ -6,6 +6,8 @@ import { getInjectable } from "@ogre-tools/injectable"; import type { Disposer } from "../utils"; +export type AddWindowEventListener = typeof addWindowEventListener; + function addWindowEventListener(type: K, listener: (this: Window, ev: WindowEventMap[K]) => any, options?: boolean | AddEventListenerOptions): Disposer { window.addEventListener(type, listener, options);