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

[CST-6876] Fix issue with filter values request for which pagination was sent twice

Browse Source
This commit is contained in:
Giuseppe Digilio
2022-09-30 12:57:55 +02:00
parent a6d29f5a23
commit a384a462eb
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/app/core/shared/search/search.service.ts
View File

@@ -268,15 +268,21 @@ export class SearchService implements OnDestroy {
* no valid cached version. Defaults to true * no valid cached version. Defaults to true
* @returns {Observable<RemoteData<PaginatedList<FacetValue>>>} Emits the given page of facet values * @returns {Observable<RemoteData<PaginatedList<FacetValue>>>} Emits the given page of facet values
*/ */
getFacetValuesFor(filterConfig: SearchFilterConfig, valuePage: number, searchOptions?: SearchOptions, filterQuery?: string, useCachedVersionIfAvailable = true): Observable<RemoteData<FacetValues>> { getFacetValuesFor(filterConfig: SearchFilterConfig, valuePage: number, searchOptions?: PaginatedSearchOptions, filterQuery?: string, useCachedVersionIfAvailable = true): Observable<RemoteData<FacetValues>> {
let href; let href;
const args: string[] = [`page=${valuePage - 1}`, `size=${filterConfig.pageSize}`]; let args: string[] = [];
if (hasValue(filterQuery)) { if (hasValue(filterQuery)) {
args.push(`prefix=${filterQuery}`); args.push(`prefix=${filterQuery}`);
} }
if (hasValue(searchOptions)) { if (hasValue(searchOptions)) {
searchOptions = Object.assign(new PaginatedSearchOptions({}), searchOptions, {
pagination: Object.assign({}, searchOptions.pagination, {
currentPage: valuePage
})
});
href = searchOptions.toRestUrl(filterConfig._links.self.href, args); href = searchOptions.toRestUrl(filterConfig._links.self.href, args);
} else { } else {
args = [`page=${valuePage - 1}`, `size=${filterConfig.pageSize}`, ...args];
href = new URLCombiner(filterConfig._links.self.href, `?${args.join('&')}`).toString(); href = new URLCombiner(filterConfig._links.self.href, `?${args.join('&')}`).toString();
} }