@datarailsshared/dr_renderer 1.2.301-dragons → 1.2.303

package/package.json

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

package/src/dr_pivottable.js

@@ -91,7 +91,6 @@ let initDRPivotTable = function($, window, document) {
 
         DRPivotData.prototype.arrSort = function(attrs) {
             var a, sortersArr;
-            const sortByValueAttrs = this.sortByValueAttrs;
             sortersArr = (function() {
                 var l, len1, results;
                 results = [];
@@ -101,16 +100,11 @@ let initDRPivotTable = function($, window, document) {
                 }
                 return results;
             }).call(this);
-
             return function(a, b) {
                 var comparison, i, sorter;
                 for (i in sortersArr) {
                     sorter = sortersArr[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]);
-                    }
+                    comparison = sorter(a[i], b[i]);
                     if (comparison !== 0) {
                         return comparison;
                     }

package/src/highcharts_renderer.js

@@ -81,11 +81,6 @@ const HIGHCHARTS_CONSTANTS = {
     MAX_SELECTED_ITEMS_CHARECHTERS_IN_LABEL: 50,
 }
 
-const SUBOPTIONS_FONT_SIZE_VALUES = (new Array(19).fill(null).map(function (item, index) {
-    const fontValue = index + 6;
-    return { label: fontValue, value: fontValue }
-}));
-
 const SUBOPTIONS_FONTS = [
     'Arial',
     'Arial Black',
@@ -694,7 +689,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             setTimeout(() => {
                 var aggr = highchartsRenderer.defaultFormatterToTooltip(pivotData, opts);
                 const formatted_value_to_return = aggr.bind(this)();
-                opts.insightsTooltipFunc({...this, formatted_value_to_return, ...insight});
+                opts.insightsTooltipFunc(lodash.merge(lodash.cloneDeep(this), formatted_value_to_return, insight));
             });
         }
     }
@@ -1155,7 +1150,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 ob.name = row_n_value.join(highchartsRenderer.delimer)
                     .replace(highchartsRenderer.DR_OTHERS_KEY, othersName);
             }
-
             lodash.forEach(col_n_keys, function (col_n_value, index) {
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
                 var val = agg.value();
@@ -1397,7 +1391,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (opts.trendLine) {
                 const a = ((ySum * squareXSum) - (xSum * xySum)) / ((n * squareXSum) - (xSum * xSum));
                 const b = ((n * xySum) -  (xSum* ySum)) / ((n * squareXSum) - (xSum * xSum));
-
                 const trendSeries = lodash.clone(chart_series[chart_series.length - 1]);
                 trendSeries.className = 'trendSeries';
                 trendSeries.name = highchartsRenderer.getTrendSeriesName(trendSeries);
@@ -1408,7 +1401,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (colors && colors[i]) {
                     trendSeries.color = colors[i];
                 }
-
                 trendSerieses.push(trendSeries);
             }
             i++;
@@ -1425,7 +1417,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         let weights = { line: 2,spline: 3 ,area:-2, areaspline: -1, scatter:4, column: 1 };
-
         if (opts.comboOptions && lodash.includes(chartType,'combo') && !lodash.isEqual(row_n_keys, EMPTY_ROW_N_KEYS)) {
             chart_series.forEach((series, seriesIndex) => {
                 const savedSeriesOption = lodash.find(opts.comboOptions.seriesOptions, {series: series.name});
@@ -4397,25 +4388,72 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return ret_str;
     };
 
-    highchartsRenderer.getSortingByValueOrderList = function (pivotData, sortingOptions, keysArray, attrs, fieldIndex) {
+    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;
+        }
+
         let values_names_arr = [];
+        let keysArray = sortingOptions.field ? rowKeys : colKeys;
+
         lodash.forEach(keysArray, function (val) {
-            const firstArray = [];
-            const secondArray = val.slice(0, fieldIndex + 1);
-            let getAggregatorParams = [firstArray, secondArray];
+            let firstArray = sortingOptions.field ? [val[0]] : [];
+            let secondArray = sortingOptions.field ? sortingOptions.field.split(highchartsRenderer.delimer) : [val[0]];
+            let aggregator_subtotal = pivotData.getAggregator(firstArray, secondArray);
 
-            if (lodash.includes(pivotData.rowAttrs, attrs[fieldIndex])) {
-                getAggregatorParams = lodash.reverse(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});
             }
+        });
 
-            let aggregator_subtotal = pivotData.getAggregator(...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);
 
             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: secondArray.join(','), value: value_subtotal});
+                values_names_arr.push({name: val[0], value: value_subtotal});
             }
         });
 
@@ -4427,32 +4465,36 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         values_names_arr = lodash.orderBy(values_names_arr, ['value'], sorting_vector);
 
         // map only names
-        return lodash.map(values_names_arr, 'name');
+        let attr_sorted_values = lodash.map(values_names_arr, 'name');
+        return {name: sortingOptions.field ? colAttrs[0] : rowAttrs[0], values: attr_sorted_values};
     };
 
