@datorama/core 21.4.0-rc.3 → 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) {
@@ -10122,6 +10132,17 @@ let GridQuery = class GridQuery extends Query {
     selectFilter() {
         return this.select(state => state.settings.filter);
     }
+    filterChanged() {
+        return this.selectFilter().pipe(map$1(filter => {
+            return Object.keys(filter).reduce((filters, key) => {
+                if (filter[key]) {
+                    const { conditional, pivotFieldsMap } = filter[key];
+                    filters.push({ column: key, filter: conditional, pivotFieldsMap });
+                }
+                return filters;
+            }, []);
+        }));
+    }
     getSearchTerm() {
         return this.getValue().settings.searchTerm;
     }
@@ -10271,7 +10292,7 @@ var OperatorTypes;
 
 function validateStringCondition(rowValue, { condition, value: filterValue }) {
     const filterTextLowerCase = filterValue ? filterValue.toLowerCase() : '';
-    const valueLowerCase = rowValue ? rowValue.toLowerCase() : '';
+    const valueLowerCase = rowValue ? `${rowValue}`.toLowerCase() : '';
     switch (condition) {
         case DatoFilterConditions.EQUALS:
             return valueLowerCase === filterTextLowerCase;
@@ -10357,7 +10378,7 @@ function validateFilter({ row, api }, activeFilters) {
             const currentRowPivotKeys = row.parent.childrenMapped && getRowPivotKeys(row.parent.childrenMapped);
             const rowValue = api.getValue(filter, row);
             /** If value is under a pivoted column but doesn't match the filter pivot */
-            if (pivotKeys && !isArrayValuesEqual(pivotKeys, currentRowPivotKeys)) {
+            if (pivotKeys && pivotKeys.length > 0 && !isArrayValuesEqual(pivotKeys, currentRowPivotKeys)) {
                 return true;
             }
             if (conditional) {
@@ -10381,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;
 }
@@ -11323,7 +11336,10 @@ let DatoGridFilterComponent = class DatoGridFilterComponent {
         const filter = {};
         filter.pivotKeys = this.pivotKeys;
         if (this.pivotColumn) {
-            filter.pivotFields = this.getPivotFields(this.pivotColumn.getParent());
+            filter.pivotFieldsMap = this.getPivotFields(this.pivotColumn.getParent()).reduce((fieldMap, field, index) => {
+                fieldMap[field] = this.pivotKeys[index];
+                return fieldMap;
+            }, {});
         }
         if (this.filterSections.Conditional) {
             this.setConditionalFilter(filter, conditional);
@@ -11636,10 +11652,11 @@ let DatoGridFilterComponent = class DatoGridFilterComponent {
      */
     getPivotFields(parent, fields = []) {
         const grandParent = parent.getParent();
+        const headerClass = parent.getOriginalColumnGroup().getColGroupDef().headerClass;
         if (grandParent) {
             this.getPivotFields(grandParent, fields);
         }
-        fields.push(parent.getOriginalColumnGroup().getColGroupDef().headerClass);
+        headerClass && fields.push(headerClass[0]);
         return fields;
     }
 };
@@ -13084,7 +13101,7 @@ let GridService = class GridService {
      */
     initPivotSecondaryColsProcess({ gridOptions }) {
         gridOptions.processSecondaryColDef = colDef => {
-            const api = colDef.headerComponentParams.gridQuery.api;
+            const api = colDef.headerComponentParams && colDef.headerComponentParams.gridQuery.api;
             if (api) {
                 const valueColumns = colDef.headerComponentParams.gridQuery.api.columns.getValueColumns();
                 const originalColDef = valueColumns
@@ -13095,17 +13112,40 @@ 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;
+                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) {
+                const [colChild] = colGroupDef.children;
+                const pivotTotalColumnIds = colChild && colChild.pivotTotalColumnIds;
+                if (pivotTotalColumnIds && pivotTotalColumnIds.length > 0) {
+                    colGroupDef.headerClass = ['total-pivot-cell'];
+                    colGroupDef.headerName = 'Total';
+                }
+            }
+            else {
+                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) || '';
+                });
             }
         };
     }
@@ -13115,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;
         });
@@ -13606,7 +13647,7 @@ let DatoGridControllerComponent = class DatoGridControllerComponent {
         this.gridService.setRows(data);
     }
     onFilterChanged() {
-        return this.gridQuery.selectFilter();
+        return this.gridQuery.filterChanged();
     }
     onSortChanged() {
         return this.gridQuery.selectSort();