@datarailsshared/dr_renderer 1.2.300-dragons → 1.2.301-dragons

package/package.json

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

package/src/dr_pivottable.js

@@ -91,6 +91,7 @@ let initDRPivotTable = function($, window, document) {
 
         DRPivotData.prototype.arrSort = function(attrs) {
             var a, sortersArr;
+            const sortByValueAttrs = this.sortByValueAttrs;
             sortersArr = (function() {
                 var l, len1, results;
                 results = [];
@@ -100,11 +101,16 @@ let initDRPivotTable = function($, window, document) {
                 }
                 return results;
             }).call(this);
+
             return function(a, b) {
                 var comparison, i, sorter;
                 for (i in sortersArr) {
                     sorter = sortersArr[i];
-                    comparison = sorter(a[i], b[i]);
+                    if (sortByValueAttrs.indexOf(attrs[parseInt(i)]) !== -1) {
+                        comparison = sorter(a.slice(0, parseInt(i) + 1).join(','), b.slice(0, parseInt(i) + 1).join(','));
+                    } else {
+                        comparison = sorter(a[i], b[i]);
+                    }
                     if (comparison !== 0) {
                         return comparison;
                     }

package/src/highcharts_renderer.js

@@ -4397,72 +4397,25 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return ret_str;
     };
 
-    highchartsRenderer.getNewAttrSortingForCol = function (pivotData, sortingOptions) {
-        let rowAttrs, rowKeys, colKeys, colAttrs;
-        rowAttrs = pivotData.rowAttrs;
-        rowKeys = pivotData.rowKeys;
-        colKeys = pivotData.colKeys;
-        colAttrs = pivotData.colAttrs;
-
-
-        if (!colAttrs || colAttrs.length == 0) {
-            return null;
-        }
-
+    highchartsRenderer.getSortingByValueOrderList = function (pivotData, sortingOptions, keysArray, attrs, fieldIndex) {
         let values_names_arr = [];
-        let keysArray = sortingOptions.field ? rowKeys : colKeys;
-
         lodash.forEach(keysArray, function (val) {
-            let firstArray = sortingOptions.field ? [val[0]] : [];
-            let secondArray = sortingOptions.field ? sortingOptions.field.split(highchartsRenderer.delimer) : [val[0]];
-            let aggregator_subtotal = pivotData.getAggregator(firstArray, secondArray);
+            const firstArray = [];
+            const secondArray = val.slice(0, fieldIndex + 1);
+            let getAggregatorParams = [firstArray, secondArray];
 
-            if (aggregator_subtotal) {
-                let value_subtotal = aggregator_subtotal.value();
-                if (sortingOptions && sortingOptions.is_absolute && !isNaN(parseFloat(value_subtotal))) {
-                    value_subtotal = Math.abs(value_subtotal);
-                }
-                values_names_arr.push({name: val[0], value: value_subtotal});
+            if (lodash.includes(pivotData.rowAttrs, attrs[fieldIndex])) {
+                getAggregatorParams = lodash.reverse(getAggregatorParams);
             }
-        });
 
-        // ORDERING
-        let sorting_vector = ['asc'];
-        if (sortingOptions && sortingOptions.type == 'largestToSmallest') {
-            sorting_vector = ['desc'];
-        }
-        values_names_arr = lodash.orderBy(values_names_arr, ['value'], sorting_vector);
-
-        // map only names
-        let attr_sorted_values = lodash.map(values_names_arr, 'name');
-        return {name: sortingOptions.field ? rowAttrs[0] : colAttrs[0], values: attr_sorted_values};
-    };
-
-    highchartsRenderer.getNewAttrSortingForRow = function (pivotData, sortingOptions) {
-        let rowAttrs, rowKeys, colKeys, colAttrs;
-        rowAttrs = pivotData.rowAttrs;
-        rowKeys = pivotData.rowKeys;
-        colKeys = pivotData.colKeys;
-        colAttrs = pivotData.colAttrs;
-
-        if (!rowAttrs || rowAttrs.length == 0) {
-            return null;
-        }
-
-        let values_names_arr = [];
-        let keysArray = sortingOptions.field ? colKeys : rowKeys;
-
-        lodash.forEach(keysArray, function (val) {
-            let firstArray = sortingOptions.field ? sortingOptions.field.split(highchartsRenderer.delimer) : [val[0]];
-            let secondArray = sortingOptions.field ? [val[0]] : [];
-            let aggregator_subtotal = pivotData.getAggregator(firstArray, secondArray);
+            let aggregator_subtotal = pivotData.getAggregator(...getAggregatorParams);
 
             if (aggregator_subtotal) {
                 let value_subtotal = aggregator_subtotal.value();
                 if (sortingOptions && sortingOptions.is_absolute && !isNaN(parseFloat(value_subtotal))) {
                     value_subtotal = Math.abs(value_subtotal);
                 }
-                values_names_arr.push({name: val[0], value: value_subtotal});
+                values_names_arr.push({name: secondArray.join(','), value: value_subtotal});
             }
         });
 
@@ -4474,36 +4427,32 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         values_names_arr = lodash.orderBy(values_names_arr, ['value'], sorting_vector);
 
         // map only names
-        let attr_sorted_values = lodash.map(values_names_arr, 'name');
-        return {name: sortingOptions.field ? colAttrs[0] : rowAttrs[0], values: attr_sorted_values};
+        return lodash.map(values_names_arr, 'name');
     };
 
-    highchartsRenderer.generateSortingFunctionByValues = function (sortingOptions, pivotData, opts) {
-        let new_map;
-        let axis = highchartsRenderer.getAxis(sortingOptions.axis, opts);
-        if (axis == 'col_total') {
-            new_map = highchartsRenderer.getNewAttrSortingForCol(pivotData, sortingOptions);
-        } else if (axis == 'row_total') {
-            new_map = highchartsRenderer.getNewAttrSortingForRow(pivotData, sortingOptions);
-        }
-
+    highchartsRenderer.generateSortingFunctionByValues = function (sortByValueSettings, pivotData, opts, widget) {
         let old_sorters_function = opts.sorters;
         if (!old_sorters_function) {
             old_sorters_function = function () {
             };
         }
-        if (new_map) {
-            var sortAs = $.pivotUtilities.sortAs;
-            let new_sorters_function = function (attr) {
-                if (new_map.name == attr) {
-                    return $.pivotUtilities.sortAs(new_map.values);
-                } else {
-                    return old_sorters_function(attr);
-                }
+        return function (attr) {
+            const sortingOptions = lodash.find(sortByValueSettings, fieldSorting => fieldSorting.name === attr);
+            if (sortingOptions) {
+                const axis = highchartsRenderer.getAxis(_.includes(pivotData.colAttrs, attr) ? 'col_total' : 'row_total', opts);
+                const isColumnSort = axis === 'col_total';
+                const fieldIndex = lodash.findIndex(isColumnSort ? pivotData.colAttrs : pivotData.rowAttrs, name => name === attr);
+                const orderedNamesList = highchartsRenderer.getSortingByValueOrderList(
+                    pivotData,
+                    sortingOptions.sorting,
+                    pivotData[isColumnSort ? 'colKeys' : 'rowKeys'],
+                    pivotData[isColumnSort ? 'colAttrs' : 'rowAttrs'],
+                    fieldIndex
+                );
+                return $.pivotUtilities.sortAs(orderedNamesList);
+            } else {
+                return old_sorters_function(attr);
             }
-            return new_sorters_function;
-        } else {
-            return old_sorters_function;
         }
     };
 
@@ -4707,6 +4656,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         result = null;
         try {
             pivotData = $.pivotUtilities.getPivotDataModel(rowData, opts);
+            pivotData.sortByValueAttrs = [];
             try {
                 if (options && options.onlyOptions) {
                     if (!opts.rendererOptions) {
@@ -4714,9 +4664,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     }
                     opts.rendererOptions.onlyOptions = true;
                 }
-                var totalFilters = lodash.get(opts, 'rendererOptions.total_value_options', null);
-                if (totalFilters && totalFilters.sorting_options) {
-                    let new_sorting_function = highchartsRenderer.generateSortingFunctionByValues(totalFilters.sorting_options, pivotData, opts);
+
+                const sortByValueSettings = lodash.filter(
+                    lodash.get(widget, 'options.sortingFields', []),
+                    sortingField => lodash.get(sortingField, 'sorting.sort_by') === 'field_values'
+                );
+
+                if (sortByValueSettings.length) {
+                    pivotData.sortByValueAttrs = lodash.map(sortByValueSettings, fieldSorting => fieldSorting.name);
+                    let new_sorting_function = highchartsRenderer.generateSortingFunctionByValues(sortByValueSettings, pivotData, opts, widget);
                     opts.sorters = new_sorting_function;
                     optsFiltered.sorters = new_sorting_function;
                     pivotData.sorters = new_sorting_function;
@@ -8668,7 +8624,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const isCustomSorting = widget.options.sortingFields && Array.isArray(widget.options.sortingFields) && widget.options.sortingFields.length > 0;
         if (isCustomSorting) {
             lodash.forEach(datesFields, function (field) {
-                const fieldToSort = lodash.find(widget.options.sortingFields, element => element.id === field.id);
+                const fieldToSort = lodash.find(
+                    widget.options.sortingFields, element => element.id === field.id && lodash.get(element, 'sorting.sort_by') === 'field_items'
+                );
                 field.sorting = fieldToSort ? fieldToSort.sorting : field.sorting;
             });
         }
@@ -8750,7 +8708,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             });
         } else if (isCustomSorting) {
             lodash.forEach(rowsAndCols, function (field) {
-                const fieldToSort = lodash.find(widget.options.sortingFields, element => element.id === field.id);
+                const fieldToSort = lodash.find(
+                    widget.options.sortingFields, element => element.id === field.id && lodash.get(element, 'sorting.sort_by') === 'field_items'
+                );
                 field.sorting = fieldToSort ? fieldToSort.sorting : field.sorting;
             });
         }