From 77a9cc7088c421ff3d74cd8c54d7990a74b58bce Mon Sep 17 00:00:00 2001 From: "Michael S. Molina" <70410625+michael-s-molina@users.noreply.github.com> Date: Fri, 16 Apr 2021 19:55:04 -0300 Subject: [PATCH] chore: Moves Collapse to the components folder (#14124) --- .../explore/components/ControlPanelsContainer_spec.tsx | 2 +- superset-frontend/spec/javascripts/sqllab/TableElement_spec.jsx | 2 +- superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx | 2 +- superset-frontend/src/SqlLab/components/TableElement.jsx | 2 +- superset-frontend/src/common/components/index.tsx | 2 +- .../src/{common => }/components/Collapse/Collapse.stories.tsx | 0 .../src/{common => }/components/Collapse/Collapse.test.tsx | 0 .../src/{common => }/components/Collapse/index.tsx | 0 .../dashboard/components/FiltersBadge/DetailsPanel/index.tsx | 2 +- .../src/explore/components/ControlPanelsContainer.tsx | 2 +- .../src/explore/components/DataTablesPane/index.tsx | 2 +- .../src/explore/components/DatasourcePanel/index.tsx | 2 +- .../explore/components/controls/FixedOrMetricControl/index.jsx | 2 +- superset-frontend/src/views/CRUD/welcome/Welcome.tsx | 2 +- 14 files changed, 11 insertions(+), 11 deletions(-) rename superset-frontend/src/{common => }/components/Collapse/Collapse.stories.tsx (100%) rename superset-frontend/src/{common => }/components/Collapse/Collapse.test.tsx (100%) rename superset-frontend/src/{common => }/components/Collapse/index.tsx (100%) diff --git a/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.tsx b/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.tsx index 9b2fe59f5..8bee3f3cc 100644 --- a/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.tsx +++ b/superset-frontend/spec/javascripts/explore/components/ControlPanelsContainer_spec.tsx @@ -29,7 +29,7 @@ import { ControlPanelsContainer, ControlPanelsContainerProps, } from 'src/explore/components/ControlPanelsContainer'; -import Collapse from 'src/common/components/Collapse'; +import Collapse from 'src/components/Collapse'; describe('ControlPanelsContainer', () => { let wrapper; diff --git a/superset-frontend/spec/javascripts/sqllab/TableElement_spec.jsx b/superset-frontend/spec/javascripts/sqllab/TableElement_spec.jsx index c667560ba..d55720637 100644 --- a/superset-frontend/spec/javascripts/sqllab/TableElement_spec.jsx +++ b/superset-frontend/spec/javascripts/sqllab/TableElement_spec.jsx @@ -21,7 +21,7 @@ import { mount, shallow } from 'enzyme'; import { Provider } from 'react-redux'; import configureStore from 'redux-mock-store'; import { supersetTheme, ThemeProvider } from '@superset-ui/core'; -import Collapse from 'src/common/components/Collapse'; +import Collapse from 'src/components/Collapse'; import { IconTooltip } from 'src/components/IconTooltip'; import TableElement from 'src/SqlLab/components/TableElement'; diff --git a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx index 667abde1e..59af1d345 100644 --- a/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx +++ b/superset-frontend/src/SqlLab/components/SqlEditorLeftBar.jsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Button from 'src/components/Button'; import { t, styled, css } from '@superset-ui/core'; -import Collapse from 'src/common/components/Collapse'; +import Collapse from 'src/components/Collapse'; import TableElement from './TableElement'; import TableSelector from '../../components/TableSelector'; diff --git a/superset-frontend/src/SqlLab/components/TableElement.jsx b/superset-frontend/src/SqlLab/components/TableElement.jsx index ec7ce38ab..497f094bd 100644 --- a/superset-frontend/src/SqlLab/components/TableElement.jsx +++ b/superset-frontend/src/SqlLab/components/TableElement.jsx @@ -19,7 +19,7 @@ import React from 'react'; import PropTypes from 'prop-types'; import Card from 'src/common/components/Card'; -import Collapse from 'src/common/components/Collapse'; +import Collapse from 'src/components/Collapse'; import ButtonGroup from 'src/components/ButtonGroup'; import shortid from 'shortid'; import { t, styled } from '@superset-ui/core'; diff --git a/superset-frontend/src/common/components/index.tsx b/superset-frontend/src/common/components/index.tsx index 9c336110f..ff7abe5d7 100644 --- a/superset-frontend/src/common/components/index.tsx +++ b/superset-frontend/src/common/components/index.tsx @@ -59,7 +59,7 @@ export { default as Alert, AlertProps } from 'antd/lib/alert'; export { default as Select, SelectProps } from 'antd/lib/select'; export { default as List, ListItemProps } from 'antd/lib/list'; -export { default as Collapse } from './Collapse'; +export { default as Collapse } from 'src/components/Collapse'; export { default as Badge } from 'src/components/Badge'; export { default as Card } from './Card'; export { default as Progress } from 'src/components/ProgressBar'; diff --git a/superset-frontend/src/common/components/Collapse/Collapse.stories.tsx b/superset-frontend/src/components/Collapse/Collapse.stories.tsx similarity index 100% rename from superset-frontend/src/common/components/Collapse/Collapse.stories.tsx rename to superset-frontend/src/components/Collapse/Collapse.stories.tsx diff --git a/superset-frontend/src/common/components/Collapse/Collapse.test.tsx b/superset-frontend/src/components/Collapse/Collapse.test.tsx similarity index 100% rename from superset-frontend/src/common/components/Collapse/Collapse.test.tsx rename to superset-frontend/src/components/Collapse/Collapse.test.tsx diff --git a/superset-frontend/src/common/components/Collapse/index.tsx b/superset-frontend/src/components/Collapse/index.tsx similarity index 100% rename from superset-frontend/src/common/components/Collapse/index.tsx rename to superset-frontend/src/components/Collapse/index.tsx diff --git a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx index c0e2c9ca4..10d50714c 100644 --- a/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx +++ b/superset-frontend/src/dashboard/components/FiltersBadge/DetailsPanel/index.tsx @@ -24,7 +24,7 @@ import { ExclamationCircleFilled, } from '@ant-design/icons'; import Popover from 'src/components/Popover'; -import Collapse from 'src/common/components/Collapse'; +import Collapse from 'src/components/Collapse'; import { Global } from '@emotion/core'; import Icon from 'src/components/Icon'; import { diff --git a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx index 2d1df61ad..d656a8e10 100644 --- a/superset-frontend/src/explore/components/ControlPanelsContainer.tsx +++ b/superset-frontend/src/explore/components/ControlPanelsContainer.tsx @@ -36,7 +36,7 @@ import { } from '@superset-ui/chart-controls'; import Tabs from 'src/common/components/Tabs'; -import Collapse from 'src/common/components/Collapse'; +import Collapse from 'src/components/Collapse'; 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 4b4620837..6e1490134 100644 --- a/superset-frontend/src/explore/components/DataTablesPane/index.tsx +++ b/superset-frontend/src/explore/components/DataTablesPane/index.tsx @@ -18,7 +18,7 @@ */ import React, { useCallback, useEffect, useState } from 'react'; import { JsonObject, styled, t } from '@superset-ui/core'; -import Collapse from 'src/common/components/Collapse'; +import Collapse from 'src/components/Collapse'; import Tabs from 'src/common/components/Tabs'; import Loading from 'src/components/Loading'; import TableView, { EmptyWrapperType } from 'src/components/TableView'; diff --git a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx index 475601ac4..40063c28a 100644 --- a/superset-frontend/src/explore/components/DatasourcePanel/index.tsx +++ b/superset-frontend/src/explore/components/DatasourcePanel/index.tsx @@ -18,7 +18,7 @@ */ import React, { useEffect, useState } from 'react'; import { styled, t } from '@superset-ui/core'; -import Collapse from 'src/common/components/Collapse'; +import Collapse from 'src/components/Collapse'; import { ColumnOption, MetricOption, diff --git a/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx b/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx index 3400b9251..fc88e7beb 100644 --- a/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx +++ b/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.jsx @@ -21,7 +21,7 @@ import PropTypes from 'prop-types'; import { css } from '@emotion/core'; import { t } from '@superset-ui/core'; import Label from 'src/components/Label'; -import Collapse from 'src/common/components/Collapse'; +import Collapse from 'src/components/Collapse'; import TextControl from 'src/explore/components/controls/TextControl'; import MetricsControl from 'src/explore/components/controls/MetricControl/MetricsControl'; import ControlHeader from 'src/explore/components/ControlHeader'; diff --git a/superset-frontend/src/views/CRUD/welcome/Welcome.tsx b/superset-frontend/src/views/CRUD/welcome/Welcome.tsx index a6a7d46bb..83719c489 100644 --- a/superset-frontend/src/views/CRUD/welcome/Welcome.tsx +++ b/superset-frontend/src/views/CRUD/welcome/Welcome.tsx @@ -18,7 +18,7 @@ */ import React, { useEffect, useState } from 'react'; import { styled, t } from '@superset-ui/core'; -import Collapse from 'src/common/components/Collapse'; +import Collapse from 'src/components/Collapse'; import { User } from 'src/types/bootstrapTypes'; import { reject } from 'lodash'; import {