apache · michael-s-molina · Apr 6, 2023 · Mar 24, 2023 · Mar 24, 2023 · Mar 31, 2023
diff --git a/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx b/superset-frontend/src/components/Datasource/ChangeDatasourceModal.tsx
@@ -40,7 +40,7 @@ import { Input } from 'src/components/Input';
 import {
   PAGE_SIZE as DATASET_PAGE_SIZE,
   SORT_BY as DATASET_SORT_BY,
-} from 'src/views/CRUD/data/dataset/constants';
+} from 'src/features/datasets/constants';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import FacePile from '../FacePile';
 

diff --git a/superset-frontend/src/components/ReportModal/HeaderReportDropdown/index.tsx b/superset-frontend/src/components/ReportModal/HeaderReportDropdown/index.tsx
@@ -31,7 +31,7 @@ import {
 } from '@superset-ui/core';
 import Icons from 'src/components/Icons';
 import { Switch } from 'src/components/Switch';
-import { AlertObject } from 'src/views/CRUD/alert/types';
+import { AlertObject } from 'src/features/alerts/types';
 import { Menu } from 'src/components/Menu';
 import Checkbox from 'src/components/Checkbox';
 import { noOp } from 'src/utils/common';

diff --git a/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx b/superset-frontend/src/dashboard/components/PropertiesModal/index.tsx
@@ -43,7 +43,12 @@ import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import { isFeatureEnabled } from 'src/featureFlags';
 import TagType from 'src/types/TagType';
