@datarailsshared/dr_renderer 1.5.89 → 1.5.90

package/src/highcharts_renderer.js

@@ -250,7 +250,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     if (!!lodash.get(document, 'ReportHippo.user')) {
         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);
     }
 
     // fix issue of use tootip.stickOnContact with tooltip.outside , source: https://github.com/highcharts/highcharts/pull/15960
@@ -1239,7 +1238,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         if (pivotData.isSmartQueriesEnabled && withExtraScenarioCycle && indexOfScenarioCycleFilter > -1) {
             const indexOfScenarioFilter = row_n_keys[0].length - 1;
-            for (let i = 0; i < row_n_keys?.length; i++) {
+            for (let i = 0; i < row_n_keys.length; i++) {
                 row_n_keys[i].splice(indexOfScenarioFilter, 1);
             }
             row_n_keys = Array.from(
@@ -3407,10 +3406,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             ? opts.chartOptions
             : highchartsRenderer.getDefaultValueForChart(highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN);
 
-        if (!highchartsRenderer.isSortingOnBackendEnabled) {
-            pivotData.colKeys = lodash.map(lodash.keys(pivotData.colTotals), key => [key]);
-        }
-
         chartOptions.chart = {
             type: 'waterfall',
             zoomType: additionOptions && additionOptions.chart && additionOptions.chart.zoom_type ? additionOptions.chart.zoom_type : 'None',
@@ -4314,83 +4309,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return ret_str;
     };
 
-    highchartsRenderer.getSortingByValueOrderList = function (pivotData, sortingOptions, keysArray, attrs, fieldIndex, widget) {
-        let values_names_arr = [];
-        lodash.forEach(keysArray, function (val) {
-            const firstArray = [];
-            const secondArray = val.slice(0, fieldIndex + 1);
-
-            let valueForComparison;
-            if (sortingOptions.sort_by === 'variance') {
-                const varianceConfig = widget.options.chartOptions.delta_column;
-                const data = pivotData.input;
-                const varianceField = varianceConfig.field === 'category' ? widget.cols[0] : widget.rows[0];
-                const varianceRowsForCurrentKey = lodash.filter(data, row =>
-                    row[varianceField.name] === varianceConfig.name
-                        && lodash.every(secondArray, (item, index) => row[attrs[index]] === item)
-                );
-
-                valueForComparison = lodash.reduce(varianceRowsForCurrentKey, (a, d) => a + d[widget.vals[0].name], 0);
-            } else {
-                let getAggregatorParams = [firstArray, secondArray];
-
-                if (lodash.includes(pivotData.rowAttrs, attrs[fieldIndex])) {
-                    getAggregatorParams = lodash.reverse(getAggregatorParams);
-                }
-
-                let aggregator_subtotal = pivotData.getAggregator(...getAggregatorParams);
-
-                if (aggregator_subtotal) {
-                    valueForComparison = aggregator_subtotal.value();
-                }
-            }
-
-            if (!lodash.isNil(valueForComparison)) {
-                if (sortingOptions && sortingOptions.is_absolute && !isNaN(parseFloat(valueForComparison))) {
-                    valueForComparison = Math.abs(valueForComparison);
-                }
-                values_names_arr.push({name: secondArray.join(','), value: valueForComparison});
-            }
-        });
-
-        // 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
-        return lodash.map(values_names_arr, 'name');
-    };
-
-    highchartsRenderer.generateSortingFunctionByValues = function (sortByValueSettings, pivotData, opts, widget) {
-        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,
-                    widget
-                );
-                return $.pivotUtilities.sortAs(orderedNamesList);
-            } else {
-                return old_sorters_function(attr);
-            }
-        }
-    };
-
     highchartsRenderer.getFieldNameForTable = function (opt) {
         if (lodash.hasIn(opt, "rendererOptions.chartOptions.table_options.remove_underscores") && opt.rendererOptions.chartOptions.table_options.remove_underscores == true) {
             return function (value) {
@@ -4542,8 +4460,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             },
             aggregator: tmp.count()(),
             aggregatorName: "Count",
-            sorters: function () {
-            },
             derivedAttributes: {},
             renderer: $.pivotUtilities.subtotal_renderers,
             rendererOptions: null,
@@ -4560,7 +4476,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) {
@@ -4569,33 +4484,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     opts.rendererOptions.onlyOptions = true;
                 }
 
-                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'))
-                    );
-
-                    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;
-
-                        if (lodash.isObject(lodash.get(widget, 'pivot'))) {
-                            widget.pivot.sorters = new_sorting_function;
-                        }
-                    }
-                }
-
                 result = opts.renderer(pivotData, opts.rendererOptions);
             } catch (_error) {
                 result = _handleRenderingError(_error, options.onlyOptions);
             }
-
-            if (lodash.isObject(lodash.get(widget, 'pivot'))) {
-                widget.pivot.sortByValueAttrs = pivotData.sortByValueAttrs;
-            }
         } catch (_error) {
             result = _handleComputationalError(_error, options.onlyOptions);
         }
@@ -4689,8 +4581,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             },
             aggregator: tmp.count()(),
             aggregatorName: "Count",
-            sorters: function () {
-            },
             derivedAttributes: {},
             renderer: $.pivotUtilities.subtotal_renderers,
             rendererOptions: null,
@@ -4706,7 +4596,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         optsFiltered = $.extend(defaults, opts);
         result = null;
         try {
-            pivotData.sortByValueAttrs = [];
             try {
                 if (options && options.onlyOptions) {
                     if (!opts.rendererOptions) {
@@ -4715,33 +4604,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     opts.rendererOptions.onlyOptions = true;
                 }
 
-                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'))
-                    );
-
-                    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;
-
-                        if (lodash.isObject(lodash.get(widget, 'pivot'))) {
-                            widget.pivot.sorters = new_sorting_function;
-                        }
-                    }
-                }
-
                 result = opts.renderer(pivotData, opts.rendererOptions);
             } catch (_error) {
                 result = _handleRenderingError(_error, options.onlyOptions);
             }
-
-            if (lodash.isObject(lodash.get(widget, 'pivot'))) {
-                widget.pivot.sortByValueAttrs = pivotData.sortByValueAttrs;
-            }
         } catch (_error) {
             result = _handleComputationalError(_error, options.onlyOptions);
         }
@@ -4772,8 +4638,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         }
 
         var subopts = {
-            sorters: pivotOptions ? pivotOptions.sorters : null,
-            sortByValueAttrs: pivotOptions ? pivotOptions.sortByValueAttrs : null,
             cols: lodash.map(pivotOptions.axisArray, 'name'),
             rows: lodash.map(pivotOptions.legendArray, 'name'),
             colFormats: highchartsRenderer.getTableFormatInfosForWidgetFields(widget, pivotOptions, widget.cols),
@@ -5323,40 +5187,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         widgetOptions.pivot.chartType = widgetOptions.chart_type;
         widgetOptions.pivot.chartOptions = widgetOptions.options;
         widgetOptions.pivot.chartRender = highchartsRenderer.getChartRendererFunction(widgetOptions.pivot.chartType, drilldownFunc, drillDownListFunc);
-
-        if (highchartsRenderer.isSortingOnBackendEnabled) return;
-        // TODO: remove this logic after BE sort is implemented
-        // it is required to do sort by totals for comparative analysis - we need to change deltas if columns swaped vice versa
-        const isTwoColumnComparisonWidget = widgetOptions.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN
-            && lodash.get(widgetOptions, 'options.breakdown_options.values.totals', []).length === 2;
-
-        if (isTwoColumnComparisonWidget) {
-            const totalsField = xaxisFields[0];
-            const isScenarioInTotals = /scenario/i.test(totalsField.name) || /scenario/i.test(totalsField.alias);
-
-            if (isScenarioInTotals) {
-                const breakdownField = legendFields[0];
-                const valuesField = valuesFields[0];
-
-                // getting first total value encounter from response rows - it's value to which delta is attached
-                const firstTotalValueInResponse = lodash.get(widgetOptions, `pivot.rowData[0].${totalsField.name}`);
-
-                // getting first total value from breakdown options (after sort is done)
-                const firstTotalValueAfterSort = lodash.get(widgetOptions, 'options.breakdown_options.values.totals[0].key');
-
-                // if two columns changed places (swaped)
-                // then we need to replace keys in response rows and multiply delta to -1
-                if (firstTotalValueInResponse && firstTotalValueAfterSort && firstTotalValueInResponse !== firstTotalValueAfterSort) {
-                    lodash.forEach(widgetOptions.pivot.rowData, row => {
-                        const isDeltaRow = row[totalsField.name] && row[breakdownField.name];
-                        if (isDeltaRow) {
-                            row[totalsField.name] = firstTotalValueAfterSort;
-                            row[valuesField.name] *= -1;
-                        }
-                    });
-                }
-            }
-        }
     };
 
     highchartsRenderer.addTemplateDataToExTableOptions = function (selectedTemplate, exTableOptions) {
@@ -5688,8 +5518,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var otherFields = [];
         var includes = {};
         var date_aggregation_configs = lodash.get(options, "date_aggregation_configs");
-        var sorters = function () {
-        };
 
         lodash.forEach(widgetOptions.filters, function (filterObj) {
             fieldOb = lodash.find(fields, {id: filterObj.field});
@@ -5760,19 +5588,15 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         });
 
         var tmpRowData = null;
-        var tmpSorters = null;
         if (widgetOptions.hasOwnProperty('pivot')) {
             tmpRowData = widgetOptions.pivot.rowData;
-            tmpSorters = widgetOptions.pivot.sorters;
         }
 
         widgetOptions.pivot = {};
         if (tmpRowData != null) {
             widgetOptions.pivot.rowData = tmpRowData;
-            widgetOptions.pivot.sorters = tmpSorters;
         } else {
             widgetOptions.pivot.rowData = selectedTemplate.widget_raw_data;
-            widgetOptions.pivot.sorters = sorters;
         }
 
         widgetOptions.pivot.calculatedValues = objectCopyJsonMethod(widgetOptions.calculated_values || []);
@@ -9174,7 +8998,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.getWidgetDataSorters = function (res, widget, defaultDateFormat) {
         const isFormattingDatesAsOtherAxisTypes = highchartsRenderer.isFormattingDatesAsOtherAxisTypes();
-        let sorters;
 
         if ($.pivotUtilities && !$.pivotUtilities.additionalFieldsList) {
             $.pivotUtilities.additionalFieldsList = [
@@ -9237,7 +9060,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         }
                     }
                 }
-                if (highchartsRenderer.sortHasBeenDoneOnBE(lodash.get(widget, 'pivot.keysObject')) && !isFormattingDatesAsOtherAxisTypes) {
+                if (!isFormattingDatesAsOtherAxisTypes) {
                     const keysObject = lodash.get(widget, 'pivot.keysObject');
 
                     lodash.forEach(['col_keys', 'row_keys', 'row_keys_by_cols'], (keysListName) => {
@@ -9248,168 +9071,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
             });
         }
-
-        if (!highchartsRenderer.sortHasBeenDoneOnBE(lodash.get(widget, 'pivot.keysObject'))) {
-
-            lodash.forEach(datesFields, function (row) {
-                row.values = lodash.uniq(row.values);
-
-                const isTimestampDateField = row.type === 'Date' && lodash.some(row.values, value => typeof value ==='number');
-                if (isTimestampDateField) {
-                    const nullValueIndex = row.values.indexOf(NULL_VALUE);
-                    if (~nullValueIndex) {
-                        row.values.splice(nullValueIndex, 1);
-                    }
-                    row.values = row.values.sort((a, b) => a - b);
-                    if (~nullValueIndex) {
-                        row.values.push(NULL_VALUE);
-                    }
-                } else {
-                    row.values = row.values.sort();
-                }
-
-                if (row.sorting && row.sorting.type == "largestToSmallest") {
-                    row.values = lodash.reverse(row.values);
-                }
-                delete row.sorting;
-
-                if (!isFormattingDatesAsOtherAxisTypes) {
-                    row.values = lodash.map(row.values, function (val) {
-                        return highchartsRenderer.returnRawDataValue(row.type, val, row.format, row.name, row.val_not_convert) + "";
-                    });
-                }
-            });
-
-            /* date string */
-            var rowsAndCols = [];
-            rowsAndCols = lodash.cloneDeep(widget.rows.concat(widget.cols));
-
-            if (widget.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_BREAKDOWN && !highchartsRenderer.sortHasBeenDoneOnBE(lodash.get(widget, 'pivot.keysObject'))) {
-
-                // if it is breakdown widget - redefine sorting according to breakdown_options
-                // TODO: remove this when BE sort will be implemented (FE subtickets for story DR-18469)
-                const isTwoColumnComparisonWidget = lodash.get(widget, 'options.breakdown_options.values.totals', []).length === 2;
-                lodash.forEach(rowsAndCols, function (field) {
-                    const waterfallFieldType = field.id === widget.cols[0].id ? 'totals' : 'breakdown';
-
-                    if (field.type === 'Date') {
-
-                        // set ascending date orders - due to issue with setting breakdown options order in webclient
-                        // this is for fixing already saved widgets with incorret order in breakdown options
-                        field.sorting = {
-                            is_absolute: false,
-                            sort_by: "field_items",
-                            type: "",
-                        };
-                    } else if (waterfallFieldType !== 'totals' || isTwoColumnComparisonWidget) {
-                        field.sorting = {
-                            type: 'CustomOrder',
-                            values: lodash.map(
-                                widget.options.breakdown_options.values[waterfallFieldType],
-                                value => value.key
-                            ),
-                        };
-                    } else {
-                        field.sorting = null;
-                    }
-                });
-            } 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'
-                    );
-                    field.sorting = fieldToSort ? fieldToSort.sorting : field.sorting;
-                });
-            }
-
-            lodash.forEach(rowsAndCols, function (field) {
-                if (field.sorting && (field.sorting.type == "DateString" || field.sorting.type == "largestToSmallest")) {
-                    var find_field = lodash.find(datesFields, {name: field.name});
-                    if (find_field) {
-                        if (find_field.type != 'Date')
-                            find_field.sorting = field.sorting;
-                    } else {
-                        datesFields.push({
-                            "format": field.format,
-                            "name": field.name,
-                            "type": field.type,
-                            "values": [],
-                            "sorting": field.sorting,
-                        });
-                    }
-                } else if (field.sorting && field.sorting.type == "CustomOrder" && field.sorting.values) {
-                    if (field.type === 'Date' && field.sorting.values.length && widget.pivot.invertedDateStringMap) {
-                        const fieldInList = lodash.find(datesFields, { name: field.name });
-                        fieldInList.values = lodash.map(field.sorting.values, value => widget.pivot.invertedDateStringMap[value] || value);
-                    } else {
-                        datesFields.push({
-                            "format": field.format,
-                            "name": field.name,
-                            "type": field.type,
-                            "values": field.sorting.values
-                        });
-                    }
-                }
-            });
-
-            if (widget.vals && widget.vals.length > 1) {
-                datesFields.push({name: "DR_Values", values: lodash.map(widget.vals, 'name')});
-            }
-
-            /****** END *******/
-
-            // TODO: Remove. sortingValues looks like lagacy which is not in use neither in webclient nor in renderer
-            if (widget.options && widget.options.sortingValues) {
-                var field = lodash.find(datesFields, {name: widget.options.sortingValues.field});
-                if (field) {
-                    field.values = widget.options.sortingValues.values;
-                    field.sorting = null;
-                } else {
-                    datesFields.push({
-                        name: widget.options.sortingValues.field,
-                        values: widget.options.sortingValues.values
-                    });
-                }
-            }
-            sorters = function (attr) {
-                var field = lodash.find(datesFields, {name: attr});
-                if (field)
-                    if (field.sorting && field.sorting.type == "DateString") {
-                        return $.pivotUtilities.sortDateStrings(field.sorting.month_order);
-                    } else if (field.sorting && field.sorting.type == "largestToSmallest") {
-                        if (field.sorting.is_absolute)
-                            return $.pivotUtilities.largeToSmallSortByAbsolute;
-                        return $.pivotUtilities.largeToSmallSort;
-                    } else {
-                        return $.pivotUtilities.sortAs(field.values);
-                    }
-            };
-        }
-
-        return sorters;
-    };
-
-    highchartsRenderer.getSorters = function (field, values) {
-        if (field.sorting && field.sorting.type === 'DateString') {
-            return $.pivotUtilities.sortDateStrings(field.sorting.month_order);
-        } else if (field.sorting && field.sorting.type === 'largestToSmallest') {
-            if (field.sorting.is_absolute)
-                return $.pivotUtilities.largeToSmallSortByAbsolute;
-
-            return $.pivotUtilities.largeToSmallSort;
-        } else {
-            return $.pivotUtilities.sortAs(values);
-        }
     };
 
     //highchartsRenderer.getGraphOptions(scope.data, override_values, res, scope.dataModel.templatesWithOutData, scope.openDrillDownList, drillDownFunction)
     highchartsRenderer.getGraphOptions = function (widget_obj, override_values, row_data, templates, openDrillDownListFunction, drillDownFunction) {
 
-        let keysObject;
-        if (highchartsRenderer.isSortingOnBackendEnabled) {
-            keysObject = highchartsRenderer.getAggregatedSortingObjects(row_data);
-        }
-
+        let keysObject = highchartsRenderer.getAggregatedSortingObjects(row_data);
         let res = highchartsRenderer.updateSelectedOverrideValues(widget_obj, override_values, row_data);
         res = highchartsRenderer.convertUniqueDateValues(widget_obj, templates, res);
 
@@ -9419,13 +9086,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         res = highchartsRenderer.fixIncompatibleCalculatedValuesTotals(widget_obj, res);
 
-        let pivot = {};
-
-        if (highchartsRenderer.sortHasBeenDoneOnBE(keysObject)) {
-            pivot.keysObject = keysObject;
-        }
+        let pivot = { keysObject }
 
         let templateNoData = lodash.find(templates, {id: widget_obj.template_id});
+
         if (templateNoData) {
 
             // we need to assign this before calling getWidgetDataSorters method
@@ -9434,7 +9098,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             widget_obj.pivot = pivot;
         }
 
-        pivot.sorters = highchartsRenderer.getWidgetDataSorters(res, widget_obj);
+        highchartsRenderer.getWidgetDataSorters(res, widget_obj);
+
         pivot.rowData = res;
         widget_obj.options = highchartsRenderer.parseOptionsToObject(widget_obj.options);
 
@@ -9494,12 +9159,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             subopts.cols = subopts.rows;
             subopts.rows = tempCols;
 
-            if (highchartsRenderer.sortHasBeenDoneOnBE(lodash.get(pivot, 'keysObject'))) {
-                subopts.keysObject = lodash.cloneDeep(pivot.keysObject);
-                const tempColKeys = subopts.keysObject.col_keys;
-                subopts.keysObject.col_keys = subopts.keysObject.row_keys;
-                subopts.keysObject.row_keys = tempColKeys;
-            }
+            subopts.keysObject = lodash.cloneDeep(pivot.keysObject);
+            const tempColKeys = subopts.keysObject.col_keys;
+            subopts.keysObject.col_keys = subopts.keysObject.row_keys;
+            subopts.keysObject.row_keys = tempColKeys;
         }
 
         if (isEditor == true) {
@@ -9864,10 +9527,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return highchartsRenderer.hasFeature(FEATURES.FORMAT_DATES_AS_OTHER_AXIS_TYPES);
     }
 
-    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);
@@ -10020,7 +9679,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     }
 
                     const isColsTotal = typeof record['DR_Values'] === 'undefined';
-                    
+
                     if (!isColsTotal) {
                         return true;
                     }