@datarailsshared/dr_renderer 1.2.421 → 1.2.423

package/package.json

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

package/src/highcharts_renderer.js

@@ -379,6 +379,31 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     /** End of 'Highcharts initial configuration section' **/
 
+    const chartDataLabelsVerticalOptions = function (chartOptions) {
+        const vertical = lodash.get(chartOptions, 'label.vertical', false);
+        if (vertical) {
+            return {
+                rotation: 270,
+                y: -25,
+                padding: 10,
+                crop: false,
+            };
+        }
+
+        return  {};
+    };
+
+    const chartHasVerticalDataLabelsOption = (type) => {
+        return ![
+            highchartsRenderer.CHART_TYPES.LINE_CHART,
+            highchartsRenderer.CHART_TYPES.LINE_CHART_SMOOTH,
+            highchartsRenderer.CHART_TYPES.AREA_CHART,
+            highchartsRenderer.CHART_TYPES.AREA_CHART_SMOOTH,
+            highchartsRenderer.CHART_TYPES.BAR_CHART,
+            highchartsRenderer.CHART_TYPES.BAR_CHART_STACKED,
+        ].includes(type);
+    };
+
     highchartsRenderer.filterFloat = function (value) {
         if (/^(\-|\+)?([0-9]+(\.[0-9]+)?|Infinity)$/.test(value))
             return Number(value);
@@ -763,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 = [];
                 }
 
@@ -1877,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);
         });
@@ -1894,8 +1923,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     highchartsRenderer.ptCreateDrillDownSeriesToDrilldownChart = function (pivotData, chartOptions, additionOptions, opts) {
 
         var pie_drill_down_series = [],
-            row_n_keys = pivotData.getRowKeys(),
-            col_n_keys = pivotData.getColKeys();
+        row_n_keys = pivotData.getRowKeys(),
+        col_n_keys = pivotData.getColKeys();
 
         var num_cols = col_n_keys.length;
         var num_rows = row_n_keys.length;
@@ -1906,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 = [];
@@ -3040,11 +3076,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
             };
         }
-
+        chartOptions.plotOptions.series = highchartsRenderer.getDataLabelsOptions(additionOptions, chartOptions.plotOptions.series);
         chartOptions.legend = highchartsRenderer.getOptionsForLegends(additionOptions, rowAttrs.length, false);
 
         chartOptions.drilldown = highchartsRenderer.getDataLabelsStylesForDrillDown(additionOptions);
-
         return highchartsRenderer.ptCreateElementAndDraw(chartOptions, opts);
     };
 
@@ -6031,7 +6066,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         let valToReturn = {};
         if (chartOpt) {
             lodash.forEach(chartOpt.suboptions, (suboption) => {
-                valToReturn[suboption.category_type] = highchartsRenderer.getDefaultValueForSubOptions(suboption, existing_options);
+                valToReturn[suboption.category_type] = highchartsRenderer.getDefaultValueForSubOptions(suboption, existing_options, type);
             });
         }
 
@@ -6101,6 +6136,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         };
         result = lodash.merge(result, options);
         result = lodash.merge(result, chartOptions.dataLabels);
+        result = lodash.merge(result, chartDataLabelsVerticalOptions(additionalOptions, chartOptions));
         chartOptions.dataLabels = result;
 
         return chartOptions;
@@ -6112,7 +6148,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return key
     };
 
-    highchartsRenderer.getDefaultValueForSubOptions = function (option, existing_options) {
+    highchartsRenderer.getDefaultValueForSubOptions = function (option, existing_options, chartType) {
         const valToReturn = {};
         
         if (option) {
@@ -6120,6 +6156,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             lodash.forEach(option.elements, function (elem) {
                 if (existing_options && lodash.has(existing_options, type + '.' + elem.value_name)) {
                     valToReturn[elem.value_name] = lodash.get(existing_options, type + '.' + elem.value_name);
+
+                    if (elem.showFn && typeof elem.showFn === 'function' && !elem.showFn(chartType)) {
+                        valToReturn[elem.value_name] = undefined;
+                    }
                 }
                 if (valToReturn[elem.value_name] == undefined && elem.element_type !== 'devider') {
                     if (typeof elem.default_value === 'object') {
@@ -6666,6 +6706,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     value_name: 'overlap',
                     default_value: false
                 },
+                {
+                    element_type: 'toggle',
+                    element_label: 'Vertical',
+                    value_name: 'vertical',
+                    default_value: false,
+                    showFn: chartHasVerticalDataLabelsOption,
+                },
                 {
                     element_type: 'devider',
                 },
@@ -6809,6 +6856,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     value_name: 'overlap',
                     default_value: false
                 },
+                {
+                    element_type: 'toggle',
+                    element_label: 'Vertical',
+                    value_name: 'vertical',
+                    default_value: false,
+                    showFn: chartHasVerticalDataLabelsOption,
+                },
                 {
                     element_type: 'toggle',
                     element_label: 'Shadow',
@@ -9647,10 +9701,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) {