From 88eed88feb09644df714185239fbaa29f29898ef Mon Sep 17 00:00:00 2001 From: Sebastian Malton Date: Tue, 15 Sep 2020 13:23:00 -0400 Subject: [PATCH] Auto select one and only cluster from pasted config - Disable add button with tooltip if no clusters are selected - Add functionality to tooltip to display correctly over disabled elements Signed-off-by: Sebastian Malton --- .../components/+add-cluster/add-cluster.tsx | 14 +++++++++++--- src/renderer/components/button/button.scss | 5 ++--- src/renderer/components/tooltip/tooltip.tsx | 17 +++++++++++++---- src/renderer/components/tooltip/withTooltip.tsx | 16 ++++++++++++---- 4 files changed, 38 insertions(+), 14 deletions(-) diff --git a/src/renderer/components/+add-cluster/add-cluster.tsx b/src/renderer/components/+add-cluster/add-cluster.tsx index 0350cdcd6b..8351c794f1 100644 --- a/src/renderer/components/+add-cluster/add-cluster.tsx +++ b/src/renderer/components/+add-cluster/add-cluster.tsx @@ -86,6 +86,9 @@ export class AddCluster extends React.Component { this.error = "" const contexts = this.getContexts(loadConfig(this.customConfig || "{}")); this.kubeContexts.replace(contexts); + if (this.kubeContexts.size === 1) { + this.selectedContexts.push(this.kubeContexts.keys().next().value) + } } catch (err) { this.error = String(err); } @@ -206,7 +209,7 @@ export class AddCluster extends React.Component { Select kubeconfig file} - active={this.sourceTab == KubeConfigSourceTab.FILE}/> + active={this.sourceTab == KubeConfigSourceTab.FILE} /> Paste as text} @@ -320,13 +323,15 @@ export class AddCluster extends React.Component { return (
{context} - {isNew && } - {isSelected && } + {isNew && } + {isSelected && }
) }; render() { + const addDisabled = this.selectedContexts.length === 0 + return (