QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-05-31 13:19:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Popovers in Explore not attached to the fields they are triggered by (#19139)

Browse Source 
* fix: Popovers in Explore not attached to the fields they are triggered by

* fix

* PR comment

* remove unused import
This commit is contained in:
Diego Medina
2022-03-16 22:46:52 -04:00
committed by GitHub
parent 3b427b2029
commit 0277ebc225
14 changed files with 277 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricOption.test.jsx
View File

@@ -21,10 +21,10 @@ import React from 'react';
import sinon from 'sinon';
import { shallow } from 'enzyme';
import Popover from 'src/components/Popover';
import { AGGREGATES } from 'src/explore/constants';
import AdhocMetricOption from 'src/explore/components/controls/MetricControl/AdhocMetricOption';
import AdhocMetric from 'src/explore/components/controls/MetricControl/AdhocMetric';
import ControlPopover from '../ControlPopover/ControlPopover';
const columns = [
{ type: 'VARCHAR(255)', column_name: 'source' },
@@ -59,7 +59,7 @@ function setup(overrides) {
describe('AdhocMetricOption', () => {
it('renders an overlay trigger wrapper for the label', () => {
const { wrapper } = setup();
expect(wrapper.find(Popover)).toExist();
expect(wrapper.find(ControlPopover)).toExist();
expect(wrapper.find('OptionControlLabel')).toExist();
});

6
superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricPopoverTrigger.tsx
View File

@@ -18,7 +18,6 @@
*/
import React, { ReactNode } from 'react';
import { Datasource, Metric } from '@superset-ui/core';
import Popover from 'src/components/Popover';
import AdhocMetricEditPopoverTitle from 'src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle';
import { ExplorePopoverContent } from 'src/explore/components/ExploreContentPopover';
import AdhocMetricEditPopover, {
@@ -26,6 +25,7 @@ import AdhocMetricEditPopover, {
} from './AdhocMetricEditPopover';
import AdhocMetric from './AdhocMetric';
import { savedMetricType } from './types';
import ControlPopover from '../ControlPopover/ControlPopover';
export type AdhocMetricPopoverTriggerProps = {
adhocMetric: AdhocMetric;
@@ -223,7 +223,7 @@ class AdhocMetricPopoverTrigger extends React.PureComponent<
);
return (
<Popover
<ControlPopover
placement="right"
trigger="click"
content={overlayContent}
@@ -234,7 +234,7 @@ class AdhocMetricPopoverTrigger extends React.PureComponent<
destroyTooltipOnHide
>
{this.props.children}
</Popover>
</ControlPopover>
);
}
}