mirror of
https://github.com/DSpace/dspace-angular.git
synced 2025-10-17 15:03:07 +00:00
[CST-6876] Fix issue with filter values request for which pagination was sent twice
This commit is contained in:
@@ -268,15 +268,21 @@ export class SearchService implements OnDestroy {
|
||||
* no valid cached version. Defaults to true
|
||||
* @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;
|
||||
const args: string[] = [`page=${valuePage - 1}`, `size=${filterConfig.pageSize}`];
|
||||
let args: string[] = [];
|
||||
if (hasValue(filterQuery)) {
|
||||
args.push(`prefix=${filterQuery}`);
|
||||
}
|
||||
if (hasValue(searchOptions)) {
|
||||
searchOptions = Object.assign(new PaginatedSearchOptions({}), searchOptions, {
|
||||
pagination: Object.assign({}, searchOptions.pagination, {
|
||||
currentPage: valuePage
|
||||
})
|
||||
});
|
||||
href = searchOptions.toRestUrl(filterConfig._links.self.href, args);
|
||||
} else {
|
||||
args = [`page=${valuePage - 1}`, `size=${filterConfig.pageSize}`, ...args];
|
||||
href = new URLCombiner(filterConfig._links.self.href, `?${args.join('&')}`).toString();
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user