chore: Moves Chart components to src/components folder

superset-frontend/spec/helpers/reducerIndex.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import charts from 'src/chart/chartReducer';
+import charts from 'src/components/Chart/chartReducer';
 import dataMask from 'src/dataMask/reducer';
 import dashboardInfo from 'src/dashboard/reducers/dashboardInfo';
 import dashboardState from 'src/dashboard/reducers/dashboardState';

superset-frontend/src/chart/ChartContainer.jsx → superset-frontend/src/components/Chart/ChartContainer.jsx

@@ -20,9 +20,9 @@ import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
 
 import * as actions from './chartAction';
-import { logEvent } from '../logger/actions';
+import { logEvent } from '../../logger/actions';
 import Chart from './Chart';
-import { updateDataMask } from '../dataMask/actions';
+import { updateDataMask } from '../../dataMask/actions';
 
 function mapDispatchToProps(dispatch) {
   return {

superset-frontend/src/chart/ChartRenderer.test.jsx → superset-frontend/src/components/Chart/ChartRenderer.test.jsx

@@ -20,7 +20,7 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { SuperChart } from '@superset-ui/core';
 
-import ChartRenderer from 'src/chart/ChartRenderer';
+import ChartRenderer from 'src/components/Chart/ChartRenderer';
 
 const requiredProps = {
   chartId: 1,

superset-frontend/src/chart/chartActions.test.js → superset-frontend/src/components/Chart/chartActions.test.js

@@ -23,7 +23,7 @@ import sinon from 'sinon';
 import * as chartlib from '@superset-ui/core';
 import { LOG_EVENT } from 'src/logger/actions';
 import * as exploreUtils from 'src/explore/exploreUtils';
-import * as actions from 'src/chart/chartAction';
+import * as actions from 'src/components/Chart/chartAction';
 
 describe('chart actions', () => {
   const MOCK_URL = '/mockURL';

superset-frontend/src/chart/chartReducers.test.js → superset-frontend/src/components/Chart/chartReducers.test.js

@@ -16,8 +16,8 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import chartReducer, { chart } from 'src/chart/chartReducer';
-import * as actions from 'src/chart/chartAction';
+import chartReducer, { chart } from 'src/components/Chart/chartReducer';
+import * as actions from 'src/components/Chart/chartAction';
 
 describe('chart reducers', () => {
   const chartKey = 1;

superset-frontend/src/dashboard/actions/dashboardState.js

@@ -19,8 +19,12 @@
 /* eslint camelcase: 0 */
 import { ActionCreators as UndoActionCreators } from 'redux-undo';
 import { ensureIsArray, t, SupersetClient } from '@superset-ui/core';
-import { addChart, removeChart, refreshChart } from 'src/chart/chartAction';
-import { chart as initChart } from 'src/chart/chartReducer';
+import {
+  addChart,
+  removeChart,
+  refreshChart,
+} from 'src/components/Chart/chartAction';
+import { chart as initChart } from 'src/components/Chart/chartReducer';
 import { applyDefaultFormData } from 'src/explore/store';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 import { SAVE_TYPE_OVERWRITE } from 'src/dashboard/util/constants';

superset-frontend/src/dashboard/actions/hydrate.js

@@ -24,7 +24,7 @@ import {
   getChartMetadataRegistry,
 } from '@superset-ui/core';
 
-import { chart } from 'src/chart/chartReducer';
+import { chart } from 'src/components/Chart/chartReducer';
 import { initSliceEntities } from 'src/dashboard/reducers/sliceEntities';
 import { getInitialState as getInitialNativeFilterState } from 'src/dashboard/reducers/nativeFilters';
 import { applyDefaultFormData } from 'src/explore/store';

superset-frontend/src/dashboard/components/FiltersBadge/FiltersBadge.test.tsx

@@ -26,7 +26,7 @@ import { styledMount as mount } from 'spec/helpers/theming';
 import {
   CHART_RENDERING_SUCCEEDED,
   CHART_UPDATE_SUCCEEDED,
-} from 'src/chart/chartAction';
+} from 'src/components/Chart/chartAction';
 import { buildActiveFilters } from 'src/dashboard/util/activeDashboardFilters';
 import { FiltersBadge } from 'src/dashboard/components/FiltersBadge';
 import {

superset-frontend/src/dashboard/components/gridComponents/Chart.jsx

@@ -23,7 +23,7 @@ import { styled, t, logging } from '@superset-ui/core';
 import { isEqual } from 'lodash';
 
 import { exportChart, mountExploreUrl } from 'src/explore/exploreUtils';
-import ChartContainer from 'src/chart/ChartContainer';
+import ChartContainer from 'src/components/Chart/ChartContainer';
 import {
   LOG_ACTIONS_CHANGE_DASHBOARD_FILTER,
   LOG_ACTIONS_EXPLORE_DASHBOARD_CHART,

superset-frontend/src/dashboard/components/gridComponents/Chart.test.jsx

@@ -22,7 +22,7 @@ import sinon from 'sinon';
 
 import Chart from 'src/dashboard/components/gridComponents/Chart';
 import SliceHeader from 'src/dashboard/components/SliceHeader';
-import ChartContainer from 'src/chart/ChartContainer';
+import ChartContainer from 'src/components/Chart/ChartContainer';
 import * as exploreUtils from 'src/explore/exploreUtils';
 import { sliceEntitiesForChart as sliceEntities } from 'spec/fixtures/mockSliceEntities';
 import mockDatasource from 'spec/fixtures/mockDatasource';

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterValue.tsx

@@ -36,7 +36,7 @@ import {
 } from '@superset-ui/core';
 import { useDispatch, useSelector } from 'react-redux';
 import { isEqual, isEqualWith } from 'lodash';
-import { getChartDataRequest } from 'src/chart/chartAction';
+import { getChartDataRequest } from 'src/components/Chart/chartAction';
 import Loading from 'src/components/Loading';
 import BasicErrorAlert from 'src/components/ErrorMessage/BasicErrorAlert';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';

superset-frontend/src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FiltersConfigForm.tsx

@@ -48,7 +48,7 @@ import React, {
 } from 'react';
 import { PluginFilterSelectCustomizeProps } from 'src/filters/components/Select/types';
 import { useSelector } from 'react-redux';
-import { getChartDataRequest } from 'src/chart/chartAction';
+import { getChartDataRequest } from 'src/components/Chart/chartAction';
 import { Input, TextArea } from 'src/components/Input';
 import { Select, FormInstance } from 'src/components';
 import Collapse from 'src/components/Collapse';

superset-frontend/src/dashboard/containers/Chart.jsx

@@ -29,7 +29,7 @@ import {
   addSuccessToast,
   addDangerToast,
 } from 'src/components/MessageToasts/actions';
-import { refreshChart } from 'src/chart/chartAction';
+import { refreshChart } from 'src/components/Chart/chartAction';
 import { logEvent } from 'src/logger/actions';
 import {
   getActiveFilters,

superset-frontend/src/dashboard/containers/Dashboard.ts

@@ -26,7 +26,7 @@ import {
 } from 'src/dashboard/actions/dashboardState';
 import { setDatasources } from 'src/dashboard/actions/datasources';
 
-import { triggerQuery } from 'src/chart/chartAction';
+import { triggerQuery } from 'src/components/Chart/chartAction';
 import { logEvent } from 'src/logger/actions';
 import { getActiveFilters } from 'src/dashboard/util/activeDashboardFilters';
 import {

superset-frontend/src/dashboard/types.ts

@@ -25,7 +25,7 @@ import {
   NativeFiltersState,
 } from '@superset-ui/core';
 import { DatasourceMeta } from '@superset-ui/chart-controls';
-import { chart } from 'src/chart/chartReducer';
+import { chart } from 'src/components/Chart/chartReducer';
 import componentTypes from 'src/dashboard/util/componentTypes';
 
 import { User } from 'src/types/bootstrapTypes';

superset-frontend/src/explore/components/DataTablesPane/index.tsx

@@ -29,7 +29,7 @@ import Tabs from 'src/components/Tabs';
 import Loading from 'src/components/Loading';
 import { EmptyStateMedium } from 'src/components/EmptyState';
 import TableView, { EmptyWrapperType } from 'src/components/TableView';
-import { getChartDataRequest } from 'src/chart/chartAction';
+import { getChartDataRequest } from 'src/components/Chart/chartAction';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
 import {
   getItem,

superset-frontend/src/explore/components/ExploreAdditionalActionsMenu/ExploreAdditionalActionsMenu.test.tsx

@@ -20,7 +20,7 @@
 import React from 'react';
 import { render, screen, waitFor } from 'spec/helpers/testing-library';
 import userEvent from '@testing-library/user-event';
-import * as chartAction from 'src/chart/chartAction';
+import * as chartAction from 'src/components/Chart/chartAction';
 import * as downloadAsImage from 'src/utils/downloadAsImage';
 import fetchMock from 'fetch-mock';
 import ExploreAdditionalActionsMenu from '.';

superset-frontend/src/explore/components/ExploreChartPanel.jsx

@@ -22,7 +22,7 @@ import Split from 'react-split';
 import { styled, SupersetClient, useTheme } from '@superset-ui/core';
 import { useResizeDetector } from 'react-resize-detector';
 import { chartPropShape } from 'src/dashboard/util/propShapes';
-import ChartContainer from 'src/chart/ChartContainer';
+import ChartContainer from 'src/components/Chart/ChartContainer';
 import {
   getItem,
   setItem,

superset-frontend/src/explore/components/ExploreViewContainer/index.jsx

@@ -39,7 +39,7 @@ import {
 import { URL_PARAMS } from 'src/constants';
 import { getUrlParam } from 'src/utils/urlUtils';
 import cx from 'classnames';
-import * as chartActions from 'src/chart/chartAction';
+import * as chartActions from 'src/components/Chart/chartAction';
 import { fetchDatasourceMetadata } from 'src/dashboard/actions/datasources';
 import { chartPropShape } from 'src/dashboard/util/propShapes';
 import { mergeExtraFormData } from 'src/dashboard/components/nativeFilters/utils';

superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.jsx

@@ -25,7 +25,7 @@ import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls';
 import Popover from 'src/components/Popover';
 import AsyncEsmComponent from 'src/components/AsyncEsmComponent';
 import { getChartKey } from 'src/explore/exploreUtils';
-import { runAnnotationQuery } from 'src/chart/chartAction';
+import { runAnnotationQuery } from 'src/components/Chart/chartAction';
 import CustomListItem from 'src/explore/components/controls/CustomListItem';
 
 const AnnotationLayer = AsyncEsmComponent(

superset-frontend/src/explore/components/controls/ViewQueryModal.tsx

@@ -24,7 +24,7 @@ import CopyToClipboard from 'src/components/CopyToClipboard';
 import Loading from 'src/components/Loading';
 import { CopyButton } from 'src/explore/components/DataTableControl';
 import { getClientErrorObject } from 'src/utils/getClientErrorObject';
-import { getChartDataRequest } from 'src/chart/chartAction';
+import { getChartDataRequest } from 'src/components/Chart/chartAction';
 import markdownSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/markdown';
 import htmlSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/htmlbars';
 import sqlSyntax from 'react-syntax-highlighter/dist/cjs/languages/hljs/sql';

superset-frontend/src/explore/reducers/exploreReducer.js

@@ -18,7 +18,7 @@
  */
 /* eslint camelcase: 0 */
 import { ensureIsArray } from '@superset-ui/core';
-import { DYNAMIC_PLUGIN_CONTROLS_READY } from 'src/chart/chartAction';
+import { DYNAMIC_PLUGIN_CONTROLS_READY } from 'src/components/Chart/chartAction';
 import { DEFAULT_TIME_RANGE } from 'src/explore/constants';
 import { getControlsState } from 'src/explore/store';
 import {

superset-frontend/src/explore/reducers/index.js

@@ -19,7 +19,7 @@
 import { combineReducers } from 'redux';
 
 import reports from 'src/reports/reducers/reports';
-import charts from 'src/chart/chartReducer';
+import charts from 'src/components/Chart/chartReducer';
 import dataMask from 'src/dataMask/reducer';
 import messageToasts from 'src/components/MessageToasts/reducers';
 import saveModal from './saveModalReducer';

superset-frontend/src/views/store.ts

@@ -20,7 +20,7 @@ import { applyMiddleware, combineReducers, compose, createStore } from 'redux';
 import thunk from 'redux-thunk';
 import messageToastReducer from 'src/components/MessageToasts/reducers';
 import { initEnhancer } from 'src/reduxUtils';
-import charts from 'src/chart/chartReducer';
+import charts from 'src/components/Chart/chartReducer';
 import dataMask from 'src/dataMask/reducer';
 import reports from 'src/reports/reducers/reports';
 import dashboardInfo from 'src/dashboard/reducers/dashboardInfo';