replaced browse/reset buttons to icons, extended drop area for custom kube-config file

Signed-off-by: Roman <ixrock@gmail.com>
This commit is contained in:
Roman committed 2020-08-25 18:58:48 +03:00
1 parent a5e5a4c0c2
commit cb669d15df
6 files changed
+66 -56

No files matched your search

@@ -1,4 +1,12 @@
.AddCluster {
.droppable {
box-shadow: 0 0 0 5px inset $primary;
> * {
pointer-events: none;
}
}
.Select {
.kube-context {
--flex-gap: #{$padding};
@@ -9,19 +17,7 @@
}
}
.kube-config-select {
&.droppable {
box-shadow: 0 0 3px 2px $primary;
> * {
pointer-events: none;
}
}
}
.info-col {
code {
color: $pink-400;
}
code {
color: $pink-400;
}
}
@@ -24,7 +24,7 @@ import { Notifications } from "../notifications";
import { Tab, Tabs } from "../tabs";
// todo: improve UI/UX kube-config consuming: FILE (input + button) | PASTE TEXT (editor)
// todo: allow to manually input kube-config file path
// todo: allow to manually input kube-config file path (edit + save on blur + auto-replace "~" => os.homedir()
// todo: allow to create multiple clusters at once (multi-select)
enum KubeConfigSourceTab {
@@ -216,21 +216,7 @@ export class AddCluster extends React.Component {
/>
</Tabs>
{this.sourceTab === KubeConfigSourceTab.FILE && (
<div
className={cssNames("kube-config-select flex gaps align-center", {
droppable: this.dropAreaActive
})}
onDragEnter={event => this.dropAreaActive = true}
onDragLeave={event => this.dropAreaActive = false}
onDragOver={event => {
event.preventDefault(); // enable onDrop()-callback
event.dataTransfer.dropEffect = "move"
}}
onDrop={event => {
this.dropAreaActive = false
this.kubeConfigPath = event.dataTransfer.files[0].path;
}}
>
<div className="kube-config-select flex gaps align-center">
<Input
autoSelectOnFocus
theme="round-black"
@@ -239,9 +225,17 @@ export class AddCluster extends React.Component {
onChange={value => console.log('change', value)}
/>
{this.kubeConfigPath !== kubeConfigDefaultPath && (
<Button accent label={<Trans>Reset</Trans>} onClick={this.resetKubeConfig}/>
<Icon
material="settings_backup_restore"
onClick={this.resetKubeConfig}
tooltip={<Trans>Reset</Trans>}
/>
)}
<Button primary label={<Trans>Browse</Trans>} onClick={this.selectKubeConfig}/>
<Icon
material="folder"
onClick={this.selectKubeConfig}
tooltip={<Trans>Browse</Trans>}
/>
</div>
)}
{this.sourceTab === KubeConfigSourceTab.TEXT && (
@@ -259,7 +253,23 @@ export class AddCluster extends React.Component {
render() {
return (
<WizardLayout className="AddCluster" infoPanel={this.renderInfo()}>
<WizardLayout
className="AddCluster"
infoPanel={this.renderInfo()}
contentClass={{ droppable: this.dropAreaActive }}
contentProps={{
onDragEnter: event => this.dropAreaActive = true,
onDragLeave: event => this.dropAreaActive = false,
onDragOver: event => {
event.preventDefault(); // enable onDrop()-callback
event.dataTransfer.dropEffect = "move"
},
onDrop: event => {
this.dropAreaActive = false
this.kubeConfigPath = event.dataTransfer.files[0].path;
}
}}
>
<h2><Trans>Add Cluster</Trans></h2>
{this.renderKubeConfigSource()}
<Select
@@ -3,7 +3,7 @@ import React from "react";
import { observer } from "mobx-react";
import { cssNames, IClassName } from "../../utils";
interface Props {
interface Props extends React.DOMAttributes<any> {
className?: IClassName;
header?: React.ReactNode;
headerClass?: IClassName;
@@ -11,22 +11,26 @@ interface Props {
infoPanelClass?: IClassName;
infoPanel?: React.ReactNode;
centered?: boolean; // Centering content horizontally
contentProps?: React.DOMAttributes<HTMLElement>
}
@observer
export class WizardLayout extends React.Component<Props> {
render() {
const { className, contentClass, infoPanelClass, infoPanel, header, headerClass, centered, children: content } = this.props;
const {
className, contentClass, infoPanelClass, infoPanel, header, headerClass, centered,
children, contentProps = {}, ...props
} = this.props;
return (
<div className={cssNames("WizardLayout", { centered }, className)}>
<div {...props} className={cssNames("WizardLayout", { centered }, className)}>
{header && (
<div className={cssNames("head-col flex gaps align-center", headerClass)}>
{header}
</div>
)}
<div className={cssNames("content-col flex column gaps", contentClass)}>
<div {...contentProps} className={cssNames("content-col flex column gaps", contentClass)}>
<div className="flex column gaps">
{content}
{children}
</div>
</div>
{infoPanel && (