-    highchartsRenderer.generateSortingFunctionByValues = function (sortByValueSettings, pivotData, opts, widget) {
+    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);
+        }
+
         let old_sorters_function = opts.sorters;
         if (!old_sorters_function) {
             old_sorters_function = function () {
             };
         }
-        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);
+        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 new_sorters_function;
+        } else {
+            return old_sorters_function;
         }
     };
 
@@ -4656,7 +4698,6 @@ 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) {
@@ -4664,15 +4705,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     }
                     opts.rendererOptions.onlyOptions = true;
                 }
-
-                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);
+                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);
                     opts.sorters = new_sorting_function;
                     optsFiltered.sorters = new_sorting_function;
                     pivotData.sorters = new_sorting_function;
@@ -4937,7 +4972,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 const fiscalYearMonthsModifier = highchartsRenderer.getFiscalYearMonthModifier();
 
                 let date = moment_lib(tryParse).utcOffset(0);
-                if (['quarter', 'year'].includes(timeframe)) {
+                if (lodash.includes(['quarter', 'year'], timeframe)) {
                     date = date.subtract(fiscalYearMonthsModifier, 'M');
                 }
 
@@ -5975,6 +6010,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.widgetPlaceholders = lodash.assign({}, $.pivotUtilities.errorHandling.placeholders);
 
+    const suboptionsFontSizeValues = (lodash.map(lodash.fill(new Array(19), null), function (item, index) {
+        const fontValue = index + 6;
+        return { label: fontValue, value: fontValue }
+    }));
+
     highchartsRenderer.suboptions = {
         'widget_library': {
             is_hidden: true,
@@ -6136,7 +6176,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'select',
                     value_name: 'columns_font_size',
                     element_label: 'Font size',
-                    element_options: SUBOPTIONS_FONT_SIZE_VALUES,
+                    element_options: suboptionsFontSizeValues,
                     default_value: '10'
                 },
                 {
@@ -6165,7 +6205,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'select',
                     value_name: 'rows_font_size',
                     element_label: 'Font size',
-                    element_options: SUBOPTIONS_FONT_SIZE_VALUES,
+                    element_options: suboptionsFontSizeValues,
                     default_value: '10'
                 },
                 {
@@ -6194,7 +6234,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'select',
                     value_name: 'values_font_size',
                     element_label: 'Font size',
-                    element_options: SUBOPTIONS_FONT_SIZE_VALUES,
+                    element_options: suboptionsFontSizeValues,
                     default_value: '10'
                 },
                 {
@@ -6223,7 +6263,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'select',
                     value_name: 'totals_font_size',
                     element_label: 'Font size',
-                    element_options: SUBOPTIONS_FONT_SIZE_VALUES,
+                    element_options: suboptionsFontSizeValues,
                     default_value: '10'
                 },
                 {
@@ -6499,7 +6539,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'select',
                     value_name: 'font_size',
                     element_label: 'Font size',
-                    element_options: SUBOPTIONS_FONT_SIZE_VALUES,
+                    element_options: suboptionsFontSizeValues,
                     default_value: LABEL_DEFAULT_SETTINGS.FONT_SIZE,
                 },
                 {
@@ -6577,7 +6617,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'select',
                     value_name: 'font_size',
                     element_label: 'Font size',
-                    element_options: SUBOPTIONS_FONT_SIZE_VALUES,
+                    element_options: suboptionsFontSizeValues,
                     default_value: LABEL_DEFAULT_SETTINGS.FONT_SIZE,
                 },
                 {
@@ -6654,7 +6694,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'select',
                     value_name: 'font_size',
                     element_label: 'Font size',
-                    element_options: SUBOPTIONS_FONT_SIZE_VALUES,
+                    element_options: suboptionsFontSizeValues,
                     default_value: LABEL_DEFAULT_SETTINGS.FONT_SIZE,
                 },
                 {
@@ -6823,7 +6863,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'select',
                     value_name: 'font_size',
                     element_label: 'Font size',
-                    element_options: SUBOPTIONS_FONT_SIZE_VALUES,
+                    element_options: suboptionsFontSizeValues,
                     default_value: TOOLTIP_DEFAULT_SETTINGS.FONT_SIZE,
                 },
                 {
@@ -6913,7 +6953,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     element_type: 'select',
                     value_name: 'font_size',
                     element_label: 'Font size',
-                    element_options: SUBOPTIONS_FONT_SIZE_VALUES,
+                    element_options: suboptionsFontSizeValues,
                     default_value: TOOLTIP_DEFAULT_SETTINGS.FONT_SIZE,
                 },
                 {
@@ -8624,9 +8664,7 @@ 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 && lodash.get(element, 'sorting.sort_by') === 'field_items'
-                );
+                const fieldToSort = lodash.find(widget.options.sortingFields, element => element.id === field.id);
                 field.sorting = fieldToSort ? fieldToSort.sorting : field.sorting;
             });
         }
@@ -8708,9 +8746,7 @@ 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 && lodash.get(element, 'sorting.sort_by') === 'field_items'
-                );
+                const fieldToSort = lodash.find(widget.options.sortingFields, element => element.id === field.id);
                 field.sorting = fieldToSort ? fieldToSort.sorting : field.sorting;
             });
         }