@datarailsshared/dr_renderer 1.2.58 → 1.2.62

package/package.json

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

package/src/dr_pivottable.js

@@ -113,7 +113,7 @@ let initDRPivotTable = function($, window, document) {
             };
         };
 
-        processKey = function(record, totals, keys, attrs, getAggregator) {
+        processKey = function(record, totals, keys, attrs, containsAverage, containsOthers, getAggregator) {
             var addKey, attr, flatKey, k, key, len, ref;
             key = [];
             addKey = false;
@@ -125,7 +125,17 @@ let initDRPivotTable = function($, window, document) {
                     totals[flatKey] = getAggregator(key.slice());
                     addKey = true;
                 }
-                totals[flatKey].push(record);
+
+                if (containsAverage || containsOthers) {
+                    if (containsAverage && key[0] === 'DR_Average') {
+                        totals[flatKey].push(record);
+                    }
+                    if (containsOthers && key[0] === 'DR_Others') {
+                        totals[flatKey].push(record);
+                    }
+                } else {
+                    totals[flatKey].push(record);
+                }
             }
             if (addKey) {
                 keys.push(key);
@@ -203,13 +213,18 @@ let initDRPivotTable = function($, window, document) {
             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) {
+            const recordValues = Object.values(record);
+            const containsAverage = recordValues.includes('DR_Average');
+            const containsOthers = recordValues.includes('DR_Others');
+            if (!containsAverage && !containsOthers) {
+                this.allTotal.push(record);
+            }
+            rowKey = processKey(record, this.rowTotals, this.rowKeys, this.rowAttrs, containsAverage, containsOthers,  (function(_this) {
                 return function(key) {
                     return _this.aggregator(_this, key, []);
                 };
             })(this));
-            colKey = processKey(record, this.colTotals, this.colKeys, this.colAttrs, (function(_this) {
+            colKey = processKey(record, this.colTotals, this.colKeys, this.colAttrs, containsAverage, containsOthers, (function(_this) {
                 return function(key) {
                     return _this.aggregator(_this, [], key);
                 };
@@ -1194,6 +1209,9 @@ let initDRPivotTable = function($, window, document) {
             if (opts.chartOptions.table_options.hide_nulls_in_headers) {
                 th.textContent = th.textContent.replace('[null]', '');
             }
+            if (th.textContent === 'DR Others') {
+                th.textContent = _.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others'
+            }
 
             if (th.hasAttribute('data_show_more') && th.colSpan > 0 && !hasColLabels) {
                 th.colSpan = th.colSpan - 1;

package/src/highcharts_renderer.js

@@ -917,8 +917,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             let xySum = 0;
             let squareXSum = 0;
             ob.data = [];
-            if (row_n_value && row_n_value.length > 0)
-                ob.name = row_n_value.join(highchartsRenderer.delimer);
+            if (row_n_value && row_n_value.length > 0) {
+                let othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
+                ob.name = row_n_value.join(highchartsRenderer.delimer).replace('DR_Others', othersName);
+            }
 
             lodash.forEach(col_n_keys, function (col_n_value, index) {
                 var agg = pivotData.getAggregator(row_n_value, col_n_value);
@@ -1056,8 +1058,10 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             let squareXSum = 0;
             var ob = {};
             ob.data = [];
-            if (row_n_value && row_n_value.length > 0)
-                ob.name = lodash.unescape(row_n_value.join(highchartsRenderer.delimer));
+            if (row_n_value && row_n_value.length > 0) {
+                let othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
+                ob.name = lodash.unescape(row_n_value.join(highchartsRenderer.delimer).replace('DR_Others', othersName));
+            }
 
             ob.dataLabels = {
                 allowOverlap: additionOptions && additionOptions.label ? additionOptions.label.overlap : false,
@@ -1176,6 +1180,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 }
 
                 totalSeries.yAxis = opts.totalSeriesSettings.secondaryAxis ? 1 : undefined;
+            } else if (chartType === 'combo-column-chart' || chartType === 'combo-stacked-chart') {
+                totalSeries.type = 'column';
             }
             totalSeries.name = 'Total';
             totalSeries.data = [];
@@ -4997,7 +5003,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': {
@@ -7141,7 +7147,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) {