@datarailsshared/dr_renderer 1.2.5 → 1.2.6

package/src/novix_renderer.js

@@ -376,14 +376,13 @@ let initNovixRenderer = function($, window, document, Handsontable){
                         //data columns
                         if (pvtData.colKeys.length > 0) {
 
-                            const formattedColKeys = pvtData.getFormattedColKeys(colKeys);
                             var aux = rowData.length;
                             var startCol = aux;
-                            var prior = formattedColKeys[0][nn];
+                            var prior = colKeys[0][nn];
                             var toMerge = 0;
-                            for (var cc = 0; cc < formattedColKeys.length; cc++) {
+                            for (var cc = 0; cc < colKeys.length; cc++) {
 
-                                var textHeader = formattedColKeys[cc][nn];
+                                var textHeader = colKeys[cc][nn];
 
                                 if (nn < pvtData.colAttrs.length - 1 && prior != textHeader) {
                                     rowData.push(textHeader);
@@ -457,9 +456,8 @@ let initNovixRenderer = function($, window, document, Handsontable){
                 // DATA
 
                 var mergeDic = {};
-                const formattedRowKeys = pvtData.getFormattedRowKeys(rowKeys);
 
-                for (var rr = 0; rr < formattedRowKeys.length; rr++) {
+                for (var rr = 0; rr < rowKeys.length; rr++) {
 
                     var rowData = [];
 
@@ -468,29 +466,29 @@ let initNovixRenderer = function($, window, document, Handsontable){
                             mergeDic[cc] = {
                                 toMerge: 1,
                                 row: 0,
-                                priorText: formattedRowKeys[rr][cc]
+                                priorText: rowKeys[rr][cc]
                             };
                         }
                     }
 
                     //column for row atts
                     for (var cc = 0; cc < pvtData.rowAttrs.length; cc++) {
-                        rowData.push(formattedRowKeys[rr][cc]);
-                        if (formattedRowKeys[rr][cc] === subtotal) {
+                        rowData.push(rowKeys[rr][cc]);
+                        if (rowKeys[rr][cc] === subtotal) {
                             addMergeCell(rr + pvtData.colAttrs.length + 1, cc, 1, dataSource.fixedColumns - cc, true, true);
-                        } else if (cc === formattedRowKeys[rr].length - 1 && hasColumnAttr) {
+                        } else if (cc === rowKeys[rr].length - 1 && hasColumnAttr) {
                             addMergeCell(rr + pvtData.colAttrs.length + 1, cc, 1, 2, true, true);
                         }
                         // merge cell (last column)
                         if (opts.chartOptions.table_options.show_column_total && rr != 0 && mergeDic[cc]) { // check for merge dic
-                            if (formattedRowKeys[rr][cc] == mergeDic[cc].priorText) {
+                            if (rowKeys[rr][cc] == mergeDic[cc].priorText) {
                                 mergeDic[cc].toMerge++;
-                            } else if (cc < formattedRowKeys[rr].length - 1) {
+                            } else if (cc < rowKeys[rr].length - 1) {
                                 //create merge cell for this column
                                 addMergeCell(mergeDic[cc].row + pvtData.colAttrs.length + 1, cc, mergeDic[cc].toMerge, 1);
                                 mergeDic[cc].row = rr;
                                 mergeDic[cc].toMerge = 1;
-                                mergeDic[cc].priorText = formattedRowKeys[rr][cc];
+                                mergeDic[cc].priorText = rowKeys[rr][cc];
                             }
                         }
                     }

package/src/pivottable.js

@@ -1,5 +1,3 @@
-const helpers = require('./dr-renderer-helpers');
-
 // from pivottable@2.23.0
 let initPivotTable = function($, window, document) {
     var indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
@@ -22,7 +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 = {
@@ -576,7 +577,6 @@ let initPivotTable = function($, window, document) {
         l_mapping = {};
         for (i in order) {
             x = order[i];
-            if (order[i] === null) x = '[null]';
             mapping[x] = i;
             if (typeof x === "string") {
                 l_mapping[x.toLowerCase()] = i;
@@ -668,7 +668,6 @@ let initPivotTable = function($, window, document) {
             this.getAggregator = bind(this.getAggregator, this);
             this.getRowKeys = bind(this.getRowKeys, this);
             this.getColKeys = bind(this.getColKeys, this);
-            this.getRowKeysByCols = bind(this.getRowKeysByCols, this);
             this.sortKeys = bind(this.sortKeys, this);
             this.arrSort = bind(this.arrSort, this);
             this.input = input;
@@ -685,34 +684,17 @@ let initPivotTable = function($, window, document) {
                 return true;
             });
             this.tree = {};
-
-            this.isKeysSortingDoneOnBackendSide = opts.keysObject && typeof opts.keysObject === 'object' && helpers.backendSortingKeysAreNotEmpty(opts.keysObject);
-            if (this.isKeysSortingDoneOnBackendSide) {
-                this.rowKeys = opts.keysObject.row_keys;
-                this.colKeys = opts.keysObject.col_keys;
-                this.rowKeysByCols = opts.keysObject.row_keys_by_cols;
-            } else {
-                this.rowKeys = [];
-                this.colKeys = [];
-            }
-
+            this.rowKeys = [];
+            this.colKeys = [];
             this.rowTotals = {};
             this.colTotals = {};
             this.allTotal = this.aggregator(this, [], []);
             this.sorted = false;
             this.dateValuesDictionary = opts.dateValuesDictionary;
-            this.sortByValueAttrs = opts.sortByValueAttrs || [];
-            this.colFormats = opts.colFormats || [];
-            this.rowFormats = opts.rowFormats || [];
-            this.isFormattingAxisLabels = opts.rendererOptions && opts.rendererOptions.isFormattingAxisLabels;
-            this.getFormattedColKeys = (keys) => opts.getFormattedColKeys(this, keys);
-            this.getFormattedRowKeys = (keys) => opts.getFormattedRowKeys(this, keys);
-            this.isDrillDownDisabled = opts.isDrillDownDisabled;
-
             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));
@@ -868,23 +850,15 @@ let initPivotTable = function($, window, document) {
         };
 
         PivotData.prototype.getColKeys = function() {
-            if (!this.isKeysSortingDoneOnBackendSide) {
-                this.sortKeys();
-            }
+            this.sortKeys();
             return this.colKeys;
         };
 
         PivotData.prototype.getRowKeys = function() {
-            if (!this.isKeysSortingDoneOnBackendSide) {
-                this.sortKeys();
-            }
+            this.sortKeys();
             return this.rowKeys;
         };
 
-        PivotData.prototype.getRowKeysByCols = function() {
-            return this.rowKeysByCols;
-        };
-
         PivotData.prototype.processRecord = function(record) {
             var colKey, flatColKey, flatRowKey, l, len1, len2, n, ref, ref1, ref2, ref3, rowKey, x;
             colKey = [];

package/src/published_items_renderer.js

@@ -4,7 +4,6 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
   this.scope = {};
   this.options = {};
   this.isScenarioMode = null;
-  this.settings = {};
 
   publishedItemsRenderer.formulaCellClicked = function (event, scope, options, window) {
     event.stopPropagation();
@@ -20,6 +19,7 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
   }
 
   publishedItemsRenderer.resizeTable = function (options, iframeWindow) {
+    options.alreadySetTimeout = null;
     const publish_item_image = iframeWindow.document.getElementById('publish_item_image');
     const table = iframeWindow.document.getElementsByTagName("table")[0];
     const body = iframeWindow.document.getElementsByTagName("body")[0];
@@ -31,23 +31,40 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     publishedItemsRenderer.resizePublishedImage(publish_item_image, iframeWindow, body);
   }
 
-  publishedItemsRenderer.zoomTable = function (iframeWindow, table, body) {
-    const bodyZoom = parseFloat(body.style.zoom) || 1;
-    const SCROLL_OFFSET = 16;
+  publishedItemsRenderer.zoomTable = function(iframeWindow, table, body) {
+    let body_zoom = body.style.zoom;
+    body_zoom = parseFloat(body_zoom) || 1;
 
-    const tableWidth = table.getBoundingClientRect().width * bodyZoom;
-    const tableHeight = table.getBoundingClientRect().height * bodyZoom;
-    const root = iframeWindow.document.documentElement;
+    let zoom = table.style.zoom;
+    zoom = parseFloat(zoom) || 1;
 
-    let requiredZoom = (root.clientWidth - SCROLL_OFFSET) / tableWidth;
-    if (this.settings.resizeTableUsingBothDimensions) {
-      requiredZoom = Math.min(requiredZoom, (root.clientHeight - SCROLL_OFFSET) / tableHeight);
-    }
+    const positionInfo = table.getBoundingClientRect();
+    let width = Math.ceil((positionInfo.width + iframeWindow.innerWidth - iframeWindow.document.body.offsetWidth) * zoom * body_zoom);
+
+    if (width < iframeWindow.innerWidth) {
+      zoom += 0.05;
 
-    table.style.zoom = requiredZoom;
-  };
+      width = Math.ceil((positionInfo.width + iframeWindow.innerWidth - iframeWindow.document.body.offsetWidth) * zoom * body_zoom);
+      if (width < iframeWindow.innerWidth) {
+        table.style.zoom = zoom;
+        setTimeout(function () {
+          publishedItemsRenderer.zoomTable(iframeWindow, table, body);
+        }, 10);
+      }
+    } else if (width >= iframeWindow.innerWidth) {
+      zoom -= 0.05;
+
+      width = Math.ceil((positionInfo.width + iframeWindow.innerWidth - iframeWindow.document.body.offsetWidth) * zoom * body_zoom);
+      table.style.zoom = zoom;
+      if (width >= iframeWindow.innerWidth) {
+        setTimeout(function () {
+          publishedItemsRenderer.zoomTable(iframeWindow, table, body);
+        }, 10);
+      }
+    }
+  }
 
-  publishedItemsRenderer.resizePublishedImage = function (publish_item_image, iframeWindow, body) {
+  publishedItemsRenderer.resizePublishedImage = function(publish_item_image, iframeWindow, body) {
     if (!publish_item_image) return;
 
     let body_zoom = body.style.zoom;
@@ -90,7 +107,11 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     if (!options.responsive) {
       publishedItemsRenderer.resetTableZoom(document);
     } else {
-      publishedItemsRenderer.resizeTable(options, iframeWindow);
+      if (!options.alreadySetTimeout) {
+        options.alreadySetTimeout = setTimeout(function () {
+          publishedItemsRenderer.resizeTable(options, iframeWindow);
+        }, 100);
+      }
     }
   }
 
@@ -196,7 +217,7 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
           const format = inputMetaData.format ? inputMetaData.format.toUpperCase() : 'MM/DD/YYYY';
           const formattedDate = formatValue('d', format, inputMetaData.value).value
           if (_this.isScenarioMode) {
-            dateEl.innerHTML = '<label class="value dateInput" style="background: #FFEDBF;padding: 2px 1px 2px 6px;border: 1px solid #FABC5F;border-radius: 6px;cursor:pointer;">' + formattedDate + '</label>';
+             dateEl.innerHTML = '<label class="value dateInput" style="background: #FFEDBF;padding: 2px 1px 2px 6px;border: 1px solid #FABC5F;border-radius: 6px;cursor:pointer;">' + formattedDate + '</label>';
           } else {
             dateEl.innerHTML = '<label class="value dateInput" style="cursor: pointer;">' + formattedDate + '</label>';
           }
@@ -302,19 +323,20 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
   }
 
   publishedItemsRenderer.addEventListeners = function (document, iframeWindow, scope, options) {
-    let resizeTimeout;
-    const handleDimensionChange = () => {
-      if (resizeTimeout) {
-        cancelAnimationFrame(resizeTimeout);
+    document.addEventListener("DOMContentLoaded", function () {
+      if (!options.alreadySetTimeout) {
+        options.alreadySetTimeout = setTimeout(function () {
+          publishedItemsRenderer.resizeTable(options, iframeWindow);
+        }, 50);
       }
-
-      resizeTimeout = requestAnimationFrame(() => {
-        publishedItemsRenderer.resizeTable(iframeWindow.__options__, iframeWindow);
-      });
-    }
-
-    document.addEventListener("DOMContentLoaded", handleDimensionChange);
-    iframeWindow.addEventListener("resize", handleDimensionChange);
+    });
+    iframeWindow.addEventListener("resize", function () {
+      if (!options.alreadySetTimeout) {
+        options.alreadySetTimeout = setTimeout(function () {
+          publishedItemsRenderer.resizeTable(iframeWindow.__options__, iframeWindow);
+        }, 100);
+      }
+    });
 
     // Add click event to cell with formula
     let all_a_hrefs = document.querySelectorAll('td a[location_id]');
@@ -350,7 +372,7 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
     }, 500);
   }
 
-  publishedItemsRenderer.applyInitDocumentStyles = function (document, iframeWindow) {
+  publishedItemsRenderer.applyInitDocumentStyles = function(document, iframeWindow) {
     const table = document.getElementsByTagName('table')[0];
     if (table) {
       table.style.overflow = 'hidden';