mirror of
https://github.com/apache/superset.git
synced 2026-05-12 11:25:56 +00:00
fix: Filter and Metric popovers not closing after clicking Save (#11607)
* Fix filter popover not closing * Fix metric popover not closing * Add e2e tests
This commit is contained in:
committed by
GitHub
parent
32e52e94e0
commit
a6bf95e30b
@@ -85,7 +85,8 @@ export default class AdhocFilterEditPopover extends React.Component {
|
||||
}
|
||||
|
||||
onSave() {
|
||||
this.props.onChange(this.state.adhocFilter);
|
||||
// unset isNew here in case save button was clicked when no changes were made
|
||||
this.props.onChange({ ...this.state.adhocFilter, isNew: false });
|
||||
this.props.onClose();
|
||||
}
|
||||
|
||||
@@ -163,7 +164,7 @@ export default class AdhocFilterEditPopover extends React.Component {
|
||||
datasource={datasource}
|
||||
onHeightChange={this.adjustHeight}
|
||||
partitionColumn={partitionColumn}
|
||||
popoverRef={this.popoverContentRef}
|
||||
popoverRef={this.popoverContentRef.current}
|
||||
/>
|
||||
</Tabs.TabPane>
|
||||
<Tabs.TabPane
|
||||
|
||||
@@ -100,7 +100,7 @@ export default class AdhocFilterEditPopoverSimpleTabContent extends React.Compon
|
||||
};
|
||||
|
||||
this.menuPortalProps = {
|
||||
menuPortalTarget: props.popoverRef?.current || document.body,
|
||||
menuPortalTarget: props.popoverRef,
|
||||
menuPosition: 'fixed',
|
||||
menuPlacement: 'bottom',
|
||||
};
|
||||
|
||||
@@ -100,9 +100,11 @@ export default class AdhocMetricEditPopover extends React.Component {
|
||||
}
|
||||
|
||||
onSave() {
|
||||
// unset isNew here in case save button was clicked when no changes were made
|
||||
this.props.onChange({
|
||||
...this.state.adhocMetric,
|
||||
...this.props.title,
|
||||
isNew: false,
|
||||
});
|
||||
this.props.onClose();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user