@datarailsshared/dr_renderer 1.2.42-beta → 1.2.44-beta

package/package.json

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

package/src/dataformatter.js

@@ -1003,6 +1003,10 @@ var DataFormatterImpl = function () {
 
                 // Call function
                 result = this.memoized[pattern].call(this, n, type);
+
+                if (result.value === result.pattern) {
+                    result.value = n;
+                }
             }
             catch (e) {
 

package/src/dr_pivottable.js

@@ -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) {
+                keys.push(key);
+            }
+            return key;
+        };
+
+        DRPivotData.prototype.processRecord = function(record, isUserHasPermission) {
             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 (isUserHasPermission) {
+                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 === 1) {
+                    this.rowTotals[rowKey[0]].push(record);
+                    this.rowTotals[rowKey[0]].isChangeable = true;
+                }
+                if (!rowKey.length && colKey.length === 1) {
+                    this.colTotals[colKey[0]].push(record);
+                    this.colTotals[colKey[0]].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) {
@@ -384,6 +438,7 @@ let initDRPivotTable = function($, window, document) {
                 pvtData.rowKeys = [];
                 pvtData.colKeys = [];
                 tooMuch = true;
+                opts.error_has_occurred = true;
             }
             return SubtotalRenderer(pvtData, opts, charttype, tooMuch);
         }
@@ -2001,6 +2056,8 @@ let initDRPivotTable = function($, window, document) {
 
         handleFreezePanesScroll = function(freezableElements) {
             return function(event) {
+                if (event.target.dataset.canFreezePanes) return;
+
                 const wrapper = event.target;
 
                 const translateY = `translate(0px, ${wrapper.scrollTop}px)`;

package/src/highcharts_renderer.js

@@ -822,6 +822,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             result = highchartsRenderer.getNoDataResult(chartOptions);
         } else if (!chartOptions.onlyText && chartOptions.series && toMatch) {
             result = highchartsRenderer.getNoDataResult(chartOptions, toMatch);
+            opts.error_has_occurred = true;
         } else {
             chartOptions = highchartsRenderer.updateChartOptions(chartOptions, opts);
             chartOptions = highchartsRenderer.updateChartOptions(chartOptions, {credits: {enabled: false}});
@@ -2547,7 +2548,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 style = {};
             }
         }
+
+        if(typeof style !== 'object' || style === null){
+            style = {};
+        }
+
         style.fontWeight = useNewUx ? 'normal' : 'bold';
+
         return style;
     }
 
@@ -2984,6 +2991,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) {
@@ -3016,7 +3024,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             this.ignoreValue = true;
                         }
 
-                        return this.sum += val;
+                        if (data.isUserHasPermission) {
+                            return this.sum = val;
+                        } else {
+                            return this.sum += val;
+                        }
                     } else {
                         return this.sum = NaN;
                     }
@@ -3459,6 +3471,30 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         filter = (a) => a > bottomx;
                 }
                 break;
+            case "filter_smallest":
+                const smallest_sumOfFields = lodash.reduce(totals, (acc, curr) => acc += curr.sum, 0);
+                const smallest = Math.floor((smallest_sumOfFields * vals[0])/100);
+
+                if (is_absolute)
+                    filter = (a) =>  Math.abs(a) > smallest;
+                else
+                    filter = (a) =>  a > smallest;
+                break;
+            case "filter_largest":
+                const largest_sumOfFields = lodash.reduce(totals, (acc, curr) => acc += curr.sum, 0);
+                const largest = Math.floor((largest_sumOfFields * vals[0])/100);
+
+                if (is_absolute)
+                    filter = (a) =>  Math.abs(a) < largest;
+                else
+                    filter = (a) =>  a < largest;
+                break;
+            case "filter_out_zero":
+                if (is_absolute)
+                    filter = (a) =>  Math.abs(a) == 0;
+                else
+                    filter = (a) =>  a == 0;
+                break;
             default:
 
         }
@@ -3709,6 +3745,30 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return to_return;
     };
 
