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

76654: Feedback to pagination

Browse Source
This commit is contained in:
Yana De Pauw
2021-02-23 11:01:40 +01:00
parent fab226912f
commit d07f44ac41
31 changed files with 184 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/core/pagination/pagination.service.ts
View File

@@ -99,17 +99,20 @@ export class PaginationService {
pageSize?: number
sortField?: string
sortDirection?: SortDirection
}, extraParams?, changeLocationNot?: boolean) {
}, extraParams?, retainScrollPosition?: boolean) {
this.getCurrentRouting(paginationId).subscribe((currentFindListOptions) => {
const currentParametersWithIdName = this.getParametersWithIdName(paginationId, currentFindListOptions);
const parametersWithIdName = this.getParametersWithIdName(paginationId, params);
if (isNotEmpty(difference(parametersWithIdName, currentParametersWithIdName)) || isNotEmpty(extraParams)) {
const queryParams = Object.assign({}, currentParametersWithIdName,
parametersWithIdName, extraParams);
if (changeLocationNot) {
this.location.go(this.router.createUrlTree([], {
relativeTo: this.route, queryParams: queryParams, queryParamsHandling: 'merge'
}).toString());
console.log(retainScrollPosition);
if (retainScrollPosition) {
this.router.navigate([], {
queryParams: queryParams,
queryParamsHandling: 'merge',
fragment: `p-${paginationId}`
});
} else {
this.router.navigate([], {
queryParams: queryParams,
@@ -125,17 +128,20 @@ export class PaginationService {
pageSize?: number
sortField?: string
sortDirection?: SortDirection
}, extraParams?, changeLocationNot?: boolean) {
}, extraParams?, retainScrollPosition?: boolean) {
console.log(retainScrollPosition);
this.getCurrentRouting(paginationId).subscribe((currentFindListOptions) => {
const currentParametersWithIdName = this.getParametersWithIdName(paginationId, currentFindListOptions);
const parametersWithIdName = this.getParametersWithIdName(paginationId, params);
if (isNotEmpty(difference(parametersWithIdName, currentParametersWithIdName)) || isNotEmpty(extraParams)) {
const queryParams = Object.assign({}, currentParametersWithIdName,
parametersWithIdName, extraParams);
if (changeLocationNot) {
this.location.go(this.router.createUrlTree([], {
relativeTo: this.route, queryParams: queryParams, queryParamsHandling: 'merge'
}).toString());
if (retainScrollPosition) {
this.router.navigate(url, {
queryParams: queryParams,
queryParamsHandling: 'merge',
fragment: `p-${paginationId}`
});
} else {
this.router.navigate(url, {
queryParams: queryParams,
@@ -146,6 +152,22 @@ export class PaginationService {
});
}
clearPagination(paginationId: string) {
const params = {};
params[`p.${paginationId}`] = null;
params[`rpp.${paginationId}`] = null;
params[`sf.${paginationId}`] = null;
params[`sd.${paginationId}`] = null;
this.router.navigate([], {
queryParams: params,
queryParamsHandling: 'merge'
});
}
getPageParam(paginationId: string) {
return `p.${paginationId}`;
}
getParametersWithIdName(paginationId: string, params: {
page?: number