@datarailsshared/dr_renderer 1.2.405 → 1.2.406

package/package.json

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

package/src/dr_pivottable.js

@@ -174,108 +174,56 @@ let initDRPivotTable = function($, window, document) {
             return keys.join(delim);
         }
 
-        DRPivotData.prototype.processRecord = function(record, useTotalsCalculation) {
-            if (useTotalsCalculation) {
-                if (!this.notFirst) {
-                    this.keysLength = _.filter(_.keys(record), key => !_.includes(['data_types', 'formats', 'values_formats'], key)).length - 1;
-                    this.notFirst = true;
-                }
-                let getRowAggregator = (function(_this) {
-                    return function(key) {
-                        return _this.aggregator(_this, key, []);
-                    };
-                })(this);
-                let getColAggregator = (function(_this) {
-                    return function(key) {
-                        return _this.aggregator(_this, [], key);
-                    };
-                })(this);
-
-                const rowKey = this.getAttrsKeys(record, this.rowAttrs);
-                const colKey = this.getAttrsKeys(record, this.colAttrs);
-
-                let flatRowKey = rowKey.join(delim);
-                let flatColKey = colKey.join(delim);
-
-                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) {
-                    if (!this.rowTotals[flatRowKey]) {
-                        this.rowTotals[flatRowKey] = getRowAggregator(rowKey.slice());
-                        this.rowTotals[flatRowKey].push(record);
-                    }
-                } else if (!rowKey.length && colKey.length) {
-                    if (!this.colTotals[flatColKey]) {
-                        this.colTotals[flatColKey] = getColAggregator(colKey.slice());
-                        this.colTotals[flatColKey].push(record);
-                    }
-                } else {
-                    if (!this.tree[flatRowKey]) {
-                        this.tree[flatRowKey] = {};
-                    }
-                    this.tree[flatRowKey][flatColKey] = this.aggregator(this, rowKey, colKey);
-                    this.tree[flatRowKey][flatColKey].push(record);
-                }
-
-                return;
-            }
-
-            var colKey, fColKey, fRowKey, flatColKey, flatRowKey, i, j, k, m, n, ref, results, rowKey;
-            rowKey = [];
-            colKey = [];
-            const recordValues = _.values(record);
-            const containsAverage = _.includes(recordValues, 'DR_Average');
-            const containsOthers = _.includes(recordValues, 'DR_Others');
-            if (!containsAverage && !containsOthers) {
-                this.allTotal.push(record);
+        DRPivotData.prototype.processRecord = function(record) {
+            if (!this.notFirst) {
+                this.keysLength = _.filter(_.keys(record), key => !_.includes(['data_types', 'formats', 'values_formats'], key)).length - 1;
+                this.notFirst = true;
             }
-            rowKey = processKey(record, this.rowTotals, this.rowKeys, this.rowAttrs, containsAverage, containsOthers,  (function(_this) {
+            let getRowAggregator = (function(_this) {
                 return function(key) {
                     return _this.aggregator(_this, key, []);
                 };
-            })(this));
-            colKey = processKey(record, this.colTotals, this.colKeys, this.colAttrs, containsAverage, containsOthers, (function(_this) {
+            })(this);
+            let getColAggregator = (function(_this) {
                 return function(key) {
                     return _this.aggregator(_this, [], key);
                 };
-            })(this));
+            })(this);
 
-            m = rowKey.length - 1;
-            n = colKey.length - 1;
-            if (m < 0 || n < 0) {
-                return;
+            const rowKey = this.getAttrsKeys(record, this.rowAttrs);
+            const colKey = this.getAttrsKeys(record, this.colAttrs);
+
+            let flatRowKey = rowKey.join(delim);
+            let flatColKey = colKey.join(delim);
+
+            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);
+                }
             }
