Make smart number default formatter

apache-superset · Feb 25, 2019 · db083e9 · db083e9
1 parent 51796e8
commit db083e9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/packages/superset-ui-number-format/src/NumberFormatterRegistry.ts b/packages/superset-ui-number-format/src/NumberFormatterRegistry.ts
@@ -1,5 +1,6 @@
 import { RegistryWithDefaultKey, OverwritePolicy } from '@superset-ui/core';
 import createD3NumberFormatter from './factories/createD3NumberFormatter';
+import createSmartNumberFormatter from './factories/createSmartNumberFormatter';
 import NumberFormats from './NumberFormats';
 import NumberFormatter from './NumberFormatter';
 
@@ -9,10 +10,16 @@ export default class NumberFormatterRegistry extends RegistryWithDefaultKey<
 > {
   constructor() {
     super({
-      initialDefaultKey: NumberFormats.SI,
       name: 'NumberFormatter',
       overwritePolicy: OverwritePolicy.WARN,
     });
+
+    this.registerValue(NumberFormats.SMART_NUMBER, createSmartNumberFormatter());
+    this.registerValue(
+      NumberFormats.SMART_NUMBER_SIGNED,
+      createSmartNumberFormatter({ signed: true }),
+    );
+    this.setDefaultKey(NumberFormats.SMART_NUMBER);
   }
 
   get(formatterId?: string) {

diff --git a/packages/superset-ui-number-format/src/factories/createSmartNumberFormatter.ts b/packages/superset-ui-number-format/src/factories/createSmartNumberFormatter.ts
@@ -2,6 +2,7 @@
 
 import { format as d3Format } from 'd3-format';
 import NumberFormatter from '../NumberFormatter';
+import NumberFormats from '../NumberFormats';
 
 export default function createSmartNumberFormatter(
   config: {
@@ -41,7 +42,7 @@ export default function createSmartNumberFormatter(
   return new NumberFormatter({
     description,
     formatFunc: value => `${getSign(value)}${formatValue(value)}`,
-    id: id || `smart_number${signed ? '_change' : ''}`,
+    id: id || signed ? NumberFormats.SMART_NUMBER_SIGNED : NumberFormats.SMART_NUMBER,
     label: label || 'Adaptive formatter',
   });
 }