Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,13 @@ import { FilteringLogic, type IFilteringExpression } from './filtering-expressio
import { FilteringExpressionsTree, type IFilteringExpressionsTree } from './filtering-expressions-tree';
import { resolveNestedPath, parseDate, formatDate, formatCurrency, columnFieldPath } from '../core/utils';
import type { ColumnType, EntityType, GridType } from '../grids/common/grid.interface';
import { GridColumnDataType } from './data-util';
import { DataUtil, GridColumnDataType } from './data-util';
import { SortingDirection } from './sorting-strategy';
import { formatNumber, formatPercent, getLocaleCurrencyCode } from '@angular/common';
import type { IFilteringState } from './filtering-state.interface';
import { isTree } from './expressions-tree-util';
import type { IgxHierarchicalGridComponent } from '../grids/hierarchical-grid/hierarchical-grid.component';
import { IgxSorting } from '../grids/common/strategy';

const DateType = 'date';
const DateTimeType = 'dateTime';
Expand Down Expand Up @@ -132,23 +133,27 @@ export abstract class BaseFilteringStrategy implements IFilteringStrategy {
public getFilterItems(column: ColumnType, tree: IFilteringExpressionsTree): Promise<IgxFilterItem[]> {
const applyFormatter = column.formatter && this.shouldFormatFilterValues(column);

let data = column.grid.gridAPI.filterDataByExpressions(tree);
data = column.grid.gridAPI.sortDataByExpressions(data,
[{ fieldName: column.field, dir: SortingDirection.Asc, ignoreCase: column.sortingIgnoreCase }]);

const data = column.grid.gridAPI.filterDataByExpressions(tree);

const pathParts = columnFieldPath(column.field)
let filterItems: IgxFilterItem[] = data.map(record => {
const value = applyFormatter ?
column.formatter(resolveNestedPath(record, pathParts), record) :
resolveNestedPath(record, pathParts);

return {
value,
label: this.getFilterItemLabel(column, value, !applyFormatter, record)
};
});
filterItems = this.getUniqueFilterItems(column, filterItems);
const seenFormattedFilterItems = new Map<any, IgxFilterItem>()

for (let i = 0; i < data.length; ++i) {
const record = this.getRecord(data[i]);
const rawValue = resolveNestedPath(record, pathParts);
const formattedValue = applyFormatter ? column.formatter(rawValue, record) : rawValue;
const { key, finalValue } = this.getFilterItemKeyValue(formattedValue, column);
// Deduplicate by normalized key
if (!seenFormattedFilterItems.has(key)) {
const label = this.getFilterItemLabel(column, finalValue, !applyFormatter, record);
seenFormattedFilterItems.set(key, { value: finalValue, label });
}
}

let filterItems: IgxFilterItem[] = Array.from(seenFormattedFilterItems.values());

filterItems = DataUtil.sort(filterItems,
[{ fieldName: 'value', dir: SortingDirection.Asc, ignoreCase: column.sortingIgnoreCase }], new IgxSorting())

return Promise.resolve(filterItems);
}
Expand Down Expand Up @@ -180,30 +185,37 @@ export abstract class BaseFilteringStrategy implements IFilteringStrategy {
}
}

protected getUniqueFilterItems(column: ColumnType, filterItems: IgxFilterItem[]) {
const filteredUniqueValues = filterItems.reduce((map, item) => {
let key = item.value;

if (column.dataType === GridColumnDataType.String && column.filteringIgnoreCase) {
key = key?.toString().toLowerCase();
} else if (column.dataType === GridColumnDataType.DateTime) {
key = item.value?.toString();
item.value = key ? new Date(key) : key;
} else if (column.dataType === GridColumnDataType.Time) {
const date = key ? new Date(key) : key;
key = date ? new Date().setHours(date.getHours(), date.getMinutes(), date.getSeconds(), date.getMilliseconds()) : key;
item.value = key ? new Date(key) : key;
} else if (column.dataType === GridColumnDataType.Date) {
const date = key ? new Date(key) : key;
key = date ? new Date(date.getFullYear(), date.getMonth(), date.getDate()).toISOString() : key;
item.value = date;
}

return map.has(key) ? map : map.set(key, item)
}, new Map());
const uniqueValues = Array.from(filteredUniqueValues.values());
protected getFilterItemKeyValue(value: any, column: ColumnType) {
let key: any = value;
let finalValue = value;
if (column.dataType === GridColumnDataType.String && column.filteringIgnoreCase) {
key = key?.toString().toLowerCase();
} else if (column.dataType === GridColumnDataType.DateTime) {
key = value?.toString();
finalValue = key ? new Date(key) : key;
} else if (column.dataType === GridColumnDataType.Time) {
const date = key ? new Date(key) : key;
key = date
? new Date().setHours(
date.getHours(),
date.getMinutes(),
date.getSeconds(),
date.getMilliseconds()
)
: date;
finalValue = key ? new Date(key) : key;
} else if (column.dataType === GridColumnDataType.Date) {
const date = key ? new Date(key) : key;
key = date
? new Date(date.getFullYear(), date.getMonth(), date.getDate()).toISOString()
: date;
finalValue = date;
}
return { key, finalValue };
}

return uniqueValues;
protected getRecord(item: any) {
return item;
}

protected shouldFormatFilterValues(_column: ColumnType): boolean {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,10 @@ export class TreeGridFilteringStrategy extends BaseFilteringStrategy {
return filterItem;
});
}

protected override getRecord(item: any) {
return item.data;
}
}

export class TreeGridFormattedValuesFilteringStrategy extends TreeGridFilteringStrategy {
Expand Down
Loading