Use smart formatter instead

apache · Mar 30, 2019 · 20c7cb3 · 20c7cb3
1 parent 49cf9bf
commit 20c7cb3
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 12 deletions.
diff --git a/superset/assets/backendSync.json b/superset/assets/backendSync.json
@@ -1631,7 +1631,7 @@
       "freeForm": true,
       "label": "Number format",
       "renderTrigger": true,
-      "default": ".3s",
+      "default": "smart_number",
       "choices": [
         [
           ".1s",
@@ -2081,7 +2081,7 @@
       "freeForm": true,
       "label": "X Axis Format",
       "renderTrigger": true,
-      "default": ".3s",
+      "default": "smart_number",
       "choices": [
         [
           ".1s",
@@ -2161,7 +2161,7 @@
       "freeForm": true,
       "label": "Y Axis Format",
       "renderTrigger": true,
-      "default": ".3s",
+      "default": "smart_number",
       "choices": [
         [
           ".1s",
@@ -2202,7 +2202,7 @@
       "type": "SelectControl",
       "freeForm": true,
       "label": "Right Axis Format",
-      "default": ".3s",
+      "default": "smart_number",
       "choices": [
         [
           ".1s",

diff --git a/superset/assets/src/explore/controlPanels/Bubble.js b/superset/assets/src/explore/controlPanels/Bubble.js
@@ -62,9 +62,6 @@ export default {
     },
   ],
   controlOverrides: {
-    x_axis_format: {
-      default: '.3s',
-    },
     color_scheme: {
       renderTrigger: false,
     },

diff --git a/superset/assets/src/explore/controls.jsx b/superset/assets/src/explore/controls.jsx
@@ -79,6 +79,7 @@ const D3_FORMAT_DOCS = 'D3 format syntax: https://github.com/d3/d3-format';
 
 // input choices & options
 const D3_FORMAT_OPTIONS = [
+  ['smart_number', 'Adaptative formating'],
   ['.1s', '.1s (12345.432 => 10k)'],
   ['.3s', '.3s (12345.432 => 12.3k)'],
   [',.1%', ',.1% (12345.432 => 1,234,543.2%)'],
@@ -988,7 +989,7 @@ export const controls = {
     freeForm: true,
     label: t('Number format'),
     renderTrigger: true,
-    default: ',.3f',
+    default: 'smart_number',
     choices: D3_FORMAT_OPTIONS,
     description: D3_FORMAT_DOCS,
   },
@@ -1231,7 +1232,7 @@ export const controls = {
     freeForm: true,
     label: t('X Axis Format'),
     renderTrigger: true,
-    default: ',.3f',
+    default: 'smart_number',
     choices: D3_FORMAT_OPTIONS,
     description: D3_FORMAT_DOCS,
   },
@@ -1251,7 +1252,7 @@ export const controls = {
     freeForm: true,
     label: t('Y Axis Format'),
     renderTrigger: true,
-    default: ',.3f',
+    default: 'smart_number',
     choices: D3_FORMAT_OPTIONS,
     description: D3_FORMAT_DOCS,
     mapStateToProps: (state) => {
@@ -1272,7 +1273,7 @@ export const controls = {
     type: 'SelectControl',
     freeForm: true,
     label: t('Right Axis Format'),
-    default: ',.3f',
+    default: 'smart_number',
     choices: D3_FORMAT_OPTIONS,
     description: D3_FORMAT_DOCS,
   },

diff --git a/superset/assets/src/setup/setupFormatters.js b/superset/assets/src/setup/setupFormatters.js
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { getNumberFormatter, getNumberFormatterRegistry, createSiAtMostNDigitFormatter, NumberFormats } from '@superset-ui/number-format';
+import { createSmartNumberFormatter, getNumberFormatter, getNumberFormatterRegistry, createSiAtMostNDigitFormatter, NumberFormats } from '@superset-ui/number-format';
 import { getTimeFormatterRegistry, smartDateFormatter, smartDateVerboseFormatter } from '@superset-ui/time-format';
 
 export default function setupFormatters() {
@@ -27,6 +27,7 @@ export default function setupFormatters() {
     .setDefaultKey(defaultNumberFormatter.id)
     // Add shims for format strings that are deprecated or common typos.
     // Temporary solution until performing a db migration to fix this.
+    .registerValue('smart_number', createSmartNumberFormatter)
     .registerValue(',0', getNumberFormatter(',.4~f'))
     .registerValue('null', getNumberFormatter(',.4~f'))
     .registerValue('%', getNumberFormatter('.0%'))