[incubator-superset] branch master updated: Treemap controls migration (#9352)

[rusackas]

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

rusackas 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 3d738ee  Treemap controls migration (#9352)
3d738ee is described below

commit 3d738eecec695d839fa1c5debf52664e9e0872dd
Author: Evan Rusackas <e...@preset.io>
AuthorDate: Mon Mar 23 22:33:08 2020 -0700

    Treemap controls migration (#9352)
    
    * Treemap
    
    * linting
---
 CONTRIBUTING.md                                        |  1 -
 superset-frontend/src/explore/controlPanels/Treemap.js | 14 +++++++++++++-
 superset-frontend/src/explore/controls.jsx             |  9 ---------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 7592c82..0479e46 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1227,7 +1227,6 @@ Note the `y_axis_format` is defined under various section 
for some charts.
 | `timed_refresh_immune_slices`   | _N/A_ |       |
 | `toggle_polygons`               | _N/A_ |       |
 | `transpose_pivot`               | _N/A_ |       |
-| `treemap_ratio`                 | _N/A_ |       |
 | `url`                           | _N/A_ |       |
 | `userid`                        | _N/A_ |       |
 | `viewport`                      | _N/A_ |       |
diff --git a/superset-frontend/src/explore/controlPanels/Treemap.js 
b/superset-frontend/src/explore/controlPanels/Treemap.js
index 8342ee5..d4b0dcc 100644
--- a/superset-frontend/src/explore/controlPanels/Treemap.js
+++ b/superset-frontend/src/explore/controlPanels/Treemap.js
@@ -35,7 +35,19 @@ export default {
       expanded: true,
       controlSetRows: [
         ['color_scheme', 'label_colors'],
-        ['treemap_ratio'],
+        [
+          {
+            name: 'treemap_ratio',
+            config: {
+              type: 'TextControl',
+              label: t('Ratio'),
+              renderTrigger: true,
+              isFloat: true,
+              default: 0.5 * (1 + Math.sqrt(5)), // d3 default, golden ratio
+              description: t('Target aspect ratio for treemap tiles.'),
+            },
+          },
+        ],
         ['number_format'],
       ],
     },
diff --git a/superset-frontend/src/explore/controls.jsx 
b/superset-frontend/src/explore/controls.jsx
index 30e1aa9..9ab560f 100644
--- a/superset-frontend/src/explore/controls.jsx
+++ b/superset-frontend/src/explore/controls.jsx
@@ -1046,15 +1046,6 @@ export const controls = {
     ]),
   },
 
-  treemap_ratio: {
-    type: 'TextControl',
-    label: t('Ratio'),
-    renderTrigger: true,
-    isFloat: true,
-    default: 0.5 * (1 + Math.sqrt(5)), // d3 default, golden ratio
-    description: t('Target aspect ratio for treemap tiles.'),
-  },
-
   number_format: {
     type: 'SelectControl',
     freeForm: true,