[incubator-superset] branch master updated: migrating unique controls (#9374)

[kristw]

This is an automated email from the ASF dual-hosted git repository.

kristw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git


The following commit(s) were added to refs/heads/master by this push:
     new b12188e  migrating unique controls (#9374)
b12188e is described below

commit b12188ec80a5d478b470675a2b51a99a87e5cfc7
Author: Evan Rusackas <e...@preset.io>
AuthorDate: Thu Mar 26 15:15:47 2020 -0700

    migrating unique controls (#9374)
---
 CONTRIBUTING.md                                    |  2 --
 .../src/explore/controlPanels/Para.js              | 23 +++++++++++++++++++++-
 superset-frontend/src/explore/controls.jsx         | 16 ---------------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f928e05..efe811f 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 f6254ce..31526f8 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 4deea5e..020b3cc 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'),