-import { addTag, deleteTaggedObjects, fetchTags, OBJECT_TYPES } from 'src/tags';
+import {
+  addTag,
+  deleteTaggedObjects,
+  fetchTags,
+  OBJECT_TYPES,
+} from 'src/features/tags/tags';
 import { loadTags } from 'src/components/Tags/utils';
 
 const StyledFormItem = styled(FormItem)`

diff --git a/superset-frontend/src/explore/components/PropertiesModal/index.tsx b/superset-frontend/src/explore/components/PropertiesModal/index.tsx
@@ -34,7 +34,12 @@ import Chart, { Slice } from 'src/types/Chart';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 import withToasts from 'src/components/MessageToasts/withToasts';
 import { loadTags } from 'src/components/Tags/utils';
-import { addTag, deleteTaggedObjects, fetchTags, OBJECT_TYPES } from 'src/tags';
+import {
+  addTag,
+  deleteTaggedObjects,
+  fetchTags,
+  OBJECT_TYPES,
+} from 'src/features/tags/tags';
 import TagType from 'src/types/TagType';
 
 export type PropertiesModalProps = {

diff --git a/...iews/CRUD/alert/AlertReportModal.test.jsx → ...features/alerts/AlertReportModal.test.jsx b/...iews/CRUD/alert/AlertReportModal.test.jsx → ...features/alerts/AlertReportModal.test.jsx
@@ -22,14 +22,14 @@ import thunk from 'redux-thunk';
 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/components/Modal';
 import { Select, AsyncSelect } from 'src/components';
 import { Switch } from 'src/components/Switch';
 import { Radio } from 'src/components/Radio';
 import TextAreaControl from 'src/explore/components/controls/TextAreaControl';
 import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
 import { styledMount as mount } from 'spec/helpers/theming';
+import AlertReportModal from './AlertReportModal';
 
 const mockData = {
   active: true,

diff --git a/...iews/CRUD/alert/AlertReportModal.test.tsx → ...features/alerts/AlertReportModal.test.tsx b/...iews/CRUD/alert/AlertReportModal.test.tsx → ...features/alerts/AlertReportModal.test.tsx
@@ -19,7 +19,7 @@
 import React from 'react';
 import { render, screen, waitFor } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
-import AlertReportModal from 'src/views/CRUD/alert/AlertReportModal';
+import AlertReportModal from './AlertReportModal';
 
 test('allows change to None in log retention', async () => {
   render(<AlertReportModal show />, { useRedux: true });

diff --git a/...src/views/CRUD/alert/AlertReportModal.tsx → .../src/features/alerts/AlertReportModal.tsx b/...src/views/CRUD/alert/AlertReportModal.tsx → .../src/features/alerts/AlertReportModal.tsx
@@ -45,7 +45,8 @@ import withToasts from 'src/components/MessageToasts/withToasts';
 import Owner from 'src/types/Owner';
 import { AntdCheckbox, AsyncSelect, Select } from 'src/components';
 import TextAreaControl from 'src/explore/components/controls/TextAreaControl';
-import { useCommonConf } from 'src/views/CRUD/data/database/state';
+import { useCommonConf } from 'src/features/databases/state';
+import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import {
   NotificationMethodOption,
   AlertObject,
@@ -56,8 +57,7 @@ import {
   Operator,
   Recipient,
   AlertsReportsConfig,
-} from 'src/views/CRUD/alert/types';
-import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
+} from 'src/features/alerts/types';
 import { useSelector } from 'react-redux';
 import { AlertReportCronScheduler } from './components/AlertReportCronScheduler';
 import { NotificationMethod } from './components/NotificationMethod';

diff --git a/...ponents/AlertReportCronScheduler.test.tsx → ...ponents/AlertReportCronScheduler.test.tsx b/...ponents/AlertReportCronScheduler.test.tsx → ...ponents/AlertReportCronScheduler.test.tsx
diff --git a/...t/components/AlertReportCronScheduler.tsx → ...s/components/AlertReportCronScheduler.tsx b/...t/components/AlertReportCronScheduler.tsx → ...s/components/AlertReportCronScheduler.tsx
@@ -23,7 +23,7 @@ import { AntdInput, RadioChangeEvent } from 'src/components';
 import { Input } from 'src/components/Input';
 import { Radio } from 'src/components/Radio';
 import { CronPicker, CronError } from 'src/components/CronPicker';
-import { StyledInputContainer } from 'src/views/CRUD/alert/AlertReportModal';
+import { StyledInputContainer } from '../AlertReportModal';
 
 export interface AlertReportCronSchedulerProps {
   value: string;

diff --git a/...CRUD/alert/components/AlertStatusIcon.tsx → ...res/alerts/components/AlertStatusIcon.tsx b/...CRUD/alert/components/AlertStatusIcon.tsx → ...res/alerts/components/AlertStatusIcon.tsx
diff --git a/...D/alert/components/NotificationMethod.tsx → .../alerts/components/NotificationMethod.tsx b/...D/alert/components/NotificationMethod.tsx → .../alerts/components/NotificationMethod.tsx
@@ -20,7 +20,7 @@ import React, { FunctionComponent, useState } from 'react';
 import { styled, t, useTheme } from '@superset-ui/core';
 import { Select } from 'src/components';
 import Icons from 'src/components/Icons';
-import { NotificationMethodOption } from 'src/views/CRUD/alert/types';
+import { NotificationMethodOption } from '../types';
 import { StyledInputContainer } from '../AlertReportModal';
 
 const StyledNotificationMethod = styled.div`

diff --git a/...s/CRUD/alert/components/RecipientIcon.tsx → ...tures/alerts/components/RecipientIcon.tsx b/...s/CRUD/alert/components/RecipientIcon.tsx → ...tures/alerts/components/RecipientIcon.tsx
diff --git a/...et-frontend/src/views/CRUD/alert/types.ts → ...set-frontend/src/features/alerts/types.ts b/...et-frontend/src/views/CRUD/alert/types.ts → ...set-frontend/src/features/alerts/types.ts
diff --git a/...ews/CRUD/allentities/AllEntitiesTable.tsx → ...features/allEntities/AllEntitiesTable.tsx b/...ews/CRUD/allentities/AllEntitiesTable.tsx → ...features/allEntities/AllEntitiesTable.tsx
@@ -21,8 +21,8 @@ import moment from 'moment';
 import { t, styled, logging } from '@superset-ui/core';
 import TableView, { EmptyWrapperType } from 'src/components/TableView';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
