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(metricoption): remove metricoption and columntypelable dependency (#10077)

Browse Source 
* remove columntypeLabel and metricoptions from superset

* fix lint

* remove old test

* update pakage

* add suggestions

* fix merge conflict
This commit is contained in:
Phillip Kelley-Dotson
2020-06-17 19:55:17 -07:00
committed by GitHub
parent 817b7aaf29
commit 02fee35314
15 changed files with 38 additions and 253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
superset-frontend/src/explore/components/AdhocMetricStaticOption.jsx
View File

@@ -18,8 +18,8 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
import { ColumnTypeLabel } from '@superset-ui/control-utils';
import ColumnTypeLabel from '../../components/ColumnTypeLabel';
import adhocMetricType from '../propTypes/adhocMetricType';
const propTypes = {

2
superset-frontend/src/explore/components/AggregateOption.jsx
View File

@@ -18,8 +18,8 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
import { ColumnTypeLabel } from '@superset-ui/control-utils';
import ColumnTypeLabel from '../../components/ColumnTypeLabel';
import aggregateOptionType from '../propTypes/aggregateOptionType';
const propTypes = {

3
superset-frontend/src/explore/components/FilterDefinitionOption.jsx
View File

@@ -18,9 +18,8 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
import { ColumnOption } from '@superset-ui/control-utils';
import { ColumnOption, ColumnTypeLabel } from '@superset-ui/control-utils';
import ColumnTypeLabel from '../../components/ColumnTypeLabel';
import AdhocMetricStaticOption from './AdhocMetricStaticOption';
import columnType from '../propTypes/columnType';
import adhocMetricType from '../propTypes/adhocMetricType';

3
superset-frontend/src/explore/components/MetricDefinitionOption.jsx
View File

@@ -18,9 +18,8 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
import { ColumnOption } from '@superset-ui/control-utils';
import { ColumnOption, MetricOption } from '@superset-ui/control-utils';
import MetricOption from '../../components/MetricOption';
import AggregateOption from './AggregateOption';
import columnType from '../propTypes/columnType';
import savedMetricType from '../propTypes/savedMetricType';

2
superset-frontend/src/explore/components/MetricDefinitionValue.jsx
View File

@@ -18,11 +18,11 @@
*/
import React from 'react';
import PropTypes from 'prop-types';
import { MetricOption } from '@superset-ui/control-utils';
import AdhocMetricOption from './AdhocMetricOption';
import AdhocMetric from '../AdhocMetric';
import columnType from '../propTypes/columnType';
import MetricOption from '../../components/MetricOption';
import savedMetricType from '../propTypes/savedMetricType';
import adhocMetricType from '../propTypes/adhocMetricType';

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

@@ -30,9 +30,8 @@ import {
Well,
} from 'react-bootstrap';
import { t } from '@superset-ui/translation';
import { ColumnOption } from '@superset-ui/control-utils';
import { ColumnOption, MetricOption } from '@superset-ui/control-utils';
import ControlHeader from '../ControlHeader';
import MetricOption from '../../../components/MetricOption';
import DatasourceModal from '../../../datasource/DatasourceModal';
import ChangeDatasourceModal from '../../../datasource/ChangeDatasourceModal';
import TooltipWrapper from '../../../components/TooltipWrapper';