@datarailsshared/dr_renderer 1.2.5 → 1.2.6

package/.circleci/config.yml

@@ -15,9 +15,9 @@ jobs:
         at: ~/repo
     - run:
         name: Prepare publish version
-        command: "postfix=\"\"\nif [[ \"${CIRCLE_BRANCH}\" != master ]] ; then\n \
-          \ postfix=\"-$CIRCLE_BRANCH\"\nfi\n\nVERSION=\"1.2.$CIRCLE_BUILD_NUM$postfix\"\
-          \nsed -i s/{{cicd_version}}/$VERSION/g ./package.json\ncat ./package.json\n"
+        command: "postfix=\"\"\nif [[ \"${CIRCLE_BRANCH}\" != prod ]] ; then\n  postfix=\"\
+          -$CIRCLE_BRANCH\"\nfi\n\nVERSION=\"1.2.$CIRCLE_BUILD_NUM$postfix\"\nsed\
+          \ -i s/{{cicd_version}}/$VERSION/g ./package.json\ncat ./package.json\n"
     - run:
         name: Authenticate with registry
         command: echo "//registry.npmjs.org/:_authToken=$npm_TOKEN" > ~/repo/.npmrc
@@ -57,7 +57,7 @@ workflows:
         filters:
           branches:
             only:
-            - /master/
+            - /prod.*/
             - /tigers/
             - /bratans/
             - /dragons/

package/README.md

@@ -13,11 +13,6 @@ This project was generated by amazing Datarails R&D team
     let default_colors = ["#106bd0", "#00cee8", "#95c8d8", "#89cff0", "#FE746D", "#6ADC4C", "#9B9AD9", "#ff8000", "#C11B12", "#5a41f9"];
     let hr = dr_renderer.getInitHighchartsRenderer($, document, default_colors, Highcharts);
 
-## Development
-### Types
-To be able to compile types with `npm run build:types` you need to install typescript globally:
-
-```npm i -g typescript```
 
 ## Publish to npm
 Just merge to prod branch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datarailsshared/dr_renderer",
-  "version": "1.2.5",
+  "version": "1.2.6",
   "description": "DataRails charts and tables renderer",
   "keywords": [
     "datarails",
@@ -10,8 +10,7 @@
   ],
   "scripts": {
     "login": "npm login",
-    "test": "jest --coverage",
-    "build:types": "tsc --build --verbose"
+    "test": "jest --coverage"
   },
   "author": "Sergey Spivakov",
   "repository": {

package/src/dataformatter.js

@@ -1,5 +1,3 @@
-const _ = require('lodash');
-
 var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -352,7 +350,7 @@ var DataFormatterImpl = function () {
 
             n = this.roundDecimals(n, decimals).toString().split('.');
             var integerPart = n[0];
-            var decimalPart = _.padEnd(String(n[1] || 0), decimals, '0');
+            var decimalPart = n[1] || 0;
 
             return this.applyNumberPattern(integerPart, patternIntegerPart) + this.locale.decimalSeparator + this.applyNumberPattern(decimalPart, patternDecimalPart, n[1] && n[1][0] == '0' ? '' : 'right');
         }
@@ -1028,49 +1026,9 @@ var DataFormatterImpl = function () {
 
             return result;
         }
-    }, {
-        key: 'formatValue',
-        value: function formatValue(data_type, number_format, value, override_values_format) {
-            if (!number_format) {
-                number_format = 'General';
-            }
-
-            if (Number.isNaN(value)) {
-                return { value: "#Error" };
-            }
-
-            if (data_type === 'n' && value != null) {
-                if (override_values_format) {
-                    number_format = override_values_format;
-                }
-
-                if (number_format.indexOf('[kilo]') >= 0) {
-                    value = value / 1000;
-                    number_format = number_format.replace('[kilo]', '');
-                } else if (number_format.indexOf('[mega]') >= 0) {
-                    value = value / 1000000;
-                    number_format = number_format.replace('[mega]', '');
-                } else if (number_format.indexOf('[kilomega]') >= 0) {
-                    number_format = number_format.replace('[kilomega]', '');
-                }
-
-                return this.format(value, 'Number', number_format);
-            } else if (data_type === 'd') {
-                number_format = number_format.split(';')[0];
-                let d;
-                if (value instanceof Date || typeof value === 'string') {
-                    d = new Date(value);
-                } else {
-                    d = new Date(value * 1000);
-                }
-                return this.format(d.toString(), 'DateTime', number_format);
-            } else {
-                return value;
-            }
-        }
     }]);
 
     return DataFormatterImpl;
 }();
 
