From 0b8c96f25e64da3a84337b5e5d471352c830ea19 Mon Sep 17 00:00:00 2001 From: Roman Date: Thu, 23 Jul 2020 20:22:02 +0300 Subject: [PATCH] fix: better bgc for remove-cluster button, clean up Signed-off-by: Roman --- src/renderer/components/app.tsx | 6 +++--- src/renderer/components/cluster-manager/clusters-menu.tsx | 6 +++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/renderer/components/app.tsx b/src/renderer/components/app.tsx index 02f243e73e..bd9ef6c65d 100755 --- a/src/renderer/components/app.tsx +++ b/src/renderer/components/app.tsx @@ -42,7 +42,7 @@ import { CubeSpinner } from "./spinner"; @observer export class App extends React.Component { - @observable appReady = false; + @observable isReady = false; @computed get clusterReady() { const clusterId = location.hostname.split(".")[0]; @@ -51,7 +51,7 @@ export class App extends React.Component { async componentDidMount() { await clusterIpc.activate.invokeFromRenderer(); - this.appReady = true; + this.isReady = true; disposeOnUnmount(this, [ reaction(() => this.startURL, url => { @@ -77,7 +77,7 @@ export class App extends React.Component { } render() { - if (!this.appReady) { + if (!this.isReady) { return } return ( diff --git a/src/renderer/components/cluster-manager/clusters-menu.tsx b/src/renderer/components/cluster-manager/clusters-menu.tsx index 900678ea02..63c86cf704 100644 --- a/src/renderer/components/cluster-manager/clusters-menu.tsx +++ b/src/renderer/components/cluster-manager/clusters-menu.tsx @@ -64,8 +64,12 @@ export class ClustersMenu extends React.Component { label: _i18n._(t`Remove`), click: () => { ConfirmDialog.open({ + okButtonProps: { + primary: false, + accent: true, + label: _i18n._(t`Remove`), + }, ok: () => clusterStore.removeById(cluster.id), - labelOk: _i18n._(t`Remove`), message:

Are you sure want to remove cluster {cluster.contextName}?

, }) }