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

package/fesm5/datorama-core.js

@@ -11267,6 +11267,16 @@ function getColField(colDef) {
     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);
@@ -11407,6 +11417,17 @@ var GridQuery = /** @class */ (function (_super) {
     GridQuery.prototype.selectFilter = function () {
         return this.select(function (state) { return state.settings.filter; });
     };
+    GridQuery.prototype.filterChanged = function () {
+        return this.selectFilter().pipe(map$1(function (filter) {
+            return Object.keys(filter).reduce(function (filters, key) {
+                if (filter[key]) {
+                    var _a = filter[key], conditional = _a.conditional, pivotFieldsMap = _a.pivotFieldsMap;
+                    filters.push({ column: key, filter: conditional, pivotFieldsMap: pivotFieldsMap });
+                }
+                return filters;
+            }, []);
+        }));
+    };
     GridQuery.prototype.getSearchTerm = function () {
         return this.getValue().settings.searchTerm;
     };
@@ -11559,7 +11580,7 @@ var OperatorTypes;
 function validateStringCondition(rowValue, _a) {
     var condition = _a.condition, filterValue = _a.value;
     var filterTextLowerCase = filterValue ? filterValue.toLowerCase() : '';
-    var valueLowerCase = rowValue ? rowValue.toLowerCase() : '';
+    var valueLowerCase = rowValue ? ("" + rowValue).toLowerCase() : '';
     switch (condition) {
         case DatoFilterConditions.EQUALS:
             return valueLowerCase === filterTextLowerCase;
@@ -11650,7 +11671,7 @@ function validateFilter(_a, activeFilters) {
             var currentRowPivotKeys = row.parent.childrenMapped && getRowPivotKeys(row.parent.childrenMapped);
             var 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 { value: true };
             }
             if (conditional) {
@@ -11690,17 +11711,9 @@ function validateFilter(_a, activeFilters) {
 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;
 }
@@ -12741,11 +12754,15 @@ var DatoGridFilterComponent = /** @class */ (function () {
         return this.columnValues.filter(function (value) { return !includedSet.has(value); });
     };
     DatoGridFilterComponent.prototype.buildFilter = function () {
+        var _this = this;
         var _a = this.filterForm.value, byValue = _a.byValue, conditional = _a.conditional;
         var filter = {};
         filter.pivotKeys = this.pivotKeys;
         if (this.pivotColumn) {
-            filter.pivotFields = this.getPivotFields(this.pivotColumn.getParent());
+            filter.pivotFieldsMap = this.getPivotFields(this.pivotColumn.getParent()).reduce(function (fieldMap, field, index) {
+                fieldMap[field] = _this.pivotKeys[index];
+                return fieldMap;
+            }, {});
         }
         if (this.filterSections.Conditional) {
             this.setConditionalFilter(filter, conditional);
@@ -13081,10 +13098,11 @@ var DatoGridFilterComponent = /** @class */ (function () {
     DatoGridFilterComponent.prototype.getPivotFields = function (parent, fields) {
         if (fields === void 0) { fields = []; }
         var grandParent = parent.getParent();
+        var headerClass = parent.getOriginalColumnGroup().getColGroupDef().headerClass;
         if (grandParent) {
             this.getPivotFields(grandParent, fields);
         }
-        fields.push(parent.getOriginalColumnGroup().getColGroupDef().headerClass);
+        headerClass && fields.push(headerClass[0]);
         return fields;
     };
     DatoGridFilterComponent.ctorParameters = function () { return [
@@ -14661,7 +14679,7 @@ var GridService = /** @class */ (function () {
     GridService.prototype.initPivotSecondaryColsProcess = function (_a) {
         var gridOptions = _a.gridOptions;
         gridOptions.processSecondaryColDef = function (colDef) {
-            var api = colDef.headerComponentParams.gridQuery.api;
+            var api = colDef.headerComponentParams && colDef.headerComponentParams.gridQuery.api;
             if (api) {
                 var valueColumns = colDef.headerComponentParams.gridQuery.api.columns.getValueColumns();
                 var originalColDef = valueColumns
@@ -14678,17 +14696,40 @@ var GridService = /** @class */ (function () {
                 }
             }
             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;
+                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 _a = __read(colGroupDef.children, 1), colChild = _a[0];
+                var 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(function (key) { return JSON.parse(key).value; });
+                colGroupDef.pivotKeys = colGroupDef.pivotKeys.map(function (key) {
+                    var parsedKey = tryParsePivotValue(key);
+                    return (parsedKey && parsedKey.value) || '';
+                });
             }
         };
     };
@@ -14701,7 +14742,8 @@ var GridService = /** @class */ (function () {
                 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 }; }
@@ -15229,7 +15271,7 @@ var DatoGridControllerComponent = /** @class */ (function () {
         this.gridService.setRows(data);
     };
     DatoGridControllerComponent.prototype.onFilterChanged = function () {
-        return this.gridQuery.selectFilter();
+        return this.gridQuery.filterChanged();
     };
     DatoGridControllerComponent.prototype.onSortChanged = function () {
         return this.gridQuery.selectSort();