From 3ffb2431111207c7bc736051c46de6ab8aab603d Mon Sep 17 00:00:00 2001 From: Alex Andreev Date: Wed, 10 May 2023 13:48:09 +0300 Subject: [PATCH 1/4] Fix open-lens package address in prestart-dev (#7714) Signed-off-by: Alex Andreev --- package-lock.json | 7 ++++--- package.json | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 63b3833b25..557aff0798 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34116,20 +34116,20 @@ } }, "open-lens": { - "version": "6.5.0-alpha.9", + "version": "6.5.0-alpha.10", "hasInstallScript": true, "license": "MIT", "dependencies": { "@k8slens/application": "^6.5.0-alpha.5", "@k8slens/application-for-electron-main": "^6.5.0-alpha.4", - "@k8slens/core": "^6.5.0-alpha.9", + "@k8slens/core": "^6.5.0-alpha.10", "@k8slens/ensure-binaries": "^6.5.0-alpha.5", "@k8slens/event-emitter": "^1.0.0-alpha.2", "@k8slens/feature-core": "^6.5.0-alpha.4", "@k8slens/keyboard-shortcuts": "^1.0.0-alpha.4", "@k8slens/kube-object": "^1.0.0-alpha.2", "@k8slens/kubectl-versions": "^1.0.0-alpha.3", - "@k8slens/legacy-extension-example": "^1.0.0-alpha.7", + "@k8slens/legacy-extension-example": "^1.0.0-alpha.8", "@k8slens/legacy-extensions": "^1.0.0-alpha.4", "@k8slens/legacy-global-di": "^1.0.0-alpha.1", "@k8slens/logger": "^1.0.0-alpha.6", @@ -38274,6 +38274,7 @@ }, "packages/open-lens": { "version": "6.5.0-alpha.10", + "extraneous": true, "hasInstallScript": true, "license": "MIT", "dependencies": { diff --git a/package.json b/package.json index 90829435e9..48f8c96b30 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "clean:node_modules": "lerna clean -y && rimraf node_modules", "dev": "cross-env NODE_ENV=development lerna run build --stream --skip-nx-cache", "postdev": "lerna watch -- lerna run build --stream --scope \\$LERNA_PACKAGE_NAME", - "prestart-dev": "cd packages/open-lens && rimraf static/build/ && npm run build:tray-icons && npm run download:binaries", + "prestart-dev": "cd ./open-lens && rimraf static/build/ && npm run build:tray-icons && npm run download:binaries", "start-dev": "lerna run start", "lint": "lerna run lint --stream --no-bail", "lint:fix": "lerna run lint:fix --stream", From 9c7be39eb135b747945f76f61811695d2f96c761 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Wed, 10 May 2023 10:59:14 +0300 Subject: [PATCH 2/4] fix: Bring back search filters for pods which were accidentally removed previously Signed-off-by: Janne Savolainen --- packages/core/src/renderer/components/workloads-pods/pods.tsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/packages/core/src/renderer/components/workloads-pods/pods.tsx b/packages/core/src/renderer/components/workloads-pods/pods.tsx index 09d3fe5232..45a5073bc8 100644 --- a/packages/core/src/renderer/components/workloads-pods/pods.tsx +++ b/packages/core/src/renderer/components/workloads-pods/pods.tsx @@ -40,7 +40,10 @@ const NonInjectedPods = observer((props: Dependencies) => { tableId="workloads_pods" isConfigurable searchFilters={[ + pod => pod.getSearchFields(), + pod => pod.getStatusMessage(), pod => pod.status?.podIP, + pod => pod.getNodeName(), ]} renderHeaderTitle="Pods" renderTableHeader={[]} From e8491ca2d39971d06842f6741eae042554fbc9a0 Mon Sep 17 00:00:00 2001 From: Janne Savolainen Date: Wed, 10 May 2023 14:11:02 +0300 Subject: [PATCH 3/4] fix: Kludge cluster settings not opening when extension introduces new settings without ID when title contains spaces Co-authored-by: Mikko Aspiala Signed-off-by: Janne Savolainen --- .../entity-settings/extension-registrator.injectable.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/renderer/components/entity-settings/extension-registrator.injectable.ts b/packages/core/src/renderer/components/entity-settings/extension-registrator.injectable.ts index 19187d921d..6acce2da09 100644 --- a/packages/core/src/renderer/components/entity-settings/extension-registrator.injectable.ts +++ b/packages/core/src/renderer/components/entity-settings/extension-registrator.injectable.ts @@ -56,7 +56,7 @@ const getInjectableForEntitySettingRegistrationFor = (extension: LensRendererExt kind, title, group = "Extensions", - id = title.toLowerCase(), + id = btoa(title), priority, source, }: EntitySettingRegistration) => getInjectable({ From 6902851026e74428f515fc5f3e01e6dc8a4c2d50 Mon Sep 17 00:00:00 2001 From: Iku-turso Date: Tue, 9 May 2023 15:54:11 +0300 Subject: [PATCH 4/4] fix: Add missing styles to fix terminal resizing Co-authored-by: Gabriel Signed-off-by: Iku-turso --- open-lens/package.json | 1 + open-lens/src/renderer/index.ts | 2 ++ package-lock.json | 1 + 3 files changed, 4 insertions(+) diff --git a/open-lens/package.json b/open-lens/package.json index 17ee26f487..9d0132f677 100644 --- a/open-lens/package.json +++ b/open-lens/package.json @@ -198,6 +198,7 @@ "@k8slens/messaging-for-renderer": "^1.0.0-alpha.4", "@k8slens/node-fetch": "^6.5.0-alpha.3", "@k8slens/react-application": "^1.0.0-alpha.3", + "@k8slens/resizing-anchor": "1.0.0-alpha.6", "@k8slens/run-many": "^1.0.0-alpha.4", "@k8slens/startable-stoppable": "^1.0.0-alpha.3", "@k8slens/utilities": "^1.0.0-alpha.3", diff --git a/open-lens/src/renderer/index.ts b/open-lens/src/renderer/index.ts index 7b12c69696..61c80aaaff 100644 --- a/open-lens/src/renderer/index.ts +++ b/open-lens/src/renderer/index.ts @@ -2,6 +2,8 @@ import "@k8slens/core/styles"; import "@k8slens/button/dist/index.css"; import "@k8slens/error-boundary/dist/index.css"; import "@k8slens/tooltip/dist/index.css"; +import "@k8slens/resizing-anchor/dist/index.css"; + import { runInAction } from "mobx"; import { rendererExtensionApi as Renderer, diff --git a/package-lock.json b/package-lock.json index 557aff0798..6ac8ebf76e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -34138,6 +34138,7 @@ "@k8slens/messaging-for-renderer": "^1.0.0-alpha.4", "@k8slens/node-fetch": "^6.5.0-alpha.3", "@k8slens/react-application": "^1.0.0-alpha.3", + "@k8slens/resizing-anchor": "1.0.0-alpha.6", "@k8slens/run-many": "^1.0.0-alpha.4", "@k8slens/startable-stoppable": "^1.0.0-alpha.3", "@k8slens/utilities": "^1.0.0-alpha.3",