-            results = [];
-            for (i = k = 0, ref = m; 0 <= ref ? k <= ref : k >= ref; i = 0 <= ref ? ++k : --k) {
-                fRowKey = rowKey.slice(0, i + 1);
-                flatRowKey = fRowKey.join(delim);
+
+            if (!colKey.length && !rowKey.length) {
+                this.allTotal.push(record);
+            } else if (!colKey.length && rowKey.length) {
+                if (!this.rowTotals[flatRowKey]) {
+                    this.rowTotals[flatRowKey] = getRowAggregator(rowKey.slice());
+                    this.rowTotals[flatRowKey].push(record);
+                }
+            } else if (!rowKey.length && colKey.length) {
+                if (!this.colTotals[flatColKey]) {
+                    this.colTotals[flatColKey] = getColAggregator(colKey.slice());
+                    this.colTotals[flatColKey].push(record);
+                }
+            } else {
                 if (!this.tree[flatRowKey]) {
                     this.tree[flatRowKey] = {};
                 }
-                results.push((function() {
-                    var l, ref1, results1;
-                    results1 = [];
-                    for (j = l = 0, ref1 = n; 0 <= ref1 ? l <= ref1 : l >= ref1; j = 0 <= ref1 ? ++l : --l) {
-                        fColKey = colKey.slice(0, j + 1);
-                        flatColKey = fColKey.join(delim);
-                        if (!this.tree[flatRowKey][flatColKey]) {
-                            this.tree[flatRowKey][flatColKey] = this.aggregator(this, fRowKey, fColKey);
-                        }
-                        results1.push(this.tree[flatRowKey][flatColKey].push(record));
-                    }
-                    return results1;
-                }).call(this));
+                this.tree[flatRowKey][flatColKey] = this.aggregator(this, rowKey, colKey);
+                this.tree[flatRowKey][flatColKey].push(record);
             }
-            return results;
         };
 
         DRPivotData.prototype.getAggregator = function(rowKey, colKey) {

package/src/highcharts_renderer.js

@@ -149,7 +149,6 @@ const CHART_LEGEND_DEFAULT_LABEL = 'Legend (Series)';
 
 const FEATURES = {
     ENABLE_NEW_WIDGET_VALUE_FORMATTING: 'enable_new_widget_value_formatting',
-    ENABLE_SERVER_TOTALS_CALCULATION: 'enable_server_totals_calculation',
     FORMAT_AXIS: 'use_default_table_format_for_axis',
     FORMAT_DATES_AS_OTHER_AXIS_TYPES: 'format_dates_as_other_axis_types',
     MULTIPLE_DIMENSION_TAGS: 'multiple_dimension_tags',
@@ -198,7 +197,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
     lodash.assign(highchartsRenderer, HIGHCHARTS_CONSTANTS);
 
-    highchartsRenderer.useTotalsCalculation = false;
     highchartsRenderer.enabledNewWidgetValueFormatting = false;
     let disableAnimation = false;
 
@@ -207,7 +205,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
     
     if (!!lodash.get(document, 'ReportHippo.user')) {
-        highchartsRenderer.useTotalsCalculation = highchartsRenderer.hasFeature(FEATURES.ENABLE_SERVER_TOTALS_CALCULATION);
         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);
@@ -3916,10 +3913,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         this.ignoreValue = true;
                     }
 
-                    if (highchartsRenderer.useTotalsCalculation && !isNaN(parseFloat(record[attr]))) {
+                    if (!isNaN(parseFloat(record[attr]))) {
                         return this.sum = parseFloat(record[attr]);
-                    } else if (!isNaN(parseFloat(record[attr]))) {
-                        return this.sum += parseFloat(record[attr]);
                     }
                 },
                 value: function () {
@@ -4074,11 +4069,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             this.ignoreValue = true;
                         }
 
-                        if (highchartsRenderer.useTotalsCalculation) {
-                            return this.sum = val;
-                        } else {
-                            return this.sum += val;
-                        }
+                        return this.sum = val;
                     } else {
                         return this.sum = NaN;
                     }
@@ -4166,11 +4157,8 @@ 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 (highchartsRenderer.useTotalsCalculation) {
-                            return this.val = x;
-                        } else {
-                            return this.val = Math.min(x, (ref = this.val) != null ? ref : x);
-                        }
+
+                        return this.val = x;
                     }
                 },
                 value: function () {
@@ -4257,11 +4245,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             this.ignoreValue = true;
                         }
 
-                        if (highchartsRenderer.useTotalsCalculation) {
-                            return this.val = x;
-                        } else {
-                            return this.val = Math.max(x, (ref = this.val) != null ? ref : x);
-                        }
+                        return this.val = x;
                     }
                 },
                 value: function () {
@@ -4349,12 +4333,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             this.ignoreValue = true;
                         }
 
-
-                        if (highchartsRenderer.useTotalsCalculation) {
-                            this.sum = parseFloat(x);
-                        } else {
-                            this.sum += parseFloat(x);
-                        }
+                        this.sum = parseFloat(x);
 
                         return this.len++;
                     }
@@ -4363,10 +4342,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     if (this.ignoreValue) {
                         return null;
                     }
-                    if (highchartsRenderer.useTotalsCalculation) {
-                        return this.sum;
-                    }
-                    return this.sum / this.len;
+                    return this.sum;
                 },
                 format: function (x, only_formats) {
                     if (x == null || x == undefined)
@@ -8956,20 +8932,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return res;
     };
 
