@datarailsshared/dr_renderer 1.2.371 → 1.2.373

package/package.json

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

package/src/highcharts_renderer.js

@@ -3184,40 +3184,30 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             stackLabels: {
                 enabled: additionOptions && additionOptions.label ? additionOptions.label.show : true,
                 formatter: function () {
-                    var presentTotal = additionOptions && additionOptions.label && additionOptions.label.present_total;
-                    var hideSubtotals = additionOptions && additionOptions.label && additionOptions.label.hide_subtotals;
-                    var showTotalsPercentage = additionOptions && additionOptions.label && additionOptions.label.show_percentage;
+                    const showTotal = additionOptions && additionOptions.label && additionOptions.label.present_total;
+                    const hideSubtotals = additionOptions && additionOptions.label && additionOptions.label.hide_subtotals;
+                    const showTotalsPercentage = additionOptions && additionOptions.label && additionOptions.label.show_percentage;
 
-                    if (hideSubtotals && !presentTotal) {
-                        return '';
-                    }
+                    if (!hideSubtotals || showTotal) {
+                        const agg = pivotData.getAggregator([], pivotData.colKeys[this.x]);
 
-                    if (this.total) {
-                        var total = parseFloat(this.total);
-                        var agg = pivotData.getAggregator([], presentTotal ? pivotData.colKeys[this.x] : []);
+                        if (agg && agg.sum) {
+                            const isNeedToDisplayLabel = agg.sum > 0 && !this.isNegative || agg.sum < 0 && this.isNegative;
 
-                        let result = '';
-                        if (agg) {
-                            let percentages = '';
-                            result = presentTotal ? this.total > 0 ? agg.sum : '' : total;
+                            if (isNeedToDisplayLabel) {
+                                const subtotalValue = agg.sum;
+                                let percentages = '';
 
-                            if (!result) {
-                                return '';
-                            }
-
-                            if (showTotalsPercentage) {
-                                let aggTotal = pivotData.getAggregator([], []);
-                                let aggTotalValue = aggTotal.value();
-                                percentages = aggTotalValue ? ' (' + Math.round(result/aggTotalValue * 100) + '%)' : '';
+                                if (showTotalsPercentage) {
+                                    const aggTotal = pivotData.getAggregator([], []);
+                                    const aggTotalValue = aggTotal.value();
+                                    percentages = aggTotalValue ? ' (' + Math.round(subtotalValue/aggTotalValue * 100) + '%)' : '';
+                                }
+                                return (showTotal ? agg.format(subtotalValue, true) : '') + percentages;
                             }
-
-                            result = (presentTotal ? agg.format(result, true) : '') + percentages;
-                        } else {
-                            result = total.toLocaleString();
                         }
-                        return result;
                     }
-                    return "";
+                    return '';
                 },
                 style: highchartsRenderer.getDataLabelsStyle(additionOptions),
             },
@@ -9707,7 +9697,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         lodash.forEach(res, (dataRow) => {
             if (!lodash.isNil(dataRow.row_keys) || !lodash.isNil(dataRow.col_keys)) {
                 if (!sortingObjectToReturn) {
-                    sortingObjectToReturn = Object.assign({}, dataRow);
+                    sortingObjectToReturn = lodash.clone(dataRow);
                 } else {
                     sortingObjectToReturn.row_keys = lodash.concat(sortingObjectToReturn.row_keys, dataRow.row_keys || []);
                 }
@@ -9718,7 +9708,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         if (sortingObjectToReturn) {
             const resWithoutSortObjects = lodash.filter(res, (dataRow) => !dataRow.isSortingObject);
             res.length = 0;
-            Object.assign(res, resWithoutSortObjects);
+            lodash.assign(res, resWithoutSortObjects);
         }
 
         return sortingObjectToReturn;