-module.exports = new DataFormatterImpl();
+module.exports = new DataFormatterImpl();

package/src/dr_pivottable.js

@@ -12,10 +12,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(delim) === flatKey);
-    };
-
     DRPivotData = (function(superClass) {
         extend(DRPivotData, superClass);
 
@@ -95,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 = [];
@@ -105,21 +100,11 @@ let initDRPivotTable = function($, window, document) {
                 }
                 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]);
-                    }
+                    sorter = sortersArr[i];
+                    comparison = sorter(a[i], b[i]);
                     if (comparison !== 0) {
                         return comparison;
                     }
@@ -158,72 +143,120 @@ let initDRPivotTable = function($, window, document) {
             return key;
         };
 
-        DRPivotData.prototype.getAttrsKeys = function(record, attrs) {
-            const keys = [];
-            for (let k = 0; k < attrs.length; k++) {
-                const attr = attrs[k];
-                if (record.hasOwnProperty(attr)) {
-                    keys.push(record[attr] != null ? record[attr] : 'null');
+        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;
                 }
-            }
-            return keys;
-        }
+                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);
 
-        DRPivotData.prototype.getFlatKey = function(record, attrs) {
-            const keys = this.getAttrsKeys(record, attrs);
-            return keys.join(delim);
-        }
+                let rowKey = [];
+                for (k = 0; k < this.rowAttrs.length; k++) {
+                    let attr = this.rowAttrs[k];
+                    if (record.hasOwnProperty(attr)) {
+                        rowKey.push((ref = record[attr]) != null ? ref : "null");
+                    }
+                }
+
+                let colKey = [];
+                for (k = 0; k < this.colAttrs.length; k++) {
+                    let attr = this.colAttrs[k];
+                    if (record.hasOwnProperty(attr)) {
+                        colKey.push((ref = record[attr]) != null ? ref : "null");
+                    }
+                }
+
+                let flatRowKey = rowKey.join(delim);
+                let flatColKey = colKey.join(delim);
+
+                if (this.keysLength === rowKey.length + colKey.length) {
+                    if (!this.rowKeys.some(rKey => rKey.join(delim) === flatRowKey)) {
+                        this.rowKeys.push(rowKey);
+                    }
+                    if (!this.colKeys.some(cKey => cKey.join(delim) === 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;
+            }
 
-        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;
+            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);
             }
-            let getRowAggregator = (function(_this) {
+            rowKey = processKey(record, this.rowTotals, this.rowKeys, this.rowAttrs, containsAverage, containsOthers,  (function(_this) {
                 return function(key) {
                     return _this.aggregator(_this, key, []);
                 };
-            })(this);
-            let getColAggregator = (function(_this) {
+            })(this));
+            colKey = processKey(record, this.colTotals, this.colKeys, this.colAttrs, containsAverage, containsOthers, (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);
+            })(this));
 
-            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);
-                }
+            m = rowKey.length - 1;
+            n = colKey.length - 1;
+            if (m < 0 || n < 0) {
+                return;
             }
-
-            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 {
+            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 (!this.tree[flatRowKey]) {
                     this.tree[flatRowKey] = {};
                 }
-                this.tree[flatRowKey][flatColKey] = this.aggregator(this, rowKey, colKey);
-                this.tree[flatRowKey][flatColKey].push(record);
+                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));
             }
