diff --git a/superset-frontend/spec/javascripts/dashboard/components/PropertiesModal_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/PropertiesModal_spec.jsx index 20edc28cda..81bd0d0670 100644 --- a/superset-frontend/spec/javascripts/dashboard/components/PropertiesModal_spec.jsx +++ b/superset-frontend/spec/javascripts/dashboard/components/PropertiesModal_spec.jsx @@ -27,7 +27,7 @@ import { ThemeProvider, } from '@superset-ui/core'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import PropertiesModal from 'src/dashboard/components/PropertiesModal'; import { mockStore } from 'spec/fixtures/mockStore'; diff --git a/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx b/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx index c1f02e09a6..4e7e9346f8 100644 --- a/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx +++ b/superset-frontend/spec/javascripts/datasource/ChangeDatasourceModal_spec.jsx @@ -24,7 +24,7 @@ import thunk from 'redux-thunk'; import { act } from 'react-dom/test-utils'; import sinon from 'sinon'; import { supersetTheme, ThemeProvider } from '@superset-ui/core'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import ChangeDatasourceModal from 'src/datasource/ChangeDatasourceModal'; import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; import mockDatasource from 'spec/fixtures/mockDatasource'; diff --git a/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx b/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx index 9d4d9c638e..d965aec720 100644 --- a/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx +++ b/superset-frontend/spec/javascripts/datasource/DatasourceModal_spec.jsx @@ -27,7 +27,7 @@ import sinon from 'sinon'; import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import DatasourceModal from 'src/datasource/DatasourceModal'; import DatasourceEditor from 'src/datasource/DatasourceEditor'; import * as featureFlags from 'src/featureFlags'; diff --git a/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx b/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx index 496f689712..dc33c77d3a 100644 --- a/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx +++ b/superset-frontend/spec/javascripts/explore/components/VizTypeControl_spec.jsx @@ -21,7 +21,7 @@ import sinon from 'sinon'; import { shallow } from 'enzyme'; import { getChartMetadataRegistry, ChartMetadata } from '@superset-ui/core'; import VizTypeControl from 'src/explore/components/controls/VizTypeControl'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; const defaultProps = { name: 'viz_type', diff --git a/superset-frontend/spec/javascripts/sqllab/SaveQuery_spec.jsx b/superset-frontend/spec/javascripts/sqllab/SaveQuery_spec.jsx index 33c96ced4b..3a5673df3c 100644 --- a/superset-frontend/spec/javascripts/sqllab/SaveQuery_spec.jsx +++ b/superset-frontend/spec/javascripts/sqllab/SaveQuery_spec.jsx @@ -21,7 +21,7 @@ import { FormControl } from 'react-bootstrap'; import { shallow } from 'enzyme'; import * as sinon from 'sinon'; import SaveQuery from 'src/SqlLab/components/SaveQuery'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import Button from 'src/components/Button'; describe('SavedQuery', () => { diff --git a/superset-frontend/spec/javascripts/views/CRUD/alert/AlertReportModal_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/alert/AlertReportModal_spec.jsx index f494c237aa..ca68fc7a09 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/alert/AlertReportModal_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/alert/AlertReportModal_spec.jsx @@ -23,7 +23,7 @@ import configureStore from 'redux-mock-store'; import fetchMock from 'fetch-mock'; import { act } from 'react-dom/test-utils'; import AlertReportModal from 'src/views/CRUD/alert/AlertReportModal'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import { AsyncSelect, NativeGraySelect as Select } from 'src/components/Select'; import { Radio } from 'src/common/components/Radio'; import { Switch } from 'src/components/Switch'; diff --git a/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx index 990928cf93..e6686d1741 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/annotation/AnnotationModal_spec.jsx @@ -22,7 +22,7 @@ import configureStore from 'redux-mock-store'; import { Provider } from 'react-redux'; import fetchMock from 'fetch-mock'; import AnnotationModal from 'src/views/CRUD/annotation/AnnotationModal'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; import { JsonEditor } from 'src/components/AsyncAceEditor'; import { styledMount as mount } from 'spec/helpers/theming'; diff --git a/superset-frontend/spec/javascripts/views/CRUD/annotationlayers/AnnotationLayerModal_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/annotationlayers/AnnotationLayerModal_spec.jsx index a9add984b3..878346fd60 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/annotationlayers/AnnotationLayerModal_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/annotationlayers/AnnotationLayerModal_spec.jsx @@ -22,7 +22,7 @@ import configureStore from 'redux-mock-store'; import { Provider } from 'react-redux'; import fetchMock from 'fetch-mock'; import AnnotationLayerModal from 'src/views/CRUD/annotationlayers/AnnotationLayerModal'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; import { styledMount as mount } from 'spec/helpers/theming'; diff --git a/superset-frontend/spec/javascripts/views/CRUD/csstemplates/CssTemplateModal_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/csstemplates/CssTemplateModal_spec.jsx index c3b8289ae8..c503c709de 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/csstemplates/CssTemplateModal_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/csstemplates/CssTemplateModal_spec.jsx @@ -22,7 +22,7 @@ import { Provider } from 'react-redux'; import configureStore from 'redux-mock-store'; import fetchMock from 'fetch-mock'; import CssTemplateModal from 'src/views/CRUD/csstemplates/CssTemplateModal'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; import { CssEditor } from 'src/components/AsyncAceEditor'; import { styledMount as mount } from 'spec/helpers/theming'; diff --git a/superset-frontend/spec/javascripts/views/CRUD/data/database/DatabaseModal_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/data/database/DatabaseModal_spec.jsx index 213f7be744..9e200a59f9 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/data/database/DatabaseModal_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/data/database/DatabaseModal_spec.jsx @@ -26,7 +26,7 @@ import userEvent from '@testing-library/user-event'; import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import { Provider } from 'react-redux'; import DatabaseModal from 'src/views/CRUD/data/database/DatabaseModal'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import Tabs from 'src/common/components/Tabs'; import fetchMock from 'fetch-mock'; import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; diff --git a/superset-frontend/spec/javascripts/views/CRUD/data/savedquery/SavedQueryPreviewModal_spec.jsx b/superset-frontend/spec/javascripts/views/CRUD/data/savedquery/SavedQueryPreviewModal_spec.jsx index 19d1235bdc..e6f17f4eae 100644 --- a/superset-frontend/spec/javascripts/views/CRUD/data/savedquery/SavedQueryPreviewModal_spec.jsx +++ b/superset-frontend/spec/javascripts/views/CRUD/data/savedquery/SavedQueryPreviewModal_spec.jsx @@ -23,7 +23,7 @@ import fetchMock from 'fetch-mock'; import { styledMount as mount } from 'spec/helpers/theming'; import SavedQueryPreviewModal from 'src/views/CRUD/data/savedquery/SavedQueryPreviewModal'; import Button from 'src/components/Button'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; import { act } from 'react-dom/test-utils'; diff --git a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx index e5c8b68f52..b5119fc6c5 100644 --- a/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx +++ b/superset-frontend/src/SqlLab/components/SaveDatasetModal.tsx @@ -21,7 +21,7 @@ import React, { FunctionComponent } from 'react'; import { AutoCompleteProps } from 'antd/lib/auto-complete'; import { Radio } from 'src/common/components/Radio'; import { AutoComplete, Input } from 'src/common/components'; -import StyledModal from 'src/common/components/Modal'; +import StyledModal from 'src/components/Modal'; import Button from 'src/components/Button'; import { styled, t } from '@superset-ui/core'; import { RadioChangeEvent } from 'antd/lib/radio'; diff --git a/superset-frontend/src/SqlLab/components/SaveQuery.tsx b/superset-frontend/src/SqlLab/components/SaveQuery.tsx index 4907684fa1..4b8e7a0b9d 100644 --- a/superset-frontend/src/SqlLab/components/SaveQuery.tsx +++ b/superset-frontend/src/SqlLab/components/SaveQuery.tsx @@ -22,7 +22,7 @@ import { t, supersetTheme, styled } from '@superset-ui/core'; import Button from 'src/components/Button'; import FormLabel from 'src/components/FormLabel'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import Icon from 'src/components/Icon'; const Styles = styled.span` diff --git a/superset-frontend/src/SqlLab/components/SqlEditor.jsx b/superset-frontend/src/SqlLab/components/SqlEditor.jsx index 1db78b18ca..fb41697036 100644 --- a/superset-frontend/src/SqlLab/components/SqlEditor.jsx +++ b/superset-frontend/src/SqlLab/components/SqlEditor.jsx @@ -28,7 +28,7 @@ import Split from 'react-split'; import { t, styled, supersetTheme } from '@superset-ui/core'; import debounce from 'lodash/debounce'; import throttle from 'lodash/throttle'; -import StyledModal from 'src/common/components/Modal'; +import StyledModal from 'src/components/Modal'; import Mousetrap from 'mousetrap'; import Button from 'src/components/Button'; import Timer from 'src/components/Timer'; diff --git a/superset-frontend/src/common/components/common.stories.tsx b/superset-frontend/src/common/components/common.stories.tsx index fa63130599..1adb42dfbc 100644 --- a/superset-frontend/src/common/components/common.stories.tsx +++ b/superset-frontend/src/common/components/common.stories.tsx @@ -21,7 +21,7 @@ import { action } from '@storybook/addon-actions'; import { withKnobs, boolean, select } from '@storybook/addon-knobs'; import Button from 'src/components/Button'; import { CronPicker, CronError } from 'src/components/CronPicker'; -import Modal from './Modal'; +import Modal from 'src/components/Modal'; import Tabs, { EditableTabs } from './Tabs'; import { Tooltip as AntdTooltip } from './Tooltip'; import { Menu, Input, Divider } from '.'; diff --git a/superset-frontend/src/components/ConfirmStatusChange/ConfirmStatusChange.test.jsx b/superset-frontend/src/components/ConfirmStatusChange/ConfirmStatusChange.test.jsx index 2d158cf2c7..ba41f5b51d 100644 --- a/superset-frontend/src/components/ConfirmStatusChange/ConfirmStatusChange.test.jsx +++ b/superset-frontend/src/components/ConfirmStatusChange/ConfirmStatusChange.test.jsx @@ -22,7 +22,7 @@ import Button from 'src/components/Button'; import { act } from 'react-dom/test-utils'; import { supersetTheme, ThemeProvider } from '@superset-ui/core'; import ConfirmStatusChange from 'src/components/ConfirmStatusChange'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; describe('ConfirmStatusChange', () => { const mockedProps = { diff --git a/superset-frontend/src/components/DeleteModal/index.tsx b/superset-frontend/src/components/DeleteModal/index.tsx index c784e57932..a4a29fb81f 100644 --- a/superset-frontend/src/components/DeleteModal/index.tsx +++ b/superset-frontend/src/components/DeleteModal/index.tsx @@ -19,7 +19,7 @@ import { t, styled } from '@superset-ui/core'; import React, { useState } from 'react'; import { FormGroup, FormControl, FormControlProps } from 'react-bootstrap'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import FormLabel from 'src/components/FormLabel'; const StyleFormGroup = styled(FormGroup)` diff --git a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx index d78f616d5b..bd5ec4c2cb 100644 --- a/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx +++ b/superset-frontend/src/components/ErrorMessage/ErrorAlert.tsx @@ -19,7 +19,7 @@ import React, { useState, ReactNode } from 'react'; import { styled, supersetTheme, t } from '@superset-ui/core'; import { noOp } from 'src/utils/common'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import Button from 'src/components/Button'; import Icon from '../Icon'; diff --git a/superset-frontend/src/components/ImportModal/ImportModal.test.tsx b/superset-frontend/src/components/ImportModal/ImportModal.test.tsx index 8594005937..478fd599b3 100644 --- a/superset-frontend/src/components/ImportModal/ImportModal.test.tsx +++ b/superset-frontend/src/components/ImportModal/ImportModal.test.tsx @@ -24,7 +24,7 @@ import { ReactWrapper } from 'enzyme'; import Button from 'src/components/Button'; import { ImportResourceName } from 'src/views/CRUD/types'; import ImportModelsModal from 'src/components/ImportModal'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; const mockStore = configureStore([thunk]); const store = mockStore({}); diff --git a/superset-frontend/src/components/ImportModal/index.tsx b/superset-frontend/src/components/ImportModal/index.tsx index a8d3db4689..f9dffcbab9 100644 --- a/superset-frontend/src/components/ImportModal/index.tsx +++ b/superset-frontend/src/components/ImportModal/index.tsx @@ -20,7 +20,7 @@ import React, { FunctionComponent, useEffect, useRef, useState } from 'react'; import { styled, t } from '@superset-ui/core'; import Icon from 'src//components/Icon'; -import StyledModal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import { useImportResource } from 'src/views/CRUD/hooks'; import { ImportResourceName } from 'src/views/CRUD/types'; @@ -255,7 +255,7 @@ const ImportModelsModal: FunctionComponent = ({ } return ( - = ({ {renderPasswordFields()} {renderOverwriteConfirmation()} - + ); }; diff --git a/superset-frontend/src/common/components/Modal/Modal.tsx b/superset-frontend/src/components/Modal/Modal.tsx similarity index 100% rename from superset-frontend/src/common/components/Modal/Modal.tsx rename to superset-frontend/src/components/Modal/Modal.tsx diff --git a/superset-frontend/src/common/components/Modal/index.ts b/superset-frontend/src/components/Modal/index.ts similarity index 100% rename from superset-frontend/src/common/components/Modal/index.ts rename to superset-frontend/src/components/Modal/index.ts diff --git a/superset-frontend/src/components/ModalTrigger/index.jsx b/superset-frontend/src/components/ModalTrigger/index.jsx index d374e9e26e..5091176c3f 100644 --- a/superset-frontend/src/components/ModalTrigger/index.jsx +++ b/superset-frontend/src/components/ModalTrigger/index.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import Button from 'src/components/Button'; const propTypes = { diff --git a/superset-frontend/src/components/OmniContainer/index.tsx b/superset-frontend/src/components/OmniContainer/index.tsx index a9b90d06d1..338661f7a4 100644 --- a/superset-frontend/src/components/OmniContainer/index.tsx +++ b/superset-frontend/src/components/OmniContainer/index.tsx @@ -20,7 +20,7 @@ import React, { useRef, useState } from 'react'; import { styled } from '@superset-ui/core'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import { useComponentDidMount } from 'src/common/hooks/useComponentDidMount'; import { Omnibar } from './Omnibar'; import { LOG_ACTIONS_OMNIBAR_TRIGGERED } from '../../logger/LogUtils'; diff --git a/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx b/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx index 71b8f5e999..c0bca8cdeb 100644 --- a/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx +++ b/superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingModal.tsx @@ -19,7 +19,7 @@ import { t } from '@superset-ui/core'; import React, { FC } from 'react'; import { useDispatch, useSelector } from 'react-redux'; -import { StyledModal } from 'src/common/components/Modal'; +import { StyledModal } from 'src/components/Modal'; import Button from 'src/components/Button'; import { Form } from 'src/common/components'; import { setChartConfiguration } from 'src/dashboard/actions/dashboardInfo'; diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx index c1114e74d7..ccf4b6c82b 100644 --- a/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx +++ b/superset-frontend/src/dashboard/components/PropertiesModal/index.jsx @@ -31,7 +31,7 @@ import { CategoricalColorNamespace, } from '@superset-ui/core'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import FormLabel from 'src/components/FormLabel'; import { JsonEditor } from 'src/components/AsyncAceEditor'; diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx index 165abd579b..4ae5413741 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal.tsx @@ -20,7 +20,7 @@ import React, { useCallback, useMemo, useState } from 'react'; import { uniq } from 'lodash'; import { t, styled } from '@superset-ui/core'; import { Form } from 'src/common/components'; -import { StyledModal } from 'src/common/components/Modal'; +import { StyledModal } from 'src/components/Modal'; import ErrorBoundary from 'src/components/ErrorBoundary'; import { useFilterConfigMap, useFilterConfiguration } from '../state'; import { FilterRemoval, NativeFiltersForm } from './types'; diff --git a/superset-frontend/src/datasource/ChangeDatasourceModal.tsx b/superset-frontend/src/datasource/ChangeDatasourceModal.tsx index 0934a6d2ad..ff06b73a1f 100644 --- a/superset-frontend/src/datasource/ChangeDatasourceModal.tsx +++ b/superset-frontend/src/datasource/ChangeDatasourceModal.tsx @@ -27,7 +27,7 @@ import { FormControl, FormControlProps } from 'react-bootstrap'; import Alert from 'src/components/Alert'; import { SupersetClient, t, styled } from '@superset-ui/core'; import TableView, { EmptyWrapperType } from 'src/components/TableView'; -import StyledModal from 'src/common/components/Modal'; +import StyledModal from 'src/components/Modal'; import Button from 'src/components/Button'; import { useListViewResource } from 'src/views/CRUD/hooks'; import Dataset from 'src/types/Dataset'; diff --git a/superset-frontend/src/datasource/DatasourceModal.tsx b/superset-frontend/src/datasource/DatasourceModal.tsx index 5fcff68e7c..0b85d462e4 100644 --- a/superset-frontend/src/datasource/DatasourceModal.tsx +++ b/superset-frontend/src/datasource/DatasourceModal.tsx @@ -21,7 +21,7 @@ import Alert from 'src/components/Alert'; import Button from 'src/components/Button'; import { styled, t, SupersetClient } from '@superset-ui/core'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import AsyncEsmComponent from 'src/components/AsyncEsmComponent'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx b/superset-frontend/src/explore/components/PropertiesModal/index.tsx index 40d5e130aa..d40e9558ed 100644 --- a/superset-frontend/src/explore/components/PropertiesModal/index.tsx +++ b/superset-frontend/src/explore/components/PropertiesModal/index.tsx @@ -24,7 +24,7 @@ import { FormGroup, FormControlProps, } from 'react-bootstrap'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import Button from 'src/components/Button'; import { OptionsType } from 'react-select/src/types'; import { AsyncSelect } from 'src/components/Select'; diff --git a/superset-frontend/src/explore/components/SaveModal.tsx b/superset-frontend/src/explore/components/SaveModal.tsx index fc848530f7..70b7d84428 100644 --- a/superset-frontend/src/explore/components/SaveModal.tsx +++ b/superset-frontend/src/explore/components/SaveModal.tsx @@ -23,7 +23,7 @@ import Alert from 'src/components/Alert'; import { JsonObject, t, styled } from '@superset-ui/core'; import ReactMarkdown from 'react-markdown'; import { Radio } from 'src/common/components/Radio'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import Button from 'src/components/Button'; import FormLabel from 'src/components/FormLabel'; import { CreatableSelect } from 'src/components/Select'; diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl.jsx b/superset-frontend/src/explore/components/controls/VizTypeControl.jsx index 84aee278f6..7d6d36e20d 100644 --- a/superset-frontend/src/explore/components/controls/VizTypeControl.jsx +++ b/superset-frontend/src/explore/components/controls/VizTypeControl.jsx @@ -22,7 +22,7 @@ import { Row, Col, FormControl } from 'react-bootstrap'; import { Behavior, t, getChartMetadataRegistry } from '@superset-ui/core'; import { useDynamicPluginContext } from 'src/components/DynamicPlugins'; import { Tooltip } from 'src/common/components/Tooltip'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import Label from 'src/components/Label'; import ControlHeader from '../ControlHeader'; import './VizTypeControl.less'; diff --git a/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx b/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx index 34c71b9708..2f04e7d4fb 100644 --- a/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx +++ b/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx @@ -22,8 +22,8 @@ import rison from 'rison'; import { useSingleViewResource } from 'src/views/CRUD/hooks'; import Icon from 'src/components/Icon'; -import Modal from 'src/common/components/Modal'; import { Switch } from 'src/components/Switch'; +import Modal from 'src/components/Modal'; import { Radio } from 'src/common/components/Radio'; import { AsyncSelect, NativeGraySelect as Select } from 'src/components/Select'; import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags'; diff --git a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx index af0a65a505..f779496860 100644 --- a/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx +++ b/superset-frontend/src/views/CRUD/annotation/AnnotationModal.tsx @@ -22,7 +22,7 @@ import { useSingleViewResource } from 'src/views/CRUD/hooks'; import { RangePicker } from 'src/components/DatePicker'; import moment from 'moment'; import Icon from 'src/components/Icon'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import withToasts from 'src/messageToasts/enhancers/withToasts'; import { JsonEditor } from 'src/components/AsyncAceEditor'; diff --git a/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx b/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx index c6cc56d9a0..675e81b868 100644 --- a/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx +++ b/superset-frontend/src/views/CRUD/annotationlayers/AnnotationLayerModal.tsx @@ -21,7 +21,7 @@ import { styled, t } from '@superset-ui/core'; import { useSingleViewResource } from 'src/views/CRUD/hooks'; import Icon from 'src/components/Icon'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import withToasts from 'src/messageToasts/enhancers/withToasts'; import { AnnotationLayerObject } from './types'; diff --git a/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx b/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx index e7f1c37353..0f80b67037 100644 --- a/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx +++ b/superset-frontend/src/views/CRUD/csstemplates/CssTemplateModal.tsx @@ -21,7 +21,7 @@ import { styled, t } from '@superset-ui/core'; import { useSingleViewResource } from 'src/views/CRUD/hooks'; import Icon from 'src/components/Icon'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import withToasts from 'src/messageToasts/enhancers/withToasts'; import { CssEditor } from 'src/components/AsyncAceEditor'; diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx index beb062526a..cb60cea145 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx @@ -25,7 +25,7 @@ import { } from 'src/views/CRUD/hooks'; import withToasts from 'src/messageToasts/enhancers/withToasts'; import Icon from 'src/components/Icon'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import Tabs from 'src/common/components/Tabs'; import Button from 'src/components/Button'; import IndeterminateCheckbox from 'src/components/IndeterminateCheckbox'; diff --git a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx index 88781707c6..63bbb9be10 100644 --- a/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx +++ b/superset-frontend/src/views/CRUD/data/dataset/AddDatasetModal.tsx @@ -21,7 +21,7 @@ import { styled, t } from '@superset-ui/core'; import { useSingleViewResource } from 'src/views/CRUD/hooks'; import { isEmpty, isNil } from 'lodash'; import Icon from 'src/components/Icon'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import TableSelector from 'src/components/TableSelector'; import withToasts from 'src/messageToasts/enhancers/withToasts'; diff --git a/superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx b/superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx index 525324b26c..cea45a9f76 100644 --- a/superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx +++ b/superset-frontend/src/views/CRUD/data/query/QueryPreviewModal.tsx @@ -18,7 +18,7 @@ */ import React, { useState } from 'react'; import { styled, t } from '@superset-ui/core'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import cx from 'classnames'; import Button from 'src/components/Button'; import withToasts, { ToastProps } from 'src/messageToasts/enhancers/withToasts'; diff --git a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx index 470ab2cf95..6f556b279d 100644 --- a/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx +++ b/superset-frontend/src/views/CRUD/data/savedquery/SavedQueryPreviewModal.tsx @@ -18,7 +18,7 @@ */ import React, { FunctionComponent } from 'react'; import { styled, t } from '@superset-ui/core'; -import Modal from 'src/common/components/Modal'; +import Modal from 'src/components/Modal'; import Button from 'src/components/Button'; import SyntaxHighlighterCopy from 'src/views/CRUD/data/components/SyntaxHighlighterCopy'; import withToasts, { ToastProps } from 'src/messageToasts/enhancers/withToasts';