@datarailsshared/dr_renderer 1.2.316-dragons → 1.2.318-rocket

package/src/pivottable.js

@@ -577,7 +577,6 @@ 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;
@@ -686,17 +685,8 @@ let initPivotTable = function($, window, document) {
             });
             this.tree = {};
             this.insights = [];
-
-            this.isKeysSortingDoneOnBackendSide = opts.keysObject && typeof opts.keysObject === 'object';
-            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.rowKeys = [];
+            this.colKeys = [];
             this.rowTotals = {};
             this.colTotals = {};
             this.allTotal = this.aggregator(this, [], []);
@@ -861,16 +851,12 @@ let initPivotTable = function($, window, document) {
         };
 
         PivotData.prototype.getColKeys = function() {
-            if (!this.isKeysSortingDoneOnBackendSide) {
-                this.sortKeys();
-            }
+            this.sortKeys();
             return this.colKeys;
         };
 
         PivotData.prototype.getRowKeys = function() {
-            if (!this.isKeysSortingDoneOnBackendSide) {
-                this.sortKeys();
-            }
+            this.sortKeys();
             return this.rowKeys;
         };