hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

90768: Prevent empty filters from being added

Browse Source
This commit is contained in:
Alexandre Vryghem
2022-04-13 09:45:37 +02:00
parent b3f010974d
commit 8924b2c92c
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
View File

@@ -230,27 +230,29 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
}
/**
* Submits a new active custom value to the filter from the input field
* Submits a new active custom value to the filter from the input field when the input field isn't empty.
* @param data The string from the input field
*/
onSubmit(data: any) {
this.selectedValues$.pipe(take(1)).subscribe((selectedValues) => {
if (isNotEmpty(data)) {
this.router.navigate(this.getSearchLinkParts(), {
queryParams:
{
[this.filterConfig.paramName]: [
...selectedValues.map((facet) => this.getFacetValue(facet)),
data
]
},
queryParamsHandling: 'merge'
});
this.filter = '';
if (data.match(new RegExp(`^.+,(equals|query|authority)$`))) {
this.selectedValues$.pipe(take(1)).subscribe((selectedValues) => {
if (isNotEmpty(data)) {
this.router.navigate(this.getSearchLinkParts(), {
queryParams:
{
[this.filterConfig.paramName]: [
...selectedValues.map((facet) => this.getFacetValue(facet)),
data
]
},
queryParamsHandling: 'merge'
});
this.filter = '';
}
this.filterSearchResults = observableOf([]);
}
this.filterSearchResults = observableOf([]);
}
);
);
}
}
/**