@datorama/core 21.4.0-rc.5 → 21.4.0-rc.6

package/bundles/datorama-core.umd.js

@@ -11466,6 +11466,16 @@
         var field = colDef.field, showRowGroup = colDef.showRowGroup, pivotValueColumn = colDef.pivotValueColumn;
         return pivotValueColumn ? pivotValueColumn.getColId() : field || showRowGroup;
     }
+    function tryParsePivotValue(str) {
+        var value;
+        try {
+            value = JSON.parse(str);
+        }
+        catch (e) {
+            console.error("Can't parse " + str + " from JSON");
+        }
+        return value;
+    }
 
     var GridQuery = /** @class */ (function (_super) {
         __extends(GridQuery, _super);
@@ -11900,17 +11910,9 @@
     function getRowPivotKeys(childrenMapped, keys) {
         if (keys === void 0) { keys = []; }
         var key = Object.keys(childrenMapped)[0];
-        var parsedKey;
-        try {
-            parsedKey = JSON.parse(key);
-        }
-        catch (e) {
-            console.error("Can't parse " + key + " from JSON");
-        }
-        finally {
-            if (parsedKey) {
-                keys = getRowPivotKeys(childrenMapped[key], __spread(keys, [parsedKey.value]));
-            }
+        var parsedKey = tryParsePivotValue(key);
+        if (parsedKey) {
+            keys = getRowPivotKeys(childrenMapped[key], __spread(keys, [parsedKey.value]));
         }
         return keys;
     }
@@ -14893,20 +14895,26 @@
                     }
                 }
                 if (colDef.pivotKeys) {
-                    colDef.pivotKeys = colDef.pivotKeys.map(function (key) { return JSON.parse(key).value; });
+                    colDef.pivotKeys = colDef.pivotKeys.map(function (key) {
+                        var parsedKey = tryParsePivotValue(key);
+                        return (parsedKey && parsedKey.value) || '';
+                    });
                 }
             };
             gridOptions.processSecondaryColGroupDef = function (colGroupDef) {
                 if (colGroupDef.headerName) {
-                    var _a = JSON.parse(colGroupDef.headerName), field = _a.field, value = _a.value;
-                    colGroupDef.headerClass = [field];
-                    colGroupDef.headerName = value;
-                    if (colGroupDef.children && colGroupDef.children.length > 1) {
-                        colGroupDef.headerClass.push('group-pivot-cell');
+                    var parsedValue = tryParsePivotValue(colGroupDef.headerName);
+                    if (parsedValue) {
+                        var field = parsedValue.field, value = parsedValue.value;
+                        colGroupDef.headerClass = [field];
+                        colGroupDef.headerName = value;
+                        if (colGroupDef.children && colGroupDef.children.length > 1) {
+                            colGroupDef.headerClass.push('group-pivot-cell');
+                        }
                     }
                 }
                 else if (colGroupDef.children) {
-                    var _b = __read(colGroupDef.children, 1), colChild = _b[0];
+                    var _a = __read(colGroupDef.children, 1), colChild = _a[0];
                     var pivotTotalColumnIds = colChild && colChild.pivotTotalColumnIds;
                     if (pivotTotalColumnIds && pivotTotalColumnIds.length > 0) {
                         colGroupDef.headerClass = ['total-pivot-cell'];
@@ -14917,7 +14925,10 @@
                     colGroupDef.headerClass = ['empty-pivot-header'];
                 }
                 if (colGroupDef.pivotKeys) {
-                    colGroupDef.pivotKeys = colGroupDef.pivotKeys.map(function (key) { return JSON.parse(key).value; });
+                    colGroupDef.pivotKeys = colGroupDef.pivotKeys.map(function (key) {
+                        var parsedKey = tryParsePivotValue(key);
+                        return (parsedKey && parsedKey.value) || '';
+                    });
                 }
             };
         };
@@ -14930,7 +14941,8 @@
                     for (var pivotColumns_1 = __values(pivotColumns), pivotColumns_1_1 = pivotColumns_1.next(); !pivotColumns_1_1.done; pivotColumns_1_1 = pivotColumns_1.next()) {
                         var col = pivotColumns_1_1.value;
                         var field = col.getColDef().field;
-                        mappedValues[field] = JSON.stringify({ field: field, value: currentValue[field] });
+                        var pivotValue = { field: field, value: currentValue[field] };
+                        mappedValues[field] = JSON.stringify(pivotValue);
                     }
                 }
                 catch (e_4_1) { e_4 = { error: e_4_1 }; }