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

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

@@ -11565,14 +11565,24 @@
             return settings;
         };
         GridQuery.prototype.getSort = function () {
-            var _a = this.api.grid.getSortModel().pop() || {}, sort = _a.sort, colId = _a.colId;
-            var column = this.api.columns.getColumn(colId);
-            var secondaryColumns = this.api.columns.getSecondaryColumns();
-            var pivotedColumn = secondaryColumns && secondaryColumns.find(function (col) { return col.getColId() === colId; });
-            var sortColumn = column || pivotedColumn;
-            var sortField = sortColumn && getColField(sortColumn.getColDef());
-            var pivotColIndex = secondaryColumns && pivotedColumn && secondaryColumns.indexOf(pivotedColumn);
-            return { colId: sortField, sort: sort, pivotColIndex: pivotColIndex };
+            if (this.gridRef.gridOptions.pivotMode) {
+                var _a = this.api.grid.getSortModel().pop() || {}, sort = _a.sort, colId_1 = _a.colId;
+                var column = this.api.columns.getColumn(colId_1);
+                var secondaryColumns = this.api.columns.getSecondaryColumns();
+                var pivotedColumn_1 = secondaryColumns && secondaryColumns.find(function (col) { return col.getColId() === colId_1; });
+                if (pivotedColumn_1) {
+                    var uniquePivotParents = uniq(secondaryColumns.map(function (column) { return column.getParent(); }));
+                    var secondaryColumn = secondaryColumns.find(function (col) { return col.getColId() === pivotedColumn_1.getColId(); });
+                    var pivotColIndex = uniquePivotParents.indexOf(secondaryColumn.getParent());
+                    return { colId: getColField(pivotedColumn_1.getColDef()), sort: sort, pivotColIndex: pivotColIndex };
+                }
+                else if (column) {
+                    return { colId: getColField(column.getColDef()), sort: sort };
+                }
+            }
+            else {
+                return this.api.grid.getSortModel().pop();
+            }
         };
         GridQuery.prototype.selectSort = function () {
             return this.select(function (state) { return state.settings.sort; });
@@ -11596,6 +11606,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;
         };
@@ -11748,7 +11769,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;
@@ -11839,7 +11860,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) {
@@ -12930,11 +12951,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);
@@ -13270,10 +13295,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 [
@@ -14850,7 +14876,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
@@ -14873,8 +14899,22 @@
             gridOptions.processSecondaryColGroupDef = function (colGroupDef) {
                 if (colGroupDef.headerName) {
                     var _a = JSON.parse(colGroupDef.headerName), field = _a.field, value = _a.value;
-                    colGroupDef.headerClass = field;
+                    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 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; });
@@ -15418,7 +15458,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();