@datarailsshared/dr_renderer 1.2.370 → 1.2.372

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.370",
+  "version": "1.2.372",
   "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),
             },
@@ -9100,7 +9090,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         let keysObject;
         if (highchartsRenderer.isSortingOnBackendEnabled) {
-            keysObject = row_data.pop();
+            keysObject = highchartsRenderer.getAggregatedSortingObjects(row_data);
         }
 
         let res = highchartsRenderer.updateSelectedOverrideValues(widget_obj, override_values, row_data);
@@ -9700,6 +9690,30 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return res;
     }
 
+    // TODO: move this logic to BE (the problem it is solving that BE returns several sorting objects for more than 1 field in Values)
+    highchartsRenderer.getAggregatedSortingObjects = function(res) {
+        let sortingObjectToReturn = null;
+
+        lodash.forEach(res, (dataRow) => {
+            if (!lodash.isNil(dataRow.row_keys) || !lodash.isNil(dataRow.col_keys)) {
+                if (!sortingObjectToReturn) {
+                    sortingObjectToReturn = Object.assign({}, dataRow);
+                } else {
+                    sortingObjectToReturn.row_keys = lodash.concat(sortingObjectToReturn.row_keys, dataRow.row_keys || []);
+                }
+                dataRow.isSortingObject = true;
+            }
+        });
+
+        if (sortingObjectToReturn) {
+            const resWithoutSortObjects = lodash.filter(res, (dataRow) => !dataRow.isSortingObject);
+            res.length = 0;
+            Object.assign(res, resWithoutSortObjects);
+        }
+
+        return sortingObjectToReturn;
+    }
+
     return highchartsRenderer;
 };
 

package/tests/highcharts_renderer.test.js

@@ -5577,7 +5577,7 @@ describe('highcharts_renderer', () => {
                 ]
             });
         });
-    
+
         it('should not replace sorting keys for non-Date fields', () => {
             const keysObject = {
                 col_keys: [
@@ -5651,4 +5651,62 @@ describe('highcharts_renderer', () => {
             highchartsRenderer.replaceSortingKeysWithMappedValues(null, invertedDateStringMap, widget.rows);
         });
     });
+    
+
+    describe('Functions getAggregatedSortingObjects', () => {
+
+        const simpleRowData = [{ someField1: 'someValue1' }, { someField2: 'someValue2' }];
+
+        const generalTestCases = [
+            {
+                description: 'should get sort object and remove from data rows (case with all fields)',
+                expectedObj:  { col_keys: ['colKey1', 'colKey2'], row_keys: ['rowKey1', 'rowKey2'], row_keys_by_cols: [['1', '2'], ['2', '1']] },
+            },
+            {
+                description: 'should get sort object and remove from data rows (case with only colkeys)',
+                expectedObj:  { row_keys: [], col_keys: ['colKey1', 'colKey2'] },
+            },
+            {
+                description: 'should get sort object and remove from data rows (case with only rowkeys)',
+                expectedObj:  { row_keys: ['rowKey1', 'rowKey2'], col_keys: [] },
+            },
+            {
+                description: 'should get null sort object and remove from data rows (case with no sorting object)',
+                expectedObj: null,
+            }
+        ];
+
+        lodash.forEach(generalTestCases, testCase => {
+            it(testCase.description, () => {
+                const rowData = lodash.concat(simpleRowData, testCase.expectedObj ? lodash.clone(testCase.expectedObj) : []);
+                const sortObj = highchartsRenderer.getAggregatedSortingObjects(rowData);
+    
+                expect(rowData).toEqual(simpleRowData);
+                expect(sortObj).toEqual(testCase.expectedObj);
+            });
+        });
+
+        it('should get sort object and remove from data rows (several object encounters - for more than one Values field)', () => {
+
+            const expectedObj = { col_keys: ['colKey1', 'colKey2'], row_keys: ['rowKey1', 'rowKey2'] };
+            const rowData = [
+                { someField1: 'someValue1' },
+                { col_keys: ['colKey1', 'colKey2'], row_keys: ['rowKey1'] },
+                { someField2: 'someValue2' },
+                { someField3: 'someValue3' },
+                { someField4: 'someValue4' },
+                { col_keys: ['colKey1', 'colKey2'], row_keys: ['rowKey2'] },
+            ];
+
+            const sortObj = highchartsRenderer.getAggregatedSortingObjects(rowData);
+
+            expect(rowData).toEqual([
+                { someField1: 'someValue1' },
+                { someField2: 'someValue2' },
+                { someField3: 'someValue3' },
+                { someField4: 'someValue4' },
+            ]);
+            expect(sortObj).toEqual(expectedObj);
+        });
+    });
 });