chore: Moves CRUD components to the Datasource component (#19032)

* chore: Moves CRUD components to the Datasource component * Fixes imports * Fixes less import (cherry picked from commit 71b8d31)
apache · Apr 3, 2022 · 4e78efc · 4e78efc
1 parent 1eac871
commit 4e78efc
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 9 deletions.
diff --git a/...rontend/src/CRUD/CollectionTable.test.jsx → ...nents/Datasource/CollectionTable.test.jsx b/...rontend/src/CRUD/CollectionTable.test.jsx → ...nents/Datasource/CollectionTable.test.jsx
@@ -19,8 +19,8 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-import CollectionTable from 'src/CRUD/CollectionTable';
 import mockDatasource from 'spec/fixtures/mockDatasource';
+import CollectionTable from './CollectionTable';
 
 const props = {
   collection: mockDatasource['7__table'].columns,

diff --git a/...set-frontend/src/CRUD/CollectionTable.tsx → ...components/Datasource/CollectionTable.tsx b/...set-frontend/src/CRUD/CollectionTable.tsx → ...components/Datasource/CollectionTable.tsx
diff --git a/superset-frontend/src/components/Datasource/DatasourceEditor.jsx b/superset-frontend/src/components/Datasource/DatasourceEditor.jsx
@@ -36,21 +36,17 @@ import Label from 'src/components/Label';
 import Loading from 'src/components/Loading';
 import TableSelector from 'src/components/TableSelector';
 import EditableTitle from 'src/components/EditableTitle';
-
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
-
 import CheckboxControl from 'src/explore/components/controls/CheckboxControl';
 import TextControl from 'src/explore/components/controls/TextControl';
 import TextAreaControl from 'src/explore/components/controls/TextAreaControl';
 import SpatialControl from 'src/explore/components/controls/SpatialControl';
-
-import CollectionTable from 'src/CRUD/CollectionTable';
-import Fieldset from 'src/CRUD/Fieldset';
-import Field from 'src/CRUD/Field';
-
 import withToasts from 'src/components/MessageToasts/withToasts';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import Icons from 'src/components/Icons';
+import CollectionTable from './CollectionTable';
+import Fieldset from './Fieldset';
+import Field from './Field';
 
 const DatasourceContainer = styled.div`
   .change-warning {

diff --git a/superset-frontend/src/CRUD/Field.test.tsx → .../src/components/Datasource/Field.test.tsx b/superset-frontend/src/CRUD/Field.test.tsx → .../src/components/Datasource/Field.test.tsx
diff --git a/superset-frontend/src/CRUD/Field.tsx → ...ntend/src/components/Datasource/Field.tsx b/superset-frontend/src/CRUD/Field.tsx → ...ntend/src/components/Datasource/Field.tsx
diff --git a/superset-frontend/src/CRUD/Fieldset.tsx → ...nd/src/components/Datasource/Fieldset.tsx b/superset-frontend/src/CRUD/Fieldset.tsx → ...nd/src/components/Datasource/Fieldset.tsx
diff --git a/superset-frontend/src/CRUD/crud.less → ...ntend/src/components/Datasource/crud.less b/superset-frontend/src/CRUD/crud.less → ...ntend/src/components/Datasource/crud.less
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-@import '../assets/stylesheets/less/variables.less';
+@import '../../assets/stylesheets/less/variables.less';
 
 .CRUD {
   .text-right {

diff --git a/superset-frontend/src/CRUD/utils.js → ...ontend/src/components/Datasource/utils.js b/superset-frontend/src/CRUD/utils.js → ...ontend/src/components/Datasource/utils.js