@datarailsshared/dr_renderer 1.2.49 → 1.2.53

package/package.json

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

package/src/dataformatter.js

@@ -1004,7 +1004,7 @@ var DataFormatterImpl = function () {
                 // Call function
                 result = this.memoized[pattern].call(this, n, type);
 
-                if (result.value === result.pattern) {
+                if (result.value === result.pattern && !(String(n) === '0' && result.value.includes('0'))) {
                     result.value = n;
                 }
             }

package/src/dr_pivottable.js

@@ -3,7 +3,7 @@ let initDRPivotTable = function($, window, document) {
     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, NovixRenderer;
+    var DRPivotData, sortDateStrings, getSort, processKey, SubtotalRenderer, getFormattedNumber, largeToSmallSort, largeToSmallSortByAbsolute, NovixRenderer;
 
     var delim = " , ";
     const newTableColors = ['rgb(127, 196, 255)', 'rgb(200, 243,243)', 'rgb(247, 161, 173)', 'rgb(255, 237, 178)', 'rgb(221, 239, 255)',
@@ -133,21 +133,75 @@ let initDRPivotTable = function($, window, document) {
             return key;
         };
 
-        DRPivotData.prototype.processRecord = function(record) {
+        let newProcessKey = function (record, totals, keys, attrs, getAggregator) {
+            var addKey, attr, flatKey, k, key, len, ref;
+            key = [];
+            addKey = false;
+            for (k = 0, len = attrs.length; k < len; k++) {
+                attr = attrs[k];
+                if (record.hasOwnProperty(attr)) {
+                    key.push((ref = record[attr]));
+                    flatKey = key.join(delim);
+                }
+                if (totals[flatKey] && totals[flatKey].isChangeable) {
+                    continue;
+                }
+                if (!flatKey) return [];
+                if (!totals[flatKey]) {
+                    totals[flatKey] = getAggregator(key.slice());
+                    addKey = true;
+                } else {
+                    totals[flatKey] = getAggregator(key.slice());
+                    totals[flatKey].push(record);
+                }
+            }
+            if (addKey && key.length === attrs.length) {
+                keys.push(key);
+            }
+            return key;
+        };
+
+        DRPivotData.prototype.processRecord = function(record, useTotalsCalculation) {
             var colKey, fColKey, fRowKey, flatColKey, flatRowKey, i, j, k, m, n, ref, results, rowKey;
             rowKey = [];
             colKey = [];
-            this.allTotal.push(record);
-            rowKey = processKey(record, this.rowTotals, this.rowKeys, this.rowAttrs, (function(_this) {
-                return function(key) {
-                    return _this.aggregator(_this, key, []);
-                };
-            })(this));
-            colKey = processKey(record, this.colTotals, this.colKeys, this.colAttrs, (function(_this) {
-                return function(key) {
-                    return _this.aggregator(_this, [], key);
-                };
-            })(this));
+            if (useTotalsCalculation) {
+                rowKey = newProcessKey(record, this.rowTotals, this.rowKeys, this.rowAttrs, (function(_this) {
+                    return function(key) {
+                        return _this.aggregator(_this, key, []);
+                    };
+                })(this));
+                colKey = newProcessKey(record, this.colTotals, this.colKeys, this.colAttrs, (function(_this) {
+                    return function(key) {
+                        return _this.aggregator(_this, [], key);
+                    };
+                })(this));
+
+                if (!colKey.length && !rowKey.length) {
+                    this.allTotal.push(record);
+                }
+                if (!colKey.length && rowKey.length) {
+                    this.rowTotals[rowKey.join(delim)].push(record);
+                    this.rowTotals[rowKey.join(delim)].isChangeable = true;
+                }
+                if (!rowKey.length && colKey.length) {
+                    this.colTotals[colKey.join(delim)].push(record);
+                    this.colTotals[colKey.join(delim)].isChangeable = true;
+                }
+            } else {
+                this.allTotal.push(record);
+                rowKey = processKey(record, this.rowTotals, this.rowKeys, this.rowAttrs, (function(_this) {
+                    return function(key) {
+                        return _this.aggregator(_this, key, []);
+                    };
+                })(this));
+                colKey = processKey(record, this.colTotals, this.colKeys, this.colAttrs, (function(_this) {
+                    return function(key) {
+                        return _this.aggregator(_this, [], key);
+                    };
+                })(this));
+            }
+
             m = rowKey.length - 1;
             n = colKey.length - 1;
             if (m < 0 || n < 0) {
@@ -286,7 +340,11 @@ let initDRPivotTable = function($, window, document) {
         };
     };
 
-    largeToSmallSort = function(as, bs) {
+    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/;
@@ -298,6 +356,11 @@ let initDRPivotTable = function($, window, document) {
             if (isNaN(bs)) {
                 return 1;
             }
+
+            if (is_abs) {
+                return Math.abs(bs) - Math.abs(as);
+            }
+
             return bs - as;
         }
         a = String(as).toLowerCase();
@@ -2163,6 +2226,7 @@ let initDRPivotTable = function($, window, document) {
     $.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';

package/src/highcharts_renderer.js

@@ -1,8 +1,12 @@
 let getHighchartsRenderer = function ($, document, Highcharts, default_colors, highchartsRenderer,
                                       DataFormatter, lodash, moment_lib) {
 
-    const useNewUx = document.ReportHippo && document.ReportHippo && document.ReportHippo.user &&
-      document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.use_new_ux;
+    let useNewUx = false;
+    let useTotalsCalculation = false;
+    if (document.ReportHippo && document.ReportHippo && document.ReportHippo.user) {
+        useTotalsCalculation = _.includes(document.ReportHippo.user.features, 'enable_server_totals_calculation');
+        useNewUx = document.ReportHippo.user.organization && document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.use_new_ux;
+    }
     const textColor = "#151a41";
     const chartLabelColor = "#cfd7dd";
 
@@ -2848,6 +2852,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 has_errors: false,
                 widget_values_format: widget_values_format,
                 calculated_formats: calculated_info.formats,
+                isChangeable: false,
                 push: function (record) {
                     if (record.hasOwnProperty('data_types') && $.isArray(record['data_types'])) {
                         this.data_types = this.data_types.concat(record['data_types']);
@@ -2868,7 +2873,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     if (highchartsRenderer.ignoreIfCalculatedValue(data, rowKey, colKey, record, calculated_info.associated_fields, render_options, is_graph)) {
                         this.ignoreValue = true;
                     }
-                    if (!isNaN(parseFloat(record[attr]))) {
+
+                    if (useTotalsCalculation && !isNaN(parseFloat(record[attr]))) {
+                        return this.sum = parseFloat(record[attr]);
+                    } else if (!isNaN(parseFloat(record[attr]))) {
                         return this.sum += parseFloat(record[attr]);
                     }
                 },
@@ -2999,6 +3007,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 has_errors: false,
                 widget_values_format: widget_values_format,
                 calculated_formats: calculated_info.formats,
+                isChangeable: false,
                 push: function (record) {
                     if (record.hasOwnProperty('data_types') && record['data_types']) {
                         if (record['data_types'].length > 0) {
@@ -3031,7 +3040,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             this.ignoreValue = true;
                         }
 
-                        return this.sum += val;
+                        if (useTotalsCalculation) {
+                            return this.sum = val;
+                        } else {
+                            return this.sum += val;
+                        }
                     } else {
                         return this.sum = NaN;
                     }
@@ -3094,6 +3107,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 has_errors: false,
                 widget_values_format: widget_values_format,
                 calculated_formats: calculated_info.formats,
+                isChangeable: false,
                 push: function (record) {
                     if (record.hasOwnProperty('data_types') && record['data_types']) {
                         if (record['data_types'].length > 0) {
@@ -3126,7 +3140,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         if (highchartsRenderer.ignoreIfCalculatedValue(data, rowKey, colKey, record, calculated_info.associated_fields, render_options, is_graph)) {
                             this.ignoreValue = true;
                         }
-                        return this.val = Math.min(x, (ref = this.val) != null ? ref : x);
+                        if (useTotalsCalculation) {
+                            return this.val = x;
+                        } else {
+                            return this.val = Math.min(x, (ref = this.val) != null ? ref : x);
+                        }
                     }
                 },
                 value: function () {
@@ -3187,6 +3205,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 has_errors: false,
                 widget_values_format: widget_values_format,
                 calculated_formats: calculated_info.formats,
+                isChangeable: false,
                 push: function (record) {
                     if (record.hasOwnProperty('data_types') && record['data_types']) {
                         if (record['data_types'].length > 0) {
@@ -3219,8 +3238,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         if (highchartsRenderer.ignoreIfCalculatedValue(data, rowKey, colKey, record, calculated_info.associated_fields, render_options, is_graph)) {
                             this.ignoreValue = true;
                         }
-                        return this.val = Math.max(x, (ref = this.val) != null ? ref : x);
-                    }
+
+                        if (useTotalsCalculation) {
+                            return this.val = x;
+                        } else {
+                            return this.val = Math.min(x, (ref = this.val) != null ? ref : x);
+                        }                    }
                 },
                 value: function () {
                     if (this.ignoreValue) {
@@ -3281,6 +3304,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 has_errors: false,
                 widget_values_format: widget_values_format,
                 calculated_formats: calculated_info.formats,
+                isChangeable: false,
                 push: function (record) {
                     if (record.hasOwnProperty('data_types') && record['data_types']) {
                         if (record['data_types'].length > 0) {
@@ -3314,7 +3338,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             this.ignoreValue = true;
                         }
 
-                        this.sum += parseFloat(x);
+
+                        if (useTotalsCalculation) {
+                            this.sum = parseFloat(x);
+                        } else {
+                            this.sum += parseFloat(x);
+                        }
+
                         return this.len++;
                     }
                 },
@@ -3849,11 +3879,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     pivotData.sorters = new_sorting_function;
                 }
 
-                if (totalFilters && totalFilters.filter_options) {
-                    result = highchartsRenderer.generateFilteredResult(totalFilters, optsFiltered, rowData, opts, pivotData);
-                } else {
-                    result = opts.renderer(pivotData, opts.rendererOptions);
-                }
+                result = opts.renderer(pivotData, opts.rendererOptions);
             } catch (_error) {
                 e = _error;
                 if (typeof console !== "undefined" && console !== null) {
@@ -4804,6 +4830,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     value_name: 'remove_underscores',
                     default_value: true
                 },
+                {
+                    element_type: 'checkbox',
+                    element_label: 'Use big data table',
+                    value_name: 'use_handsOnTable',
+                    default_value: false
+                },
                 {
                   element_type: 'checkbox',
                   element_label: 'Use new table design',
@@ -5355,12 +5387,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 element_type: 'checkbox',
                 element_label: 'Sort by variance',
                 value_name: 'sort_by_variance',
-                default_value: false
+                default_value: false,
+                hidden: true
             }, {
                 element_type: 'checkbox',
                 element_label: 'Sort by absolute variance',
                 value_name: 'sort_by_absolute_variance',
-                default_value: false
+                default_value: false,
+                hidden: true
             }]
         },
         'delta_column_for_drill_down': {
@@ -5426,12 +5460,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 element_type: 'checkbox',
                 element_label: 'Sort by variance',
                 value_name: 'sort_by_variance',
-                default_value: false
+                default_value: false,
+                hidden: true
             }, {
                 element_type: 'checkbox',
                 element_label: 'Sort by absolute variance',
                 value_name: 'sort_by_absolute_variance',
-                default_value: false
+                default_value: false,
+                hidden: true
             }, {
                 element_type: 'checkbox',
                 element_label: 'Filter zero values',
@@ -6631,6 +6667,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.setNewFieldNames = function (res) {
+        if (useTotalsCalculation) {
+            return res;
+        }
+
         if (res && res[0] && res[0]['DR_Values']) {
             lodash.forEach(res, function (item) {
                 item['DR_Values'] = highchartsRenderer.getFieldName(item['DR_Values']);
@@ -6712,7 +6752,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         "name": field.name,
                         "type": field.type,
                         "values": [],
-                        "sorting": field.sorting
+                        "sorting": field.sorting,
                     });
                 }
             } else if (field.sorting && field.sorting.type == "CustomOrder" && field.sorting.values) {
@@ -6797,6 +6837,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 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);

package/src/pivottable.js

@@ -20,6 +20,10 @@ let initPivotTable = function($, window, document) {
         }
         return x1 + x2;
     };
+    let useTotalsCalculation = false;
+    if (document.ReportHippo && document.ReportHippo && document.ReportHippo.user) {
+        useTotalsCalculation = _.includes(document.ReportHippo.user.features, 'enable_server_totals_calculation');
+    }
     numberFormat = function(opts) {
         var defaults;
         defaults = {
@@ -689,7 +693,7 @@ let initPivotTable = function($, window, document) {
             PivotData.forEachRecord(this.input, this.derivedAttributes, (function(_this) {
                 return function(record) {
                     if (_this.filter(record)) {
-                        return _this.processRecord(record);
+                        return _this.processRecord(record, useTotalsCalculation);
                     }
                 };
             })(this));
@@ -1863,4 +1867,4 @@ let initPivotTable = function($, window, document) {
     };
 };
 
-module.exports = initPivotTable;
+module.exports = initPivotTable;

package/src/published_items_renderer.js

@@ -124,8 +124,11 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     const metaData = options.inputValuesData ? options.inputValuesData[name] : null;
     let newValue = inputElement.value;
     if (metaData) {
-      if (metaData.type === 'editInput')
+      if (metaData.type === 'editInput') {
         newValue = parseFloat(newValue);
+      } else if (metaData.type === 'editInputPercent') {
+        newValue = parseFloat(newValue) + '%';
+      }
 
       if (metaData.value !== newValue) {
         metaData.value = newValue;
@@ -158,19 +161,14 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
             }, 1)
           });
 
-          if (inputMetaData.type === 'editInputPercent')
-            inEl.setAttribute("type", "text");
-          else if (inputMetaData.type === 'editInput')
-            inEl.setAttribute("type", "number");
-
+          inEl.setAttribute("type", "number");
           inEl.setAttribute("name", inputMetaData.name);
           inEl.setAttribute("style", "background: transparent;width: calc(100% - 15px);border: 0;margin: 5px;text-align: inherit;display: none;");
-          inEl.value = inputMetaData.value;
+          inEl.value = inputMetaData.type === 'editInputPercent' ? parseFloat(inputMetaData.value.replace('%', '')) : inputMetaData.value;
           inEl.addEventListener("focusout", function (event) {
             event.preventDefault();
             publishedItemsRenderer.changedInputElement(event, scope, options);
             inEl.style.display = 'none';
-            labelEl.innerText = inEl.value;
             labelEl.innerText = inputMetaData.format ? formatValue('n', inputMetaData.format, inEl.value).value : inputMetaData.value;
             labelEl.style.display = 'block';
           });