chore: Move charts to src/pages folder (#22230)

apache · Jan 12, 2023 · 1a0de49 · 1a0de49
1 parent 5a422b3
commit 1a0de49
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 59 deletions.
diff --git a/...d/src/addSlice/AddSliceContainer.test.tsx → ...ages/ChartCreation/ChartCreation.test.tsx b/...d/src/addSlice/AddSliceContainer.test.tsx → ...ages/ChartCreation/ChartCreation.test.tsx
@@ -22,10 +22,10 @@ import { styledMount as mount } from 'spec/helpers/theming';
 import Button from 'src/components/Button';
 import { AsyncSelect } from 'src/components';
 import {
-  AddSliceContainer,
-  AddSliceContainerProps,
-  AddSliceContainerState,
-} from 'src/addSlice/AddSliceContainer';
+  ChartCreation,
+  ChartCreationProps,
+  ChartCreationState,
+} from 'src/pages/ChartCreation';
 import VizTypeGallery from 'src/explore/components/controls/VizTypeControl/VizTypeGallery';
 import { act } from 'spec/helpers/testing-library';
 import { UserWithPermissionsAndRoles } from 'src/types/bootstrapTypes';
@@ -70,15 +70,11 @@ const routeProps = {
 
 async function getWrapper(user = mockUser) {
   const wrapper = mount(
-    <AddSliceContainer
-      user={user}
-      addSuccessToast={() => null}
-      {...routeProps}
-    />,
+    <ChartCreation user={user} addSuccessToast={() => null} {...routeProps} />,
   ) as unknown as ReactWrapper<
-    AddSliceContainerProps,
-    AddSliceContainerState,
-    AddSliceContainer
+    ChartCreationProps,
+    ChartCreationState,
+    ChartCreation
   >;
   await act(() => new Promise(resolve => setTimeout(resolve, 0)));
   return wrapper;

diff --git a/...ontend/src/addSlice/AddSliceContainer.tsx → ...rontend/src/pages/ChartCreation/index.tsx b/...ontend/src/addSlice/AddSliceContainer.tsx → ...rontend/src/pages/ChartCreation/index.tsx
@@ -48,12 +48,12 @@ type Dataset = {
   datasource_type: string;
 };
 
-export interface AddSliceContainerProps extends RouteComponentProps {
+export interface ChartCreationProps extends RouteComponentProps {
   user: UserWithPermissionsAndRoles;
   addSuccessToast: (arg: string) => void;
 }
 
-export type AddSliceContainerState = {
+export type ChartCreationState = {
   datasource?: { label: string; value: string };
   datasetName?: string | string[] | null;
   vizType: string | null;
@@ -215,11 +215,11 @@ const StyledStepDescription = styled.div`
   `}
 `;
 
-export class AddSliceContainer extends React.PureComponent<
-  AddSliceContainerProps,
-  AddSliceContainerState
+export class ChartCreation extends React.PureComponent<
+  ChartCreationProps,
+  ChartCreationState
 > {
-  constructor(props: AddSliceContainerProps) {
+  constructor(props: ChartCreationProps) {
     super(props);
     this.state = {
       vizType: null,
@@ -428,4 +428,4 @@ export class AddSliceContainer extends React.PureComponent<
   }
 }
 
-export default withRouter(withToasts(AddSliceContainer));
+export default withRouter(withToasts(ChartCreation));
diff --git a/...ontend/src/views/CRUD/chart/ChartCard.tsx → ...rontend/src/pages/ChartList/ChartCard.tsx b/...ontend/src/views/CRUD/chart/ChartCard.tsx → ...rontend/src/pages/ChartList/ChartCard.tsx
@@ -30,7 +30,7 @@ import { AntdDropdown } from 'src/components';
 import { Menu } from 'src/components/Menu';
 import FaveStar from 'src/components/FaveStar';
 import FacePile from 'src/components/FacePile';
-import { handleChartDelete, CardStyles } from '../utils';
+import { handleChartDelete, CardStyles } from 'src/views/CRUD/utils';
 
 interface ChartCardProps {
   chart: Chart;

diff --git a/...d/src/views/CRUD/chart/ChartList.test.jsx → ...nd/src/pages/ChartList/ChartList.test.jsx b/...d/src/views/CRUD/chart/ChartList.test.jsx → ...nd/src/pages/ChartList/ChartList.test.jsx
@@ -30,7 +30,7 @@ import userEvent from '@testing-library/user-event';
 import { QueryParamProvider } from 'use-query-params';
 import { act } from 'react-dom/test-utils';
 
-import ChartList from 'src/views/CRUD/chart/ChartList';
+import ChartList from 'src/pages/ChartList';
 import ConfirmStatusChange from 'src/components/ConfirmStatusChange';
 import ListView from 'src/components/ListView';
 import PropertiesModal from 'src/explore/components/PropertiesModal';

diff --git a/...ontend/src/views/CRUD/chart/ChartList.tsx → ...et-frontend/src/pages/ChartList/index.tsx b/...ontend/src/views/CRUD/chart/ChartList.tsx → ...et-frontend/src/pages/ChartList/index.tsx
diff --git a/superset-frontend/src/views/CRUD/chart/types.ts b/superset-frontend/src/views/CRUD/chart/types.ts
diff --git a/superset-frontend/src/views/CRUD/welcome/ChartTable.tsx b/superset-frontend/src/views/CRUD/welcome/ChartTable.tsx
@@ -40,7 +40,7 @@ import {
   PAGE_SIZE,
 } from 'src/views/CRUD/utils';
 import { LoadingCards } from 'src/views/CRUD/welcome/Welcome';
-import ChartCard from 'src/views/CRUD/chart/ChartCard';
+import ChartCard from 'src/pages/ChartList/ChartCard';
 import Chart from 'src/types/Chart';
 import handleResourceExport from 'src/utils/export';
 import Loading from 'src/components/Loading';

diff --git a/superset-frontend/src/views/routes.tsx b/superset-frontend/src/views/routes.tsx
@@ -21,11 +21,9 @@ import React, { lazy } from 'react';
 // not lazy loaded since this is the home page.
 import Welcome from 'src/views/CRUD/welcome/Welcome';
 
-const AddSliceContainer = lazy(
+const ChartCreation = lazy(
   () =>
-    import(
-      /* webpackChunkName: "AddSliceContainer" */ 'src/addSlice/AddSliceContainer'
-    ),
+    import(/* webpackChunkName: "ChartCreation" */ 'src/pages/ChartCreation'),
 );
 const AnnotationLayersList = lazy(
   () =>
@@ -46,10 +44,7 @@ const AnnotationList = lazy(
     ),
 );
 const ChartList = lazy(
-  () =>
-    import(
-      /* webpackChunkName: "ChartList" */ 'src/views/CRUD/chart/ChartList'
-    ),
+  () => import(/* webpackChunkName: "ChartList" */ 'src/pages/ChartList'),
 );
 const CssTemplatesList = lazy(
   () =>
@@ -139,7 +134,7 @@ export const routes: Routes = [
   },
   {
     path: '/chart/add',
-    Component: AddSliceContainer,
+    Component: ChartCreation,
   },
   {
     path: '/chart/list/',