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

package/fesm2015/datorama-core.js

@@ -10010,6 +10010,16 @@ function getColField(colDef) {
     const { field, showRowGroup, pivotValueColumn } = colDef;
     return pivotValueColumn ? pivotValueColumn.getColId() : field || showRowGroup;
 }
+function tryParsePivotValue(str) {
+    let value;
+    try {
+        value = JSON.parse(str);
+    }
+    catch (e) {
+        console.error(`Can't parse ${str} from JSON`);
+    }
+    return value;
+}
 
 let GridQuery = class GridQuery extends Query {
     constructor(store) {
@@ -10392,17 +10402,9 @@ function validateFilter({ row, api }, activeFilters) {
  */
 function getRowPivotKeys(childrenMapped, keys = []) {
     const key = Object.keys(childrenMapped)[0];
-    let parsedKey;
-    try {
-        parsedKey = JSON.parse(key);
-    }
-    catch (e) {
-        console.error(`Can't parse ${key} from JSON`);
-    }
-    finally {
-        if (parsedKey) {
-            keys = getRowPivotKeys(childrenMapped[key], [...keys, parsedKey.value]);
-        }
+    const parsedKey = tryParsePivotValue(key);
+    if (parsedKey) {
+        keys = getRowPivotKeys(childrenMapped[key], [...keys, parsedKey.value]);
     }
     return keys;
 }
@@ -13110,16 +13112,22 @@ let GridService = class GridService {
                 }
             }
             if (colDef.pivotKeys) {
-                colDef.pivotKeys = colDef.pivotKeys.map(key => JSON.parse(key).value);
+                colDef.pivotKeys = colDef.pivotKeys.map(key => {
+                    const parsedKey = tryParsePivotValue(key);
+                    return (parsedKey && parsedKey.value) || '';
+                });
             }
         };
         gridOptions.processSecondaryColGroupDef = (colGroupDef) => {
             if (colGroupDef.headerName) {
-                const { field, value } = JSON.parse(colGroupDef.headerName);
-                colGroupDef.headerClass = [field];
-                colGroupDef.headerName = value;
-                if (colGroupDef.children && colGroupDef.children.length > 1) {
-                    colGroupDef.headerClass.push('group-pivot-cell');
+                const parsedValue = tryParsePivotValue(colGroupDef.headerName);
+                if (parsedValue) {
+                    const { field, value } = parsedValue;
+                    colGroupDef.headerClass = [field];
+                    colGroupDef.headerName = value;
+                    if (colGroupDef.children && colGroupDef.children.length > 1) {
+                        colGroupDef.headerClass.push('group-pivot-cell');
+                    }
                 }
             }
             else if (colGroupDef.children) {
@@ -13134,7 +13142,10 @@ let GridService = class GridService {
                 colGroupDef.headerClass = ['empty-pivot-header'];
             }
             if (colGroupDef.pivotKeys) {
-                colGroupDef.pivotKeys = colGroupDef.pivotKeys.map(key => JSON.parse(key).value);
+                colGroupDef.pivotKeys = colGroupDef.pivotKeys.map(key => {
+                    const parsedKey = tryParsePivotValue(key);
+                    return (parsedKey && parsedKey.value) || '';
+                });
             }
         };
     }
@@ -13144,7 +13155,8 @@ let GridService = class GridService {
             const mappedValues = Object.assign({}, currentValue);
             for (const col of pivotColumns) {
                 const field = col.getColDef().field;
-                mappedValues[field] = JSON.stringify({ field, value: currentValue[field] });
+                const pivotValue = { field, value: currentValue[field] };
+                mappedValues[field] = JSON.stringify(pivotValue);
             }
             return mappedValues;
         });