@datarailsshared/dr_renderer 1.2.360 → 1.2.362

package/package.json

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

package/src/dr-renderer-helpers.js

@@ -0,0 +1,7 @@
+function backendSortingKeysAreNotEmpty(keys) {
+    return !!keys && (!!keys.row_keys && !!keys.row_keys.length || !!keys.col_keys && !!keys.col_keys.length);
+}
+
+module.exports = {
+    backendSortingKeysAreNotEmpty: backendSortingKeysAreNotEmpty,
+}

package/src/highcharts_renderer.js

@@ -1,3 +1,5 @@
+const helpers = require('./dr-renderer-helpers');
+
 const mobileBrowserRegex = new RegExp([
     '(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)',
     '|ipad|iris|kindle|Android|Silk|lge |maemo|midp|mmp|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/',
@@ -1042,7 +1044,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     chartOptions.yAxis && chartOptions.yAxis.title && (chartOptions.yAxis.title.text || chartOptions.yAxis.title.autoylabel) ? -60 : -40;
                 const y = isPieChart ? 27 :
                     chartOptions.xAxis && chartOptions.xAxis.title && (chartOptions.xAxis.title.text || chartOptions.xAxis.title.autoxlabel) ? 65 : 43;
-                chartOptions.chart.spacingBottom = chartOptions.xAxis.title ? 34 : 30; 
+                chartOptions.chart.spacingBottom = lodash.get(chartOptions, 'xAxis.title') ? 34 : 30; 
                 chartOptions.drilldown.breadcrumbs = {
                     formatter: () => 'Back',
                     showFullPath: false,
@@ -4803,7 +4805,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     opts.rendererOptions.onlyOptions = true;
                 }
 
-                if (!highchartsRenderer.isSortingOnBackendEnabled) {
+                if (!highchartsRenderer.sortHasBeenDoneOnBE(lodash.get(widget, 'pivot.keysObject'))) {
                     const sortByValueSettings = lodash.filter(
                         lodash.get(widget, 'options.sortingFields', []),
                         sortingField => lodash.includes(['field_values', 'variance'], lodash.get(sortingField, 'sorting.sort_by'))
@@ -8850,7 +8852,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
             });
 
-            if (highchartsRenderer.isSortingOnBackendEnabled && !isFormattingDatesAsOtherAxisTypes && lodash.get(widget, 'pivot.keysObject')) {
+            if (!highchartsRenderer.sortHasBeenDoneOnBE(lodash.get(widget, 'pivot.keysObject')) && !isFormattingDatesAsOtherAxisTypes) {
                 lodash.forEach(['col_keys', 'row_keys'], (keysListName, index) => {
                     const widgetFields = index ? widget.rows : widget.cols;
                     const uniqueFormattedKeysList = [];
@@ -8869,7 +8871,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
         }
 
-        if (!highchartsRenderer.isSortingOnBackendEnabled) {
+        if (!highchartsRenderer.sortHasBeenDoneOnBE(lodash.get(widget, 'pivot.keysObject'))) {
     
             lodash.forEach(datesFields, function (row) {
                 row.values = lodash.uniq(row.values);
@@ -9028,7 +9030,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         let pivot = {};
 
-        if (highchartsRenderer.isSortingOnBackendEnabled) {
+        if (highchartsRenderer.sortHasBeenDoneOnBE(keysObject)) {
             pivot.keysObject = keysObject;
         }
 
@@ -9457,6 +9459,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return highchartsRenderer.hasFeature(FEATURES.FORMAT_AXIS);
     }
 
+    highchartsRenderer.sortHasBeenDoneOnBE = function (keysObject) {
+        return highchartsRenderer.isSortingOnBackendEnabled && helpers.backendSortingKeysAreNotEmpty(keysObject);
+    }
+
     // Method for getting formatted kyes for Axis (cols, rows)
     highchartsRenderer.getFormattedKey = function (initialKey, pivotData, type) {
         const isFlatKey = lodash.isString(initialKey) || lodash.isNumber(initialKey);

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; },
@@ -687,7 +689,7 @@ let initPivotTable = function($, window, document) {
             this.tree = {};
             this.insights = [];
 
-            this.isKeysSortingDoneOnBackendSide = opts.keysObject && typeof opts.keysObject === 'object';
+            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;

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);
+        });
+    });
+});