From 38aefc5b01067d9fdbf703f3630ee8ae6bf25ce7 Mon Sep 17 00:00:00 2001
From: Alex Andreev <alex.andreev.email@gmail.com>
Date: Fri, 14 Aug 2020 11:04:41 +0300
Subject: [PATCH] Reconnecting cluster after selection (#685)

* Reconnecting selected cluster

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

* Cleaning up ClusteStatus render() method

Signed-off-by: alexfront <alex.andreev.email@gmail.com>
---
 src/common/cluster-store.ts                   |  2 +-
 .../+cluster-settings/cluster-settings.tsx    |  1 +
 src/renderer/components/app-init/app-init.tsx |  1 -
 .../cluster-manager/cluster-status.tsx        | 70 ++++++++++---------
 .../cluster-manager/clusters-menu.tsx         |  2 +-
 5 files changed, 41 insertions(+), 35 deletions(-)

diff --git a/src/common/cluster-store.ts b/src/common/cluster-store.ts
index 8dca6d6936..ad25f43f26 100644
--- a/src/common/cluster-store.ts
+++ b/src/common/cluster-store.ts
@@ -84,7 +84,7 @@ export class ClusterStore extends BaseStore<ClusterStoreModel> {
   }
 
   isActive(id: ClusterId) {
-    return this.activeCluster.id === id;
+    return this.activeClusterId === id;
   }
 
   setActive(id: ClusterId) {
diff --git a/src/renderer/components/+cluster-settings/cluster-settings.tsx b/src/renderer/components/+cluster-settings/cluster-settings.tsx
index 5feeb64d69..d0a6385ac5 100644
--- a/src/renderer/components/+cluster-settings/cluster-settings.tsx
+++ b/src/renderer/components/+cluster-settings/cluster-settings.tsx
@@ -16,6 +16,7 @@ import { getMatchedCluster } from "../cluster-manager/cluster-view.route";
 export class ClusterSettings extends React.Component {
   render() {
     const cluster = getMatchedCluster();
+    if (!cluster) return null;
     const header = (
       <>
         <ClusterIcon
diff --git a/src/renderer/components/app-init/app-init.tsx b/src/renderer/components/app-init/app-init.tsx
index fe46a8a6d5..e5a740ebc4 100644
--- a/src/renderer/components/app-init/app-init.tsx
+++ b/src/renderer/components/app-init/app-init.tsx
@@ -13,7 +13,6 @@ interface Props {
 
 export class AppInit extends React.Component<Props> {
   static async start(rootElem: HTMLElement) {
-
     render(<AppInit/>, rootElem); // show loading indicator asap
     await AppInit.readyStateCheck(rootElem); // wait while all good to run
   }
diff --git a/src/renderer/components/cluster-manager/cluster-status.tsx b/src/renderer/components/cluster-manager/cluster-status.tsx
index b7595c17fa..1f5d52f814 100644
--- a/src/renderer/components/cluster-manager/cluster-status.tsx
+++ b/src/renderer/components/cluster-manager/cluster-status.tsx
@@ -11,6 +11,7 @@ import { Button } from "../button";
 import { cssNames, IClassName } from "../../utils";
 import { Cluster } from "../../../main/cluster";
 import { ClusterId, clusterStore } from "../../../common/cluster-store";
+import { CubeSpinner } from "../spinner";
 
 interface Props {
   className?: IClassName;
@@ -31,17 +32,13 @@ export class ClusterStatus extends React.Component<Props> {
   }
 
   async componentDidMount() {
-    if (this.cluster.disconnected) {
-      return;
-    }
-    this.authOutput = [{ data: "Connecting..." }];
     ipcRenderer.on(`kube-auth:${this.cluster.id}`, (evt, res: KubeAuthProxyLog) => {
       this.authOutput.push({
         data: res.data.trimRight(),
         error: res.error,
       });
     })
-    if (!this.cluster.initialized) {
+    if (!this.cluster.initialized || this.cluster.disconnected) {
       await this.refreshCluster();
     }
   }
@@ -55,48 +52,57 @@ export class ClusterStatus extends React.Component<Props> {
   }
 
   reconnect = async () => {
-    this.authOutput = [{ data: "Reconnecting..." }];
     this.isReconnecting = true;
     await this.refreshCluster();
     this.isReconnecting = false;
   }
 
-  render() {
+  renderContent() {
     const { authOutput, cluster, hasErrors } = this;
-    const isDisconnected = !!cluster.disconnected;
     const failureReason = cluster.failureReason;
-    const isError = hasErrors || isDisconnected;
-    return (
-      <div className={cssNames("ClusterStatus flex column gaps box center", this.props.className)}>
-        {isError && (
-          <Icon
-            material="cloud_off"
-            className={cssNames({ error: hasErrors })}
-          />
-        )}
-        <h2>
-          {cluster.preferences.clusterName}
-        </h2>
-        {!isDisconnected && (
+    if (!hasErrors || this.isReconnecting) {
+      return (
+        <>
+          <CubeSpinner />
           <pre className="kube-auth-out">
+            <p>{this.isReconnecting ? "Reconnecting..." : "Connecting..."}</p>
             {authOutput.map(({ data, error }, index) => {
               return <p key={index} className={cssNames({ error })}>{data}</p>
             })}
           </pre>
-        )}
+        </>
+      );
+    }
+    return (
+      <>
+        <Icon material="cloud_off" className="error" />
+        <h2>
+          {cluster.preferences.clusterName}
+        </h2>
+        <pre className="kube-auth-out">
+          {authOutput.map(({ data, error }, index) => {
+            return <p key={index} className={cssNames({ error })}>{data}</p>
+          })}
+        </pre>
         {failureReason && (
           <div className="failure-reason error">{failureReason}</div>
         )}
-        {isError && (
-          <Button
-            primary
-            label="Reconnect"
-            className="box center"
-            onClick={this.reconnect}
-            waiting={this.isReconnecting}
-          />
-        )}
+        <Button
+          primary
+          label="Reconnect"
+          className="box center"
+          onClick={this.reconnect}
+          waiting={this.isReconnecting}
+        />
+      </>
+    );
+  }
+
+  render() {
+    return (
+      <div className={cssNames("ClusterStatus flex column gaps box center align-center justify-center", this.props.className)}>
+        {this.renderContent()}
       </div>
-    )
+    );
   }
 }
diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx
index 14ef57543d..23d85507c3 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.tsx
+++ b/src/renderer/components/cluster-manager/clusters-menu.tsx
@@ -34,7 +34,7 @@ export class ClustersMenu extends React.Component<Props> {
 
   showCluster = (clusterId: ClusterId) => {
     clusterStore.setActive(clusterId);
-    navigate("/"); // redirect to index
+    navigate(clusterViewURL({ params: { clusterId } }));
   }
 
   addCluster = () => {