From 074cc61145869165217e2d35a4b949f92a6829e7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Kuty=C5=82a?= Date: Mon, 27 Mar 2023 23:43:38 +0200 Subject: [PATCH] 200085: Fix for sharing dialog, clear on blur MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła --- cypress/integration/banner-tooltip.spec.js | 1 - .../sharing-dialog/participant-select.tsx | 9 ++++++++- src/views-components/sharing-dialog/sharing-dialog.tsx | 1 - .../virtual-machines-dialog/group-array-input.tsx | 1 - 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cypress/integration/banner-tooltip.spec.js b/cypress/integration/banner-tooltip.spec.js index 6156909c..df84abe9 100644 --- a/cypress/integration/banner-tooltip.spec.js +++ b/cypress/integration/banner-tooltip.spec.js @@ -94,7 +94,6 @@ describe('Collection panel tests', function () { cy.getAll('@banner', '@tooltips') .then(([banner, tooltips]) => { - console.log(tooltips) cy.get('[data-cy=drag-and-drop]').upload(banner, 'banner.html', false); cy.get('[data-cy=drag-and-drop]').upload(tooltips, 'tooltips.json', false); }); diff --git a/src/views-components/sharing-dialog/participant-select.tsx b/src/views-components/sharing-dialog/participant-select.tsx index 02cdeaf2..b43940f0 100644 --- a/src/views-components/sharing-dialog/participant-select.tsx +++ b/src/views-components/sharing-dialog/participant-select.tsx @@ -88,7 +88,7 @@ export const ParticipantSelect = connect()( onSelect={this.handleSelect} onDelete={this.props.onDelete && !this.props.disabled ? this.handleDelete : undefined} onFocus={this.props.onFocus} - onBlur={this.props.onBlur} + onBlur={this.onBlur} renderChipValue={this.renderChipValue} renderChipTooltip={this.renderChipTooltip} renderSuggestion={this.renderSuggestion} @@ -96,6 +96,13 @@ export const ParticipantSelect = connect()( ); } + onBlur = (e) => { + if (this.props.onBlur) { + this.props.onBlur(e); + } + setTimeout(() => this.setState({ value: '', suggestions: [] }), 200); + } + renderChipValue(chipValue: Participant) { const { name, uuid } = chipValue; return name || uuid; diff --git a/src/views-components/sharing-dialog/sharing-dialog.tsx b/src/views-components/sharing-dialog/sharing-dialog.tsx index db89a83c..01cd390b 100644 --- a/src/views-components/sharing-dialog/sharing-dialog.tsx +++ b/src/views-components/sharing-dialog/sharing-dialog.tsx @@ -36,7 +36,6 @@ const mapStateToProps = (state: RootState, { working, ...props }: Props): Sharin const dialog = getDialog(state.dialog, SHARING_DIALOG_NAME); const sharedResourceUuid = dialog?.data.resourceUuid || ''; const sharingURLsDisabled = state.auth.config.clusterConfig.Workbench.DisableSharingURLsUI; - console.log(state); return ({ ...props, saveEnabled: hasChanges(state), diff --git a/src/views-components/virtual-machines-dialog/group-array-input.tsx b/src/views-components/virtual-machines-dialog/group-array-input.tsx index 95a86420..cba9af63 100644 --- a/src/views-components/virtual-machines-dialog/group-array-input.tsx +++ b/src/views-components/virtual-machines-dialog/group-array-input.tsx @@ -46,7 +46,6 @@ const styles = (theme: ArvadosTheme) => ({ }); export const GroupArrayInput = ({name, input, setPartialGroupInput, hasPartialGroupInput}: GroupArrayInputProps & GroupArrayDataProps) => { - console.log(hasPartialGroupInput); return