@datarailsshared/dr_renderer 1.5.74 → 1.5.79

package/package.json

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

package/src/highcharts_renderer.js

@@ -989,7 +989,8 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
                 tempAr[temp_len - 1] = highchartsRenderer.getFieldName(colAttrs[j]);
             }
 
-            tempAr = tempAr.concat(lodash.map(colKeys, function (row) {
+            const formattedColKeys = highchartsRenderer.getFormattedColKeys(pivotData, null);
+            tempAr = tempAr.concat(lodash.map(formattedColKeys, function (row) {
                 return row[j];
             }));
 
@@ -10012,8 +10013,23 @@ let getHighchartsRenderer = function ($, document, Highcharts, default_colors, h
             // It is just not counting sum there. So we remove it in order not to show improper values
             if ((calculatedValuesInValsCount > 1 || calculatedValuesInValsCount && widget.vals.length > 1) && !widget.rows.length) {
                 res = lodash.filter(res, record => {
+                    // Check if record is metadata (has col_keys or row_keys)
+                    const isMetadata = typeof record['col_keys'] !== 'undefined' || typeof record['row_keys'] !== 'undefined';
+                    if (isMetadata) {
+                        return false;
+                    }
+
                     const isColsTotal = typeof record['DR_Values'] === 'undefined';
-                    return !isColsTotal;
+                    
+                    if (!isColsTotal) {
+                        return true;
+                    }
+
+                    // If it doesn't have DR_Values, check if it has any value fields
+                    // Records with value fields are valid data, not empty subtotals
+                    return lodash.some(fieldWithDrValuesNames, fieldName => {
+                        return typeof record[fieldName] !== 'undefined' || typeof record['value'] !== 'undefined';
+                    });
                 })
             }
         }