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

package/fesm5/datorama-core.js

@@ -11366,14 +11366,24 @@ var GridQuery = /** @class */ (function (_super) {
         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; });
@@ -11397,6 +11407,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;
     };
@@ -11549,7 +11570,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;
@@ -11640,7 +11661,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) {
@@ -12731,11 +12752,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);
@@ -13071,10 +13096,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 [
@@ -14651,7 +14677,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
@@ -14674,8 +14700,22 @@ var GridService = /** @class */ (function () {
         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; });
@@ -15219,7 +15259,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();