@datarailsshared/dr_renderer 1.2.449 → 1.2.451

package/package.json

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

package/src/highcharts_renderer.js

@@ -154,7 +154,6 @@ const FEATURES = {
     MULTIPLE_DIMENSION_TAGS: 'multiple_dimension_tags',
     USE_NEW_SCENARIO_TAG: 'use_new_scenario_tag',
     ENABLE_SERVER_WIDGET_DATA_SORTING: 'enable_server_widget_data_sorting',
-    CLIENT_WIDGET_SORTING_KEYS_MERGE: 'client_widget_sorting_keys_merge',
 }
 
 const TICKS_COUNT = 5;
@@ -209,7 +208,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         disableAnimation = document.ReportHippo.user.organization && document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.disable_animation
         highchartsRenderer.enabledNewWidgetValueFormatting = highchartsRenderer.hasFeature(FEATURES.ENABLE_NEW_WIDGET_VALUE_FORMATTING);
         highchartsRenderer.isSortingOnBackendEnabled = highchartsRenderer.hasFeature(FEATURES.ENABLE_SERVER_WIDGET_DATA_SORTING);
-        highchartsRenderer.CLIENT_WIDGET_SORTING_KEYS_MERGE = highchartsRenderer.hasFeature(FEATURES.CLIENT_WIDGET_SORTING_KEYS_MERGE);
     }
 
     // fix issue of use tootip.stickOnContact with tooltip.outside , source: https://github.com/highcharts/highcharts/pull/15960
@@ -7435,7 +7433,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             name: 'Combo Chart ',
             label: 'Combo Chart ',
             title: 'Allows for multiple chart display formats in one widget',
-            description: 'For example, Revenue and Cost of goods sold as clomuns, and Gross margin as a line',
+            description: 'For example, Revenue and Cost of goods sold as columns, and Gross margin as a line',
             axisName: 'X - Axis',
             legendName: 'Data series',
             startedMessage: 'To add multiple chart types, click on  “Combo Chart Options“. A Secondary Axis is available in this chart',
@@ -7446,7 +7444,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             name: 'Column Combo Chart ',
             label: 'Column Chart',
             title: 'Allows for multiple chart display formats in one widget',
-            description: 'For example, Revenue and Cost of goods sold as clomuns, and Gross margin as a line',
+            description: 'For example, Revenue and Cost of goods sold as columns, and Gross margin as a line',
             axisName: 'X - Axis',
             legendName: 'Data series',
             startedMessage: 'To add multiple chart types, click on  “Combo Chart Options“. A Secondary Axis is available in this chart.',
@@ -7457,7 +7455,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             name: 'Stacked Column Combo Chart  ',
             label: 'Stacked Column',
             title: 'Allows for multiple chart display formats in one widget.',
-            description: 'For example, different department stacked clomuns, and average as a line.',
+            description: 'For example, different department stacked columns, and average as a line.',
             axisName: 'X - Axis',
             legendName: 'Data series',
             startedMessage: 'To add multiple chart types, click on  “Combo Chart Options“. A Secondary Axis is available in this chart.',
@@ -9789,17 +9787,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (!sortingObjectToReturn) {
                     sortingObjectToReturn = lodash.clone(dataRow);
                 } else {
-                    if (highchartsRenderer.CLIENT_WIDGET_SORTING_KEYS_MERGE) {
-                        const concatUniqueKeys = (keysA, keysB) => {
-                            if (!Array.isArray(keysB) || !keysB.length) return keysA;
-                            return lodash.chain(keysA).concat(keysB).uniqWith(lodash.isEqual).value();
-                        }
-                        sortingObjectToReturn.row_keys = concatUniqueKeys(sortingObjectToReturn.row_keys, dataRow.row_keys);
-                        sortingObjectToReturn.col_keys = concatUniqueKeys(sortingObjectToReturn.col_keys, dataRow.col_keys);
-                    } else {
-                        sortingObjectToReturn.row_keys = lodash.concat(sortingObjectToReturn.row_keys, dataRow.row_keys || []);
+                    const concatUniqueKeys = (keysA, keysB) => {
+                        if (!Array.isArray(keysB) || !keysB.length) return keysA;
+                        return lodash.chain(keysA).concat(keysB).uniqWith(lodash.isEqual).value();
                     }
-
+                    sortingObjectToReturn.row_keys = concatUniqueKeys(sortingObjectToReturn.row_keys, dataRow.row_keys);
+                    sortingObjectToReturn.col_keys = concatUniqueKeys(sortingObjectToReturn.col_keys, dataRow.col_keys);
                 }
                 dataRow.isSortingObject = true;
             }

package/tests/highcharts_renderer.test.js

@@ -5260,7 +5260,6 @@ describe('highcharts_renderer', () => {
         });
 
         it('should get sort object and remove from data rows (several object encounters - for more than one Values field) with merge cols and rows under FF', () => {
-            highchartsRenderer.CLIENT_WIDGET_SORTING_KEYS_MERGE = true;
             const expectedObj = {
                 col_keys: [['colKey1'], ['colKey2'], ['colKey3'], ['colKey4'], ['colKey5']],
                 row_keys: [['rowKey1'], ['rowKey2'], ['rowKey1', 'rowKey2'], ['rowKey3']],