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

chore: Upgrade react-dnd to 11.1.3 (#12815)

Browse Source
This commit is contained in:
Kamil Gabryjelski
2021-01-29 03:34:56 +01:00
committed by GitHub
parent 34549cb5b7
commit fcaa0acad5
31 changed files with 200 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl.jsx
View File

@@ -34,7 +34,6 @@ import {
LabelsContainer,
} from 'src/explore/components/OptionControls';
import Icon from 'src/components/Icon';
import DndWithHTML5Backend from 'src/explore/DndContextProvider';
import AdhocFilterPopoverTrigger from './AdhocFilterPopoverTrigger';
import AdhocFilterOption from './AdhocFilterOption';
import AdhocFilter, { CLAUSES, EXPRESSION_TYPES } from './AdhocFilter';
@@ -362,4 +361,4 @@ class AdhocFilterControl extends React.Component {
AdhocFilterControl.propTypes = propTypes;
AdhocFilterControl.defaultProps = defaultProps;
export default DndWithHTML5Backend(withTheme(AdhocFilterControl));
export default withTheme(AdhocFilterControl);

4
superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterOption.jsx
View File

@@ -20,7 +20,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import columnType from 'src/explore/propTypes/columnType';
import adhocMetricType from 'src/explore/components/controls/MetricControl/adhocMetricType';
import { DraggableOptionControlLabel } from 'src/explore/components/OptionControls';
import { OptionControlLabel } from 'src/explore/components/OptionControls';
import { OPTION_TYPES } from 'src/explore/components/optionTypes';
import AdhocFilterPopoverTrigger from './AdhocFilterPopoverTrigger';
import AdhocFilter from './AdhocFilter';
@@ -61,7 +61,7 @@ const AdhocFilterOption = ({
onFilterEdit={onFilterEdit}
partitionColumn={partitionColumn}
>
<DraggableOptionControlLabel
<OptionControlLabel
label={adhocFilter.getDefaultLabel()}
onRemove={onRemoveFilter}
onMoveLabel={onMoveLabel}

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

@@ -20,7 +20,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import { Tooltip } from 'src/common/components/Tooltip';
import columnType from 'src/explore/propTypes/columnType';
import { DraggableOptionControlLabel } from 'src/explore/components/OptionControls';
import { OptionControlLabel } from 'src/explore/components/OptionControls';
import { OPTION_TYPES } from 'src/explore/components/optionTypes';
import AdhocMetric from './AdhocMetric';
import savedMetricType from './savedMetricType';
@@ -75,7 +75,7 @@ class AdhocMetricOption extends React.PureComponent {
placement="top"
title={savedMetric.expression || adhocMetric.label}
>
<DraggableOptionControlLabel
<OptionControlLabel
savedMetric={savedMetric}
label={adhocMetric.label}
onRemove={this.onRemoveMetric}

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

@@ -19,7 +19,7 @@
import React from 'react';
import PropTypes from 'prop-types';
import columnType from 'src/explore/propTypes/columnType';
import { DraggableOptionControlLabel } from 'src/explore/components/OptionControls';
import { OptionControlLabel } from 'src/explore/components/OptionControls';
import { OPTION_TYPES } from 'src/explore/components/optionTypes';
import AdhocMetricOption from './AdhocMetricOption';
import AdhocMetric from './AdhocMetric';
@@ -83,7 +83,7 @@ export default function MetricDefinitionValue({
}
if (typeof option === 'string') {
return (
<DraggableOptionControlLabel
<OptionControlLabel
label={option}
onRemove={onRemoveMetric}
onMoveLabel={onMoveLabel}

3
superset-frontend/src/explore/components/controls/MetricControl/MetricsControl.jsx
View File

@@ -34,7 +34,6 @@ import {
HeaderContainer,
LabelsContainer,
} from 'src/explore/components/OptionControls';
import DndWithHTML5Backend from 'src/explore/DndContextProvider';
import MetricDefinitionOption from './MetricDefinitionOption';
import MetricDefinitionValue from './MetricDefinitionValue';
import AdhocMetric from './AdhocMetric';
@@ -411,4 +410,4 @@ class MetricsControl extends React.PureComponent {
MetricsControl.propTypes = propTypes;
MetricsControl.defaultProps = defaultProps;
export default DndWithHTML5Backend(withTheme(MetricsControl));
export default withTheme(MetricsControl);