From 45c65610b93ef8cf913e4b08f9e5a62e479813c4 Mon Sep 17 00:00:00 2001
From: Roman <ixrock@gmail.com>
Date: Mon, 10 Aug 2020 21:58:00 +0300
Subject: [PATCH] moar random fixes

Signed-off-by: Roman <ixrock@gmail.com>
---
 .../components/+add-cluster/add-cluster.tsx      |  5 +++--
 src/renderer/components/app.tsx                  |  2 +-
 .../cluster-manager/cluster-manager.scss         |  4 ++++
 .../cluster-manager/cluster-status.tsx           | 16 +++++++---------
 .../components/cluster-manager/cluster-view.tsx  |  2 +-
 .../components/cluster-manager/clusters-menu.tsx |  5 ++++-
 src/renderer/lens-app.tsx                        |  4 ++++
 7 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx
index 93d28d400a..b7603d593d 100644
--- a/src/renderer/components/+add-cluster/add-cluster.tsx
+++ b/src/renderer/components/+add-cluster/add-cluster.tsx
@@ -15,8 +15,9 @@ import { getKubeConfigLocal, loadConfig, saveConfigToAppFiles, splitConfig, vali
 import { clusterStore } from "../../../common/cluster-store";
 import { workspaceStore } from "../../../common/workspace-store";
 import { v4 as uuid } from "uuid"
-import { navigation } from "../../navigation";
+import { navigate } from "../../navigation";
 import { userStore } from "../../../common/user-store";
+import { clusterViewURL } from "../cluster-manager/cluster-view.route";
 
 @observer
 export class AddCluster extends React.Component {
@@ -102,7 +103,7 @@ export class AddCluster extends React.Component {
           httpsProxy: proxyServer || undefined,
         },
       });
-      navigation.goBack(); // return to previous opened page for the cluster view
+      navigate(clusterViewURL({ params: { clusterId } }))
     } catch (err) {
       this.error = String(err);
     } finally {
diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx
index 1359427ce5..259e3c8ebe 100755
--- a/src/renderer/components/app.tsx
+++ b/src/renderer/components/app.tsx
@@ -70,9 +70,9 @@ export class App extends React.Component {
               <Redirect exact from="/" to={this.startURL}/>
               <Route component={NotFound}/>
             </Switch>
-            <KubeObjectDetails/>
             <Notifications/>
             <ConfirmDialog/>
+            <KubeObjectDetails/>
             <KubeConfigDialog/>
             <AddRoleBindingDialog/>
             <PodLogsDialog/>
diff --git a/src/renderer/components/cluster-manager/cluster-manager.scss b/src/renderer/components/cluster-manager/cluster-manager.scss
index 991edbb009..7cbc5c12dd 100644
--- a/src/renderer/components/cluster-manager/cluster-manager.scss
+++ b/src/renderer/components/cluster-manager/cluster-manager.scss
@@ -9,6 +9,10 @@
     position: relative;
     grid-area: main;
     display: flex;
+
+    > * {
+      flex: 1;
+    }
   }
 
   #lens-views {
diff --git a/src/renderer/components/cluster-manager/cluster-status.tsx b/src/renderer/components/cluster-manager/cluster-status.tsx
index 2e0ff8784f..4f2ae31e65 100644
--- a/src/renderer/components/cluster-manager/cluster-status.tsx
+++ b/src/renderer/components/cluster-manager/cluster-status.tsx
@@ -22,12 +22,8 @@ export class ClusterStatus extends React.Component<Props> {
   @observable authOutput: KubeAuthProxyLog[] = [];
   @observable isReconnecting = false;
 
-  @computed get clusterId() {
-    return this.props.clusterId;
-  }
-
-  @computed get cluster(): Cluster {
-    return clusterStore.getById(this.clusterId);
+  get cluster(): Cluster {
+    return clusterStore.getById(this.props.clusterId);
   }
 
   @computed get hasErrors(): boolean {
@@ -45,15 +41,17 @@ export class ClusterStatus extends React.Component<Props> {
         error: res.error,
       });
     })
-    await this.refreshCluster();
+    if (!this.cluster.initialized) {
+      await this.refreshCluster();
+    }
   }
 
   componentWillUnmount() {
-    ipcRenderer.removeAllListeners(`kube-auth:${this.clusterId}`);
+    ipcRenderer.removeAllListeners(`kube-auth:${this.cluster.id}`);
   }
 
   refreshCluster = async () => {
-    await clusterIpc.activate.invokeFromRenderer(this.clusterId);
+    await clusterIpc.activate.invokeFromRenderer(this.cluster.id);
   }
 
   reconnect = async () => {
diff --git a/src/renderer/components/cluster-manager/cluster-view.tsx b/src/renderer/components/cluster-manager/cluster-view.tsx
index c3fc1c3ad6..0431ede9ce 100644
--- a/src/renderer/components/cluster-manager/cluster-view.tsx
+++ b/src/renderer/components/cluster-manager/cluster-view.tsx
@@ -13,7 +13,7 @@ export class ClusterView extends React.Component {
     return (
       <div className="ClusterView flex column">
         {showStatus && (
-          <ClusterStatus clusterId={cluster.id} className="box center"/>
+          <ClusterStatus key={cluster.id} clusterId={cluster.id} className="box center"/>
         )}
       </div>
     )
diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx
index 6ab39d3af0..a93ebaac1e 100644
--- a/src/renderer/components/cluster-manager/clusters-menu.tsx
+++ b/src/renderer/components/cluster-manager/clusters-menu.tsx
@@ -69,7 +69,10 @@ export class ClustersMenu extends React.Component<Props> {
             accent: true,
             label: _i18n._(t`Remove`),
           },
-          ok: () => clusterStore.removeById(cluster.id),
+          ok: () => {
+            clusterStore.removeById(cluster.id);
+            navigate(landingURL());
+          },
           message: <p>Are you sure want to remove cluster <b title={cluster.id}>{cluster.contextName}</b>?</p>,
         })
       }
diff --git a/src/renderer/lens-app.tsx b/src/renderer/lens-app.tsx
index 86978a05e4..9b4fffc6a1 100644
--- a/src/renderer/lens-app.tsx
+++ b/src/renderer/lens-app.tsx
@@ -9,6 +9,8 @@ import { _i18n } from "./i18n";
 import { ClusterManager } from "./components/cluster-manager";
 import { ErrorBoundary } from "./components/error-boundary";
 import { WhatsNew, whatsNewRoute } from "./components/+whats-new";
+import { Notifications } from "./components/notifications";
+import { ConfirmDialog } from "./components/confirm-dialog";
 
 @observer
 export class LensApp extends React.Component {
@@ -23,6 +25,8 @@ export class LensApp extends React.Component {
               <Route component={ClusterManager}/>
             </Switch>
           </ErrorBoundary>
+          <Notifications/>
+          <ConfirmDialog/>
         </Router>
       </I18nProvider>
     )