@datarailsshared/dr_renderer 1.2.340 → 1.2.342

package/package.json

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

package/src/highcharts_renderer.js

@@ -1243,14 +1243,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             i++;
         });
 
-        lodash.forEach(col_n_keys, (col_n_value, index) => {
-            if (lodash.isArray(col_n_value)) {
-                col_n_keys[index] = lodash.map(
-                    lodash.filter(col_n_value, value => !!value),
-                    value => lodash.replace(value, highchartsRenderer.DR_OTHERS_KEY, othersName)
-                );
-            }
-        });
+        if (lodash.get(chartOptions, 'xAxis.categories')) {
+            lodash.forEach(chartOptions.xAxis.categories, (col_n_value, index) => {
+                if (lodash.isArray(col_n_value)) {
+                    chartOptions.xAxis.categories[index] = lodash.map(
+                        lodash.filter(col_n_value, value => !!value),
+                        value => lodash.replace(value, highchartsRenderer.DR_OTHERS_KEY, othersName)
+                    );
+                }
+            });
+        }
 
         const ethalonSeries = chart_series[chart_series.length - 1];
 
@@ -5007,7 +5009,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         })
     };
 
-    highchartsRenderer.returnRawDataValue = function (type, value, format, field_name, vals_not_for_convert) {
+    highchartsRenderer.returnRawDataValue = function (type, value, format, field_name, vals_not_for_convert, isFormattingNumbers) {
         if (vals_not_for_convert && vals_not_for_convert.length && lodash.includes(vals_not_for_convert, value)) {
             return value;
         }
@@ -5072,8 +5074,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 return 'Wrong date format';
             }
         } else {
+            const isFormatting = highchartsRenderer.isFormattingAxisFeatureOn() && isFormattingNumbers && format && !isNaN(value);
             if (value === null || value === '[null]') {
                 return '[null]';
+            } else if (isFormatting) {
+                return highchartsRenderer.formatValue('n', format, value).value;
             }
         }
 
@@ -8008,7 +8013,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         suboptions: []
     };
 
-    highchartsRenderer.getFilterLabel = function (fieldFilter, showTemplateName) {
+    highchartsRenderer.getFilterLabel = function (fieldFilter, showTemplateName, isFormattingNumbers) {
         var displayname;
         if (fieldFilter.new_name)
             displayname = fieldFilter.new_name.replace('RH_DIM_', '');
@@ -8031,7 +8036,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 var tooltip = '';
                 var all_vals = [];
                 if (fieldFilter.type == 'Date') {
-                    all_vals = [];
                     var invertValueFormatMap = lodash.invert(fieldFilter.valueFormatMap);
                     lodash.forEach(fieldFilter.includes, function (val) {
                         if (invertValueFormatMap && invertValueFormatMap[val]) {
@@ -8041,6 +8045,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         }
                         all_vals.push(val);
                     });
+                } else if (isFormattingNumbers && highchartsRenderer.isFormattingAxisFeatureOn()) {
+                    all_vals = lodash.map(lodash.cloneDeep(fieldFilter.includes), val => 
+                        highchartsRenderer.returnRawDataValue(fieldFilter.type, val, fieldFilter.format || '', null, null, true) + ""
+                    );
                 } else {
                     all_vals = lodash.clone(fieldFilter.includes);
                 }
@@ -9331,7 +9339,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
 
     highchartsRenderer.isFormattingAxis = function (pivotData) {
-        return lodash.includes(lodash.get(document, 'ReportHippo.user.features', []), FEATURES.FORMAT_AXIS) && pivotData.isFormattingAxisLabels;
+        return highchartsRenderer.isFormattingAxisFeatureOn() && pivotData.isFormattingAxisLabels;
+    }
+
+    highchartsRenderer.isFormattingAxisFeatureOn = function () {
+        return lodash.includes(lodash.get(document, 'ReportHippo.user.features', []), FEATURES.FORMAT_AXIS);
     }
 
     // Method for getting formatted kyes for Axis (cols, rows)