From b4172b3982bf5a28e93db649d227e8e5542b5d23 Mon Sep 17 00:00:00 2001
From: alexfront <alex.andreev.email@gmail.com>
Date: Thu, 6 Aug 2020 15:46:31 +0300
Subject: [PATCH] Minor ClusterSettings fixes

Signed-off-by: alexfront <alex.andreev.email@gmail.com>
---
 .../components/install-feature.tsx               | 16 +++++++++++-----
 .../components/remove-cluster-button.tsx         |  3 +--
 .../components/file-picker/file-picker.tsx       |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/renderer/components/+cluster-settings/components/install-feature.tsx b/src/renderer/components/+cluster-settings/components/install-feature.tsx
index f10d2a3d7d..b185f906a9 100644
--- a/src/renderer/components/+cluster-settings/components/install-feature.tsx
+++ b/src/renderer/components/+cluster-settings/components/install-feature.tsx
@@ -28,7 +28,9 @@ export class InstallFeature extends React.Component<Props> {
           <Button
             primary
             disabled={disabled}
-            onClick={this.runAction("upgradeFeature")}
+            onClick={this.runAction(() =>
+              clusterIpc.upgradeFeature.invokeFromRenderer(cluster.id, feature))
+            }
           >
             Upgrade
           </Button>
@@ -37,7 +39,9 @@ export class InstallFeature extends React.Component<Props> {
           <Button
             accent
             disabled={disabled}
-            onClick={this.runAction("uninstallFeature")}
+            onClick={this.runAction(() =>
+              clusterIpc.uninstallFeature.invokeFromRenderer(cluster.id, feature))
+            }
           >
             Uninstall
           </Button>
@@ -46,7 +50,9 @@ export class InstallFeature extends React.Component<Props> {
           <Button
             primary
             disabled={disabled}
-            onClick={this.runAction("installFeature")}
+            onClick={this.runAction(() =>
+              clusterIpc.installFeature.invokeFromRenderer(cluster.id, feature))
+            }
           >
             Install
           </Button>
@@ -57,12 +63,12 @@ export class InstallFeature extends React.Component<Props> {
     );
   }
 
-  runAction(action: keyof typeof clusterIpc): () => Promise<void> {
+  runAction(action: () => Promise<any>): () => Promise<void> {
     return async () => {
       const { cluster, feature } = this.props;
       try {
         this.loading = true;
-        await clusterIpc[action].invokeFromRenderer(cluster.id, feature);
+        await action();
       } catch (err) {
         Notifications.error(err.toString());
       }
diff --git a/src/renderer/components/+cluster-settings/components/remove-cluster-button.tsx b/src/renderer/components/+cluster-settings/components/remove-cluster-button.tsx
index 137a275093..fe62ef4899 100644
--- a/src/renderer/components/+cluster-settings/components/remove-cluster-button.tsx
+++ b/src/renderer/components/+cluster-settings/components/remove-cluster-button.tsx
@@ -22,8 +22,7 @@ export class RemoveClusterButton extends React.Component<Props> {
       labelOk: <Trans>Yes</Trans>,
       labelCancel: <Trans>No</Trans>,
       ok: async () => {
-        await clusterIpc.disconnect.invokeFromRenderer(cluster.id);
-        await clusterStore.removeById(cluster.id);
+        await clusterStore.removeById(cluster.id); 
       }
     })
   }
diff --git a/src/renderer/components/file-picker/file-picker.tsx b/src/renderer/components/file-picker/file-picker.tsx
index 09d4dcc957..5af7a176d1 100644
--- a/src/renderer/components/file-picker/file-picker.tsx
+++ b/src/renderer/components/file-picker/file-picker.tsx
@@ -43,7 +43,7 @@ export enum OverTotalSizeLimitStyle {
 
 export interface BaseProps {
     accept?: string;
-    label: React.ReactElement;
+    label: React.ReactNode;
     multiple?: boolean;
 
     // limit is the optional maximum number of files to upload