From a10bc51ff73fa07ef7cbb4f6924bd2e7b4da08da Mon Sep 17 00:00:00 2001 From: Cagatay Civici Date: Mon, 30 Nov 2020 16:55:37 +0300 Subject: [PATCH] Fixed #8348 - FilterUtils.filter only accepts filterValue of type string --- src/app/components/api/filterservice.ts | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/app/components/api/filterservice.ts b/src/app/components/api/filterservice.ts index a199a358f08..e03bb73b750 100644 --- a/src/app/components/api/filterservice.ts +++ b/src/app/components/api/filterservice.ts @@ -4,16 +4,15 @@ import { ObjectUtils } from '../utils/objectutils'; @Injectable({providedIn: 'root'}) export class FilterService { - filter(value: any[], fields: any[], filterValue: string, filterMatchMode: string, filterLocale?: string) { + filter(value: any[], fields: any[], filterValue: any, filterMatchMode: string, filterLocale?: string) { let filteredItems: any[] = []; - let filterText = ObjectUtils.removeAccents(filterValue).toLocaleLowerCase(filterLocale); if (value) { for (let item of value) { for (let field of fields) { - let fieldValue = ObjectUtils.removeAccents(String(ObjectUtils.resolveFieldData(item, field))).toLocaleLowerCase(filterLocale); + let fieldValue = ObjectUtils.resolveFieldData(item, field); - if (this.filters[filterMatchMode](fieldValue, filterText, filterLocale)) { + if (this.filters[filterMatchMode](fieldValue, filterValue, filterLocale)) { filteredItems.push(item); break; }