From 8ab63d7943e316509f2025859defaad3f7bcd17c Mon Sep 17 00:00:00 2001 From: Ville Brofeldt <33317356+villebro@users.noreply.github.com> Date: Mon, 21 Dec 2020 21:29:24 +0200 Subject: [PATCH] fix: fix nvd3 and histogram regressions and migrate control panels to TS (#875) * chore: add types to all control panels * move nvd3 shared section to individual viz --- .../src/{controlPanel.js => controlPanel.ts} | 15 +++++++------ .../src/{controlPanel.js => controlPanel.ts} | 6 ++++-- .../src/{controlPanel.js => controlPanel.ts} | 0 .../src/{controlPanel.js => controlPanel.ts} | 7 +++++-- .../src/{controlPanel.js => controlPanel.ts} | 12 ++++++++--- .../src/{controlPanel.js => controlPanel.ts} | 6 ++++-- .../src/{controlPanel.js => controlPanel.ts} | 21 ++++++++++++++----- ...nDescription.jsx => OptionDescription.tsx} | 4 ++-- .../{controlPanel.jsx => controlPanel.tsx} | 14 ++++++++----- .../src/{controlPanel.js => controlPanel.ts} | 9 +++++--- .../{controlPanel.jsx => controlPanel.tsx} | 7 +++++-- .../src/{controlPanel.js => controlPanel.ts} | 6 ++++-- .../src/{controlPanel.js => controlPanel.ts} | 13 +++++++++--- .../src/{controlPanel.js => controlPanel.ts} | 6 ++++-- .../src/Area/controlPanel.ts | 1 + .../src/Bar/controlPanel.ts | 1 + .../src/Compare/controlPanel.ts | 1 + .../src/Line/controlPanel.ts | 1 + .../src/NVD3Controls.tsx | 2 -- 19 files changed, 91 insertions(+), 41 deletions(-) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/{controlPanel.js => controlPanel.ts} (95%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-chord/src/{controlPanel.js => controlPanel.ts} (92%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/{controlPanel.js => controlPanel.ts} (100%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/{controlPanel.js => controlPanel.ts} (98%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/{controlPanel.js => controlPanel.ts} (93%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/{controlPanel.js => controlPanel.ts} (94%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/{controlPanel.js => controlPanel.ts} (94%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/{OptionDescription.jsx => OptionDescription.tsx} (89%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/{controlPanel.jsx => controlPanel.tsx} (97%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/{controlPanel.js => controlPanel.ts} (97%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/{controlPanel.jsx => controlPanel.tsx} (99%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/{controlPanel.js => controlPanel.ts} (90%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/{controlPanel.js => controlPanel.ts} (90%) rename superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/{controlPanel.js => controlPanel.ts} (95%) diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts similarity index 95% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts index 74cf4c238fed..4b3208c5d818 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-calendar/src/controlPanel.ts @@ -16,15 +16,16 @@ * specific language governing permissions and limitations * under the License. */ +import { t, legacyValidateInteger } from '@superset-ui/core'; import { - t, - legacyValidateInteger, - D3_TIME_FORMAT_OPTIONS, + ControlPanelConfig, D3_FORMAT_DOCS, -} from '@superset-ui/core'; -import { formatSelectOptions, sections } from '@superset-ui/chart-controls'; + D3_TIME_FORMAT_OPTIONS, + formatSelectOptions, + sections, +} from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -177,3 +178,5 @@ export default { }, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts similarity index 92% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts index 7b8bc1bc1a8c..7a53785dd6f1 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-chord/src/controlPanel.ts @@ -17,9 +17,9 @@ * under the License. */ import { t, validateNonEmpty } from '@superset-ui/core'; -import { sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -55,3 +55,5 @@ export default { }, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts similarity index 100% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-force-directed/src/controlPanel.ts diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts similarity index 98% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts index e2d08f093b42..8dcea6295da4 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-heatmap/src/controlPanel.ts @@ -18,8 +18,9 @@ */ import { t, validateNonEmpty } from '@superset-ui/core'; import { - formatSelectOptions, columnChoices, + ControlPanelConfig, + formatSelectOptions, formatSelectOptionsForRange, sections, } from '@superset-ui/chart-controls'; @@ -31,7 +32,7 @@ const sortAxisChoices = [ ['value_desc', t('Metric descending')], ]; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -261,3 +262,5 @@ export default { }, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts similarity index 93% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts index b70567ecd286..48b3650aa483 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-histogram/src/controlPanel.ts @@ -17,15 +17,20 @@ * under the License. */ import { t, validateNonEmpty } from '@superset-ui/core'; -import { formatSelectOptions, columnChoices, sections } from '@superset-ui/chart-controls'; +import { + ControlPanelConfig, + columnChoices, + formatSelectOptions, + sections, +} from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ + sections.legacyRegularTime, { label: t('Query'), expanded: true, controlSetRows: [ - sections.legacyRegularTime, [ { name: 'all_columns_x', @@ -102,3 +107,4 @@ export default { }, ], }; +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts similarity index 94% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts index 0d9f34f23b4f..9fe3cd940ec2 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-horizon/src/controlPanel.ts @@ -17,9 +17,9 @@ * under the License. */ import { t } from '@superset-ui/core'; -import { formatSelectOptions, sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, formatSelectOptions, sections } from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -92,3 +92,5 @@ export default { }, ], }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts similarity index 94% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts index 30abdffdfb2c..9a25c58ac140 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-map-box/src/controlPanel.ts @@ -17,9 +17,14 @@ * under the License. */ import { t } from '@superset-ui/core'; -import { formatSelectOptions, columnChoices, sections } from '@superset-ui/chart-controls'; +import { + columnChoices, + ControlPanelConfig, + formatSelectOptions, + sections, +} from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -99,9 +104,13 @@ export default { 'Either a numerical column or `Auto`, which scales the point based ' + 'on the largest cluster', ), - mapStateToProps: state => ({ - choices: formatSelectOptions(['Auto']).concat(columnChoices(state.datasource)), - }), + mapStateToProps: state => { + const datasourceChoices = columnChoices(state.datasource); + const choices: [string, string][] = formatSelectOptions(['Auto']); + return { + choices: choices.concat(datasourceChoices), + }; + }, }, }, ], @@ -292,3 +301,5 @@ export default { }, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/OptionDescription.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/OptionDescription.tsx similarity index 89% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/OptionDescription.jsx rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/OptionDescription.tsx index 75dca1963097..719bf8e4cad5 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/OptionDescription.jsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/OptionDescription.tsx @@ -20,7 +20,7 @@ import React from 'react'; import PropTypes from 'prop-types'; -import { InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; +import { ColumnMeta, InfoTooltipWithTrigger } from '@superset-ui/chart-controls'; const propTypes = { option: PropTypes.object.isRequired, @@ -28,7 +28,7 @@ const propTypes = { // This component provides a general tooltip for options // in a SelectControl -export default function OptionDescription({ option }) { +export default function OptionDescription({ option }: { option: ColumnMeta }) { return ( {option.label} diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx similarity index 97% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.jsx rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx index 3ccdaa83de8c..82adfbbd7fc4 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.jsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-partition/src/controlPanel.tsx @@ -19,15 +19,17 @@ import React from 'react'; import { t, validateNonEmpty } from '@superset-ui/core'; import { - formatSelectOptions, - D3_TIME_FORMAT_OPTIONS, + ColumnMeta, + ControlPanelConfig, D3_FORMAT_DOCS, D3_FORMAT_OPTIONS, + D3_TIME_FORMAT_OPTIONS, + formatSelectOptions, sections, } from '@superset-ui/chart-controls'; import OptionDescription from './OptionDescription'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -116,8 +118,8 @@ export default { description: t('Use the Advanced Analytics options below'), }, ], - optionRenderer: op => , - valueRenderer: op => , + optionRenderer: (op: ColumnMeta) => , + valueRenderer: (op: ColumnMeta) => , description: t('Settings for time series'), }, }, @@ -355,3 +357,5 @@ export default { }, ], }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts similarity index 97% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts index 410c52b687a8..d60f8d8eee20 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-pivot-table/src/controlPanel.ts @@ -18,14 +18,15 @@ */ import { t } from '@superset-ui/core'; import { - D3_FORMAT_OPTIONS, - D3_FORMAT_DOCS, + ControlPanelConfig, formatSelectOptions, + D3_FORMAT_DOCS, + D3_FORMAT_OPTIONS, D3_TIME_FORMAT_OPTIONS, sections, } from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyTimeseriesTime, { @@ -135,3 +136,5 @@ export default { columns: { includeTime: true }, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.jsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx similarity index 99% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.jsx rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx index e94cd7ea649e..c5bdb5734c71 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.jsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-rose/src/controlPanel.tsx @@ -19,14 +19,15 @@ import React from 'react'; import { t } from '@superset-ui/core'; import { + ControlPanelConfig, formatSelectOptions, - D3_TIME_FORMAT_OPTIONS, D3_FORMAT_DOCS, D3_FORMAT_OPTIONS, + D3_TIME_FORMAT_OPTIONS, sections, } from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyTimeseriesTime, { @@ -251,3 +252,5 @@ export default { }, ], }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.ts similarity index 90% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.ts index 6c5b6fc2694d..f659aa51a592 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-sankey-loop/src/controlPanel.ts @@ -17,9 +17,9 @@ * under the License. */ import { t } from '@superset-ui/core'; -import { sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, sections } from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -40,3 +40,5 @@ export default { }, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts similarity index 90% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts index 8cc2059be1eb..798e7d4717a0 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-treemap/src/controlPanel.ts @@ -16,10 +16,15 @@ * specific language governing permissions and limitations * under the License. */ -import { t, D3_FORMAT_OPTIONS, D3_FORMAT_DOCS } from '@superset-ui/core'; -import { sections } from '@superset-ui/chart-controls'; +import { t } from '@superset-ui/core'; +import { + ControlPanelConfig, + D3_FORMAT_OPTIONS, + D3_FORMAT_DOCS, + sections, +} from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -69,3 +74,5 @@ export default { }, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.js b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts similarity index 95% rename from superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.js rename to superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts index 5a186950aacb..866b6a70dc31 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.js +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-plugin-chart-world-map/src/controlPanel.ts @@ -17,9 +17,9 @@ * under the License. */ import { t } from '@superset-ui/core'; -import { formatSelectOptions, sections } from '@superset-ui/chart-controls'; +import { ControlPanelConfig, formatSelectOptions, sections } from '@superset-ui/chart-controls'; -export default { +const config: ControlPanelConfig = { controlPanelSections: [ sections.legacyRegularTime, { @@ -107,3 +107,5 @@ export default { }, }, }; + +export default config; diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts index 5cd173f47c7f..204770ff7468 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Area/controlPanel.ts @@ -36,6 +36,7 @@ import { const config: ControlPanelConfig = { controlPanelSections: [ + sections.legacyTimeseriesTime, timeSeriesSection[0], { label: t('Chart Options'), diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts index 892e5e5e8438..adc5e89a8c5a 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Bar/controlPanel.ts @@ -42,6 +42,7 @@ import { const config: ControlPanelConfig = { controlPanelSections: [ + sections.legacyTimeseriesTime, timeSeriesSection[0], { label: t('Chart Options'), diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts index ee4902f95d0e..0a68fe8e4492 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Compare/controlPanel.ts @@ -34,6 +34,7 @@ import { const config: ControlPanelConfig = { controlPanelSections: [ + sections.legacyTimeseriesTime, timeSeriesSection[0], { label: t('Chart Options'), diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts index 7f0ac239eacd..33c51a773a0d 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/Line/controlPanel.ts @@ -39,6 +39,7 @@ import { const config: ControlPanelConfig = { controlPanelSections: [ + sections.legacyTimeseriesTime, timeSeriesSection[0], { label: t('Chart Options'), diff --git a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx index 1f438d0e0898..7dd8fd3806f6 100644 --- a/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx +++ b/superset-frontend/temporary_superset_ui/superset-ui/plugins/legacy-preset-chart-nvd3/src/NVD3Controls.tsx @@ -27,7 +27,6 @@ import { D3_TIME_FORMAT_OPTIONS, D3_FORMAT_DOCS, D3_FORMAT_OPTIONS, - sections, } from '@superset-ui/chart-controls'; /* @@ -305,7 +304,6 @@ export const yAxisLabel: CustomControlItem = { }; export const timeSeriesSection: ControlPanelSectionConfig[] = [ - sections.legacyTimeseriesTime, { label: t('Query'), expanded: true,