From ea2d6681dded621495f13be923f39f340588de9d Mon Sep 17 00:00:00 2001 From: Yongjie Zhao Date: Fri, 28 Jan 2022 12:13:12 +0800 Subject: [PATCH] chore: move controlPanel into time_table (#18160) --- .../controls/VizTypeControl/VizTypeControl.test.tsx | 2 +- superset-frontend/src/setup/setupPlugins.ts | 5 +---- .../TimeTable/controlPanel.js} | 0 .../TimeTable/{TimeTableChartPlugin.ts => index.ts} | 2 ++ superset-frontend/src/visualizations/presets/MainPreset.js | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) rename superset-frontend/src/{explore/controlPanels/TimeTable.js => visualizations/TimeTable/controlPanel.js} (100%) rename superset-frontend/src/visualizations/TimeTable/{TimeTableChartPlugin.ts => index.ts} (96%) diff --git a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx index 9474d24b4b..a875591620 100644 --- a/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx +++ b/superset-frontend/src/explore/components/controls/VizTypeControl/VizTypeControl.test.tsx @@ -33,7 +33,7 @@ import { EchartsTimeseriesChartPlugin, } from '@superset-ui/plugin-chart-echarts'; import { LineChartPlugin } from '@superset-ui/preset-chart-xy'; -import TimeTableChartPlugin from '../../../../visualizations/TimeTable/TimeTableChartPlugin'; +import TimeTableChartPlugin from '../../../../visualizations/TimeTable'; import VizTypeControl, { VIZ_TYPE_CONTROL_TEST_ID } from './index'; jest.useFakeTimers(); diff --git a/superset-frontend/src/setup/setupPlugins.ts b/superset-frontend/src/setup/setupPlugins.ts index 9eb3eca95e..cad8a8fe98 100644 --- a/superset-frontend/src/setup/setupPlugins.ts +++ b/superset-frontend/src/setup/setupPlugins.ts @@ -21,15 +21,12 @@ import MainPreset from '../visualizations/presets/MainPreset'; import setupPluginsExtra from './setupPluginsExtra'; import Separator from '../explore/controlPanels/Separator'; -import TimeTable from '../explore/controlPanels/TimeTable'; export default function setupPlugins() { new MainPreset().register(); // TODO: Remove these shims once the control panel configs are moved into the plugin package. - getChartControlPanelRegistry() - .registerValue('separator', Separator) - .registerValue('time_table', TimeTable); + getChartControlPanelRegistry().registerValue('separator', Separator); setupPluginsExtra(); } diff --git a/superset-frontend/src/explore/controlPanels/TimeTable.js b/superset-frontend/src/visualizations/TimeTable/controlPanel.js similarity index 100% rename from superset-frontend/src/explore/controlPanels/TimeTable.js rename to superset-frontend/src/visualizations/TimeTable/controlPanel.js diff --git a/superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.ts b/superset-frontend/src/visualizations/TimeTable/index.ts similarity index 96% rename from superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.ts rename to superset-frontend/src/visualizations/TimeTable/index.ts index 73537b266c..ae7f406646 100644 --- a/superset-frontend/src/visualizations/TimeTable/TimeTableChartPlugin.ts +++ b/superset-frontend/src/visualizations/TimeTable/index.ts @@ -19,6 +19,7 @@ import { t, ChartMetadata, ChartPlugin } from '@superset-ui/core'; import transformProps from './transformProps'; import thumbnail from './images/thumbnail.png'; +import controlPanel from './controlPanel'; const metadata = new ChartMetadata({ category: t('Table'), @@ -45,6 +46,7 @@ export default class TimeTableChartPlugin extends ChartPlugin { metadata, transformProps, loadChart: () => import('./TimeTable'), + controlPanel, }); } } diff --git a/superset-frontend/src/visualizations/presets/MainPreset.js b/superset-frontend/src/visualizations/presets/MainPreset.js index a32fbb2b74..dc3736ff17 100644 --- a/superset-frontend/src/visualizations/presets/MainPreset.js +++ b/superset-frontend/src/visualizations/presets/MainPreset.js @@ -79,7 +79,7 @@ import { } from 'src/filters/components/'; import { PivotTableChartPlugin as PivotTableChartPluginV2 } from '@superset-ui/plugin-chart-pivot-table'; import FilterBoxChartPlugin from '../FilterBox/FilterBoxChartPlugin'; -import TimeTableChartPlugin from '../TimeTable/TimeTableChartPlugin'; +import TimeTableChartPlugin from '../TimeTable'; export default class MainPreset extends Preset { constructor() {