diff --git a/superset/assets/spec/javascripts/addSlice/AddSliceContainer_spec.jsx b/superset/assets/spec/javascripts/addSlice/AddSliceContainer_spec.jsx index c842c040a..e16b98893 100644 --- a/superset/assets/spec/javascripts/addSlice/AddSliceContainer_spec.jsx +++ b/superset/assets/spec/javascripts/addSlice/AddSliceContainer_spec.jsx @@ -20,7 +20,9 @@ import React from 'react'; import { shallow } from 'enzyme'; import { Button } from 'react-bootstrap'; import Select from 'react-virtualized-select'; + import AddSliceContainer from '../../../src/addSlice/AddSliceContainer'; +import VizTypeControl from '../../../src/explore/components/controls/VizTypeControl'; const defaultProps = { datasources: [ @@ -40,8 +42,9 @@ describe('AddSliceContainer', () => { expect(wrapper.state().visType).toBe('table'); }); - it('renders 2 selects', () => { - expect(wrapper.find(Select)).toHaveLength(2); + it('renders a select and a VizTypeControl', () => { + expect(wrapper.find(Select)).toHaveLength(1); + expect(wrapper.find(VizTypeControl)).toHaveLength(1); }); it('renders a button', () => { diff --git a/superset/assets/src/addSlice/AddSliceContainer.jsx b/superset/assets/src/addSlice/AddSliceContainer.jsx index bb3166c64..6935690ca 100644 --- a/superset/assets/src/addSlice/AddSliceContainer.jsx +++ b/superset/assets/src/addSlice/AddSliceContainer.jsx @@ -21,7 +21,8 @@ import PropTypes from 'prop-types'; import { Button, Panel } from 'react-bootstrap'; import Select from 'react-virtualized-select'; import { t } from '@superset-ui/translation'; -import { getChartMetadataRegistry } from '@superset-ui/chart'; + +import VizTypeControl from '../explore/components/controls/VizTypeControl'; const propTypes = { datasources: PropTypes.arrayOf(PropTypes.shape({ @@ -65,8 +66,8 @@ export default class AddSliceContainer extends React.PureComponent { }); } - changeVisType(e) { - this.setState({ visType: e.value }); + changeVisType(visType) { + this.setState({ visType }); } isBtnDisabled() { @@ -74,12 +75,6 @@ export default class AddSliceContainer extends React.PureComponent { } render() { - const types = getChartMetadataRegistry().entries() - .map(({ key, value }) => ({ - value: key, - label: value.name, - })); - return (
{t('Create a new chart')}}> @@ -108,17 +103,14 @@ export default class AddSliceContainer extends React.PureComponent {

{t('Choose a visualization type')}

-