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 <alex.andreev.email@gmail.com>

* Linter fix

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

---------

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>

* Release 6.4.4

Signed-off-by: Sebastian Malton <sebastian@malton.name>

---------

Signed-off-by: Alex Andreev <alex.andreev.email@gmail.com>
Signed-off-by: Sebastian Malton <sebastian@malton.name>
Co-authored-by: Alex Andreev <alex.andreev.email@gmail.com>

lerna.json

@@ -4,7 +4,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "6.4.3",
+  "version": "6.4.4",
   "npmClient": "yarn",
   "npmClientArgs": [
     "--network-timeout=100000"

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"

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:

packages/core/src/renderer/components/cluster-manager/cluster-view.tsx

@@ -69,7 +69,11 @@ class NonInjectedClusterView extends React.Component<Dependencies> {
     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<Dependencies> {
       }, {
         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
-        }
-      }),
     ]);
   }
 

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",

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",