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:
Kamil Gabryjelski
2020-11-06 23:23:12 +01:00
committed by GitHub
parent 32e52e94e0
commit a6bf95e30b
5 changed files with 38 additions and 3 deletions

View File

@@ -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

View File

@@ -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',
};

View File

@@ -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();
}