@datarailsshared/dr_renderer 1.2.60 → 1.2.64

package/package.json

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

package/src/dr_pivottable.js

@@ -146,7 +146,7 @@ let initDRPivotTable = function($, window, document) {
         DRPivotData.prototype.processRecord = function(record, useTotalsCalculation) {
             if (useTotalsCalculation) {
                 if (!this.notFirst) {
-                    this.keysLength = Object.keys(record).length - 1;
+                    this.keysLength = _.keys(record).length - 1;
                     this.notFirst = true;
                 }
                 let getRowAggregator = (function(_this) {
@@ -213,9 +213,9 @@ let initDRPivotTable = function($, window, document) {
             var colKey, fColKey, fRowKey, flatColKey, flatRowKey, i, j, k, m, n, ref, results, rowKey;
             rowKey = [];
             colKey = [];
-            const recordValues = Object.values(record);
-            const containsAverage = recordValues.includes('DR_Average');
-            const containsOthers = recordValues.includes('DR_Others');
+            const recordValues = _.values(record);
+            const containsAverage = _.includes(recordValues, 'DR_Average');
+            const containsOthers = _.includes(recordValues, 'DR_Others');
             if (!containsAverage && !containsOthers) {
                 this.allTotal.push(record);
             }
@@ -2115,7 +2115,7 @@ let initDRPivotTable = function($, window, document) {
         };
 
         selectFreezableElements = function(wrapper) {
-            const selectString =_.map(Object.values(elementToTransform), function (item) {
+            const selectString =_.map(_.values(elementToTransform), function (item) {
                 return `.${item.replace(' ', '')}`;
             }).join(',');
             return Array.from(wrapper.querySelectorAll(selectString));

package/src/highcharts_renderer.js

@@ -4,7 +4,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     let useNewUx = false;
     let useTotalsCalculation = false;
     if (document.ReportHippo && document.ReportHippo && document.ReportHippo.user) {
-        useTotalsCalculation = _.includes(document.ReportHippo.user.features, 'enable_server_totals_calculation');
+        useTotalsCalculation = lodash.includes(document.ReportHippo.user.features, 'enable_server_totals_calculation');
         useNewUx = document.ReportHippo.user.organization && document.ReportHippo.user.organization.settings && document.ReportHippo.user.organization.settings.use_new_ux;
     }
     const textColor = "#151a41";
@@ -1020,13 +1020,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (lodash.isArray(columnKey)) {
                     totalKey = totalKey.join(' , ');
                 }
-                newSeries.data.push(pivotData.colTotals[totalKey].sum);
+                const value = pivotData.colTotals[totalKey] ? pivotData.colTotals[totalKey].value() : 0;
+                newSeries.data.push(value);
             })
 
             chart_series.push(newSeries);
         }
 
-        chart_series = [...chart_series, ...trendSerieses]
+        chart_series = chart_series.concat(trendSerieses);
 
         highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts, opts.total && opts.totalSeriesSettings && opts.totalSeriesSettings.secondaryAxis);
 
@@ -1153,7 +1154,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
         let weights = { line: 2,spline: 3 ,area:-2, areaspline: -1, scatter:4, column: 1 };
 
-        if (opts.comboOptions && chartType.includes('combo') && !lodash.isEqual(row_n_keys, [[]])) {
+        if (opts.comboOptions && lodash.includes(chartType,'combo') && !lodash.isEqual(row_n_keys, [[]])) {
             chart_series.forEach((series, seriesIndex) => {
                 const savedSeriesOption = lodash.find(opts.comboOptions.seriesOptions, {series: series.name});
                 if (savedSeriesOption) {
@@ -1175,14 +1176,19 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         if (opts.total) {
             const totalSeries = lodash.clone(ethalonSeries);
             if (opts.totalSeriesSettings) {
-                if (chartType.includes('combo')) {
+                if (lodash.includes(chartType, 'combo')) {
                     highchartsRenderer.setChartTypeBySeriesType(opts.totalSeriesSettings.chartType, totalSeries);
                 }
 
                 totalSeries.yAxis = opts.totalSeriesSettings.secondaryAxis ? 1 : undefined;
-            } else if (chartType === 'combo-column-chart' || chartType === 'combo-stacked-chart') {
-                totalSeries.type = 'column';
+            } else if (lodash.includes(chartType,'combo')) {
+                if (has_delta) {
+                    totalSeries.type = 'column';
+                } else {
+                    totalSeries.type = 'line';
+                }
             }
+
             totalSeries.name = 'Total';
             totalSeries.data = [];
             col_n_keys.forEach(columnKey => {
@@ -1192,13 +1198,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                     key = columnKey[0];
                     totalKey = totalKey.join(' , ');
                 }
-                totalSeries.data.push({name: lodash.unescape(key), y: pivotData.colTotals[totalKey].sum});
+                const value = pivotData.colTotals[totalKey] ? pivotData.colTotals[totalKey].value() : 0;
+                totalSeries.data.push({name: lodash.unescape(key), y: value});
             });
 
             chart_series.push(totalSeries);
         }
 
-        chart_series = [...chart_series, ...trendSerieses];
+        chart_series = chart_series.concat(trendSerieses);
 
         highchartsRenderer.moveSeriesToSecondYAxisIfNeeded(chart_series, pivotData, chartOptions, additionOptions, opts, opts.total && opts.totalSeriesSettings && opts.totalSeriesSettings.secondaryAxis);
 
@@ -3021,13 +3028,13 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.ignoreIfCalculatedValue = function(data, rowKey, colKey, record, associatedFields, renderOptions, isGraph) {
         var eliminate = renderOptions && renderOptions.chartOptions && renderOptions.chartOptions.table_options &&
-            renderOptions.chartOptions.table_options.eliminate_calc_totals && !_.isEmpty(associatedFields) && !isGraph;
+            renderOptions.chartOptions.table_options.eliminate_calc_totals && !lodash.isEmpty(associatedFields) && !isGraph;
         let ignore = false;
 
         if (eliminate && !(data.colAttrs.length === colKey.length && data.rowAttrs.length === rowKey.length)) {
-            const keys = Object.keys(associatedFields);
-            _.forEach(keys, key => {
-                if (~_.indexOf(associatedFields[key], record[key]) || ~_.indexOf(associatedFields[key], record['DR_Values'])) {
+            const keys = lodash.keys(associatedFields);
+            lodash.forEach(keys, key => {
+                if (~lodash.indexOf(associatedFields[key], record[key]) || ~lodash.indexOf(associatedFields[key], record['DR_Values'])) {
                     ignore = true;
                 }
             });
@@ -4124,14 +4131,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             formats: {},
             associated_fields: {},
         };
-        _.forEach(widget.calculated_values, item => {
+        lodash.forEach(widget.calculated_values, item => {
             calculated_values_info.formats[item.name] = item.format
 
             let fieldName = item.field_name;
 
             if (!fieldName) {
-                const sourceArr = _.concat(widget.cols, widget.rows);
-                const filed = _.find(sourceArr, {id: item.field})
+                const sourceArr = lodash.concat(widget.cols, widget.rows);
+                const filed = lodash.find(sourceArr, {id: item.field})
                 fieldName = filed ? filed.name : '';
             }
 
@@ -4421,7 +4428,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
     };
 
     highchartsRenderer.updateBackwardCompatibleWidgetOptions = function(options, type) {
-        if (_.get(options, 'chartOptions.chart.hideLegends', false)) {
+        if (lodash.get(options, 'chartOptions.chart.hideLegends', false)) {
             options.chartOptions.legends_position = { value: 'none' };
             delete options.chartOptions.chart.hideLegends;
         }
@@ -5003,7 +5010,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         return valToReturn;
     };
 
-    highchartsRenderer.widgetPlaceholders = Object.assign({}, $.pivotUtilities.errorHandling.placeholders);
+    highchartsRenderer.widgetPlaceholders = lodash.assign({}, $.pivotUtilities.errorHandling.placeholders);
 
     highchartsRenderer.suboptions = {
         'default_show': {
@@ -7147,7 +7154,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 return data_row[field_with_variant.name] == variance_config.name && data_row[field_for_sorting.name] != undefined;
             });
 
-            const sorting_variance = widget.options.total_value_options.sorting_variance === '' ? 'asc' : 'desc';
+            const sorting_variance = widget.options.total_value_options && widget.options.total_value_options.sorting_variance === '' ? 'asc' : 'desc';
 
             if (widget.options.chartOptions.delta_column.sort_by_absolute_variance) {
                 data_sorted = lodash.sortBy(data_sorted, function (o) {

package/src/novix_renderer.js

@@ -108,7 +108,7 @@ let initNovixRenderer = function($, window, document, Handsontable){
                     visibility: 'hidden',
                 };
                 let td = document.createElement('td');
-                for (let [key, value] of Object.entries(tdStyles)) {
+                for (let [key, value] of _.entries(tdStyles)) {
                     td.style[key] = value;
                 };
                 td.innerHTML = item.str;