@datarailsshared/dr_renderer 1.2.108 → 1.2.111

package/package.json

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

package/src/dr_pivottable.js

@@ -1313,7 +1313,7 @@ let initDRPivotTable = function($, window, document) {
             if (th.hasAttribute('data_show_more') && th.colSpan > 0 && !hasColLabels) {
                 th.colSpan = th.colSpan - 1;
             }
-            
+
             tr.appendChild(th);
             if (isRowSubtotal) {
                 addClass(tr, classRowExpanded);
@@ -1491,14 +1491,18 @@ let initDRPivotTable = function($, window, document) {
             const value = totalAggregator.value();
             const formattedValue = getFormattedNumber(value, totalAggregator, opts);
 
+            if (!colHeader) {
+                colHeader = {}
+            }
+
             let style = "pvtTotal pvtAddField colTotal";
-            style += " col" + colHeader.row + " colcol" + colHeader.col;
+            style += " col" + colHeader.row || "-1" + " colcol" + colHeader.col || "-1";
 
             const td = createElement("td", style, formattedValue, {
                 "data-value": value,
-                "data-rowcol": "col" + colHeader.col,
-                "data-rownode": "" + colHeader.node
-            }, getTableEventHandlers(value, [], colHeader.key));
+                "data-rowcol": "col" + colHeader.col || "-1",
+                "data-rownode": "" + colHeader.node || "-1"
+            }, getTableEventHandlers(value, [], colHeader.key || []));
 
             return td;
         }

package/src/highcharts_renderer.js

@@ -242,7 +242,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.createFilterObject = function (value) {
         var filtOb = {};
-        if ((value.values && value.values.datetype && value.values.datetype != 'list') || (value.datetypevalues && value.datetypevalues.datetype != 'list')) {
+        if ((value.values && value.values.datetype && value.values.datetype != 'list') ||
+            (value.datetypevalues && value.datetypevalues.datetype != 'list') ||
+            (value.values && value.values.type === 'advanced')) {
             filtOb.values = value.datetypevalues || value.values;
             filtOb.is_excluded = false;
         } else if (value.excludes) {
@@ -467,8 +469,9 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 if (!cols && is_drill_down_pie) {
                     cols = this.point.name;
                 }
-
-                if (!lodash.isArray(cols)) {
+                
+                var drOthersInColumn = lodash.find(pivotData.getColKeys(), keys => keys.length && keys.includes('DR_Others')) || [];
+                if (!lodash.isArray(cols) && drOthersInColumn[0] !== 'DR_Others') {
                     cols = [cols];
                 }
 
@@ -1385,8 +1388,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var num_cols = col_n_keys.length;
         var num_rows = row_n_keys.length;
 
+        const isOthersIncludedInRow = num_rows === 1 && row_n_keys[0].includes('DR_Others');
+        const othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
+
         lodash.forEach(col_n_keys, function (col_n_value) {
-            var agg = pivotData.getAggregator([], col_n_value);
+            const row_n_value = isOthersIncludedInRow ? row_n_keys[0] : [];
+            var agg = pivotData.getAggregator(row_n_value, col_n_value);
             var val = agg.value();
             var key = col_n_value;
 
@@ -1400,6 +1407,11 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             if (lodash.isEmpty(String(ob.name))) {
                 ob.name = "[blank]";
             }
+
+            if (ob.name === 'DR_Others') {
+                ob.name = othersName;
+            }
+
             ob.y = val;
             if (!isNaN(key))
                 key = Number(key)
@@ -1424,13 +1436,14 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
         var num_cols = col_n_keys.length;
         var num_rows = row_n_keys.length;
 
+        const othersName = lodash.get(opts, "total_value_options.filter_options.filteredOutFieldName") || 'Others';
 
         lodash.forEach(col_n_keys, function (col_n_value) {
             var col_ob = {};
             var col_n = col_n_value[0];
             if (col_n != undefined) {
                 col_ob.id = !isNaN(col_n) ? Number(col_n) : col_n;
-                col_ob.name = col_n;
+                col_ob.name = col_n === 'DR_Others' ? othersName : col_n;
                 col_ob.data = [];
                 lodash.forEach(row_n_keys, function (row_n_value) {
                     var agg = pivotData.getAggregator(row_n_value, col_n_value);
@@ -1445,7 +1458,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                             // }
                         }
 
-                        col_ob.data.push([row_n_value[0], val]);
+                        const row_name = row_n_value[0] === 'DR_Others' ? othersName : row_n_value[0];
+                        col_ob.data.push([row_name, val]);
                     }
                 });
                 if (col_ob.data.length) {
@@ -5145,7 +5159,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
 
     highchartsRenderer.getDefaultValueForSubOptions = function (type, existing_options) {
         var valToReturn = {};
-        var option = highchartsRenderer.suboptions[type];
+        var option = highchartsRenderer.suboptions[type] || lodash.find(highchartsRenderer.suboptions, suboption => suboption.category_type === type);
         if (option) {
             lodash.forEach(option.elements, function (elem) {
                 if (existing_options && lodash.has(existing_options, type + '.' + elem.value_name)) {