This is an automated email from the ASF dual-hosted git repository. villebro pushed a commit to branch 0.35 in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit ff092e20f53ef44a52e0a6d1b35efa9635a3595f Author: Maxime Beauchemin <[email protected]> AuthorDate: Mon Dec 9 21:59:53 2019 -0800 fix: don't show filter popover on explore view load (#8729) * fix: don't show filter popover on explore view load There's this confusing "feature" that I thought was a bug that shows the metric popover opened when entering the explore view when the filter comes from an active dashboard filter, based on the "fromFormData" attribute of the filter. The popover is confusing and often shows as misaligned with the actual element it's supposed to float over when overflowing. * warn * fix cypress * also shut off metrics --- superset/assets/cypress/integration/explore/control.test.js | 3 ++- superset/assets/src/explore/components/AdhocFilterOption.jsx | 3 +-- superset/assets/src/explore/components/AdhocMetricOption.jsx | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/superset/assets/cypress/integration/explore/control.test.js b/superset/assets/cypress/integration/explore/control.test.js index d20cb46..86f6183 100644 --- a/superset/assets/cypress/integration/explore/control.test.js +++ b/superset/assets/cypress/integration/explore/control.test.js @@ -164,7 +164,7 @@ describe('AdhocFilters', () => { .trigger('mousedown') .click(); }); - + cy.get('.adhoc-filter-option').click({ force: true }); cy.get('#filter-edit-popover').within(() => { cy.get('[data-test=adhoc-filter-simple-value]').within(() => { cy.get('div.select-input').click({ force: true }); @@ -197,6 +197,7 @@ describe('AdhocFilters', () => { .click(); }); + cy.get('.adhoc-filter-option').click({ force: true }); cy.get('#filter-edit-popover').within(() => { cy.get('#adhoc-filter-edit-tabs-tab-SQL').click(); cy.get('.ace_content').click(); diff --git a/superset/assets/src/explore/components/AdhocFilterOption.jsx b/superset/assets/src/explore/components/AdhocFilterOption.jsx index 195bbe4..d027737 100644 --- a/superset/assets/src/explore/components/AdhocFilterOption.jsx +++ b/superset/assets/src/explore/components/AdhocFilterOption.jsx @@ -43,7 +43,7 @@ export default class AdhocFilterOption extends React.PureComponent { this.onPopoverResize = this.onPopoverResize.bind(this); this.onOverlayEntered = this.onOverlayEntered.bind(this); this.onOverlayExited = this.onOverlayExited.bind(this); - this.state = { overlayShown: !this.props.adhocFilter.fromFormData }; + this.state = { overlayShown: false }; } onPopoverResize() { @@ -88,7 +88,6 @@ export default class AdhocFilterOption extends React.PureComponent { overlay={overlay} rootClose shouldUpdatePosition - defaultOverlayShown={!adhocFilter.fromFormData} onEntered={this.onOverlayEntered} onExited={this.onOverlayExited} > diff --git a/superset/assets/src/explore/components/AdhocMetricOption.jsx b/superset/assets/src/explore/components/AdhocMetricOption.jsx index a1ca1ed..9d80b80 100644 --- a/superset/assets/src/explore/components/AdhocMetricOption.jsx +++ b/superset/assets/src/explore/components/AdhocMetricOption.jsx @@ -39,7 +39,7 @@ export default class AdhocMetricOption extends React.PureComponent { this.onOverlayEntered = this.onOverlayEntered.bind(this); this.onOverlayExited = this.onOverlayExited.bind(this); this.onPopoverResize = this.onPopoverResize.bind(this); - this.state = { overlayShown: !this.props.adhocMetric.fromFormData }; + this.state = { overlayShown: false }; } onPopoverResize() { @@ -47,7 +47,7 @@ export default class AdhocMetricOption extends React.PureComponent { } onOverlayEntered() { - this.setState({ overlayShown: true }); + this.setState({ overlayShown: false }); } onOverlayExited() {
