@datarailsshared/dr_renderer 1.2.294 → 1.2.296

package/package.json

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

package/src/highcharts_renderer.js

@@ -171,10 +171,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     }
     lodash.assign(highchartsRenderer, HIGHCHARTS_CONSTANTS);
 
-    let useTotalsCalculation = false;
+    highchartsRenderer.useTotalsCalculation = false;
     let disableAnimation = false;
     if (document.ReportHippo && document.ReportHippo && document.ReportHippo.user) {
-        useTotalsCalculation = lodash.includes(document.ReportHippo.user.features, 'enable_server_totals_calculation');
+        highchartsRenderer.useTotalsCalculation = lodash.includes(document.ReportHippo.user.features, 'enable_server_totals_calculation');
         disableAnimation = document.ReportHippo.user.organization && document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.disable_animation
     }
 
@@ -687,8 +687,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         stickOnContact: true,
         hideDelay: 1500,
         formatter: function () {
-            const rowKey = pivotData.rowAttrs.length ? _.get(this.point, 'series.name') || "" : "";
-            const colKey = _.get(this.point, 'name') || this.x.name[0] || "";
+            const rowKey = pivotData.rowAttrs.length ? lodash.get(this.point, 'series.name') || "" : "";
+            const colKey = lodash.get(this.point, 'name') || this.x.name[0] || "";
             const insight = pivotData.getInsight(colKey, rowKey) || {};
             setTimeout(() => {
                 var aggr = highchartsRenderer.defaultFormatterToTooltip(pivotData, opts);
@@ -1598,7 +1598,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (value.trend === 'total') {
                 keys = value.key;
             } else {
-                _.forEach(value.key, (item) => {
+                lodash.forEach(value.key, (item) => {
                     const findKeyByValue = lodash.find(
                         Object.keys(pivotData.dateValuesDictionary || {}),
                         key => pivotData.dateValuesDictionary[key] === item
@@ -3579,7 +3579,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         chartOptions.legend.useHTML = true;
         chartOptions.legend.labelFormatter = function() {
             const name = this.name;
-            const findTotal = _.find(this.options.data, {isTotal: true});
+            const findTotal = lodash.find(this.options.data, {isTotal: true});
             const color = lodash.get(findTotal, 'color') ? findTotal.color : this.color;
             return `<span style="margin: 5px; vertical-align: middle; display:inline-block; background-color: ${color};
                         width: 12px; height: 12px; border-radius: 50%"></span>
@@ -3699,7 +3699,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             chartOptions.legend.useHTML = true;
             chartOptions.legend.labelFormatter = function() {
                 const name = this.options.className ? 'Total': this.name;
-                const findTotal = _.find(this.options.data, {isTotal: true});
+                const findTotal = lodash.find(this.options.data, {isTotal: true});
                 const color = lodash.get(findTotal, 'color') ? findTotal.color : this.color;
                 return '<span style="margin: 5px; vertical-align: middle; display:inline-block; background-color: '+ color + '; width: 12px; height: 12px; border-radius: 50%"></span><span style="color: #000; display: inline-block; margin: 5px; vertical-align: middle;">' + name + '</span>';
             }
@@ -3883,7 +3883,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         this.ignoreValue = true;
                     }
 
-                    if (useTotalsCalculation && !isNaN(parseFloat(record[attr]))) {
+                    if (highchartsRenderer.useTotalsCalculation && !isNaN(parseFloat(record[attr]))) {
                         return this.sum = parseFloat(record[attr]);
                     } else if (!isNaN(parseFloat(record[attr]))) {
                         return this.sum += parseFloat(record[attr]);
@@ -4037,7 +4037,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             this.ignoreValue = true;
                         }
 
-                        if (useTotalsCalculation) {
+                        if (highchartsRenderer.useTotalsCalculation) {
                             return this.sum = val;
                         } else {
                             return this.sum += val;
@@ -4125,7 +4125,7 @@ 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 (useTotalsCalculation) {
+                        if (highchartsRenderer.useTotalsCalculation) {
                             return this.val = x;
                         } else {
                             return this.val = Math.min(x, (ref = this.val) != null ? ref : x);
@@ -4212,11 +4212,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             this.ignoreValue = true;
                         }
 
-                        if (useTotalsCalculation) {
+                        if (highchartsRenderer.useTotalsCalculation) {
                             return this.val = x;
                         } else {
-                            return this.val = Math.min(x, (ref = this.val) != null ? ref : x);
-                        }                    }
+                            return this.val = Math.max(x, (ref = this.val) != null ? ref : x);
+                        }
+                    }
                 },
                 value: function () {
                     if (this.ignoreValue) {
@@ -4300,7 +4301,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                         }
 
 
-                        if (useTotalsCalculation) {
+                        if (highchartsRenderer.useTotalsCalculation) {
                             this.sum = parseFloat(x);
                         } else {
                             this.sum += parseFloat(x);
@@ -4313,7 +4314,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     if (this.ignoreValue) {
                         return null;
                     }
-                    if (useTotalsCalculation) {
+                    if (highchartsRenderer.useTotalsCalculation) {
                         return this.sum;
                     }
                     return this.sum / this.len;
@@ -4935,7 +4936,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             }
 
             if (typeof (value) != 'number') {
-                const drAdditionalField = _.find($.pivotUtilities.additionalFieldsList, {key: value});
+                const drAdditionalField = lodash.find($.pivotUtilities.additionalFieldsList, {key: value});
                 if (drAdditionalField && drAdditionalField.key)
                     return drAdditionalField.key;
 
@@ -8044,8 +8045,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                   };
             }
         } else {
-            if (fieldFilter && fieldFilter.type && fieldFilter.type === 'Date'
-                && fieldFilter.datetypevalues && fieldFilter.datetypevalues) {
+            if (fieldFilter && fieldFilter.type && fieldFilter.type === 'Date' && fieldFilter.datetypevalues) {
                 if (fieldFilter.datetypevalues.datetype === "frame") {
                     displayname += ` (${fieldFilter.datetypevalues.val.timeframe})`;
                 } else if (fieldFilter.datetypevalues.datetype === "range") {
@@ -8057,7 +8057,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     // range timestamps currently are set presupposing that user selects UTC dates,
                     // that is why for consistency we also should show in filters values which user selected
                     // and not local dates, that can differ
-                    _.forEach(Object.keys(dates), key => {
+                    lodash.forEach(Object.keys(dates), key => {
                         const dateConfiguration = dates[key];
                         const timestamp = dateConfiguration.timestamp;
                         if (timestamp) {
@@ -8123,7 +8123,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     highchartsRenderer.getDashboardOverrideValues = function (data_model, graph, local_current_dashboard) {
         let overrideValues = [];
 
-        if (!local_current_dashboard == undefined) {
+        if (!local_current_dashboard) {
             local_current_dashboard = data_model.current_dashboard;
         }
 
@@ -8199,11 +8199,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             local_current_dashboard = data_model.current_dashboard;
         }
 
-        if (local_current_dashboard.date_tags.length > 0) {
+        if (local_current_dashboard.date_tags && local_current_dashboard.date_tags.length > 0) {
             return 'date_tags';
         }
 
-        if (local_current_dashboard.plan_tags.length > 0) {
+        if (local_current_dashboard.plan_tags && local_current_dashboard.plan_tags.length > 0) {
             return 'plan_tags';
         }
     };
@@ -8229,7 +8229,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.getDashboardApplyScenarios = function (data_model, graph, local_current_dashboard) {
-        if (!local_current_dashboard == undefined) {
+        if (local_current_dashboard == undefined) {
             local_current_dashboard = data_model.current_dashboard;
         }
 
@@ -8255,7 +8255,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.isDate = function (date) {
-        return ((new Date(date) !== "Invalid Date" && !isNaN(new Date(date))));
+        return new Date(date) !== "Invalid Date" && !isNaN(new Date(date));
     };
 
     highchartsRenderer.isDateFormat = function (datestr, format) {
@@ -8263,7 +8263,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.containsIgnoreCase = function (str, it) {
-        return str.toLowerCase().indexOf(it) != -1;
+        return str.toLowerCase().indexOf(it.toLowerCase()) != -1;
     };
 
     highchartsRenderer.createDateTypeFromValue = function (fieldnametoFilter, format, colName) {
@@ -8630,7 +8630,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.setNewFieldNames = function (res) {
-        if (useTotalsCalculation) {
+        if (highchartsRenderer.useTotalsCalculation) {
             return res;
         }
 
@@ -9099,7 +9099,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.getDateFieldFormat = function(widget, dateField) {
         const aggregationConfig = widget.options && widget.options.date_aggregation_configs
-            ? _.find(widget.options.date_aggregation_configs, { field_id: dateField.id })
+            ? lodash.find(widget.options.date_aggregation_configs, { field_id: dateField.id })
             : null;
 
         if (aggregationConfig && aggregationConfig.aggregate_by && aggregationConfig.is_formatting_by_aggregation_method) {
@@ -9173,7 +9173,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 rowData.splice(rowIndex, 1);
             } else {
                 const totalRow = {};
-                _.forEach(categoryFields, (field, fieldKey) => {
+                lodash.forEach(categoryFields, (field, fieldKey) => {
                     totalRow[field.name] = value.key[fieldKey];
                 });
                 totalRow[valueField.name] = sum;
@@ -9231,7 +9231,6 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         });
     }
 
-
     highchartsRenderer.getFiscalYearMonthModifier = function() {
         return lodash.get(document, 'ReportHippo.user.organization.fiscal_year_starts_from', 1) - 1;
     }