inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-06-30 18:15:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pageSize value fetch for infinite pagination (#4073)

Browse Source 
- uses pageSize defined on the component or by the UserPreferencesService
if not defined
This commit is contained in:
Nicolas Barithel 2018-12-13 15:20:20 +01:00 committed by Eugenio Romano
parent bdef2642e7
commit 411166605e
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/core/pagination/infinite-pagination.component.spec.ts
View File

@ -139,7 +139,17 @@ describe('InfinitePaginationComponent', () => {
component.onLoadMore();
expect(testTarget.updatePagination).toHaveBeenCalledWith({ maxItems: 469, skipCount: 0, totalItems: 888, hasMoreItems: true, merge: true });
expect(testTarget.updatePagination).toHaveBeenCalledWith({ maxItems: 444 + 25, skipCount: 0, totalItems: 888, hasMoreItems: true, merge: true });
});
it('should call the target\'s updatePagination on invoking the onLoadMore with a specific pageSize', () => {
component.target = testTarget;
component.pageSize = 7;
fixture.detectChanges();
component.onLoadMore();
expect(testTarget.updatePagination).toHaveBeenCalledWith({ maxItems: 444 + component.pageSize, skipCount: 0, totalItems: 888, hasMoreItems: true, merge: true });
});
it('should unsubscribe from the target\'s pagination on onDestroy', () => {

7
lib/core/pagination/infinite-pagination.component.ts
View File

@ -40,6 +40,9 @@ import { UserPreferencesService } from '../services/user-preferences.service';
})
export class InfinitePaginationComponent implements OnInit, OnDestroy, PaginationComponentInterface {
/**
* @deprecated 3.0.0 - uses paginationSize's default in UserPreferencesService
*/
static DEFAULT_PAGE_SIZE: number = 25;
static DEFAULT_PAGINATION: PaginationModel = {
@ -61,7 +64,7 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy, Paginatio
/** Number of items that are added with each "load more" event. */
@Input()
pageSize: number = InfinitePaginationComponent.DEFAULT_PAGE_SIZE;
pageSize: number;
/** Is a new page loading? */
@Input('loading')
@ -81,7 +84,7 @@ export class InfinitePaginationComponent implements OnInit, OnDestroy, Paginatio
this.paginationSubscription = this.target.pagination.subscribe((pagination) => {
this.isLoading = false;
this.pagination = pagination;
this.pageSize = this.userPreferencesService.paginationSize || this.pageSize;
this.pageSize = this.pageSize || this.userPreferencesService.paginationSize;
this.cdr.detectChanges();
});
}