-    highchartsRenderer.setNewFieldNames = function (res) {
-        if (highchartsRenderer.useTotalsCalculation) {
-            return res;
-        }
-
-        if (res && res[0] && res[0]['DR_Values']) {
-            lodash.forEach(res, function (item) {
-                item['DR_Values'] = highchartsRenderer.getFieldName(item['DR_Values']);
-            });
-        }
-
-        return res;
-    };
-
     highchartsRenderer.replaceSortingKeysWithMappedValues = function(keys, invertedDateStringMap, widgetFields) {
         if (!keys || !invertedDateStringMap) {
             return;
@@ -9230,8 +9192,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         let res = highchartsRenderer.updateSelectedOverrideValues(widget_obj, override_values, row_data);
         res = highchartsRenderer.convertUniqueDateValues(widget_obj, templates, res);
 
-        res = highchartsRenderer.setNewFieldNames(res);
-
         if (widget_obj.chart_type === highchartsRenderer.CHART_TYPES.WATERFALL_WALKTHROUGH) {
             res = highchartsRenderer.addTotalsToWalkthroughRowData(widget_obj, res);
         }
@@ -9758,8 +9718,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     // TODO: remove it when fixed on BE side
     highchartsRenderer.fixIncompatibleCalculatedValuesTotals = function(widget, res) {
 
-        // if it is FE side calculation or empty response - just return unmodified
-        if (!highchartsRenderer.useTotalsCalculation || !lodash.get(res, 'length')) return res;
+        // if it is empty response - just return unmodified
+        if (!lodash.get(res, 'length')) return res;
 
         const calculatedValuesInValsCount = lodash.filter(
             widget.calculated_values, calcVal => lodash.some(widget.vals, { field: calcVal.field })

package/src/pivottable.js

@@ -22,10 +22,7 @@ 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 = {
@@ -715,7 +712,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, useTotalsCalculation);
+                        return _this.processRecord(record);
                     }
                 };
             })(this));

package/tests/highcharts_renderer.test.js

@@ -1969,15 +1969,7 @@ describe('highcharts_renderer', () => {
                         expect(aggregatorObject.formats).toEqual(['####', '#,###']);
                     });
 
