diff --git a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx index 78d5d637d8..4b2dbd9a53 100644 --- a/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx +++ b/superset-frontend/spec/javascripts/dashboard/components/gridComponents/Tabs_spec.jsx @@ -23,7 +23,7 @@ import sinon from 'sinon'; import { DndProvider } from 'react-dnd'; import { HTML5Backend } from 'react-dnd-html5-backend'; -import { LineEditableTabs } from 'src/common/components/Tabs'; +import { LineEditableTabs } from 'src/components/Tabs'; import { Modal } from 'src/common/components'; import fetchMock from 'fetch-mock'; import { styledMount as mount } from 'spec/helpers/theming'; diff --git a/superset-frontend/spec/javascripts/datasource/DatasourceEditor_spec.jsx b/superset-frontend/spec/javascripts/datasource/DatasourceEditor_spec.jsx index 09e0882134..a9e1454b0e 100644 --- a/superset-frontend/spec/javascripts/datasource/DatasourceEditor_spec.jsx +++ b/superset-frontend/spec/javascripts/datasource/DatasourceEditor_spec.jsx @@ -24,7 +24,7 @@ import thunk from 'redux-thunk'; import { Radio } from 'src/components/Radio'; import Icon from 'src/components/Icon'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import DatasourceEditor from 'src/datasource/DatasourceEditor'; import Field from 'src/CRUD/Field'; import mockDatasource from 'spec/fixtures/mockDatasource'; diff --git a/superset-frontend/spec/javascripts/profile/App_spec.tsx b/superset-frontend/spec/javascripts/profile/App_spec.tsx index 50ca563f96..db466d54fb 100644 --- a/superset-frontend/spec/javascripts/profile/App_spec.tsx +++ b/superset-frontend/spec/javascripts/profile/App_spec.tsx @@ -20,7 +20,7 @@ import React from 'react'; import { Row, Col } from 'src/common/components'; import { shallow } from 'enzyme'; import App from 'src/profile/components/App'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import { user } from './fixtures'; diff --git a/superset-frontend/spec/javascripts/sqllab/TabbedSqlEditors_spec.jsx b/superset-frontend/spec/javascripts/sqllab/TabbedSqlEditors_spec.jsx index 362539472f..da4cde59d6 100644 --- a/superset-frontend/spec/javascripts/sqllab/TabbedSqlEditors_spec.jsx +++ b/superset-frontend/spec/javascripts/sqllab/TabbedSqlEditors_spec.jsx @@ -26,7 +26,7 @@ import sinon from 'sinon'; import { act } from 'react-dom/test-utils'; import fetchMock from 'fetch-mock'; import { supersetTheme, ThemeProvider } from '@superset-ui/core'; -import { EditableTabs } from 'src/common/components/Tabs'; +import { EditableTabs } from 'src/components/Tabs'; import TabbedSqlEditors from 'src/SqlLab/components/TabbedSqlEditors'; import SqlEditor from 'src/SqlLab/components/SqlEditor'; diff --git a/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx b/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx index 5585a151cc..4b69e51c36 100644 --- a/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx +++ b/superset-frontend/src/SqlLab/components/SouthPane/SouthPane.tsx @@ -19,7 +19,7 @@ import React, { createRef } from 'react'; import shortid from 'shortid'; import Alert from 'src/components/Alert'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import { t, styled } from '@superset-ui/core'; import { isFeatureEnabled, FeatureFlag } from 'src/featureFlags'; diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx b/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx index 47ae237cad..58115cce9b 100644 --- a/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx +++ b/superset-frontend/src/SqlLab/components/TabbedSqlEditors.jsx @@ -18,8 +18,8 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { EditableTabs } from 'src/common/components/Tabs'; import { Dropdown } from 'src/components/Dropdown'; +import { EditableTabs } from 'src/components/Tabs'; import { Menu } from 'src/common/components'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; diff --git a/superset-frontend/src/common/components/common.stories.tsx b/superset-frontend/src/common/components/common.stories.tsx index b4356d8b08..d706bf60a8 100644 --- a/superset-frontend/src/common/components/common.stories.tsx +++ b/superset-frontend/src/common/components/common.stories.tsx @@ -23,7 +23,7 @@ import { CronPicker, CronError } from 'src/components/CronPicker'; import Modal from 'src/components/Modal'; import InfoTooltip from 'src/components/InfoTooltip'; import { Dropdown } from 'src/components/Dropdown'; -import Tabs, { EditableTabs } from './Tabs'; +import Tabs, { EditableTabs } from 'src/components/Tabs'; import { Menu, Input, Divider } from '.'; export default { diff --git a/superset-frontend/src/common/components/Tabs/Tabs.tsx b/superset-frontend/src/components/Tabs/Tabs.tsx similarity index 100% rename from superset-frontend/src/common/components/Tabs/Tabs.tsx rename to superset-frontend/src/components/Tabs/Tabs.tsx diff --git a/superset-frontend/src/common/components/Tabs/index.ts b/superset-frontend/src/components/Tabs/index.ts similarity index 100% rename from superset-frontend/src/common/components/Tabs/index.ts rename to superset-frontend/src/components/Tabs/index.ts diff --git a/superset-frontend/src/dashboard/components/BuilderComponentPane.tsx b/superset-frontend/src/dashboard/components/BuilderComponentPane.tsx index 4227fc402c..d19778fc0f 100644 --- a/superset-frontend/src/dashboard/components/BuilderComponentPane.tsx +++ b/superset-frontend/src/dashboard/components/BuilderComponentPane.tsx @@ -18,7 +18,7 @@ */ /* eslint-env browser */ import React from 'react'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import { StickyContainer, Sticky } from 'react-sticky'; import { ParentSize } from '@vx/responsive'; diff --git a/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx b/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx index ece5d944a5..427145b89e 100644 --- a/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx +++ b/superset-frontend/src/dashboard/components/gridComponents/Tabs.jsx @@ -18,7 +18,7 @@ */ import React from 'react'; import PropTypes from 'prop-types'; -import { LineEditableTabs } from 'src/common/components/Tabs'; +import { LineEditableTabs } from 'src/components/Tabs'; import { LOG_ACTIONS_SELECT_DASHBOARD_TAB } from 'src/logger/LogUtils'; import { Modal } from 'src/common/components'; import { styled, t } from '@superset-ui/core'; diff --git a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx index 13f6a5d0fa..6f4ae3def1 100644 --- a/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx +++ b/superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FilterTabs.tsx @@ -19,7 +19,7 @@ import { PlusOutlined } from '@ant-design/icons'; import { styled, t } from '@superset-ui/core'; import React, { FC } from 'react'; -import { LineEditableTabs } from 'src/common/components/Tabs'; +import { LineEditableTabs } from 'src/components/Tabs'; import Icon from 'src/components/Icon'; import { FilterRemoval } from './types'; import { REMOVAL_DELAY_SECS } from './utils'; diff --git a/superset-frontend/src/datasource/DatasourceEditor.jsx b/superset-frontend/src/datasource/DatasourceEditor.jsx index a29eac3dcb..b308bf0b98 100644 --- a/superset-frontend/src/datasource/DatasourceEditor.jsx +++ b/superset-frontend/src/datasource/DatasourceEditor.jsx @@ -26,7 +26,7 @@ import Badge from 'src/components/Badge'; import shortid from 'shortid'; import { styled, SupersetClient, t, supersetTheme } from '@superset-ui/core'; import Button from 'src/components/Button'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import CertifiedIcon from 'src/components/CertifiedIcon'; import WarningIconWithTooltip from 'src/components/WarningIconWithTooltip'; import DatabaseSelector from 'src/components/DatabaseSelector'; diff --git a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx index d656a8e10f..9181a568c7 100644 --- a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx +++ b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx @@ -35,8 +35,8 @@ import { InfoTooltipWithTrigger, } from '@superset-ui/chart-controls'; -import Tabs from 'src/common/components/Tabs'; import Collapse from 'src/components/Collapse'; +import Tabs from 'src/components/Tabs'; import { PluginContext } from 'src/components/DynamicPlugins'; import Loading from 'src/components/Loading'; diff --git a/superset-frontend/src/explore/components/DataTablesPane/index.tsx b/superset-frontend/src/explore/components/DataTablesPane/index.tsx index 6e1490134d..62229c4fef 100644 --- a/superset-frontend/src/explore/components/DataTablesPane/index.tsx +++ b/superset-frontend/src/explore/components/DataTablesPane/index.tsx @@ -19,7 +19,7 @@ import React, { useCallback, useEffect, useState } from 'react'; import { JsonObject, styled, t } from '@superset-ui/core'; import Collapse from 'src/components/Collapse'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import Loading from 'src/components/Loading'; import TableView, { EmptyWrapperType } from 'src/components/TableView'; import { getChartDataRequest } from 'src/chart/chartAction'; diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/AdhocFilterEditPopover.test.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/AdhocFilterEditPopover.test.jsx index b071acfcf1..907d78ff64 100644 --- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/AdhocFilterEditPopover.test.jsx +++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/AdhocFilterEditPopover.test.jsx @@ -23,7 +23,7 @@ import { shallow } from 'enzyme'; import Button from 'src/components/Button'; import ErrorBoundary from 'src/components/ErrorBoundary'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import AdhocFilter, { EXPRESSION_TYPES, CLAUSES, diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx index ae5e95e218..f7ec6be4f8 100644 --- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx +++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.jsx @@ -22,7 +22,7 @@ import Button from 'src/components/Button'; import { styled, t } from '@superset-ui/core'; import ErrorBoundary from 'src/components/ErrorBoundary'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import adhocMetricType from 'src/explore/components/controls/MetricControl/adhocMetricType'; import AdhocFilter, { EXPRESSION_TYPES, diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx index c0c1218b0c..fd62b81406 100644 --- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx +++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import { FormGroup } from 'react-bootstrap'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import Button from 'src/components/Button'; import { NativeSelect as Select } from 'src/components/Select'; import { styled, t } from '@superset-ui/core'; diff --git a/superset-frontend/src/profile/components/App.tsx b/superset-frontend/src/profile/components/App.tsx index 6cf388540f..1afbaa13a9 100644 --- a/superset-frontend/src/profile/components/App.tsx +++ b/superset-frontend/src/profile/components/App.tsx @@ -19,7 +19,7 @@ import React from 'react'; import { Row, Col } from 'src/common/components'; import { Panel } from 'react-bootstrap'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import { t } from '@superset-ui/core'; import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes'; import Favorites from './Favorites'; diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.test.jsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.test.jsx index 89116a50b6..18b8c7bf8d 100644 --- a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.test.jsx +++ b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.test.jsx @@ -26,7 +26,7 @@ import userEvent from '@testing-library/user-event'; import { Provider } from 'react-redux'; import DatabaseModal from 'src/views/CRUD/data/database/DatabaseModal'; import Modal from 'src/components/Modal'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import fetchMock from 'fetch-mock'; import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint'; import { initialState } from 'spec/javascripts/sqllab/fixtures'; diff --git a/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx b/superset-frontend/src/views/CRUD/data/database/DatabaseModal.tsx index 7df7c3e397..4e3f6e19b5 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 { testDatabaseConnection, } from 'src/views/CRUD/hooks'; import withToasts from 'src/messageToasts/enhancers/withToasts'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; import Button from 'src/components/Button'; import IndeterminateCheckbox from 'src/components/IndeterminateCheckbox'; import Collapse from 'src/components/Collapse'; diff --git a/superset-frontend/src/views/CRUD/data/database/styles.ts b/superset-frontend/src/views/CRUD/data/database/styles.ts index 93ce119380..e2dcc4ef3e 100644 --- a/superset-frontend/src/views/CRUD/data/database/styles.ts +++ b/superset-frontend/src/views/CRUD/data/database/styles.ts @@ -20,7 +20,7 @@ import { styled } from '@superset-ui/core'; import Modal from 'src/components/Modal'; import { JsonEditor } from 'src/components/AsyncAceEditor'; -import Tabs from 'src/common/components/Tabs'; +import Tabs from 'src/components/Tabs'; const CTAS_CVAS_SCHEMA_FORM_HEIGHT = 102; const EXPOSE_IN_SQLLAB_FORM_HEIGHT = CTAS_CVAS_SCHEMA_FORM_HEIGHT + 52;