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

Fixed switch view pagination issue

Browse Source
This commit is contained in:
Giuseppe Digilio
2019-04-05 16:32:20 +02:00
parent 3d873713b6
commit 9b452c980f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/+search-page/search-service/search.service.spec.ts
View File

@@ -123,7 +123,7 @@ describe('SearchService', () => {
it('should call the navigate method on the Router with view mode list parameter as a parameter when setViewMode is called', () => { it('should call the navigate method on the Router with view mode list parameter as a parameter when setViewMode is called', () => {
searchService.setViewMode(ViewMode.List); searchService.setViewMode(ViewMode.List);
expect(router.navigate).toHaveBeenCalledWith(['/search'], { expect(router.navigate).toHaveBeenCalledWith(['/search'], {
queryParams: { view: ViewMode.List }, queryParams: { view: ViewMode.List, page: 1 },
queryParamsHandling: 'merge' queryParamsHandling: 'merge'
}); });
}); });
@@ -131,7 +131,7 @@ describe('SearchService', () => {
it('should call the navigate method on the Router with view mode grid parameter as a parameter when setViewMode is called', () => { it('should call the navigate method on the Router with view mode grid parameter as a parameter when setViewMode is called', () => {
searchService.setViewMode(ViewMode.Grid); searchService.setViewMode(ViewMode.Grid);
expect(router.navigate).toHaveBeenCalledWith(['/search'], { expect(router.navigate).toHaveBeenCalledWith(['/search'], {
queryParams: { view: ViewMode.Grid }, queryParams: { view: ViewMode.Grid, page: 1 },
queryParamsHandling: 'merge' queryParamsHandling: 'merge'
}); });
}); });

2
src/app/+search-page/search-service/search.service.ts
View File

@@ -331,7 +331,7 @@ export class SearchService implements OnDestroy {
setViewMode(viewMode: ViewMode) { setViewMode(viewMode: ViewMode) {
this.routeService.getQueryParameterValue('pageSize').pipe(first()) this.routeService.getQueryParameterValue('pageSize').pipe(first())
.subscribe((pageSize) => { .subscribe((pageSize) => {
let queryParams = { view: viewMode }; let queryParams = { view: viewMode, page: 1 };
if (viewMode === ViewMode.Detail) { if (viewMode === ViewMode.Detail) {
queryParams = Object.assign(queryParams, {pageSize: '1'}); queryParams = Object.assign(queryParams, {pageSize: '1'});
} else if (pageSize === '1') { } else if (pageSize === '1') {