@datorama/core 21.4.0-rc.11 → 21.4.0-rc.14

package/bundles/datorama-core.umd.js

@@ -11620,7 +11620,7 @@
                 return Object.keys(filter).reduce(function (filters, field) {
                     var datoFilter = filter[field];
                     if (datoFilter) {
-                        filters.push({ colId: datoFilter.colId, field: field, filter: datoFilter });
+                        filters.push({ field: field, filter: datoFilter });
                     }
                     return filters;
                 }, []);
@@ -12679,12 +12679,12 @@
     var ɵ0$1 = mapToValue;
     var mapToListItem = function (val) { return ({ id: val, label: isNil(val) ? "(Empty)" : ("" + val).trim(), value: val }); };
     var ɵ1$1 = mapToListItem;
-    var mapToListItemWithFormatted = function (_a) {
+    var mapToListItemWithFormatted = function (_a, key) {
         var value = _a.value, formattedValue = _a.formattedValue;
         return ({
-            id: value,
-            label: isNil(formattedValue) ? "(Empty)" : ("" + formattedValue).trim(),
-            value: value
+            id: key && value ? value[key] : value,
+            label: isNil(formattedValue) ? "(Empty)" : ("" + (key ? formattedValue[key] : formattedValue)).trim(),
+            value: key && value ? value[key] : value
         });
     };
     var ɵ2$1 = mapToListItemWithFormatted;
@@ -12866,9 +12866,11 @@
                         var columnValues = this.getColumnValues();
                         this.columnValues = columnValues.map(function (_a) {
                             var value = _a.value;
-                            return value;
+                            return !isNil(_this.pivotColumn) && value ? value[_this.colField] : value;
+                        });
+                        this.listOptions = columnValues.map(function (colValue) {
+                            return mapToListItemWithFormatted(colValue, !isNil(_this.pivotColumn) && _this.colField);
                         });
-                        this.listOptions = columnValues.map(mapToListItemWithFormatted);
                     }
                 }
                 else {
@@ -12963,7 +12965,9 @@
             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;
                 }, {});
             }
@@ -14370,13 +14374,13 @@
             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);
                     }
                 }