diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f928e052d6f53..efe811f489da3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1121,7 +1121,6 @@ Note the `y_axis_format` is defined under various section for some charts. | `grid_size` | _N/A_ | | | `horizon_color_scale` | _N/A_ | | | `import_time` | _N/A_ | | -| `include_series` | _N/A_ | | | `instant_filtering` | _N/A_ | | | `js_agg_function` | _N/A_ | | | `js_columns` | _N/A_ | | @@ -1188,7 +1187,6 @@ Note the `y_axis_format` is defined under various section for some charts. | `show_brush` | _N/A_ | | | `show_bubbles` | _N/A_ | | | `show_controls` | _N/A_ | | -| `show_datatable` | _N/A_ | | | `show_druid_time_granularity` | _N/A_ | | | `show_druid_time_origin` | _N/A_ | | | `show_labels` | _N/A_ | | diff --git a/superset-frontend/src/explore/controlPanels/Para.js b/superset-frontend/src/explore/controlPanels/Para.js index f6254ce7867d6..31526f8040d41 100644 --- a/superset-frontend/src/explore/controlPanels/Para.js +++ b/superset-frontend/src/explore/controlPanels/Para.js @@ -35,7 +35,28 @@ export default { label: t('Options'), expanded: true, controlSetRows: [ - ['show_datatable', 'include_series'], + [ + { + name: 'show_datatable', + config: { + type: 'CheckboxControl', + label: t('Data Table'), + default: false, + renderTrigger: true, + description: t('Whether to display the interactive data table'), + }, + }, + { + name: 'include_series', + config: { + type: 'CheckboxControl', + label: t('Include Series'), + renderTrigger: true, + default: false, + description: t('Include series name as an axis'), + }, + }, + ], ['linear_color_scheme'], ], }, diff --git a/superset-frontend/src/explore/controls.jsx b/superset-frontend/src/explore/controls.jsx index 4deea5edd07d9..020b3ccc785b8 100644 --- a/superset-frontend/src/explore/controls.jsx +++ b/superset-frontend/src/explore/controls.jsx @@ -464,14 +464,6 @@ export const controls = { ), }, - include_series: { - type: 'CheckboxControl', - label: t('Include Series'), - renderTrigger: true, - default: false, - description: t('Include series name as an axis'), - }, - secondary_metric: { ...metric, label: t('Color Metric'), @@ -1364,14 +1356,6 @@ export const controls = { description: t('Check to include Time Origin dropdown'), }, - show_datatable: { - type: 'CheckboxControl', - label: t('Data Table'), - default: false, - renderTrigger: true, - description: t('Whether to display the interactive data table'), - }, - table_filter: { type: 'CheckboxControl', label: t('Emit Filter Events'),