From 57ce050e111dd8ee2a84fa1cf0ccb0b2e2a0b4a0 Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 7 Mar 2023 09:18:06 -0800 Subject: [PATCH] Release 6.4.4 (#7308) * Navigate to catalog explicitly on cluster disconnect (#7304) * Navigate to catalog explicitly on cluster disconnect Signed-off-by: Alex Andreev * Linter fix Signed-off-by: Alex Andreev --------- Signed-off-by: Alex Andreev * Release 6.4.4 Signed-off-by: Sebastian Malton --------- Signed-off-by: Alex Andreev Signed-off-by: Sebastian Malton Co-authored-by: Alex Andreev --- lerna.json | 2 +- packages/core/package.json | 2 +- .../common/catalog-entities/kubernetes-cluster.ts | 8 +++++++- .../components/cluster-manager/cluster-view.tsx | 12 +++++------- packages/extension-api/package.json | 4 ++-- packages/open-lens/package.json | 4 ++-- 6 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lerna.json b/lerna.json index c812a0b823..de8a79396c 100644 --- a/lerna.json +++ b/lerna.json @@ -4,7 +4,7 @@ "packages": [ "packages/*" ], - "version": "6.4.3", + "version": "6.4.4", "npmClient": "yarn", "npmClientArgs": [ "--network-timeout=100000" diff --git a/packages/core/package.json b/packages/core/package.json index 0f6886a8dc..4c860d45d9 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -3,7 +3,7 @@ "productName": "", "description": "Lens Desktop Core", "homepage": "https://github.com/lensapp/lens", - "version": "6.4.3", + "version": "6.4.4", "repository": { "type": "git", "url": "git+https://github.com/lensapp/lens.git" diff --git a/packages/core/src/common/catalog-entities/kubernetes-cluster.ts b/packages/core/src/common/catalog-entities/kubernetes-cluster.ts index 57cac07122..a9dac5873a 100644 --- a/packages/core/src/common/catalog-entities/kubernetes-cluster.ts +++ b/packages/core/src/common/catalog-entities/kubernetes-cluster.ts @@ -127,7 +127,13 @@ export class KubernetesCluster< context.menuItems.push({ title: "Disconnect", icon: "link_off", - onClick: () => requestClusterDisconnection(this.getId()), + onClick: () => { + requestClusterDisconnection(this.getId()); + broadcastMessage( + IpcRendererNavigationEvents.NAVIGATE_IN_APP, + "/catalog", + ); + }, }); break; case LensKubernetesClusterStatus.DISCONNECTED: diff --git a/packages/core/src/renderer/components/cluster-manager/cluster-view.tsx b/packages/core/src/renderer/components/cluster-manager/cluster-view.tsx index 4a22c80076..23cd98fed2 100644 --- a/packages/core/src/renderer/components/cluster-manager/cluster-view.tsx +++ b/packages/core/src/renderer/components/cluster-manager/cluster-view.tsx @@ -69,7 +69,11 @@ class NonInjectedClusterView extends React.Component { disposeOnUnmount(this, [ reaction(() => this.clusterId, async (clusterId) => { // TODO: replace with better handling - if (clusterId && !this.props.entityRegistry.getById(clusterId)) { + if (!this.clusterId) { + return; + } + + if (!this.props.entityRegistry.getById(clusterId)) { return this.props.navigateToCatalog(); // redirect to catalog when the clusterId does not correspond to an entity } @@ -80,12 +84,6 @@ class NonInjectedClusterView extends React.Component { }, { fireImmediately: true, }), - - reaction(() => [this.cluster?.ready, this.cluster?.disconnected], ([, disconnected]) => { - if (this.isViewLoaded.get() && disconnected) { - this.props.navigateToCatalog(); // redirect to catalog when active cluster get disconnected/not available - } - }), ]); } diff --git a/packages/extension-api/package.json b/packages/extension-api/package.json index 5f0f7b8fbc..3c870086cb 100644 --- a/packages/extension-api/package.json +++ b/packages/extension-api/package.json @@ -2,7 +2,7 @@ "name": "@k8slens/extensions", "productName": "OpenLens extensions", "description": "OpenLens - Open Source Kubernetes IDE: extensions", - "version": "6.4.3", + "version": "6.4.4", "copyright": "© 2022 OpenLens Authors", "license": "MIT", "main": "dist/extension-api.js", @@ -26,7 +26,7 @@ "prepare:dev": "yarn run build" }, "dependencies": { - "@k8slens/core": "^6.4.3" + "@k8slens/core": "^6.4.4" }, "devDependencies": { "@types/node": "^16.18.6", diff --git a/packages/open-lens/package.json b/packages/open-lens/package.json index 3314991cdc..cc74c79462 100644 --- a/packages/open-lens/package.json +++ b/packages/open-lens/package.json @@ -4,7 +4,7 @@ "productName": "OpenLens", "description": "OpenLens - Open Source IDE for Kubernetes", "homepage": "https://github.com/lensapp/lens", - "version": "6.4.3", + "version": "6.4.4", "repository": { "type": "git", "url": "git+https://github.com/lensapp/lens.git" @@ -192,7 +192,7 @@ } }, "dependencies": { - "@k8slens/core": "^6.4.3", + "@k8slens/core": "^6.4.4", "@k8slens/ensure-binaries": "^6.4.0-beta.16", "@k8slens/generate-tray-icons": "^6.4.0-beta.16", "@ogre-tools/fp": "^12.0.1",