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

package/fesm2015/datorama-core.js

@@ -10315,8 +10315,8 @@ function validateStringCondition(rowValue, { condition, value: filterValue }) {
             return !isEmpty(valueLowerCase);
     }
 }
-function validateNumberCondition(unparsedRowValue, { condition, value, rangeEnd }) {
-    const rowValue = !!unparsedRowValue ? parseFloat(unparsedRowValue) : null;
+function validateNumberCondition(unparsedRowValue, { condition, value, rangeEnd }, filterKey) {
+    const rowValue = !!unparsedRowValue ? parseFloat(unparsedRowValue[filterKey] || unparsedRowValue) : null;
     const filterValue = parseFloat(value);
     switch (condition) {
         case DatoFilterConditions.EQUALS:
@@ -10362,14 +10362,14 @@ function validateDateCondition(rowValue, { condition, value, rangeEnd }) {
             return !isNil(rowValue);
     }
 }
-function validateCondition({ rowValue, filter, type }) {
+function validateCondition({ rowValue, condition, type, filterKey }) {
     switch (type) {
         case DatoGridFilterTypes.Date:
-            return validateDateCondition(rowValue, filter);
+            return validateDateCondition(rowValue, condition);
         case DatoGridFilterTypes.Number:
-            return validateNumberCondition(rowValue, filter);
+            return validateNumberCondition(rowValue, condition, filterKey);
         default:
-            return validateStringCondition(rowValue, filter);
+            return validateStringCondition(rowValue, condition);
     }
 }
 function validateFilter({ row, api }, activeFilters) {
@@ -10387,7 +10387,7 @@ function validateFilter({ row, api }, activeFilters) {
             if (conditional) {
                 const { operator, conditions, type } = conditional;
                 const conditionsRelation = operator === OperatorTypes.AND ? 'every' : 'some';
-                filterPasses = conditions[conditionsRelation](filter => validateCondition({ rowValue, filter, type: type }));
+                filterPasses = conditions[conditionsRelation](condition => validateCondition({ rowValue, condition, type: type, filterKey: filter }));
             }
             if (filterPasses && byValue) {
                 const includesValue = byValue.values.includes(rowValue);
@@ -11123,10 +11123,10 @@ const mapToValue = ({ value }) => value;
 const ɵ0$1 = mapToValue;
 const mapToListItem = val => ({ id: val, label: isNil(val) ? `(Empty)` : `${val}`.trim(), value: val });
 const ɵ1$1 = mapToListItem;
-const mapToListItemWithFormatted = ({ value, formattedValue }) => ({
-    id: value,
-    label: isNil(formattedValue) ? `(Empty)` : `${formattedValue}`.trim(),
-    value
+const mapToListItemWithFormatted = ({ value, formattedValue }, key) => ({
+    id: key && value ? value[key] : value,
+    label: isNil(formattedValue) ? `(Empty)` : `${key ? formattedValue[key] : formattedValue}`.trim(),
+    value: key && value ? value[key] : value
 });
 const ɵ2$1 = mapToListItemWithFormatted;
 let DatoGridFilterComponent = class DatoGridFilterComponent {
@@ -11211,16 +11211,20 @@ let DatoGridFilterComponent = class DatoGridFilterComponent {
     }
     ngOnInit() {
         const { gridService, gridQuery } = this.popover.data;
-        const { filter, filtersConfig = {}, pivotValueColumn, pivotKeys } = this.colDef;
+        const { filter, pivotValueColumn, pivotKeys } = this.colDef;
+        const colDefs = gridQuery.api.columns.getAllColumns().map(column => column.getColDef());
         this.colField = getColField(this.colDef);
+        const colDef = colDefs.find(colDef => colDef.field === this.colField);
+        const filtersConfig = colDef.filtersConfig;
         this.pivotColumn = gridQuery.api.columns.getSecondaryPivotColumn(pivotKeys, pivotValueColumn);
         if (filtersConfig.sections) {
             this.filterSections = { [filtersConfig.sections]: true };
         }
         this.keepPredefinedListOriginalOrder =
             filtersConfig.keepPredefinedListOriginalOrder && !isEmpty(filtersConfig.predefinedListValues);
-        const filterOptions = DatoGridFilterOptionsMap[filter];
-        this.filterType = filterOptions ? filter : DatoGridFilterTypes.String;
+        const colFilter = filter || colDef.filter;
+        const filterOptions = DatoGridFilterOptionsMap[colFilter];
+        this.filterType = filterOptions ? colFilter : DatoGridFilterTypes.String;
         this.listLabelType = this.filterType.toLowerCase();
         this.listSortByKey = this.filterType === DatoGridFilterTypes.Number && this.colDef.valueFormatter ? 'id' : 'label';
         this.gridQuery = gridQuery;
@@ -11254,9 +11258,9 @@ let DatoGridFilterComponent = class DatoGridFilterComponent {
                 else {
                     const columnValues = this.getColumnValues();
                     this.columnValues = columnValues.map(({ value }) => {
-                        return this.pivotColumn && value ? value[this.colField] : value;
+                        return !isNil(this.pivotColumn) && value ? value[this.colField] : value;
                     });
-                    this.listOptions = columnValues.map(mapToListItemWithFormatted);
+                    this.listOptions = columnValues.map(colValue => mapToListItemWithFormatted(colValue, !isNil(this.pivotColumn) && this.colField));
                 }
             }
             else {
@@ -13123,19 +13127,12 @@ let GridService = class GridService {
     /**
      * When pivoting,
      * we add the field name to the column header class in order to access it through the auto generated pivot column.
-     * @private
      */
     initPivotSecondaryColsProcess({ gridOptions }) {
         gridOptions.processSecondaryColDef = colDef => {
-            const api = colDef.headerComponentParams && colDef.headerComponentParams.gridQuery.api;
-            if (api) {
-                const valueColumns = colDef.headerComponentParams.gridQuery.api.columns.getValueColumns();
-                const originalColDef = valueColumns
-                    .map(({ userProvidedColDef }) => userProvidedColDef)
-                    .find(({ colId }) => colId === colDef.pivotValueColumn.getColId());
-                if (originalColDef) {
-                    colDef.filter = originalColDef.filter;
-                }
+            const userProvidedColDef = colDef.pivotValueColumn.getUserProvidedColDef();
+            if (userProvidedColDef) {
+                colDef.filter = userProvidedColDef.filter;
             }
             if (colDef.pivotKeys) {
                 colDef.pivotKeys = colDef.pivotKeys.map(key => {