-import { fetchObjects } from '../../../tags';
-import Loading from '../../../components/Loading';
+import Loading from 'src/components/Loading';
+import { fetchObjects } from '../tags/tags';
 
 const AllEntitiesTableContainer = styled.div`
   text-align: left;

diff --git a/...ationlayers/AnnotationLayerModal.test.jsx → ...ationLayers/AnnotationLayerModal.test.jsx b/...ationlayers/AnnotationLayerModal.test.jsx → ...ationLayers/AnnotationLayerModal.test.jsx
@@ -21,10 +21,10 @@ import thunk from 'redux-thunk';
 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/components/Modal';
 import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
 import { styledMount as mount } from 'spec/helpers/theming';
+import AnnotationLayerModal from './AnnotationLayerModal';
 
 const mockData = { id: 1, name: 'test', descr: 'test description' };
 const FETCH_ANNOTATION_LAYER_ENDPOINT = 'glob:*/api/v1/annotation_layer/*';

diff --git a/...annotationlayers/AnnotationLayerModal.tsx → ...annotationLayers/AnnotationLayerModal.tsx b/...annotationlayers/AnnotationLayerModal.tsx → ...annotationLayers/AnnotationLayerModal.tsx
diff --git a/.../src/views/CRUD/annotationlayers/types.ts → ...nd/src/features/annotationLayers/types.ts b/.../src/views/CRUD/annotationlayers/types.ts → ...nd/src/features/annotationLayers/types.ts
diff --git a/.../CRUD/annotation/AnnotationModal.test.jsx → ...ures/annotations/AnnotationModal.test.jsx b/.../CRUD/annotation/AnnotationModal.test.jsx → ...ures/annotations/AnnotationModal.test.jsx
@@ -21,11 +21,11 @@ import thunk from 'redux-thunk';
 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/components/Modal';
 import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
 import { JsonEditor } from 'src/components/AsyncAceEditor';
 import { styledMount as mount } from 'spec/helpers/theming';
+import AnnotationModal from './AnnotationModal';
 
 const mockData = {
   id: 1,

diff --git a/...views/CRUD/annotation/AnnotationModal.tsx → .../features/annotations/AnnotationModal.tsx b/...views/CRUD/annotation/AnnotationModal.tsx → .../features/annotations/AnnotationModal.tsx
diff --git a/...ontend/src/views/CRUD/annotation/types.ts → ...rontend/src/features/annotations/types.ts b/...ontend/src/views/CRUD/annotation/types.ts → ...rontend/src/features/annotations/types.ts
diff --git a/...ontend/src/views/CRUD/chart/ChartCard.tsx → ...rontend/src/features/charts/ChartCard.tsx b/...ontend/src/views/CRUD/chart/ChartCard.tsx → ...rontend/src/features/charts/ChartCard.tsx
diff --git a/...UD/csstemplates/CssTemplateModal.test.jsx → ...es/cssTemplates/CssTemplateModal.test.jsx b/...UD/csstemplates/CssTemplateModal.test.jsx → ...es/cssTemplates/CssTemplateModal.test.jsx
@@ -21,11 +21,11 @@ import thunk from 'redux-thunk';
 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/components/Modal';
 import waitForComponentToPaint from 'spec/helpers/waitForComponentToPaint';
 import { CssEditor } from 'src/components/AsyncAceEditor';
 import { styledMount as mount } from 'spec/helpers/theming';
+import CssTemplateModal from './CssTemplateModal';
 
 const mockData = { id: 1, template_name: 'test' };
 const FETCH_CSS_TEMPLATE_ENDPOINT = 'glob:*/api/v1/css_template/*';

diff --git a/...ws/CRUD/csstemplates/CssTemplateModal.tsx → ...eatures/cssTemplates/CssTemplateModal.tsx b/...ws/CRUD/csstemplates/CssTemplateModal.tsx → ...eatures/cssTemplates/CssTemplateModal.tsx
diff --git a/...tend/src/views/CRUD/csstemplates/types.ts → ...ontend/src/features/cssTemplates/types.ts b/...tend/src/views/CRUD/csstemplates/types.ts → ...ontend/src/features/cssTemplates/types.ts
diff --git a/...rc/views/CRUD/dashboard/DashboardCard.tsx → ...src/features/dashboards/DashboardCard.tsx b/...rc/views/CRUD/dashboard/DashboardCard.tsx → ...src/features/dashboards/DashboardCard.tsx
diff --git a/...rontend/src/views/CRUD/dashboard/types.ts → ...frontend/src/features/dashboards/types.ts b/...rontend/src/views/CRUD/dashboard/types.ts → ...frontend/src/features/dashboards/types.ts
diff --git a/...tabaseConnectionForm/CommonParameters.tsx → ...tabaseConnectionForm/CommonParameters.tsx b/...tabaseConnectionForm/CommonParameters.tsx → ...tabaseConnectionForm/CommonParameters.tsx
diff --git a/...DatabaseConnectionForm/EncryptedField.tsx → ...DatabaseConnectionForm/EncryptedField.tsx b/...DatabaseConnectionForm/EncryptedField.tsx → ...DatabaseConnectionForm/EncryptedField.tsx
diff --git a/...l/DatabaseConnectionForm/TableCatalog.tsx → ...l/DatabaseConnectionForm/TableCatalog.tsx b/...l/DatabaseConnectionForm/TableCatalog.tsx → ...l/DatabaseConnectionForm/TableCatalog.tsx
diff --git a/...aseConnectionForm/ValidatedInputField.tsx → ...aseConnectionForm/ValidatedInputField.tsx b/...aseConnectionForm/ValidatedInputField.tsx → ...aseConnectionForm/ValidatedInputField.tsx
diff --git a/...aseModal/DatabaseConnectionForm/index.tsx → ...aseModal/DatabaseConnectionForm/index.tsx b/...aseModal/DatabaseConnectionForm/index.tsx → ...aseModal/DatabaseConnectionForm/index.tsx
diff --git a/...a/database/DatabaseModal/ExtraOptions.tsx → .../databases/DatabaseModal/ExtraOptions.tsx b/...a/database/DatabaseModal/ExtraOptions.tsx → .../databases/DatabaseModal/ExtraOptions.tsx
diff --git a/...ta/database/DatabaseModal/ModalHeader.tsx → ...s/databases/DatabaseModal/ModalHeader.tsx b/...ta/database/DatabaseModal/ModalHeader.tsx → ...s/databases/DatabaseModal/ModalHeader.tsx
diff --git a/.../database/DatabaseModal/SSHTunnelForm.tsx → ...databases/DatabaseModal/SSHTunnelForm.tsx b/.../database/DatabaseModal/SSHTunnelForm.tsx → ...databases/DatabaseModal/SSHTunnelForm.tsx
@@ -24,7 +24,6 @@ import { Radio } from 'src/components/Radio';
 import { Input, TextArea } from 'src/components/Input';
 import { Input as AntdInput, Tooltip } from 'antd';
 import { EyeInvisibleOutlined, EyeOutlined } from '@ant-design/icons';
-
 import { DatabaseObject } from '../types';
 import { AuthType } from '.';
 

diff --git a/...atabase/DatabaseModal/SSHTunnelSwitch.tsx → ...tabases/DatabaseModal/SSHTunnelSwitch.tsx b/...atabase/DatabaseModal/SSHTunnelSwitch.tsx → ...tabases/DatabaseModal/SSHTunnelSwitch.tsx
diff --git a/...database/DatabaseModal/SqlAlchemyForm.tsx → ...atabases/DatabaseModal/SqlAlchemyForm.tsx b/...database/DatabaseModal/SqlAlchemyForm.tsx → ...atabases/DatabaseModal/SqlAlchemyForm.tsx
@@ -21,7 +21,6 @@ import { t, SupersetTheme } from '@superset-ui/core';
 import SupersetText from 'src/utils/textUtils';
 import Button from 'src/components/Button';
 import { StyledInputContainer, wideButton } from './styles';
-
 import { DatabaseObject } from '../types';
 
 const SqlAlchemyTab = ({

diff --git a/...ata/database/DatabaseModal/index.test.tsx → ...es/databases/DatabaseModal/index.test.tsx b/...ata/database/DatabaseModal/index.test.tsx → ...es/databases/DatabaseModal/index.test.tsx
@@ -27,13 +27,10 @@ import {
   act,
   waitFor,
 } from 'spec/helpers/testing-library';
-import {
-  DatabaseObject,
-  CONFIGURATION_METHOD,
-} from 'src/views/CRUD/data/database/types';
 import { getExtensionsRegistry } from '@superset-ui/core';
 import setupExtensions from 'src/setup/setupExtensions';
 import * as hooks from 'src/views/CRUD/hooks';
+import { DatabaseObject, CONFIGURATION_METHOD } from '../types';
 import DatabaseModal, {
   dbReducer,
   DBReducerActionType,

diff --git a/...RUD/data/database/DatabaseModal/index.tsx → ...eatures/databases/DatabaseModal/index.tsx b/...RUD/data/database/DatabaseModal/index.tsx → ...eatures/databases/DatabaseModal/index.tsx
@@ -54,17 +54,17 @@ import {
   getConnectionAlert,
   useImportResource,
 } from 'src/views/CRUD/hooks';
-import { useCommonConf } from 'src/views/CRUD/data/database/state';
+import { useCommonConf } from 'src/features/databases/state';
+import Loading from 'src/components/Loading';
+import { isEmpty, pick } from 'lodash';
 import {
   DatabaseObject,
   DatabaseForm,
   CONFIGURATION_METHOD,
   CatalogObject,
   Engines,
   ExtraJson,
-} from 'src/views/CRUD/data/database/types';
-import Loading from 'src/components/Loading';
-import { isEmpty, pick } from 'lodash';
+} from '../types';
 import ExtraOptions from './ExtraOptions';
 import SqlAlchemyForm from './SqlAlchemyForm';
 import DatabaseConnectionForm from './DatabaseConnectionForm';

diff --git a/...RUD/data/database/DatabaseModal/styles.ts → ...eatures/databases/DatabaseModal/styles.ts b/...RUD/data/database/DatabaseModal/styles.ts → ...eatures/databases/DatabaseModal/styles.ts
diff --git a/...end/src/views/CRUD/data/database/state.ts → ...-frontend/src/features/databases/state.ts b/...end/src/views/CRUD/data/database/state.ts → ...-frontend/src/features/databases/state.ts
diff --git a/...end/src/views/CRUD/data/database/types.ts → ...-frontend/src/features/databases/types.ts b/...end/src/views/CRUD/data/database/types.ts → ...-frontend/src/features/databases/types.ts
diff --git a/...set/DatasetPanel/DatasetPanel.stories.tsx → ...set/DatasetPanel/DatasetPanel.stories.tsx b/...set/DatasetPanel/DatasetPanel.stories.tsx → ...set/DatasetPanel/DatasetPanel.stories.tsx
diff --git a/...ataset/DatasetPanel/DatasetPanel.test.tsx → ...ataset/DatasetPanel/DatasetPanel.test.tsx b/...ataset/DatasetPanel/DatasetPanel.test.tsx → ...ataset/DatasetPanel/DatasetPanel.test.tsx
@@ -23,7 +23,7 @@ import DatasetPanel, {
   ALT_LOADING,
   tableColumnDefinition,
   COLUMN_TITLE,
-} from 'src/views/CRUD/data/dataset/AddDataset/DatasetPanel/DatasetPanel';
+} from 'src/features/datasets/AddDataset/DatasetPanel/DatasetPanel';
 import { exampleColumns, exampleDataset } from './fixtures';
 import {
   SELECT_MESSAGE,

diff --git a/.../AddDataset/DatasetPanel/DatasetPanel.tsx → .../AddDataset/DatasetPanel/DatasetPanel.tsx b/.../AddDataset/DatasetPanel/DatasetPanel.tsx → .../AddDataset/DatasetPanel/DatasetPanel.tsx
@@ -24,7 +24,7 @@ import Table, { ColumnsType, TableSize } from 'src/components/Table';
 import { alphabeticalSort } from 'src/components/Table/sorters';
 // @ts-ignore
 import LOADING_GIF from 'src/assets/images/loading.gif';
-import { DatasetObject } from 'src/views/CRUD/data/dataset/AddDataset/types';
+import { DatasetObject } from 'src/features/datasets/AddDataset/types';
 import { ITableColumn } from './types';
 import MessageContent from './MessageContent';
 

diff --git a/...ddDataset/DatasetPanel/MessageContent.tsx → ...ddDataset/DatasetPanel/MessageContent.tsx b/...ddDataset/DatasetPanel/MessageContent.tsx → ...ddDataset/DatasetPanel/MessageContent.tsx
diff --git a/...taset/AddDataset/DatasetPanel/fixtures.ts → ...asets/AddDataset/DatasetPanel/fixtures.ts b/...taset/AddDataset/DatasetPanel/fixtures.ts → ...asets/AddDataset/DatasetPanel/fixtures.ts
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { DatasetObject } from 'src/views/CRUD/data/dataset/AddDataset/types';
+import { DatasetObject } from 'src/features/datasets/AddDataset/types';
 import { ITableColumn } from './types';
 
 export const exampleColumns: ITableColumn[] = [

diff --git a/...dataset/AddDataset/DatasetPanel/index.tsx → ...atasets/AddDataset/DatasetPanel/index.tsx b/...dataset/AddDataset/DatasetPanel/index.tsx → ...atasets/AddDataset/DatasetPanel/index.tsx
@@ -18,7 +18,7 @@
  */
 import React, { useEffect, useState, useRef } from 'react';
 import { SupersetClient, logging, t } from '@superset-ui/core';
-import { DatasetObject } from 'src/views/CRUD/data/dataset/AddDataset/types';
+import { DatasetObject } from 'src/features/datasets/AddDataset/types';
 import { addDangerToast } from 'src/components/MessageToasts/actions';
 import DatasetPanel from './DatasetPanel';
 import { ITableColumn, IDatabaseTable, isIDatabaseTable } from './types';

diff --git a/.../dataset/AddDataset/DatasetPanel/types.ts → ...datasets/AddDataset/DatasetPanel/types.ts b/.../dataset/AddDataset/DatasetPanel/types.ts → ...datasets/AddDataset/DatasetPanel/types.ts
diff --git a/...dDataset/EditDataset/EditDataset.test.tsx → ...dDataset/EditDataset/EditDataset.test.tsx b/...dDataset/EditDataset/EditDataset.test.tsx → ...dDataset/EditDataset/EditDataset.test.tsx
diff --git a/...et/EditDataset/UsageTab/UsageTab.test.tsx → ...et/EditDataset/UsageTab/UsageTab.test.tsx b/...et/EditDataset/UsageTab/UsageTab.test.tsx → ...et/EditDataset/UsageTab/UsageTab.test.tsx
diff --git a/...AddDataset/EditDataset/UsageTab/index.tsx → ...AddDataset/EditDataset/UsageTab/index.tsx b/...AddDataset/EditDataset/UsageTab/index.tsx → ...AddDataset/EditDataset/UsageTab/index.tsx
diff --git a/.../dataset/AddDataset/EditDataset/index.tsx → ...datasets/AddDataset/EditDataset/index.tsx b/.../dataset/AddDataset/EditDataset/index.tsx → ...datasets/AddDataset/EditDataset/index.tsx
@@ -18,7 +18,7 @@
  */
 import { styled, t } from '@superset-ui/core';
 import React from 'react';
-import { useGetDatasetRelatedCounts } from 'src/views/CRUD/data/hooks';
+import useGetDatasetRelatedCounts from 'src/features/datasets/hooks/useGetDatasetRelatedCounts';
 import Badge from 'src/components/Badge';
 import Tabs from 'src/components/Tabs';
 import UsageTab from './UsageTab';

diff --git a/...dataset/AddDataset/Footer/Footer.test.tsx → ...atasets/AddDataset/Footer/Footer.test.tsx b/...dataset/AddDataset/Footer/Footer.test.tsx → ...atasets/AddDataset/Footer/Footer.test.tsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { render, screen } from 'spec/helpers/testing-library';
-import Footer from 'src/views/CRUD/data/dataset/AddDataset/Footer';
+import Footer from 'src/features/datasets/AddDataset/Footer';
 
 const mockHistoryPush = jest.fn();
 jest.mock('react-router-dom', () => ({

diff --git a/.../data/dataset/AddDataset/Footer/index.tsx → ...ures/datasets/AddDataset/Footer/index.tsx b/.../data/dataset/AddDataset/Footer/index.tsx → ...ures/datasets/AddDataset/Footer/index.tsx
diff --git a/...dataset/AddDataset/Header/Header.test.tsx → ...atasets/AddDataset/Header/Header.test.tsx b/...dataset/AddDataset/Header/Header.test.tsx → ...atasets/AddDataset/Header/Header.test.tsx
@@ -18,9 +18,7 @@
  */
 import React from 'react';
 import { render, screen, waitFor } from 'spec/helpers/testing-library';
-import Header, {
-  DEFAULT_TITLE,
-} from 'src/views/CRUD/data/dataset/AddDataset/Header';
+import Header, { DEFAULT_TITLE } from 'src/features/datasets/AddDataset/Header';
 
 describe('Header', () => {
   const mockSetDataset = jest.fn();

diff --git a/.../data/dataset/AddDataset/Header/index.tsx → ...ures/datasets/AddDataset/Header/index.tsx b/.../data/dataset/AddDataset/Header/index.tsx → ...ures/datasets/AddDataset/Header/index.tsx
@@ -23,15 +23,15 @@ import Button from 'src/components/Button';
 import Icons from 'src/components/Icons';
 import { Menu } from 'src/components/Menu';
 import { TooltipPlacement } from 'src/components/Tooltip';
+import {
+  DatasetActionType,
+  DSReducerActionType,
+} from 'src/features/datasets/AddDataset/types';
 import {
   HeaderComponentStyles,
   disabledSaveBtnStyles,
   StyledCreateDatasetTitle,
-} from 'src/views/CRUD/data/dataset/styles';
-import {
-  DatasetActionType,
-  DSReducerActionType,
-} from 'src/views/CRUD/data/dataset/AddDataset/types';
+} from '../../styles';
 
 export const DEFAULT_TITLE = t('New dataset');
 

diff --git a/...t/AddDataset/LeftPanel/LeftPanel.test.tsx → ...s/AddDataset/LeftPanel/LeftPanel.test.tsx b/...t/AddDataset/LeftPanel/LeftPanel.test.tsx → ...s/AddDataset/LeftPanel/LeftPanel.test.tsx
@@ -20,8 +20,8 @@ import React from 'react';
 import fetchMock from 'fetch-mock';
 import userEvent from '@testing-library/user-event';
 import { render, screen, waitFor } from 'spec/helpers/testing-library';
-import LeftPanel from 'src/views/CRUD/data/dataset/AddDataset/LeftPanel';
-import { exampleDataset } from 'src/views/CRUD/data/dataset/AddDataset/DatasetPanel/fixtures';
+import LeftPanel from 'src/features/datasets/AddDataset/LeftPanel';
+import { exampleDataset } from 'src/features/datasets/AddDataset/DatasetPanel/fixtures';
 
 const databasesEndpoint = 'glob:*/api/v1/database/?q*';
 const schemasEndpoint = 'glob:*/api/v1/database/*/schemas*';

diff --git a/...ta/dataset/AddDataset/LeftPanel/index.tsx → ...s/datasets/AddDataset/LeftPanel/index.tsx b/...ta/dataset/AddDataset/LeftPanel/index.tsx → ...s/datasets/AddDataset/LeftPanel/index.tsx
@@ -51,7 +51,7 @@ import { LocalStorageKeys, getItem } from 'src/utils/localStorageHelpers';
 import {
   DatasetActionType,
   DatasetObject,
-} from 'src/views/CRUD/data/dataset/AddDataset/types';
+} from 'src/features/datasets/AddDataset/types';
 
 interface LeftPanelProps {
   setDataset: Dispatch<SetStateAction<object>>;

diff --git a/...AddDataset/RightPanel/RightPanel.test.tsx → ...AddDataset/RightPanel/RightPanel.test.tsx b/...AddDataset/RightPanel/RightPanel.test.tsx → ...AddDataset/RightPanel/RightPanel.test.tsx
@@ -18,7 +18,7 @@
  */
 import React from 'react';
 import { render, screen } from 'spec/helpers/testing-library';
-import RightPanel from 'src/views/CRUD/data/dataset/AddDataset/RightPanel';
+import RightPanel from 'src/features/datasets/AddDataset/RightPanel';
 
 describe('RightPanel', () => {
   it('renders a blank state RightPanel', () => {

diff --git a/...a/dataset/AddDataset/RightPanel/index.tsx → .../datasets/AddDataset/RightPanel/index.tsx b/...a/dataset/AddDataset/RightPanel/index.tsx → .../datasets/AddDataset/RightPanel/index.tsx
diff --git a/...ws/CRUD/data/dataset/AddDataset/types.tsx → ...rc/features/datasets/AddDataset/types.tsx b/...ws/CRUD/data/dataset/AddDataset/types.tsx → ...rc/features/datasets/AddDataset/types.tsx
diff --git a/...aset/DatasetLayout/DatasetLayout.test.tsx → ...sets/DatasetLayout/DatasetLayout.test.tsx b/...aset/DatasetLayout/DatasetLayout.test.tsx → ...sets/DatasetLayout/DatasetLayout.test.tsx
@@ -18,12 +18,12 @@
  */
 import React from 'react';
 import { render, screen, waitFor } from 'spec/helpers/testing-library';
-import DatasetLayout from 'src/views/CRUD/data/dataset/DatasetLayout';
-import Header from 'src/views/CRUD/data/dataset/AddDataset/Header';
-import LeftPanel from 'src/views/CRUD/data/dataset/AddDataset/LeftPanel';
-import DatasetPanel from 'src/views/CRUD/data/dataset/AddDataset/DatasetPanel';
-import RightPanel from 'src/views/CRUD/data/dataset/AddDataset/RightPanel';
-import Footer from 'src/views/CRUD/data/dataset/AddDataset/Footer';
+import DatasetLayout from 'src/features/datasets/DatasetLayout';
+import Header from 'src/features/datasets/AddDataset/Header';
+import LeftPanel from 'src/features/datasets/AddDataset/LeftPanel';
+import DatasetPanel from 'src/features/datasets/AddDataset/DatasetPanel';
+import RightPanel from 'src/features/datasets/AddDataset/RightPanel';
+import Footer from 'src/features/datasets/AddDataset/Footer';
 
 const mockHistoryPush = jest.fn();
 jest.mock('react-router-dom', () => ({

diff --git a/...CRUD/data/dataset/DatasetLayout/index.tsx → ...features/datasets/DatasetLayout/index.tsx b/...CRUD/data/dataset/DatasetLayout/index.tsx → ...features/datasets/DatasetLayout/index.tsx
@@ -29,7 +29,7 @@ import {
   StyledLayoutDatasetPanel,
   StyledLayoutRightPanel,
   StyledLayoutFooter,
-} from 'src/views/CRUD/data/dataset/styles';
+} from '../styles';
 
 interface DatasetLayoutProps {
   header?: ReactElement<any, string | JSXElementConstructor<any>> | null;

diff --git a/...UD/data/dataset/DuplicateDatasetModal.tsx → ...atures/datasets/DuplicateDatasetModal.tsx b/...UD/data/dataset/DuplicateDatasetModal.tsx → ...atures/datasets/DuplicateDatasetModal.tsx
diff --git a/.../src/views/CRUD/data/dataset/constants.ts → ...ontend/src/features/datasets/constants.ts b/.../src/views/CRUD/data/dataset/constants.ts → ...ontend/src/features/datasets/constants.ts