@datarailsshared/dr_renderer 1.2.365 → 1.2.366

package/src/novix_renderer.js

@@ -376,13 +376,14 @@ let initNovixRenderer = function($, window, document, Handsontable){
                         //data columns
                         if (pvtData.colKeys.length > 0) {
 
+                            const formattedColKeys = pvtData.getFormattedColKeys(colKeys);
                             var aux = rowData.length;
                             var startCol = aux;
-                            var prior = colKeys[0][nn];
+                            var prior = formattedColKeys[0][nn];
                             var toMerge = 0;
-                            for (var cc = 0; cc < colKeys.length; cc++) {
+                            for (var cc = 0; cc < formattedColKeys.length; cc++) {
 
-                                var textHeader = colKeys[cc][nn];
+                                var textHeader = formattedColKeys[cc][nn];
 
                                 if (nn < pvtData.colAttrs.length - 1 && prior != textHeader) {
                                     rowData.push(textHeader);
@@ -456,8 +457,9 @@ let initNovixRenderer = function($, window, document, Handsontable){
                 // DATA
 
                 var mergeDic = {};
+                const formattedRowKeys = pvtData.getFormattedRowKeys(rowKeys);
 
-                for (var rr = 0; rr < rowKeys.length; rr++) {
+                for (var rr = 0; rr < formattedRowKeys.length; rr++) {
 
                     var rowData = [];
 
@@ -466,29 +468,29 @@ let initNovixRenderer = function($, window, document, Handsontable){
                             mergeDic[cc] = {
                                 toMerge: 1,
                                 row: 0,
-                                priorText: rowKeys[rr][cc]
+                                priorText: formattedRowKeys[rr][cc]
                             };
                         }
                     }
 
                     //column for row atts
                     for (var cc = 0; cc < pvtData.rowAttrs.length; cc++) {
-                        rowData.push(rowKeys[rr][cc]);
-                        if (rowKeys[rr][cc] === subtotal) {
+                        rowData.push(formattedRowKeys[rr][cc]);
+                        if (formattedRowKeys[rr][cc] === subtotal) {
                             addMergeCell(rr + pvtData.colAttrs.length + 1, cc, 1, dataSource.fixedColumns - cc, true, true);
-                        } else if (cc === rowKeys[rr].length - 1 && hasColumnAttr) {
+                        } else if (cc === formattedRowKeys[rr].length - 1 && hasColumnAttr) {
                             addMergeCell(rr + pvtData.colAttrs.length + 1, cc, 1, 2, true, true);
                         }
                         // merge cell (last column)
                         if (opts.chartOptions.table_options.show_column_total && rr != 0 && mergeDic[cc]) { // check for merge dic
-                            if (rowKeys[rr][cc] == mergeDic[cc].priorText) {
+                            if (formattedRowKeys[rr][cc] == mergeDic[cc].priorText) {
                                 mergeDic[cc].toMerge++;
-                            } else if (cc < rowKeys[rr].length - 1) {
+                            } else if (cc < formattedRowKeys[rr].length - 1) {
                                 //create merge cell for this column
                                 addMergeCell(mergeDic[cc].row + pvtData.colAttrs.length + 1, cc, mergeDic[cc].toMerge, 1);
                                 mergeDic[cc].row = rr;
                                 mergeDic[cc].toMerge = 1;
-                                mergeDic[cc].priorText = rowKeys[rr][cc];
+                                mergeDic[cc].priorText = formattedRowKeys[rr][cc];
                             }
                         }
                     }

package/src/pivottable.js

@@ -1,3 +1,5 @@
+const helpers = require('./dr-renderer-helpers');
+
 // from pivottable@2.23.0
 let initPivotTable = function($, window, document) {
     var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
@@ -577,6 +579,7 @@ let initPivotTable = function($, window, document) {
         l_mapping = {};
         for (i in order) {
             x = order[i];
+            if (order[i] === null) x = '[null]';
             mapping[x] = i;
             if (typeof x === "string") {
                 l_mapping[x.toLowerCase()] = i;
@@ -684,13 +687,30 @@ let initPivotTable = function($, window, document) {
                 return true;
             });
             this.tree = {};
-            this.rowKeys = [];
-            this.colKeys = [];
+            this.insights = [];
+
+            this.isKeysSortingDoneOnBackendSide = opts.keysObject && typeof opts.keysObject === 'object' && helpers.backendSortingKeysAreNotEmpty(opts.keysObject);
+            if (this.isKeysSortingDoneOnBackendSide) {
+                this.rowKeys = opts.keysObject.row_keys;
+                this.colKeys = opts.keysObject.col_keys;
+                // TODO: add also for breakdown sort object when BE story is ready.
+            } else {
+                this.rowKeys = [];
+                this.colKeys = [];
+            }
+
             this.rowTotals = {};
             this.colTotals = {};
             this.allTotal = this.aggregator(this, [], []);
             this.sorted = false;
             this.dateValuesDictionary = opts.dateValuesDictionary;
+            this.sortByValueAttrs = opts.sortByValueAttrs || [];
+            this.colFormats = opts.colFormats || [];
+            this.rowFormats = opts.rowFormats || [];
+            this.isFormattingAxisLabels = opts.rendererOptions && opts.rendererOptions.isFormattingAxisLabels;
+            this.getFormattedColKeys = (keys) => opts.getFormattedColKeys(this, keys);
+            this.getFormattedRowKeys = (keys) => opts.getFormattedRowKeys(this, keys);
+
             PivotData.forEachRecord(this.input, this.derivedAttributes, (function(_this) {
                 return function(record) {
                     if (_this.filter(record)) {
@@ -850,12 +870,16 @@ let initPivotTable = function($, window, document) {
         };
 
         PivotData.prototype.getColKeys = function() {
-            this.sortKeys();
+            if (!this.isKeysSortingDoneOnBackendSide) {
+                this.sortKeys();
+            }
             return this.colKeys;
         };
 
         PivotData.prototype.getRowKeys = function() {
-            this.sortKeys();
+            if (!this.isKeysSortingDoneOnBackendSide) {
+                this.sortKeys();
+            }
             return this.rowKeys;
         };
 

package/tests/dr-renderer-helpers.test.js

@@ -0,0 +1,34 @@
+describe('dr-renderer-helpers', () => {
+    const drRendererHelpers = require('../src/dr-renderer-helpers');
+
+    describe('backendSortingKeysAreNotEmpty', () => {
+        it('should return true if keys are not empty', () => {
+            const keys = {
+                row_keys: [1, 2, 3],
+                col_keys: [1, 2, 3]
+            };
+            expect(drRendererHelpers.backendSortingKeysAreNotEmpty(keys)).toBe(true);
+        });
+
+        it('should return true if one of the keys is not empty', () => {
+            const keys = {
+                row_keys: [1, 2, 3],
+                col_keys: []
+            };
+            expect(drRendererHelpers.backendSortingKeysAreNotEmpty(keys)).toBe(true);
+        });
+
+        it('should return false if keys are empty', () => {
+            const keys = {
+                row_keys: [],
+                col_keys: [],
+            };
+            expect(drRendererHelpers.backendSortingKeysAreNotEmpty(keys)).toBe(false);
+        });
+
+        it('should return false if keys are null', () => {
+            const keys = null;
+            expect(drRendererHelpers.backendSortingKeysAreNotEmpty(keys)).toBe(false);
+        });
+    });
+});