@datorama/core 21.4.0-rc.10 → 21.4.0-rc.13

package/fesm5/datorama-core.js

@@ -11419,8 +11419,9 @@ var GridQuery = /** @class */ (function (_super) {
     GridQuery.prototype.filterChanged = function () {
         return this.selectFilter().pipe(map$1(function (filter) {
             return Object.keys(filter).reduce(function (filters, field) {
-                if (filter[field]) {
-                    filters.push({ colId: '', field: field, filter: filter[field] });
+                var datoFilter = filter[field];
+                if (datoFilter) {
+                    filters.push({ field: field, filter: datoFilter });
                 }
                 return filters;
             }, []);
@@ -12666,7 +12667,7 @@ var DatoGridFilterComponent = /** @class */ (function () {
                     var columnValues = this.getColumnValues();
                     this.columnValues = columnValues.map(function (_a) {
                         var value = _a.value;
-                        return value;
+                        return _this.pivotColumn && value ? value[_this.colField] : value;
                     });
                     this.listOptions = columnValues.map(mapToListItemWithFormatted);
                 }
@@ -12759,11 +12760,13 @@ var DatoGridFilterComponent = /** @class */ (function () {
     DatoGridFilterComponent.prototype.buildFilter = function () {
         var _this = this;
         var _a = this.filterForm.value, byValue = _a.byValue, conditional = _a.conditional;
-        var filter = {};
+        var filter = { colId: this.colDef.colId };
         filter.pivotKeys = this.pivotKeys;
         if (this.pivotColumn) {
             filter.pivotFieldsMap = this.getPivotFields(this.pivotColumn.getParent()).reduce(function (fieldMap, field, index) {
-                fieldMap[field] = _this.pivotKeys[index];
+                if (_this.pivotKeys[index]) {
+                    fieldMap[field] = _this.pivotKeys[index];
+                }
                 return fieldMap;
             }, {});
         }
@@ -14166,17 +14169,17 @@ var GridService = /** @class */ (function () {
             this.notifyFilterUpdate();
         }
     };
-    GridService.prototype.setExternalFilters = function (filters) {
+    GridService.prototype.setGridFilters = function (filters) {
         var e_2, _a;
         try {
             for (var filters_1 = __values(filters), filters_1_1 = filters_1.next(); !filters_1_1.done; filters_1_1 = filters_1.next()) {
-                var _b = filters_1_1.value, colId = _b.colId, filter = _b.filter;
-                var column = this.api.columns.getColumn(colId);
+                var filter = filters_1_1.value.filter;
+                var column = this.api.columns.getColumn(filter.colId);
                 if (column) {
                     this.setColumnFilter(column, filter);
                 }
                 else {
-                    var pivotColumn = this.gridQuery.getSecondaryColumn(colId);
+                    var pivotColumn = this.gridQuery.getSecondaryColumn(filter.colId);
                     this.setColumnFilter(pivotColumn, filter);
                 }
             }
@@ -15304,8 +15307,8 @@ var DatoGridControllerComponent = /** @class */ (function () {
     DatoGridControllerComponent.prototype.setGridRows = function (data) {
         this.gridService.setRows(data);
     };
-    DatoGridControllerComponent.prototype.setColumnFilters = function (filters) {
-        this.gridService.setExternalFilters(filters);
+    DatoGridControllerComponent.prototype.setGridFilters = function (filters) {
+        this.gridService.setGridFilters(filters);
     };
     DatoGridControllerComponent.prototype.onFilterChanged = function () {
         return this.gridQuery.filterChanged();