Skip to content
Snippets Groups Projects
Commit a4c08ff8 authored by Florent Poittevin's avatar Florent Poittevin
Browse files

fix: data table isFilterApplied and ClearFilters

parent 5b846926
No related branches found
No related tags found
No related merge requests found
......@@ -256,7 +256,7 @@ export class SharedDataTablePresentational<TResource extends BaseResource> exten
isFilterApplied(): boolean {
let toSkip: boolean = false;
if (this._queryParameters.search.searchItems.size !== 0) {
if (MappingObjectUtil.size(QueryParametersUtil.getSearchItems(this.queryParameters)) > 0) {
if (this.columnsSkippedToClear === undefined || isEmptyArray(this.columnsSkippedToClear)) {
return true;
}
......@@ -272,11 +272,11 @@ export class SharedDataTablePresentational<TResource extends BaseResource> exten
clearFilters(): void {
let queryParameters = QueryParametersUtil.clone(this.queryParameters);
const searchItems: Map<string, string> = MappingObjectUtil.toMap(QueryParametersUtil.getSearchItems(queryParameters));
const searchItems = QueryParametersUtil.getSearchItems(queryParameters);
if (this.columnsSkippedToClear === undefined || isEmptyArray(this.columnsSkippedToClear)) {
searchItems.clear();
MappingObjectUtil.clear(searchItems);
} else {
searchItems.forEach((value: string, key: string) => {
MappingObjectUtil.forEach(searchItems, (value: string, key: string) => {
if (this.columnsSkippedToClear.some(c => c.includes(key)) === false) {
MappingObjectUtil.delete(searchItems, key);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment