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

package/bundles/datorama-core.umd.js

@@ -11802,9 +11802,9 @@
                 return !isEmpty(valueLowerCase);
         }
     }
-    function validateNumberCondition(unparsedRowValue, _a) {
+    function validateNumberCondition(unparsedRowValue, _a, filterKey) {
         var condition = _a.condition, value = _a.value, rangeEnd = _a.rangeEnd;
-        var rowValue = !!unparsedRowValue ? parseFloat(unparsedRowValue) : null;
+        var rowValue = !!unparsedRowValue ? parseFloat(unparsedRowValue[filterKey] || unparsedRowValue) : null;
         var filterValue = parseFloat(value);
         switch (condition) {
             case exports.DatoFilterConditions.EQUALS:
@@ -11852,14 +11852,14 @@
         }
     }
     function validateCondition(_a) {
-        var rowValue = _a.rowValue, filter = _a.filter, type = _a.type;
+        var rowValue = _a.rowValue, condition = _a.condition, type = _a.type, filterKey = _a.filterKey;
         switch (type) {
             case exports.DatoGridFilterTypes.Date:
-                return validateDateCondition(rowValue, filter);
+                return validateDateCondition(rowValue, condition);
             case exports.DatoGridFilterTypes.Number:
-                return validateNumberCondition(rowValue, filter);
+                return validateNumberCondition(rowValue, condition, filterKey);
             default:
-                return validateStringCondition(rowValue, filter);
+                return validateStringCondition(rowValue, condition);
         }
     }
     function validateFilter(_a, activeFilters) {
@@ -11879,7 +11879,9 @@
                 if (conditional) {
                     var operator = conditional.operator, conditions = conditional.conditions, type_1 = conditional.type;
                     var conditionsRelation = operator === exports.OperatorTypes.AND ? 'every' : 'some';
-                    filterPasses = conditions[conditionsRelation](function (filter) { return validateCondition({ rowValue: rowValue, filter: filter, type: type_1 }); });
+                    filterPasses = conditions[conditionsRelation](function (condition) {
+                        return validateCondition({ rowValue: rowValue, condition: condition, type: type_1, filterKey: filter });
+                    });
                 }
                 if (filterPasses && byValue) {
                     var includesValue = byValue.values.includes(rowValue);
@@ -12823,15 +12825,18 @@
             var _this = this;
             var _b = this.popover.data, gridService = _b.gridService, gridQuery = _b.gridQuery;
             var _c = this.colDef, filter = _c.filter, _d = _c.filtersConfig, filtersConfig = _d === void 0 ? {} : _d, pivotValueColumn = _c.pivotValueColumn, pivotKeys = _c.pivotKeys;
+            var colDefs = gridQuery.api.columns.getAllColumns().map(function (column) { return column.getColDef(); });
             this.colField = getColField(this.colDef);
+            var colDef = colDefs.find(function (colDef) { return colDef.field === _this.colField; });
+            var colFilter = filter || colDef.filter;
+            var filterOptions = DatoGridFilterOptionsMap[colFilter];
             this.pivotColumn = gridQuery.api.columns.getSecondaryPivotColumn(pivotKeys, pivotValueColumn);
             if (filtersConfig.sections) {
                 this.filterSections = (_a = {}, _a[filtersConfig.sections] = true, _a);
             }
             this.keepPredefinedListOriginalOrder =
                 filtersConfig.keepPredefinedListOriginalOrder && !isEmpty(filtersConfig.predefinedListValues);
-            var filterOptions = DatoGridFilterOptionsMap[filter];
-            this.filterType = filterOptions ? filter : exports.DatoGridFilterTypes.String;
+            this.filterType = filterOptions ? colFilter : exports.DatoGridFilterTypes.String;
             this.listLabelType = this.filterType.toLowerCase();
             this.listSortByKey = this.filterType === exports.DatoGridFilterTypes.Number && this.colDef.valueFormatter ? 'id' : 'label';
             this.gridQuery = gridQuery;
@@ -14911,27 +14916,14 @@
         /**
          * When pivoting,
          * we add the field name to the column header class in order to access it through the auto generated pivot column.
-         * @private
          */
         GridService.prototype.initPivotSecondaryColsProcess = function (_a) {
             var _this = this;
             var gridOptions = _a.gridOptions;
             gridOptions.processSecondaryColDef = function (colDef) {
-                var api = colDef.headerComponentParams && colDef.headerComponentParams.gridQuery.api;
-                if (api) {
-                    var valueColumns = colDef.headerComponentParams.gridQuery.api.columns.getValueColumns();
-                    var originalColDef = valueColumns
-                        .map(function (_a) {
-                        var userProvidedColDef = _a.userProvidedColDef;
-                        return userProvidedColDef;
-                    })
-                        .find(function (_a) {
-                        var colId = _a.colId;
-                        return colId === colDef.pivotValueColumn.getColId();
-                    });
-                    if (originalColDef) {
-                        colDef.filter = originalColDef.filter;
-                    }
+                var userProvidedColDef = colDef.pivotValueColumn.getUserProvidedColDef();
+                if (userProvidedColDef) {
+                    colDef.filter = userProvidedColDef.filter;
                 }
                 if (colDef.pivotKeys) {
                     colDef.pivotKeys = colDef.pivotKeys.map(function (key) {