+    highchartsRenderer.checkFreezePanesAvaliable = function (pivotView) {
+        if (!pivotView || !pivotView.querySelector) {
+            return;
+        }
+
+        const tableContainer = pivotView.querySelector('.pivot-div');
+        const tableHead = pivotView.querySelector('table.pvtTable thead');
+        const tableHeadChildren = tableHead ? tableHead.children[0] : null;
+        const trChildren = tableHeadChildren ? tableHeadChildren.children : [];
+        let thWidth = 0;
+
+        for (let th of trChildren) {
+            if (th.classList.contains('axis-freeze-pane') || th.classList.contains('horizontal-freeze-pane')) {
+                thWidth += th.offsetWidth;
+            }
+        }
+
+        if (thWidth >= tableContainer.offsetWidth) {
+            tableContainer.dataset.canFreezePanes = 'false';
+        } else if (thWidth < tableContainer.offsetWidth &&  tableContainer.dataset.canFreezePanes) {
+            delete tableContainer.dataset.canFreezePanes;
+        }
+    };
+
     highchartsRenderer.rhPivotView = function (rowData, options, isTable = false) {
         if (!rowData || !rowData) {
             if (options.onlyOptions) {
@@ -4168,7 +4228,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             options.chartOptions.legends_position = { value: 'none' };
             delete options.chartOptions.chart.hideLegends;
         }
-        if (['pie-chart', 'pie-chart-drilldown'].includes(type)) {
+        if (lodash.includes(['pie-chart', 'pie-chart-drilldown'], type)) {
             if (options.chartOptions && options.chartOptions.label) {
                 if (options.chartOptions.label.only_value) {
                     options.chartOptions.label.show_percentage_in_labels = false;
@@ -6579,7 +6639,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         const isCustomSorting = widget.options.sortingFields && Array.isArray(widget.options.sortingFields) && widget.options.sortingFields.length > 0;
         if (isCustomSorting) {
             lodash.forEach(datesFields, function (field) {
-                const fieldToSort = widget.options.sortingFields.find(element => element.id === field.id);
+                const fieldToSort = lodash.find(widget.options.sortingFields, element => element.id === field.id);
                 field.sorting = fieldToSort ? fieldToSort.sorting : field.sorting;
             });
         }
@@ -6626,7 +6686,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         if (isCustomSorting) {
             lodash.forEach(rowsAndCols, function (field) {
-                const fieldToSort = widget.options.sortingFields.find(element => element.id === field.id);
+                const fieldToSort = lodash.find(widget.options.sortingFields, element => element.id === field.id);
                 field.sorting = fieldToSort ? fieldToSort.sorting : field.sorting;
             });
         }

package/src/pivottable.js

@@ -626,6 +626,7 @@ let initPivotTable = function($, window, document) {
             this.sortKeys = bind(this.sortKeys, this);
             this.arrSort = bind(this.arrSort, this);
             this.input = input;
+            this.isUserHasPermission = opts.userHasPermission;
             this.aggregator = (ref = opts.aggregator) != null ? ref : aggregatorTemplates.count()();
             this.aggregatorName = (ref1 = opts.aggregatorName) != null ? ref1 : "Count";
             this.colAttrs = (ref2 = opts.cols) != null ? ref2 : [];
@@ -648,7 +649,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, _this.isUserHasPermission);
                     }
                 };
             })(this));
@@ -1821,4 +1822,4 @@ let initPivotTable = function($, window, document) {
     };
 };
 
-module.exports = initPivotTable;
+module.exports = initPivotTable;

package/src/published_items_renderer.js

@@ -15,9 +15,9 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
 
   publishedItemsRenderer.resizeTable = function (options, window) {
     options.alreadySetTimeout = null;
-    const publish_item_image = document.getElementById('publish_item_image');
-    const table = document.getElementsByTagName("table")[0];
-    const body = document.getElementsByTagName("body")[0];
+    const publish_item_image = window.document.getElementById('publish_item_image');
+    const table = window.document.getElementsByTagName("table")[0];
+    const body = window.document.getElementsByTagName("body")[0];
     let body_zoom = body.style.zoom;
     body_zoom = parseFloat(body_zoom);
 
@@ -190,7 +190,7 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
           break;
         case "dateInput":
           let dateEl = document.createElement("DIV");
-          const format = inputMetaData.format || 'mm/dd/yyyy';
+          const format = inputMetaData.format ? inputMetaData.format.toUpperCase() : 'MM/DD/YYYY';
           const formattedDate = formatValue('d', format, inputMetaData.value).value
           dateEl.innerHTML = '<label class="value" style="cursor: pointer;">' + formattedDate + '</label>';
           tdElement.appendChild(dateEl);
@@ -305,4 +305,4 @@ let getPublishedItemsRenderer = function (publishedItemsRenderer) {
   }
 }
 
-module.exports = getPublishedItemsRenderer;
+module.exports = getPublishedItemsRenderer;