QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-14 05:34:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: Pasting text issues in MetricsControl and AdhocFilterControl inputs (#11445)

Browse Source 
* Fix paste not working in Metrics and Filter inputs

* Use noOp instead of empty function

* Use default Select component instead of OnPasteSelect

* Revert onPaste override
This commit is contained in:
Kamil Gabryjelski
2020-11-04 22:48:48 +01:00
committed by GitHub
parent ad98981d9d
commit 128ddfabb6
4 changed files with 40 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
superset-frontend/spec/javascripts/explore/components/MetricsControl_spec.jsx
View File

@@ -23,7 +23,7 @@ import { shallow } from 'enzyme';
import MetricsControl from 'src/explore/components/controls/MetricsControl';
import { AGGREGATES } from 'src/explore/constants';
import OnPasteSelect from 'src/components/Select/OnPasteSelect';
import Select from 'src/components/Select';
import AdhocMetric, { EXPRESSION_TYPES } from 'src/explore/AdhocMetric';
const defaultProps = {
@@ -63,9 +63,9 @@ const sumValueAdhocMetric = new AdhocMetric({
});
describe('MetricsControl', () => {
it('renders an OnPasteSelect', () => {
it('renders Select', () => {
const { wrapper } = setup();
expect(wrapper.find(OnPasteSelect)).toExist();
expect(wrapper.find(Select)).toExist();
});
describe('constructor', () => {
@@ -152,14 +152,14 @@ describe('MetricsControl', () => {
describe('onChange', () => {
it('handles saved metrics being selected', () => {
const { wrapper, onChange } = setup();
const select = wrapper.find(OnPasteSelect);
const select = wrapper.find(Select);
select.simulate('change', [{ metric_name: 'sum__value' }]);
expect(onChange.lastCall.args).toEqual([['sum__value']]);
});
it('handles columns being selected', () => {
const { wrapper, onChange } = setup();
const select = wrapper.find(OnPasteSelect);
const select = wrapper.find(Select);
select.simulate('change', [valueColumn]);
const adhocMetric = onChange.lastCall.args[0][0];
@@ -184,7 +184,7 @@ describe('MetricsControl', () => {
it('handles aggregates being selected', () => {
return new Promise(done => {
const { wrapper, onChange } = setup();
const select = wrapper.find(OnPasteSelect);
const select = wrapper.find(Select);
// mock out the Select ref
const instance = wrapper.instance();
@@ -220,7 +220,7 @@ describe('MetricsControl', () => {
it('preserves existing selected AdhocMetrics', () => {
const { wrapper, onChange } = setup();
const select = wrapper.find(OnPasteSelect);
const select = wrapper.find(Select);
select.simulate('change', [
{ metric_name: 'sum__value' },
sumValueAdhocMetric,
@@ -262,6 +262,18 @@ describe('MetricsControl', () => {
wrapper.instance().checkIfAggregateInInput('colu');
expect(wrapper.state('aggregateInInput')).toBeNull();
});
it('handles an aggregate in the input when paste event fires', () => {
const { wrapper } = setup();
expect(wrapper.state('aggregateInInput')).toBeNull();
const mEvent = {
clipboardData: { getData: jest.fn().mockReturnValueOnce('AVG(') },
};
const select = wrapper.find(Select);
select.simulate('paste', mEvent);
expect(wrapper.state('aggregateInInput')).toBe(AGGREGATES.AVG);
});
});
describe('option filter', () => {