+            return results;
         };
 
         DRPivotData.prototype.getAggregator = function(rowKey, colKey) {
@@ -396,10 +429,13 @@ let initDRPivotTable = function($, window, document) {
             switch (opts.chartOptions.negative_numbers.value) {
                 case 'red_minus':
                     return '<span style="color: red; fill: red;">' + aggregator.format(val, format_argument) + '</span>';
+                    break;
                 case 'absolute':
                     return '(' + aggregator.format(Math.abs(val), format_argument) + ')';
+                    break;
                 case 'red_absolute':
                     return '<span style="color: red; fill: red;">(' + aggregator.format(Math.abs(val), format_argument) + ')</span>';
+                    break;
                 default:
                     return aggregator.format(val, format_argument);
             }
@@ -435,11 +471,8 @@ let initDRPivotTable = function($, window, document) {
             return resultsArr;
         } else {
             let tooMuch = false;
-            const show_more_than_thousand_rows = _.get(opts, 'chartOptions.table_options.show_more_than_thousand_rows', false);
-            if (pvtData &&
-                (pvtData.rowKeys.length > 1000 || pvtData.colKeys.length > 500) &&
-                (!opts.show_more_function_cols || !opts.show_more_function_cols) &&
-                !show_more_than_thousand_rows) {
+            if (pvtData && (pvtData.rowKeys.length > 1000 || pvtData.colKeys.length > 500) &&
+                (!opts.show_more_function_cols || !opts.show_more_function_cols)) {
                 pvtData.rowKeys = [];
                 pvtData.colKeys = [];
                 tooMuch = true;
@@ -451,11 +484,11 @@ let initDRPivotTable = function($, window, document) {
     }
 
     SubtotalRenderer = function(pivotData, opts, charttype, tooMuch = false, error_params) {
-        var addClass, allTotal, arrowCollapsed, arrowExpanded, buildColHeaderHeader, buildColHeaderHeaders, buildColHeaderHeadersClickEvents, buildColHeaders, buildColTotals, buildColTotalsHeader, buildGrandTotal, buildRowHeaderHeaders, buildRowHeaderHeadersClickEvents, buildRowHeaders, buildRowTotalsHeader, buildValues, classColCollapsed, classColExpanded, classColHide, classColShow, classCollapsed, classExpanded, classRowCollapsed, classRowExpanded, classRowHide, classRowShow, clickStatusCollapsed, clickStatusExpanded, colAttrs, colDisableAfter, colKeys, colTotals, collapseCol, collapseColsAt, collapseHideDescendantRow, collapseRow, collapseRowsAt, collapseShowColSubtotal, collapseShowRowSubtotal, applyInlineStyles, createElement, defaults, expandChildCol, expandChildRow, expandCol, expandColsAt, expandHideColSubtotal, expandHideRowSubtotal, expandRow, expandRowsAt, expandShowColSubtotal, expandShowRowSubtotal, getTableEventHandlers, hasClass, hideDescendantCol, isColDisable, isColDisableExpandCollapse, isColHideOnExpand, isRowDisable, isRowDisableExpandCollapse, isRowHideOnExpand, main, getSubtotalInBrackets, processKeys, encodeHtmlEntities, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, removeClass, replaceClass, rowAttrs, rowDisableAfter, rowKeys, rowTotals, setAttributes, showChildCol, showChildRow, toggleCol, toggleColHeaderHeader, toggleRow, toggleRowHeaderHeader, tree, subscribeToClick;
+        var addClass, allTotal, arrowCollapsed, arrowExpanded, buildColHeaderHeader, buildColHeaderHeaders, buildColHeaderHeadersClickEvents, buildColHeaders, buildColTotals, buildColTotalsHeader, buildGrandTotal, buildRowHeaderHeaders, buildRowHeaderHeadersClickEvents, buildRowHeaders, buildRowTotalsHeader, buildValues, classColCollapsed, classColExpanded, classColHide, classColShow, classCollapsed, classExpanded, classRowCollapsed, classRowExpanded, classRowHide, classRowShow, clickStatusCollapsed, clickStatusExpanded, colAttrs, colDisableAfter, colKeys, colTotals, collapseCol, collapseColsAt, collapseHideDescendantRow, collapseRow, collapseRowsAt, collapseShowColSubtotal, collapseShowRowSubtotal, applyInlineStyles, createElement, defaults, expandChildCol, expandChildRow, expandCol, expandColsAt, expandHideColSubtotal, expandHideRowSubtotal, expandRow, expandRowsAt, expandShowColSubtotal, expandShowRowSubtotal, getTableEventHandlers, hasClass, hideDescendantCol, isColDisable, isColDisableExpandCollapse, isColHideOnExpand, isRowDisable, isRowDisableExpandCollapse, isRowHideOnExpand, main, getSubtotalInBrackets, processKeys, encodeHtmlEntities, ref, ref1, ref2, ref3, ref4, ref5, ref6, ref7, removeClass, replaceClass, rowAttrs, rowDisableAfter, rowKeys, rowTotals, setAttributes, showChildCol, showChildRow, toggleCol, toggleColHeaderHeader, toggleRow, toggleRowHeaderHeader, tree, assumptionSubscribe;
         var createTotalValsBolder, createGrandTotalBolder, getHeaderColorProperties, colorizeRowLabelHeaders, colorizeTableIfNeed, valueNoDashes, getColorsWithOffsetForTable, offsetColors, handleFreezePanesScroll, selectFreezableElements, removeRowHeaderNullValue;
         var getAdditionalAggregation, buildAdditionalHeaderCols, buildAdditionalHeaderRows, buildAdditionalColValues, buildAdditionalRowValues, buildAdditionalRowTotals, buildAdditionalColTotals;
         var additionalFieldsCol, additionalFieldsRow, additionalFieldsList;
-        var getExistingAggregator;
+        var edit_assumptions, getExistingAggregator;
 
         var horizontalFreezePaneClass = opts.chartOptions.table_options.freeze_panes ? ' horizontal-freeze-pane' : '';
         var verticalFreezePaneClass = opts.chartOptions.table_options.freeze_panes ? ' vertical-freeze-pane' : '';
@@ -506,6 +539,7 @@ let initDRPivotTable = function($, window, document) {
         if(opts.chartOptions.table_options.start_collapsed_columns) {
             opts.collapseColsAt = 0;
         }
+        edit_assumptions = opts.chartOptions.edit_assumptions;
         isRowDisable = (ref = opts.rowSubtotalDisplay) != null ? ref.disableSubtotal : void 0;
         isRowHideOnExpand = (ref1 = opts.rowSubtotalDisplay) != null ? ref1.hideOnExpand : !opts.chartOptions.table_options.show_subtotals_for_rows;
         isRowDisableExpandCollapse = (ref2 = opts.rowSubtotalDisplay) != null ? ref2.disableExpandCollapse : void 0;
@@ -842,7 +876,7 @@ let initDRPivotTable = function($, window, document) {
             return string_val;
         };
 
-        processKeys = function(keysArr, className, dimention, attrs, formattedKeys) {
+        processKeys = function(keysArr, className, dimention, attrs) {
             for (let i = 0; i < keysArr.length; i++) {
                 const additionalField = _.find(additionalFieldsList, {key: keysArr[i][0]})
 
@@ -863,7 +897,7 @@ let initDRPivotTable = function($, window, document) {
                 lastCol = 0;
             }
             rMark = [];
-            th = createElement("th", className, valueNoDashes(encodeHtmlEntities(formattedKeys[0][0]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, 0, 0)));
+            th = createElement("th", className, valueNoDashes(encodeHtmlEntities(keysArr[0][0]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, 0, 0)));
             key = [];
             key.push(keysArr[0][0]);
             nodePos = 0;
@@ -883,7 +917,7 @@ let initDRPivotTable = function($, window, document) {
             rMark[0] = node;
             c = 1;
             while (c <= lastCol) {
-                th = createElement("th", className, valueNoDashes(encodeHtmlEntities(formattedKeys[0][c]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, 0, c)));
+                th = createElement("th", className, valueNoDashes(encodeHtmlEntities(keysArr[0][c]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, 0, c)));
                 key = key.slice();
                 key.push(keysArr[0][c]);
                 ++nodePos;
@@ -949,7 +983,7 @@ let initDRPivotTable = function($, window, document) {
                     }
 
 
-                    th = createElement("th", className, valueNoDashes(encodeHtmlEntities(formattedKeys[r][c]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, r, c)));
+                    th = createElement("th", className, valueNoDashes(encodeHtmlEntities(keysArr[r][c]) + getSubtotalInBrackets(keysArr, className, lastCol, lastRow, r, c)));
                     ++nodePos;
                     node = {
                         node: nodePos,
@@ -1536,7 +1570,7 @@ let initDRPivotTable = function($, window, document) {
                     if ((isRowSubtotal && (isRowHideOnExpand || isRowDisable || rowHeader.col > rowDisableAfter)) || (isColSubtotal && (isColHideOnExpand || isColDisable || colHeader.col > colDisableAfter))) {
                         td.style.display = "none";
                     }
-                    subscribeToClick(td, rowHeader, rowAttrs, colHeader, colAttrs, val);
+                    assumptionSubscribe(td, rowHeader, rowAttrs, colHeader, colAttrs, val);
 
                     tr.appendChild(td);
                 }
@@ -1574,7 +1608,7 @@ let initDRPivotTable = function($, window, document) {
                     td.style.display = "none";
                 }
 
-                subscribeToClick(td, rowHeader, rowAttrs, {key:[], flatKey:''}, colAttrs, val);
+                assumptionSubscribe(td, rowHeader, rowAttrs, {key:[], flatKey:''}, colAttrs, val);
 
                 if(opts.chartOptions.table_options.show_row_total)
                     tr.appendChild(td);
@@ -1584,7 +1618,43 @@ let initDRPivotTable = function($, window, document) {
             return results;
         };
 
-        subscribeToClick = function(td, rowHeader, rowAttrs, colHeader, colAttrs, val){
+        assumptionSubscribe = function(td, rowHeader, rowAttrs, colHeader, colAttrs, val){
+            if(edit_assumptions){
+                var filters = [];
+                var i=0;
+                var temp;
+                for(i=0; i<rowHeader.key.length; i++){
+                    temp = {
+                        name: rowAttrs[i],
+                        values: [rowHeader.key[i]],
+                        is_excluded:false
+                    }
+                    filters.push(temp);
+                }
+                for(i=0; i<colHeader.key.length; i++){
+                    temp = {
+                        name: colAttrs[i],
+                        values: [colHeader.key[i]],
+                        is_excluded:false
+                    }
+                    filters.push(temp);
+                }
+                var obj_to_send = {
+                    "flatColKey": colHeader.flatKey,
+                    "flatRowKey": rowHeader.flatKey,
+                    "val": val,
+                    "filters": filters
+                };
+
+                // td.addEventListener('dblclick', function(){
+                //     edit_assumptions.fn(obj_to_send, this);
+                // });
+
+                td.addEventListener('click', function(){
+                    edit_assumptions.fn(obj_to_send, this);
+                });
+            }
+
             if(opts.value_drill_down_fn){
                 td.classList.add('clickable');
                 td.addEventListener('click', function(rowKey, colKey, rowAttrs, colAttrs){
@@ -1645,7 +1715,7 @@ let initDRPivotTable = function($, window, document) {
                     td.style.display = "none";
                 }
 
-                subscribeToClick(td, {key:[], flatKey:''}, rowAttrs, h, colAttrs, val);
+                assumptionSubscribe(td, {key:[], flatKey:''}, rowAttrs, h, colAttrs, val);
 
                 results.push(tr.appendChild(td));
             }
@@ -1671,7 +1741,7 @@ let initDRPivotTable = function($, window, document) {
                 "data-value": val
             }, getTableEventHandlers(val, [], []));
             createTotalValsBolder(td);
-            subscribeToClick(td, {key:[], flatKey:''}, rowAttrs,  {key:[], flatKey:''}, colAttrs, val);
+            assumptionSubscribe(td, {key:[], flatKey:''}, rowAttrs,  {key:[], flatKey:''}, colAttrs, val);
 
             tr.appendChild(td);
             return result.appendChild(tr);
@@ -2337,7 +2407,7 @@ let initDRPivotTable = function($, window, document) {
             return Array.from(wrapper.querySelectorAll(selectString));
         }
 
-        main = function(rowAttrs, rowKeys, colAttrs, colKeys, pivotData) {
+        main = function(rowAttrs, rowKeys, colAttrs, colKeys) {
             var c,rowspan, colHeaderCols, colHeaderHeaders, colHeaders, h, k, l, len, len1, result, rowHeaderHeaders, rowHeaderRows, rowHeaders, tbody, thead, tr;
             rowHeaders = [];
             colHeaders = [];
@@ -2346,12 +2416,10 @@ let initDRPivotTable = function($, window, document) {
             colHeaderHeaders = [];
             colHeaderCols = [];
             if (rowAttrs.length > 0 && rowKeys.length > 0) {
-                const formattedKeys = pivotData.getFormattedRowKeys(rowKeys);
-                rowHeaders = processKeys(rowKeys, "pvtRowLabel", 'rows', rowAttrs, formattedKeys);
+                rowHeaders = processKeys(rowKeys, "pvtRowLabel", 'rows', rowAttrs);
             }
             if (colAttrs.length > 0 && colKeys.length > 0) {
-                const formattedKeys = pivotData.getFormattedColKeys(colKeys);
-                colHeaders = processKeys(colKeys, "pvtColLabel", 'cols', colAttrs, formattedKeys);
+                colHeaders = processKeys(colKeys, "pvtColLabel", 'cols', colAttrs);
             }
             var tableClasses = ['pvtTable'];
             if (opts.chartOptions.table_options.use_new_table_design) {
@@ -2496,7 +2564,7 @@ let initDRPivotTable = function($, window, document) {
 
             return wrapper;
         };
-        return main(rowAttrs, rowKeys, colAttrs, colKeys, pivotData);
+        return main(rowAttrs, rowKeys, colAttrs, colKeys);
     };
     // $.pivotUtilities.subtotal_renderers = SubtotalRenderer;
     $.pivotUtilities.subtotal_renderers = NovixRenderer;