@datarailsshared/dr_renderer 1.2.437 → 1.2.439

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.437",
+  "version": "1.2.439",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",

package/src/dr_pivottable.js

@@ -396,13 +396,10 @@ let initDRPivotTable = function($, window, document) {
             switch (opts.chartOptions.negative_numbers.value) {
                 case 'red_minus':
                     return '<span style="color: red; fill: red;">' + aggregator.format(val, format_argument) + '</span>';
-                    break;
                 case 'absolute':
                     return '(' + aggregator.format(Math.abs(val), format_argument) + ')';
-                    break;
                 case 'red_absolute':
                     return '<span style="color: red; fill: red;">(' + aggregator.format(Math.abs(val), format_argument) + ')</span>';
-                    break;
                 default:
                     return aggregator.format(val, format_argument);
             }

package/src/highcharts_renderer.js

@@ -407,6 +407,20 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         ].includes(type);
     };
 
+    /**
+     * @param {String} value 
+     * @param {{ useUnitAbbreviation: boolean } labelOptions 
+     * @returns {String}
+     */
+    const removeNumberFormatValueUnitSign = (value, labelOptions) => {
+        const removeUnitAbbreviation = labelOptions && !lodash.isNil(labelOptions.useUnitAbbreviation) && !labelOptions.useUnitAbbreviation;
+        if (!removeUnitAbbreviation || !value || typeof value !== 'string') {
+            return value;
+        }
+        const unitsAbbr = /[KM]/gi;
+        return value.replace(unitsAbbr, '');
+    }
+
     highchartsRenderer.filterFloat = function (value) {
         if (/^(\-|\+)?([0-9]+(\.[0-9]+)?|Infinity)$/.test(value))
             return Number(value);
@@ -542,19 +556,22 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     //TODO No totals formatts
     highchartsRenderer.defaultValueLabelsFormatter = function (pivotData, opts) {
-        var func = function () {
-            var value = parseFloat(this.value);
-            if (pivotData) {
-                try {
-                    var aggr = pivotData.getAggregator([], []);
-                    return $.pivotUtilities.getFormattedNumber(value, aggr, opts, true);
-                } catch (err) {
-                    // do nothing
-                }
-            }
-            return $.pivotUtilities.getFormattedNumber(value, null, opts);
+        const labelOptions = lodash.get(opts.chartOptions, 'label') || lodash.get(opts.chartOptions, 'label_pie');
+
+        return function () {
+            const value = parseFloat(this.value);
+            try {
+                const aggr = pivotData ? pivotData.getAggregator([], []) : null;
+                let formattedValue = $.pivotUtilities.getFormattedNumber(value, aggr, opts, !!aggr);
+                formattedValue = removeNumberFormatValueUnitSign(formattedValue, labelOptions);
+                return formattedValue;
+            } catch (err) {
+                // do nothing
+            }
+            let formattedValue =  $.pivotUtilities.getFormattedNumber(value, null, opts);
+            formattedValue = removeNumberFormatValueUnitSign(formattedValue, labelOptions);
+            return formattedValue;
         };
-        return func;
     };
 
     highchartsRenderer.persantageValueLabelsFormatter = function (pivotData, opts) {
@@ -701,14 +718,17 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
                     var aggr = pivotData.getAggregator(rows, cols);
 
-                    const formattedValue = is_drill_down_pie || labelOptions.show_value ? $.pivotUtilities.getFormattedNumber(value, aggr, opts, true) : '';
+                    let formattedValue = is_drill_down_pie || labelOptions.show_value ? $.pivotUtilities.getFormattedNumber(value, aggr, opts, true) : '';
+                    formattedValue = removeNumberFormatValueUnitSign(formattedValue, labelOptions);
                     return String(formattedValue) + percentageWrapper;
 
                 } catch (err) {
                     // do nothing
                 }
             }
-            return $.pivotUtilities.getFormattedNumber(value, null, opts).replace(/\u00A0/g, " ");
+            let formattedValue = $.pivotUtilities.getFormattedNumber(value, null, opts).replace(/\u00A0/g, " "); 
+            formattedValue = removeNumberFormatValueUnitSign(formattedValue, labelOptions);
+            return formattedValue;
         };
         return func;
     };
@@ -4963,9 +4983,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             //subopts.rendererOptions = { tableOptions: { showTotals: false } };
         }
 
-        if (is_graph)
+        if (is_graph) {
             subopts.renderer = pivotOptions.chartRender;
-        else {
+            const chartOptions = subopts.rendererOptions.chartOptions;
+            const labelOptions = lodash.get(chartOptions, 'label_pie', lodash.get(chartOptions, 'label'));
+            if (labelOptions) {
+                labelOptions.useUnitAbbreviation = subopts.rendererOptions.useUnitAbbreviation;
+            }
+        } else {
             var functionToReturn = function (pivotData, opt) {
                 opt.widgetId = widget.id;
                 return $.pivotUtilities.subtotal_renderers(pivotData, opt, widget.chart_type);