Unverified Commit 7f6ae6e8 authored by Sebastian Malton's avatar Sebastian Malton Committed by GitHub
Browse files

Auto select one and only cluster from pasted config (#888)


* 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

* feature should work of any method of adding kube config
Signed-off-by: default avatarSebastian Malton <sebastian@malton.name>
Co-authored-by: default avatarSebastian Malton <smalton@mirantis.com>
parent c82b54d5
master Nokel81-patch-1 allowed-resources api-manager-claenup asdasd ban-circular-deps bar-chart-cleanup better-release-script bug/port-forward-missing build-flatpak bundled-extensions-update catalog-entity-detail-registry chore/eslint-rules cleanup-pod-details-container cleanup-shell-session cleanup-terminal cluster-icons-as-letters consolidate-running-of-setups-on-application-start customize-colour debugging-integration-tests dependabot/npm_and_yarn/react-select-5.3.2 dependabot/npm_and_yarn/react-window-1.8.7 dependabot/npm_and_yarn/types/node-14.18.16 dependabot/npm_and_yarn/types/webpack-env-1.16.4 di-stores disposer-for-singletons doc/cluster-feature-extension-guide doc/status-bar-kube-object-extension-guides docs-spelling docs/api-all-exported electron-11.4.3 electron-12 endpoints-free-functions enhancement-node-vertical-metric-bars enhancement/group-app-preferences-by-extension ensure-listref-current entity-settings extension-auto-update extension-dir extension-discovery-changes extension-startup extensions/lens-version-check feat/add-bg-to-cluster-status feat/add-tests-for-main-extension-api-and-catalog-entity-registry feat/capture-logger-error feat/capture-winston-logger feat/lazy-load-compoment feat/new-api feature/auto-update feature/catalog-helm-repos feature/context-providers feature/kube-api-manager feature/lens-proxy-tls feature/navigate-back-ui-button feature/webpack5 feature/workspace-overview-extension-support feature/workspace-overview-landing fix-2109/compact-events fix-NamespaceSelect-gradients fix-api-doc-generate fix-change-os-theme-crash fix-concurrent-access fix-lint-error fix-linter-errors fix-local-make-dev fix-local-shell-session fix-namespace-filter-select fix-optimise-update-events-from-buffer fix-reload-list-items-on-mount fix-remove-watch-flush-headers fix-reseting-select-value fix-resource-applier fix-spelling fix-sync-open fix/allown-entity-id fix/blank-disabled-select-option fix/consistent-inputs fix/log-store-loading fix/metrics-resources-link fix/no-ui fix/node-shell-fail fix/ns-selector-performance-issue fix/pod-logs-storage fix/rewatch-if-resume fix/search_input_autofocus front-end-routes-ocp front-end-routes-ocp-2 front-end-routes-ocp-3 fuzz-tests global-watch hackweek-protocol-handler hackweek/multiple-windows helm-repo-cleanup helm-repo-manager helm-repo-manager-removal helm-routes hide-metrics improve-metrics-queries improve-pipelines-cache improve-workspace-validation improved-categories issue-1262 issue-1432 issue-1759 issue-1909 issue-2116 issue-2293 issue-2549 issue-2648 issue-2727 issue-3126 issue-3232 issue-3276 issue-3374 issue-3498 issue-3797 issue-3896 issue-4633 issue-4766 issue-4829 issue-4997 issue-5141 issue-5165 issue-5173 issue-5177 issue-5238 issue-745 lockdown-ownership make-LensExtension-abstract menu_enhancement mobx-6.2 more-places-to-check-for-updates move-docs native-menus port-forward-pod-deleted prometheus/victoria-metrics-single reactive-table refactor-settings-layout-styles release/v3.6 release/v4.0 release/v4.0-cherry-pick-fixes release/v4.0-doc-update release/v4.0-extension-publishing release/v4.0.0 release/v4.0.1 release/v4.0.2 release/v4.0.3 release/v4.0.4 release/v4.0.5 release/v4.0.6 release/v4.0.7 release/v4.0.8 release/v4.1 release/v4.1.0-alpha.1 release/v4.1.0-alpha.2 release/v4.1.0-beta.1 release/v4.1.0-beta.2 release/v4.1.0-rc.1 release/v4.1.0-rc.2 release/v4.1.1 release/v4.1.2 release/v4.1.3 release/v4.1.4 release/v4.2 release/v4.2.0-alpha.0 release/v5.0.0-rc.0 release/v5.2 release/v5.2.4 release/v5.2.7-beta.0 release/v5.3 release/v5.4 remove-font-icons remove-in-app-release-notes remove-unused-telemetry resizable_table_columns revert/store-and-watch-changes run-npm-publish-master-always set-build-version show-extension-preferences-in-separate-page single-logger squashed-update-injectable strict-mode temporary-manual-update-notification test/remove-sentry testing/issue-4314 testing/virtual-select tidy-hiddenTableColumns titles-and-headings top-bar-registry turn-on-strict typed-ipc-refactoring ui-table-empty-state-lines ui-tweaks update-bundled-extensions update-electon-builder-to-3-0-8 update-locks upgrade-typedoc-to-0.20 validate-cluster-model verify-quit-events watch-api-fixes websocket-catalog-sync welcome-banners-rounded-corners welcome-menu-registry workspace-overview-bug-test 4.2.0-beta.1 v5.5.0-beta.0 v5.4.6 v5.4.5 v5.4.4 v5.4.3 v5.4.2 v5.4.1 v5.4.0 v5.4.0-beta.5 v5.4.0-beta.4 v5.4.0-beta.3 v5.4.0-beta.2 v5.4.0-beta.1 v5.4.0-beta.0 v5.4.0-alpha.1 v5.4.0-alpha.0 v5.3.4 v5.3.3 v5.3.2 v5.3.1 v5.3.0 v5.3.0-beta.4 v5.3.0-beta.3 v5.3.0-beta.2 v5.3.0-beta.1 v5.3.0-beta.0 v5.3.0-alpha.11 v5.3.0-alpha.10 v5.3.0-alpha.9 v5.3.0-alpha.8 v5.3.0-alpha.7 v5.3.0-alpha.6 v5.3.0-alpha.5 v5.3.0-alpha.4 v5.3.0-alpha.3 v5.3.0-alpha.2 v5.3.0-alpha.1 v5.3.0-alpha.0 v5.2.7 v5.2.6 v5.2.6-beta.1 v5.2.6-beta.0 v5.2.5 v5.2.4 v5.2.3 v5.2.2 v5.2.1 v5.2.0 v5.2.0-rc.1 v5.2.0-beta.4 v5.2.0-beta.3 v5.2.0-beta.2 v5.2.0-beta.1 v5.1.3 v5.1.2 v5.1.1 v5.1.0 v5.1.0-beta.2 v5.1.0-beta.1 v5.0.2 v5.0.1 v5.0.0 v5.0.0-rc.0 v5.0.0-beta.13 v5.0.0-beta.12 v5.0.0-beta.11 v5.0.0-beta.10 v5.0.0-beta.9 v5.0.0-beta.8 v5.0.0-beta.7 v5.0.0-beta.6 v5.0.0-beta.5 v5.0.0-beta.4 v5.0.0-beta.3 v5.0.0-beta.2 v5.0.0-beta.1 v5.0.0-alpha.4 v5.0.0-alpha.3 v5.0.0-alpha.2 v5.0.0-alpha.1 v4.2.5 v4.2.4 v4.2.3 v4.2.2 v4.2.1 v4.2.0 v4.2.0-rc.3 v4.2.0-rc.2 v4.2.0-rc.1 v4.2.0-beta.1 v4.2.0-alpha.1 v4.1.5 v4.1.4 v4.1.3 v4.1.2 v4.1.1 v4.1.0 v4.1.0-rc.2 v4.1.0-rc.1 v4.1.0-beta.2 v4.1.0-beta.1 v4.1.0-alpha.2 v4.1.0-alpha.1 v4.0.8 v4.0.7 v4.0.6 v4.0.5 v4.0.4 v4.0.3 v4.0.2 v4.0.1 v4.0.0 v4.0.0-rc.3 v4.0.0-rc.2 v4.0.0-rc.1 v4.0.0-beta.4 v4.0.0-beta.3 v4.0.0-beta.2 v4.0.0-beta.1 v4.0.0-alpha.5 v4.0.0-alpha.4 v4.0.0-alpha.3 v4.0.0-alpha.2 v4.0.0-alpha.1 v3.6.10 v3.6.9 v3.6.8 v3.6.7 v3.6.6 v3.6.5 v3.6.5-rc.1 v3.5.6-rc.1
No related merge requests found
Showing with 39 additions and 19 deletions
+39 -19
......@@ -17,10 +17,6 @@ describe("app start", () => {
const addMinikubeCluster = async (app: Application) => {
await app.client.click("div.add-cluster")
await app.client.waitUntilTextExists("div", "Select kubeconfig file")
await app.client.click("div.Select__control")
await app.client.waitUntilTextExists("div", "minikube")
await app.client.click("div.minikube")
await app.client.click("div.Select__control")
await app.client.click("button.primary")
}
......
......@@ -80,7 +80,6 @@ export class AddCluster extends React.Component {
const contexts = this.getContexts(this.kubeConfigLocal);
this.kubeContexts.replace(contexts);
break;
case KubeConfigSourceTab.TEXT:
try {
this.error = ""
......@@ -91,6 +90,10 @@ export class AddCluster extends React.Component {
}
break;
}
if (this.kubeContexts.size === 1) {
this.selectedContexts.push(this.kubeContexts.keys().next().value)
}
}
getContexts(config: KubeConfig): Map<string, KubeConfig> {
......@@ -206,7 +209,7 @@ export class AddCluster extends React.Component {
<Tab
value={KubeConfigSourceTab.FILE}
label={<Trans>Select kubeconfig file</Trans>}
active={this.sourceTab == KubeConfigSourceTab.FILE}/>
active={this.sourceTab == KubeConfigSourceTab.FILE} />
<Tab
value={KubeConfigSourceTab.TEXT}
label={<Trans>Paste as text</Trans>}
......@@ -320,13 +323,15 @@ export class AddCluster extends React.Component {
return (
<div className={cssNames("kube-context flex gaps align-center", context)}>
<span>{context}</span>
{isNew && <Icon small material="fiber_new"/>}
{isSelected && <Icon small material="check" className="box right"/>}
{isNew && <Icon small material="fiber_new" />}
{isSelected && <Icon small material="check" className="box right" />}
</div>
)
};
render() {
const addDisabled = this.selectedContexts.length === 0
return (
<WizardLayout
className="AddCluster"
......@@ -374,9 +379,12 @@ export class AddCluster extends React.Component {
<div className="actions-panel">
<Button
primary
disabled={addDisabled}
label={<Trans>Add cluster(s)</Trans>}
onClick={this.addClusters}
waiting={this.isWaiting}
tooltip={addDisabled ? _i18n._("Select at least one cluster to add.") : undefined}
tooltipOverrideDisabled
/>
</div>
</WizardLayout>
......
......@@ -54,8 +54,7 @@
form:not([novalidate]):invalid &[type=submit]:not(.active),
&:disabled {
color: silver;
background: $buttonDisabledBackground;
opacity: 50%;
pointer-events: none;
}
......@@ -112,4 +111,4 @@
left: 100%;
width: 0;
}
}
\ No newline at end of file
}
......@@ -15,6 +15,7 @@ export enum TooltipPosition {
export interface TooltipProps {
targetId: string; // html-id of target element to bind for
tooltipOnParentHover?: boolean; // detect hover on parent of target
visible?: boolean; // initial visibility
offset?: number; // offset from target element in pixels (all sides)
usePortal?: boolean; // renders element outside of parent (in body), disable for "easy-styling", default: true
......@@ -50,14 +51,22 @@ export class Tooltip extends React.Component<TooltipProps> {
return document.getElementById(this.props.targetId)
}
get hoverTarget(): HTMLElement {
if (this.props.tooltipOnParentHover) {
return this.targetElem.parentElement
}
return this.targetElem
}
componentDidMount() {
this.targetElem.addEventListener("mouseenter", this.onEnterTarget)
this.targetElem.addEventListener("mouseleave", this.onLeaveTarget)
this.hoverTarget.addEventListener("mouseenter", this.onEnterTarget)
this.hoverTarget.addEventListener("mouseleave", this.onLeaveTarget)
}
componentWillUnmount() {
this.targetElem.removeEventListener("mouseenter", this.onEnterTarget)
this.targetElem.removeEventListener("mouseleave", this.onLeaveTarget)
this.hoverTarget.removeEventListener("mouseenter", this.onEnterTarget)
this.hoverTarget.removeEventListener("mouseleave", this.onLeaveTarget)
}
@autobind()
......
......@@ -8,6 +8,11 @@ import uniqueId from "lodash/uniqueId"
export interface TooltipDecoratorProps {
tooltip?: ReactNode | Omit<TooltipProps, "targetId">;
/**
* forces tooltip to detect the target's parent for mouse events. This is
* useful for displaying tooltips even when the target is "disabled"
*/
tooltipOverrideDisabled?: boolean;
}
export function withTooltip<T extends React.ComponentType<any>>(Target: T): T {
......@@ -17,22 +22,25 @@ export function withTooltip<T extends React.ComponentType<any>>(Target: T): T {
protected tooltipId = uniqueId("tooltip_target_");
render() {
const { tooltip, ...targetProps } = this.props;
const { tooltip, tooltipOverrideDisabled, ...targetProps } = this.props;
if (tooltip) {
const tooltipId = targetProps.id || this.tooltipId;
const tooltipProps: TooltipProps = {
targetId: tooltipId,
tooltipOnParentHover: tooltipOverrideDisabled,
...(isReactNode(tooltip) ? { children: tooltip } : tooltip),
};
targetProps.id = tooltipId;
targetProps.children = (
<>
{targetProps.children}
<Tooltip {...tooltipProps}/>
<div>
{targetProps.children}
</div>
<Tooltip {...tooltipProps} />
</>
)
}
return <Target {...targetProps as any}/>;
return <Target {...targetProps as any} />;
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment