@datarailsshared/dr_renderer 1.5.88 → 1.5.90

package/package.json

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

package/src/dr-renderer-helpers.js

@@ -1,9 +1,5 @@
 const _ = require('lodash');
 
-function backendSortingKeysAreNotEmpty(keys) {
-    return !!keys && (!!keys.row_keys && !!keys.row_keys.length || !!keys.col_keys && !!keys.col_keys.length);
-}
-
 function capitalize(string) {
     if (typeof string !== 'string') return '';
     return string.charAt(0).toUpperCase() + string.slice(1);
@@ -79,12 +75,10 @@ const FEATURES = {
     FORMAT_DATES_AS_OTHER_AXIS_TYPES: 'format_dates_as_other_axis_types',
     MULTIPLE_DIMENSION_TAGS: 'multiple_dimension_tags',
     USE_NEW_SCENARIO_TAG: 'use_new_scenario_tag',
-    ENABLE_SERVER_WIDGET_DATA_SORTING: 'enable_server_widget_data_sorting',
     ENABLE_GAUGE_DYNAMIC_GOAL: 'enable_gauge_dynamic_goal',
 }
 
 module.exports = {
-    backendSortingKeysAreNotEmpty,
     capitalize,
     clamp,
     isNumber,

package/src/dr_pivottable.js

@@ -4,10 +4,9 @@ const { TooMuchDataError } = require('./errors');
 
 let initDRPivotTable = function($, window, document) {
     var hasProp = {}.hasOwnProperty;
-    var slice = [].slice;
     var extend = function(child, parent) { for (var key in parent) { if (hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
 
-    var DRPivotData, sortDateStrings, getSort, processKey, SubtotalRenderer, getFormattedNumber, largeToSmallSort, largeToSmallSortByAbsolute, NovixRenderer;
+    var DRPivotData, processKey, SubtotalRenderer, getFormattedNumber, NovixRenderer;
     const newTableColors = ['rgb(127, 196, 255)', 'rgb(200, 243,243)', 'rgb(247, 161, 173)', 'rgb(255, 237, 178)', 'rgb(221, 239, 255)',
         'rgb(171, 216, 255)', 'rgb(174, 231, 220)', 'rgb(227, 255, 236)', 'rgb(162, 215, 227)', 'rgb(223, 239, 236)'];
 
@@ -15,10 +14,6 @@ let initDRPivotTable = function($, window, document) {
       document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.use_new_ux;
     // const numberOfRows = 500; // change to activate the handsontable when num of rows bigger then this.
 
-    const isFlatKeyInPivotKeys = function(keys, flatKey) {
-        return keys.some(key => key.join(DELIMER) === flatKey);
-    };
-
     DRPivotData = (function(superClass) {
         extend(DRPivotData, superClass);
 
@@ -26,16 +21,6 @@ let initDRPivotTable = function($, window, document) {
             DRPivotData.__super__.constructor.call(this, input, opts);
         }
 
-        getSort = function(sorters, attr) {
-            var sort;
-            sort = sorters(attr);
-            if ($.isFunction(sort)) {
-                return sort;
-            } else {
-                return $.pivotUtilities.naturalSort;
-            }
-        };
-
         DRPivotData.prototype.forEachRecord = function(input, derivedAttributes, f) {
             var addRecord, compactRecord, i, j, k, l, len1, record, ref, results, results1, tblCols;
             if ($.isEmptyObject(derivedAttributes)) {
@@ -96,41 +81,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 = [];
-                for (l = 0, len1 = attrs.length; l < len1; l++) {
-                    a = attrs[l];
-                    results.push(getSort(this.sorters, a));
-                }
-                return results;
-            }).call(this);
-
-            return function(a, b) {
-                var comparison, i, sorter;
-                for (i in sortersArr) {
-                    const index = parseInt(i);
-                    sorter = sortersArr[index];
-                    if (sortByValueAttrs.indexOf(attrs[index]) !== -1) {
-
-                        // For case current Field attrs[index] is sorted by value we are concatenating values passed to sorter function
-                        // Concatenation is done from first field in a block (first axis or first series) until current field index.
-                        // Cause for this case sorting will be as list of these concatenated strings (which is prepared in getSortingByValueOrderList)
-                        comparison = sorter(a.slice(0, index + 1).join(','), b.slice(0, index + 1).join(','));
-                    } else {
-                        comparison = sorter(a[index], b[index]);
-                    }
-                    if (comparison !== 0) {
-                        return comparison;
-                    }
-                }
-                return 0;
-            };
-        };
-
         processKey = function(record, totals, keys, attrs, containsAverage, containsOthers, getAggregator) {
             var addKey, attr, flatKey, k, key, len, ref;
             key = [];
@@ -199,15 +149,6 @@ let initDRPivotTable = function($, window, document) {
             let flatRowKey = rowKey.join(DELIMER);
             let flatColKey = colKey.join(DELIMER);
 
-            if (this.keysLength === rowKey.length + colKey.length) {
-                if (!this.isKeysSortingDoneOnBackendSide && !isFlatKeyInPivotKeys(this.rowKeys, flatRowKey)) {
-                    this.rowKeys.push(rowKey);
-                }
-                if (!this.isKeysSortingDoneOnBackendSide && !isFlatKeyInPivotKeys(this.colKeys, flatColKey)) {
-                    this.colKeys.push(colKey);
-                }
-            }
-
             if (!colKey.length && !rowKey.length) {
                 this.allTotal.push(record);
             } else if (!colKey.length && rowKey.length) {
@@ -258,135 +199,6 @@ let initDRPivotTable = function($, window, document) {
 
     })($.pivotUtilities.PivotData);
 
-    sortDateStrings = function(month_order) {
-        var i, mapping, x;
-        mapping = {};
-        var order = [
-            {"month":"jan", "versions": ['january', 'jan', 'ja'], weight:1},
-            {"month":"feb", "versions": ['february', 'feb', 'fe'], weight:2},
-            {"month":"mar", "versions": ['march', 'mar', 'mr'], weight:3},
-            {"month":"apr", "versions": ['april', 'apr', 'ap','al'], weight:4},
-            {"month":"may", "versions": ['may', 'ma'], weight:5},
-            {"month":"jun", "versions": ['june', 'jun','jn'], weight:6},
-            {"month":"jul", "versions": ['july', 'jul','jl'], weight:7},
-            {"month":"aug", "versions": ['august', 'aug', 'au'], weight:8},
-            {"month":"sep", "versions": ['september', 'sept', 'sep','sp','se'], weight:9},
-            {"month":"oct", "versions": ['october','oct', 'oc'], weight:10},
-            {"month":"nov", "versions": ['november', 'nov', 'no'], weight:11},
-            {"month":"dec", "versions": ['december', 'dec', 'de'], weight:12}
-        ];
-        var pattern = /(\d{1,4})|(Ja(n)?(uary)?|Fe(b)?(ruary)?|Mar(ch)?|mr|Ap(r)?(il)?|al|Ma(y)?|Jun(e)?|jn|Jul(y)?|jl|Aug(ust)?|au|Se(p)?(t)?(ember)?|sp|Oc(t)?(ober)?|No(v)?(ember)?|De(c)?(ember)?)/ig
-        if(month_order){
-            for(i=0; i<month_order.length; i++){
-                var find_row = _.find(order, {month:month_order[i]});
-                if(find_row){
-                    find_row.weight = i+1;
-                }
-            }
-        }
-
-        _.forEach(order, function(month_obj){
-            _.forEach(month_obj.versions, function(val){
-                mapping[val] = month_obj.weight*31;
-            });
-        });
-
-        var getIndexForVal = function(value){
-            var to_return = 0, matches, i;
-            if (typeof value === 'string' || value instanceof String){
-                matches = value.match(pattern);
-                var numbers = 0;
-                var i = 0;
-                _.forEach(matches, function(v)
-                {
-                    i++;
-                    v = v.trim().toLowerCase();
-                    var res = 0;
-
-                    if(mapping[v] != undefined){
-                        res = mapping[v];
-                    }
-                    else{
-                        try {
-                            res = parseInt(v)
-                            if(res > 31 || numbers > 1 || i == matches.length)
-                                res *=1000
-                            numbers++;
-                        }
-                        catch(er){
-                            res = 0
-                        }
-                    }
-                    if(res == NaN){
-                        res = 0
-                    }
-                    to_return += res
-                });
-            }
-            else{
-                try {
-                    to_return = parseInt(value)
-                }
-                catch(er){
-                    to_return = value
-                }
-            }
-
-            return to_return;
-        };
-
-        return function(a, b) {
-            return $.pivotUtilities.naturalSort(getIndexForVal(a), getIndexForVal(b));
-        };
-    };
-
-    largeToSmallSortByAbsolute = function (as, bs) {
-        return largeToSmallSort(as , bs, true);
-    }
-
-    largeToSmallSort = function(as, bs, is_abs = false) {
-        var a, a1, b, b1, rd, rx, rz;
-        rx = /(\d+)|(\D+)/g;
-        rd = /\d/;
-        rz = /^0/;
-        if (typeof as === "number" || typeof bs === "number") {
-            if (isNaN(as)) {
-                return -1;
-            }
-            if (isNaN(bs)) {
-                return 1;
-            }
-
-            if (is_abs) {
-                return Math.abs(bs) - Math.abs(as);
-            }
-
-            return bs - as;
-        }
-        a = String(as).toLowerCase();
-        b = String(bs).toLowerCase();
-        if (a === b) {
-            return 0;
-        }
-        if (!(rd.test(a) && rd.test(b))) {
-            return (b > a ? 1 : -1);
-        }
-        a = a.match(rx);
-        b = b.match(rx);
-        while (a.length && b.length) {
-            a1 = a.shift();
-            b1 = b.shift();
-            if (a1 !== b1) {
-                if (rd.test(a1) && rd.test(b1)) {
-                    return b1.replace(rz, ".0") - a1.replace(rz, ".0");
-                } else {
-                    return (b1 > a1 ? 1 : -1);
-                }
-            }
-        }
-        return b.length - a.length;
-    };
-
     $.pivotUtilities.DRPivotData = DRPivotData;
 
     getFormattedNumber = function(val, aggregator, opts, format_argument) {
@@ -2508,9 +2320,6 @@ let initDRPivotTable = function($, window, document) {
     $.pivotUtilities.delim = DELIMER;
 
     $.pivotUtilities.getFormattedNumber = getFormattedNumber;
-    $.pivotUtilities.sortDateStrings = sortDateStrings;
-    $.pivotUtilities.largeToSmallSort = largeToSmallSort;
-    $.pivotUtilities.largeToSmallSortByAbsolute = largeToSmallSortByAbsolute;
     $.pivotUtilities.getPivotDataModel = function(input, opts){ return new DRPivotData(input, opts); }
     $.pivotUtilities.getPivotTableFormula = function(rowData, opts, func, colFields, rowFields, aggregationDefaults, utils) {
         let totalStr = 'Grand Totals';