From 6018bf0c42c27e213ce3cdfb4e4abb5a0f042a35 Mon Sep 17 00:00:00 2001
From: alexfront <alex.andreev.email@gmail.com>
Date: Wed, 5 Aug 2020 11:40:47 +0300
Subject: [PATCH] Remove icons / checks from RemoveClusterButton

Signed-off-by: alexfront <alex.andreev.email@gmail.com>
---
 .../+cluster-settings/cluster-settings.scss   |  8 ++-
 .../components/remove-cluster-button.tsx      | 61 ++++++-------------
 .../+cluster-settings/components/statuses.ts  |  6 --
 .../components/+cluster-settings/removal.tsx  |  2 +-
 .../components/layout/wizard-layout.tsx       |  8 ++-
 5 files changed, 30 insertions(+), 55 deletions(-)

diff --git a/src/renderer/components/+cluster-settings/cluster-settings.scss b/src/renderer/components/+cluster-settings/cluster-settings.scss
index b3c538daf8..93aeaf7e47 100644
--- a/src/renderer/components/+cluster-settings/cluster-settings.scss
+++ b/src/renderer/components/+cluster-settings/cluster-settings.scss
@@ -16,7 +16,7 @@
     .settings-wrapper {
       margin: 0 auto;
       width: 70%;
-      min-width: 800px;
+      min-width: 690px;
 
       > div {
         margin-top: $margin * 3;
@@ -37,8 +37,10 @@
       border: 1px solid var(--drawerSubtitleBackground);
       border-radius: $radius;
 
-      .TableCell {
-        border-bottom: 1px solid var(--drawerSubtitleBackground);
+      .TableRow {
+        &:not(:last-of-type) {
+          border-bottom: 1px solid var(--drawerSubtitleBackground);
+        }
 
         &.value {
           color: var(--textColorSecondary);
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 0c57196330..af6aee4b13 100644
--- a/src/renderer/components/+cluster-settings/components/remove-cluster-button.tsx
+++ b/src/renderer/components/+cluster-settings/components/remove-cluster-button.tsx
@@ -1,63 +1,40 @@
 import React from "react";
-import { Cluster } from "../../../../main/cluster";
-import { Button } from "../../button";
-import { autobind } from "../../../utils";
-import { Spinner } from "../../spinner";
-import { Icon } from "../../icon";
-import { ConfirmDialog } from "../../confirm-dialog";
 import { Trans } from "@lingui/macro";
+import { observer } from "mobx-react";
 import { clusterIpc } from "../../../../common/cluster-ipc";
 import { clusterStore } from "../../../../common/cluster-store";
-import { observable } from "mobx";
-import { observer } from "mobx-react";
-import { RemovalStatus } from "./statuses"
+import { Cluster } from "../../../../main/cluster";
+import { autobind } from "../../../utils";
+import { Button } from "../../button";
+import { ConfirmDialog } from "../../confirm-dialog";
 
 interface Props {
-    cluster: Cluster;
+  cluster: Cluster;
 }
 
 @observer
 export class RemoveClusterButton extends React.Component<Props> {
-  @observable status = RemovalStatus.PRESENT;
-  @observable errorText?: string;
-
-  render() {
-    return (
-      <div className="center">
-        <Button accent onClick={this.confirmRemoveCluster}>Remove Cluster {this.getStatusIcon()}</Button>
-      </div>
-    );
-  }
-
-  getStatusIcon(): React.ReactNode {
-    switch (this.status) {
-    case RemovalStatus.PRESENT:
-      return null;
-    case RemovalStatus.PROCESSING:
-      return <Spinner />;
-    case RemovalStatus.ERROR:
-      return <Icon size="16px" material="error" title={this.errorText}></Icon>;
-    }
-  }
-
-    @autobind()
+  @autobind()
   confirmRemoveCluster() {
     const { cluster } = this.props;
-
     ConfirmDialog.open({
       message: <p>Are you sure you want to remove <b>{cluster.preferences.clusterName}</b> from Lens?</p>,
       labelOk: <Trans>Yes</Trans>,
       labelCancel: <Trans>No</Trans>,
       ok: async () => {
-        try {
-          this.status = RemovalStatus.PROCESSING;
-          await clusterIpc.disconnect.invokeFromRenderer(cluster.id);
-          await clusterStore.removeById(cluster.id);
-        } catch (err) {
-          this.status = RemovalStatus.ERROR;
-          this.errorText = err.toString();
-        }
+        await clusterIpc.disconnect.invokeFromRenderer(cluster.id);
+        await clusterStore.removeById(cluster.id);
       }
     })
   }
+
+  render() {
+    return (
+      <div className="flex gaps align-center">
+        <Button accent onClick={this.confirmRemoveCluster}>
+          Remove Cluster
+        </Button>
+      </div>
+    );
+  }
 }
\ No newline at end of file
diff --git a/src/renderer/components/+cluster-settings/components/statuses.ts b/src/renderer/components/+cluster-settings/components/statuses.ts
index d9d897c430..9ce641e1c7 100644
--- a/src/renderer/components/+cluster-settings/components/statuses.ts
+++ b/src/renderer/components/+cluster-settings/components/statuses.ts
@@ -16,9 +16,3 @@ export enum ActionStatus {
     PROCESSING = "processing",
     ERROR = "error"
 }
-
-export enum RemovalStatus {
-    PRESENT = "present",
-    PROCESSING = "processing",
-    ERROR = "error",
-}
\ No newline at end of file
diff --git a/src/renderer/components/+cluster-settings/removal.tsx b/src/renderer/components/+cluster-settings/removal.tsx
index f1d613c694..f8bc03e520 100644
--- a/src/renderer/components/+cluster-settings/removal.tsx
+++ b/src/renderer/components/+cluster-settings/removal.tsx
@@ -3,7 +3,7 @@ import { Cluster } from "../../../main/cluster";
 import { RemoveClusterButton } from "./components/remove-cluster-button";
 
 interface Props {
-    cluster: Cluster;
+  cluster: Cluster;
 }
 
 export class Removal extends React.Component<Props> {
diff --git a/src/renderer/components/layout/wizard-layout.tsx b/src/renderer/components/layout/wizard-layout.tsx
index 5067fb299d..01b7f331d8 100644
--- a/src/renderer/components/layout/wizard-layout.tsx
+++ b/src/renderer/components/layout/wizard-layout.tsx
@@ -18,9 +18,11 @@ export class WizardLayout extends React.Component<Props> {
     const { className, contentClass, infoPanelClass, infoPanel, header, headerClass, children: content } = this.props;
     return (
       <div className={cssNames("WizardLayout", className)}>
-        <div className={cssNames("head-col flex gaps align-center", headerClass)}>
-          {header}
-        </div>
+        {header && (
+          <div className={cssNames("head-col flex gaps align-center", headerClass)}>
+            {header}
+          </div>
+        )}
         <div className={cssNames("content-col flex column gaps", contentClass)}>
           {content}
         </div>