From f75d2c2cebc39b744cc6519b35ce8e80a7283cb8 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Fri, 31 Mar 2023 08:43:33 +0300 Subject: [PATCH] Start using keyboard shortcuts feature Signed-off-by: Janne Savolainen --- package-lock.json | 35 ++++++++++++++++++++---- packages/open-lens/package.json | 1 + packages/open-lens/src/renderer/index.ts | 2 ++ 3 files changed, 33 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index 27d7bbc8d6..f83ae5609b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4638,8 +4638,8 @@ "resolved": "packages/node-fetch", "link": true }, - "node_modules/@k8slens/react-application-root": { - "resolved": "packages/technical-features/react-application-root", + "node_modules/@k8slens/react-application": { + "resolved": "packages/technical-features/react-application", "link": true }, "node_modules/@k8slens/react-testing-library-discovery": { @@ -34380,7 +34380,7 @@ }, "peerDependencies": { "@k8slens/feature-core": "^6.5.0-alpha.0", - "@k8slens/react-application-root": "^1.0.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", "@ogre-tools/fp": "^15.1.2", "@ogre-tools/injectable": "^15.1.2", "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", @@ -34416,7 +34416,7 @@ "@hapi/subtext": "^7.1.0", "@k8slens/cluster-settings": "^6.5.0-alpha.1", "@k8slens/node-fetch": "^6.5.0-alpha.1", - "@k8slens/react-application-root": "^1.0.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", "@kubernetes/client-node": "^0.18.1", "@material-ui/styles": "^4.11.5", "@ogre-tools/fp": "^15.1.2", @@ -37951,12 +37951,13 @@ "@k8slens/ensure-binaries": "^6.5.0-alpha.1", "@k8slens/feature-core": "^6.5.0-alpha.1", "@k8slens/generate-tray-icons": "^6.5.0-alpha.1", + "@k8slens/keyboard-shortcuts": "^1.0.0-alpha.0", "@k8slens/legacy-extension-example": "^1.0.0-alpha.1", "@k8slens/legacy-extensions": "^1.0.0-alpha.1", "@k8slens/messaging": "^1.0.0-alpha.1", "@k8slens/messaging-for-main": "^1.0.0-alpha.1", "@k8slens/messaging-for-renderer": "^1.0.0-alpha.1", - "@k8slens/react-application-root": "^1.0.0-alpha.0", + "@k8slens/react-application": "^1.0.0-alpha.0", "@k8slens/run-many": "^1.0.0-alpha.1", "@k8slens/startable-stoppable": "^1.0.0-alpha.1", "@k8slens/test-utils": "^1.0.0-alpha.1", @@ -39608,9 +39609,33 @@ "lodash": "^4.17.21" } }, + "packages/technical-features/react-application": { + "version": "1.0.0-alpha.0", + "license": "MIT", + "devDependencies": { + "@async-fn/jest": "^1.6.4", + "@k8slens/eslint-config": "6.5.0-alpha.1", + "@k8slens/react-testing-library-discovery": "*", + "@testing-library/react": "^12.1.5" + }, + "peerDependencies": { + "@k8slens/application": "^6.5.0-alpha.2", + "@k8slens/feature-core": "^6.5.0-alpha.0", + "@ogre-tools/fp": "^15.1.2", + "@ogre-tools/injectable": "^15.1.2", + "@ogre-tools/injectable-extension-for-auto-registration": "^15.1.2", + "@ogre-tools/injectable-extension-for-mobx": "^15.1.2", + "@ogre-tools/injectable-react": "^15.1.2", + "lodash": "^4.17.15", + "mobx": "^6.8.0", + "react": "^17.0.2", + "react-dom": "^17.0.2" + } + }, "packages/technical-features/react-application-root": { "name": "@k8slens/react-application-root", "version": "1.0.0-alpha.0", + "extraneous": true, "license": "MIT", "devDependencies": { "@async-fn/jest": "^1.6.4", diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index 7fa19eeb23..c229a32d58 100644 --- a/packages/open-lens/package.json +++ b/packages/open-lens/package.json @@ -190,6 +190,7 @@ "@k8slens/core": "^6.5.0-alpha.3", "@k8slens/ensure-binaries": "^6.5.0-alpha.1", "@k8slens/feature-core": "^6.5.0-alpha.1", + "@k8slens/keyboard-shortcuts": "^1.0.0-alpha.0", "@k8slens/legacy-extension-example": "^1.0.0-alpha.1", "@k8slens/legacy-extensions": "^1.0.0-alpha.1", "@k8slens/messaging": "^1.0.0-alpha.1", diff --git a/packages/open-lens/src/renderer/index.ts b/packages/open-lens/src/renderer/index.ts index 2d5dda2f04..d14e817347 100644 --- a/packages/open-lens/src/renderer/index.ts +++ b/packages/open-lens/src/renderer/index.ts @@ -15,6 +15,7 @@ import { createContainer } from "@ogre-tools/injectable"; import { registerMobX } from "@ogre-tools/injectable-extension-for-mobx"; import { registerInjectableReact } from "@ogre-tools/injectable-react"; import { messagingFeatureForRenderer } from "@k8slens/messaging-for-renderer"; +import { keyboardShortcutsFeature } from "@k8slens/keyboard-shortcuts"; import { reactApplicationFeature } from "@k8slens/react-application"; const environment = "renderer"; @@ -30,6 +31,7 @@ runInAction(() => { di, applicationFeature, messagingFeatureForRenderer, + keyboardShortcutsFeature, reactApplicationFeature );