@datarailsshared/dr_renderer 1.2.422 → 1.2.424

package/package.json

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

package/src/highcharts_renderer.js

@@ -788,10 +788,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
 
                 var cols = highchartsRenderer.getColsInFormatterContext(this);
-                if (!cols && is_drill_down_pie) {
+                if (lodash.isNil(cols) && is_drill_down_pie) {
                     cols = this.name;
                 }
-                if (!cols) {
+                if (lodash.isNil(cols)) {
                     cols = [];
                 }
 
@@ -1902,8 +1902,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             // it displays negative values as empty segments in version <= 8.2.2
             ob.y = val >= 0 || chartOptions.chart.type !== 'pie' ? val : 0;
 
-            if (!isNaN(key))
-                key = Number(key)
+            if (lodash.isBoolean(key)) {
+                key = key.toString();
+            } else if (!isNaN(key)) {
+                key = Number(key);
+            }
+            
             ob.drilldown = key;
             pie_series.push(ob);
         });
@@ -1931,7 +1935,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             var col_ob = {};
             var col_n = col_n_value[0];
             if (col_n != undefined) {
-                col_ob.id = !isNaN(col_n) ? Number(col_n) : col_n;
+
+                col_ob.id = col_n;
+                if (lodash.isBoolean(col_ob.id)) {
+                    col_ob.id = col_ob.id.toString();
+                } else if (!isNaN(col_ob.id)) {
+                    col_ob.id = Number(col_ob.id);
+                }
+
                 col_ob.initialName = col_n === highchartsRenderer.DR_OTHERS_KEY ? othersName : col_n;
                 col_ob.name = highchartsRenderer.getFormattedColKey(col_ob.initialName, pivotData);
                 col_ob.data = [];
@@ -1974,7 +1985,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     highchartsRenderer.getDataLabelsStylesForDrillDown = function(additionOptions) {
         let result = highchartsRenderer.getDataLabelsOptions(additionOptions, { dataLabels: {} });
 
-        if (!result.dataLabels) return {};
         return {
             activeDataLabelStyle: {
                 color: result.dataLabels.color,
@@ -9690,10 +9700,16 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
 
     highchartsRenderer.getColsInFormatterContext = function(context) {
-        return lodash.get(context, 'point.options.colsForTotal')
-            || lodash.get(context, 'point.initialName')
-            || lodash.get(context, 'options.initialName')
-            || context.key;
+        const colsForTotal = lodash.get(context, "point.options.colsForTotal");
+        const pointInitialName = lodash.get(context, "point.initialName");
+        const optionsInitialName = lodash.get(context, "options.initialName");
+
+        switch(true) {
+            case !lodash.isNil(colsForTotal): return colsForTotal;
+            case !lodash.isNil(pointInitialName): return pointInitialName;
+            case !lodash.isNil(optionsInitialName): return optionsInitialName;
+            default: return context.key;
+        }
     }
 
     highchartsRenderer.getTableFormatInfosForWidgetFields = function(widget, pivotOptions, fields) {

package/tests/highcharts_renderer.test.js

@@ -8931,4 +8931,19 @@ describe('highcharts_renderer', () => {
         });
     });
 
+    describe('Function getDataLabelsStylesForDrillDown', () => {
+        
+        it('should return an object with activeDataLabelStyle containing color from dataLabels', () => {
+            const mockColor = 'red';
+            const additionalOptions = {
+                label_option: {
+                    font_color: mockColor,
+                },
+            };
+
+            const result = highchartsRenderer.getDataLabelsStylesForDrillDown(additionalOptions);
+            expect(result).toEqual({ activeDataLabelStyle: { color: mockColor } });
+        });
+    });
+
 });