-                    it('Value should be a sum of records when server calculation disabled', () => {
-                        highchartsRenderer.useTotalsCalculation = false;
-                        aggregatorObject.push({Profit: 10});
-                        aggregatorObject.push({Profit: 20});
-                        expect(aggregatorObject.sum).toEqual(30);
-                    });
-
-                    it('Value should be a last record value when server calculation enabled', () => {
-                        highchartsRenderer.useTotalsCalculation = true;
+                    it('Value should be a last record value', () => {
                         aggregatorObject.push({Profit: 10});
                         aggregatorObject.push({Profit: 20});
                         expect(aggregatorObject.sum).toEqual(20);
@@ -2178,15 +2170,7 @@ describe('highcharts_renderer', () => {
                         expect(aggregatorObject.formats).toEqual(['####', '#,###']);
                     });
 
-                    it('Value should be a sum of records when server calculation disabled', () => {
-                        highchartsRenderer.useTotalsCalculation = false;
-                        aggregatorObject.push({Profit: 10});
-                        aggregatorObject.push({Profit: 20});
-                        expect(aggregatorObject.sum).toEqual(30);
-                    });
-
-                    it('Value should be a last record value when server calculation enabled', () => {
-                        highchartsRenderer.useTotalsCalculation = true;
+                    it('Value should be a last record value', () => {
                         aggregatorObject.push({Profit: 10});
                         aggregatorObject.push({Profit: 20});
                         expect(aggregatorObject.sum).toEqual(20);
@@ -2379,13 +2363,6 @@ describe('highcharts_renderer', () => {
                         expect(aggregatorObject.formated_values).toEqual(['$123.12', 456.456, 789.789]);
                     });
 
-                    // it('Value should be a sum of records when server calculation disabled', () => {
-                    //     highchartsRenderer.useTotalsCalculation = false;
-                    //     aggregatorObject.push({Profit: 10});
-                    //     aggregatorObject.push({Profit: 20});
-                    //     expect(aggregatorObject.sum).toEqual(30);
-                    // });
-
                     it('Value must be ignored if calculated totals disabled', () => {
                         const options = {
                             chartOptions: {
@@ -2541,16 +2518,7 @@ describe('highcharts_renderer', () => {
                         expect(aggregatorObject.formats).toEqual(['####', '#,###']);
                     });
 
-                    it('Value should be a sum of records when server calculation disabled', () => {
-                        highchartsRenderer.useTotalsCalculation = false;
-                        aggregatorObject.push({Profit: 10});
-                        aggregatorObject.push({Profit: 20});
-                        expect(aggregatorObject.sum).toEqual(30);
-                        expect(aggregatorObject.len).toEqual(2);
-                    });
-
-                    it('Value should be a last record value when server calculation enabled', () => {
-                        highchartsRenderer.useTotalsCalculation = true;
+                    it('Value should be a last record value', () => {
                         aggregatorObject.push({Profit: 20});
                         aggregatorObject.push({Profit: 10});
                         expect(aggregatorObject.sum).toEqual(10);
@@ -2615,17 +2583,10 @@ describe('highcharts_renderer', () => {
                         expect(aggregatorObject.value()).toBe(null);
                     });
 
-                    it('Should return sum if server calculation enabled', () => {
-                        highchartsRenderer.useTotalsCalculation = true;
+                    it('Should return sum', () => {
                         aggregatorObject.ignoreValue = false;
                         expect(aggregatorObject.value()).toBe(20);
                     });
-
-                    it('Should return average if server calculation disabled', () => {
-                        highchartsRenderer.useTotalsCalculation = false;
-                        aggregatorObject.ignoreValue = false;
-                        expect(aggregatorObject.value()).toBe(5);
-                    });
                 });
 
                 describe('Format method', () => {
@@ -2761,15 +2722,7 @@ describe('highcharts_renderer', () => {
                         expect(aggregatorObject.formats).toEqual(['####', '#,###']);
                     });
 
-                    it('Value should be a min of records when server calculation disabled', () => {
-                        highchartsRenderer.useTotalsCalculation = false;
-                        aggregatorObject.push({Profit: 10});
-                        aggregatorObject.push({Profit: 20});
-                        expect(aggregatorObject.val).toEqual(10);
-                    });
-
-                    it('Value should be a last record value when server calculation enabled', () => {
-                        highchartsRenderer.useTotalsCalculation = true;
+                    it('Value should be a last record value', () => {
                         aggregatorObject.push({Profit: 10});
                         aggregatorObject.push({Profit: 20});
                         expect(aggregatorObject.val).toEqual(20);
@@ -2971,15 +2924,7 @@ describe('highcharts_renderer', () => {
                         expect(aggregatorObject.formats).toEqual(['####', '#,###']);
                     });
 
-                    it('Value should be a min of records when server calculation disabled', () => {
-                        highchartsRenderer.useTotalsCalculation = false;
-                        aggregatorObject.push({Profit: 20});
-                        aggregatorObject.push({Profit: 10});
-                        expect(aggregatorObject.val).toEqual(20);
-                    });
-
-                    it('Value should be a last record value when server calculation enabled', () => {
-                        highchartsRenderer.useTotalsCalculation = true;
+                    it('Value should be a last record value', () => {
                         aggregatorObject.push({Profit: 20});
                         aggregatorObject.push({Profit: 10});
                         expect(aggregatorObject.val).toEqual(10);
@@ -4473,44 +4418,6 @@ describe('highcharts_renderer', () => {
         });
     });
 
-    describe('function setNewFieldNames', () => {
-        beforeEach(() => {
-            highchartsRenderer.useTotalsCalculation = false;
-        });
-
-        it('should return the input if useTotalsCalculation is true', () => {
-            const res = [{ DR_Values: 'value1' }, { DR_Values: 'value2' }];
-            highchartsRenderer.useTotalsCalculation = true;
-            const result = highchartsRenderer.setNewFieldNames(res);
-
-            expect(result).toEqual(res);
-        });
-
-        it('should update DR_Values field names', () => {
-            const res = [{ DR_Values: 'DR_Values' }, { DR_Values: 'value2' }];
-            const expected = [{ DR_Values: 'Values' }, { DR_Values: 'value2' }];
-            const result = highchartsRenderer.setNewFieldNames(res);
-
-            expect(result).toEqual(expected);
-        });
-
-        it('should handle empty input', () => {
-            const res = null;
-            const expected = null;
-            const result = highchartsRenderer.setNewFieldNames(res);
-
-            expect(result).toEqual(expected);
-        });
-
-        it('should handle empty DR_Values array in input', () => {
-            const res = [{}];
-            const expected = [{ DR_Values: undefined }];
-            const result = highchartsRenderer.setNewFieldNames(res);
-
-            expect(result).toEqual(expected);
-        });
-    });
-
     describe('function getOptionsForLegends', () => {
         const rowAttrsLength = 1;
         let additionOptions;
@@ -6313,10 +6220,11 @@ describe('highcharts_renderer', () => {
             const csvJson = highchartsRenderer.tableCSVExportRenderer(pivotData);
             expect(csvJson).toEqual(
                 [
-                    [1651363200, 1652400000, 1653177600, 1653955200, 'null', 'Totals' ],
-                    ['null', 'null', 'null', 'null', 'null', 'Totals'],
+                    [ 1651363200, 1652400000, 1653177600, 1653955200, 'Totals' ],
+                    [ undefined, undefined, undefined, undefined, 'Totals' ],
                     [],
-                    [1, 1, 1, 1, 2, 6]
+                    [ 1, 1, 1, 1, 2 ],
+                    [ 1, 1, 1, 1, 2 ]
                 ]
             );
         });