[DSC-2682] persist current pageSize when calling doPageChange

Author: Andrea Barbasso

src/app/core/pagination/pagination.service.ts

@@ -69,7 +69,7 @@ export class PaginationService {
       map(([page, size]) => {
         return Object.assign(new PaginationComponentOptions(), defaultPagination, {
           currentPage: this.convertToNumeric(page, defaultPagination.currentPage),
-          pageSize: this.getBestMatchPageSize(size, defaultPagination),
+          pageSize: size || this.getBestMatchPageSize(size, defaultPagination),
         });
       }),
     );

src/app/shared/pagination/pagination.component.spec.ts

@@ -286,11 +286,11 @@ describe('Pagination component', () => {
 
       changePage(testFixture, 3);
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 3 }), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 3, pageSize: 10 }), {},  false);
 
       changePage(testFixture, 0);
       tick();
-      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 2 }), {},  false);
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', Object.assign({ page: 2, pageSize: 10 }), {},  false);
     }));
 
     it('should set correct pageSize route parameters', fakeAsync(() => {
@@ -389,6 +389,35 @@ describe('Pagination component', () => {
         expect(next).toBeTruthy();
       });
     });
+
+    it('emits pageChange event with the correct page number', fakeAsync(() => {
+      spyOn(testComp, 'pageChanged');
+      const paginationComponent: PaginationComponent = testFixture.debugElement.query(By.css('ds-pagination')).references.p;
+
+      paginationComponent.doPageChange(2);
+      tick();
+
+      expect(testComp.pageChanged).toHaveBeenCalledWith(2);
+    }));
+
+    it('updates query params with the correct page and pageSize', fakeAsync(() => {
+      const paginationComponent: PaginationComponent = testFixture.debugElement.query(By.css('ds-pagination')).references.p;
+
+      paginationComponent.doPageChange(3);
+      tick();
+
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', { page: 3, pageSize: 10 }, {}, false);
+    }));
+
+    it('handles undefined pageSize gracefully', fakeAsync(() => {
+      const paginationComponent: PaginationComponent = testFixture.debugElement.query(By.css('ds-pagination')).references.p;
+
+      currentPagination.next(Object.assign(new PaginationComponentOptions(), pagination, { pageSize: undefined }));
+      paginationComponent.doPageChange(1);
+      tick();
+
+      expect(paginationService.updateRoute).toHaveBeenCalledWith('test', { page: 1, pageSize: undefined }, {}, false);
+    }));
   });
 
 });

src/app/shared/pagination/pagination.component.ts

@@ -325,11 +325,14 @@ export class PaginationComponent implements OnChanges, OnDestroy, OnInit {
    *
    * @param page
    *    The page being navigated to.
+   * @param pageSize
    */
   public doPageChange(page: number) {
-    this.updateParams({ page: page });
-    this.emitPaginationChange();
-    this.pageChange.emit(page);
+    this.pageSize$.pipe(take(1)).subscribe((pageSize) => {
+      this.updateParams({ page, pageSize: pageSize });
+      this.emitPaginationChange();
+      this.pageChange.emit(page);
+    });
   }
 
   /**