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

package/bundle.scss

@@ -14386,7 +14386,6 @@ dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-group-cell .ag
 
 dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-group-cell .ag-header-group-cell-label {
     align-items: center;
-    justify-content: center;
 }
 
 dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-group-cell .ag-header-group-cell-label span {
@@ -14402,6 +14401,14 @@ dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-group-cell.ag-
     border-right: 1px solid themify(primary-200);
 }
 
+dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-group-cell.ag-header-group-cell-with-group.empty-pivot-header {
+    display: none;
+}
+
+dato-grid-v2 ag-grid-angular.pivot-mode .ag-header-row .ag-header-group-cell.ag-header-group-cell-with-group.group-pivot-cell .ag-header-group-cell-label {
+    justify-content: center;
+}
+
 .ag-dnd-ghost {
     box-shadow: 0 0 10px -1px themify(primary-700, 0.3);
     background-color: themify(primary-100) !important;

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);
@@ -11606,6 +11616,17 @@
         GridQuery.prototype.selectFilter = function () {
             return this.select(function (state) { return state.settings.filter; });
         };
+        GridQuery.prototype.filterChanged = function () {
+            return this.selectFilter().pipe(operators.map(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;
         };
@@ -11758,7 +11779,7 @@
     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 exports.DatoFilterConditions.EQUALS:
                 return valueLowerCase === filterTextLowerCase;
@@ -11849,7 +11870,7 @@
                 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) {
@@ -11889,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;
     }
@@ -12940,11 +12953,15 @@
             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);
@@ -13280,10 +13297,11 @@
         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 [
@@ -14860,7 +14878,7 @@
         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
@@ -14877,17 +14895,40 @@
                     }
                 }
                 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) || '';
+                    });
                 }
             };
         };
@@ -14900,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 }; }
@@ -15428,7 +15470,7 @@
             this.gridService.setRows(data);
         };
         DatoGridControllerComponent.prototype.onFilterChanged = function () {
-            return this.gridQuery.selectFilter();
+            return this.gridQuery.filterChanged();
         };
         DatoGridControllerComponent.prototype.onSortChanged = function () {
             return this.gridQuery.selectSort();