@datarailsshared/dr_renderer 1.2.312 → 1.2.314

package/package.json

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

package/src/highcharts_renderer.js

@@ -1460,6 +1460,7 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 totalSeries.color = colors[i];
             }
 
+        if (!lodash.isEmpty(pivotData.colTotals)) {
             col_n_keys.forEach(columnKey => {
                 let key = columnKey;
                 let totalKey = columnKey;
@@ -1470,6 +1471,18 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 const value = pivotData.colTotals[totalKey] ? pivotData.colTotals[totalKey].value() : 0;
                 totalSeries.data.push({name: lodash.unescape(key), y: value});
             });
+        } else {
+            lodash.forEach(row_n_keys, (rowKey, index) => {
+                let key = rowKey;
+                let totalKey = rowKey;
+                if (lodash.isArray(rowKey)) {
+                    key = col_n_keys[index];
+                    totalKey = totalKey.join(highchartsRenderer.delimer);
+                }
+                const value = pivotData.rowTotals[totalKey] ? pivotData.rowTotals[totalKey].value() : 0;
+                totalSeries.data.push({name: lodash.unescape(key), y: value});
+            });
+        }
 
             chart_series.push(totalSeries);
         }
@@ -5503,18 +5516,12 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             const fieldOb = lodash.find(fields, { id: filterObj.id });
             if (!fieldOb) return;
 
-            filterObj.values = filterObj.values && lodash.map(filterObj.values, highchartsRenderer.decodeFunc);
-            filterObj.includes = filterObj.includes && lodash.map(filterObj.includes, highchartsRenderer.decodeFunc);
-
-            if (lodash.get(filterObj, 'values.datetype') === 'list') {
-                filterObj.values = lodash.map(filterObj.values.val, highchartsRenderer.decodeFunc);
-            }
-
-            fieldOb.includes = filterObj.includes;
-            fieldOb.values = filterObj.values;
-
-            if (filterObj.allow_nulls && fieldOb) {
-                fieldOb.allow_nulls = filterObj.allow_nulls;
+            if (filterObj.is_exclude) {
+                filterObj.excludes = filterObj.values && lodash.map(filterObj.values, highchartsRenderer.decodeFunc);
+                fieldOb.excludes = filterObj.excludes;
+            } else {
+                filterObj.includes = filterObj.values && lodash.map(filterObj.values, highchartsRenderer.decodeFunc);
+                fieldOb.includes = filterObj.includes;
             }
         });