Skip to content

Updated pagination next/previous detection. Resolves #1063. #1158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 22, 2020
Merged

Updated pagination next/previous detection. Resolves #1063. #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions spa/src/app/files/hca-table-pagination/hca-table-pagination.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,25 +112,25 @@ export class HCATablePaginationComponent implements OnInit {
}

/**
* Check if there is a next page.
* Check if there is a next page. Use search_after_uid and not search_after as null is a valid value for
* search_after.
*
* @param {PaginationModel} pm
* @returns {boolean}
*/
public hasNext(pm: PaginationModel): boolean {
// return (pm.from + pm.count) < pm.total;
return pm.search_after !== null;
return pm.search_after_uid !== null;
}

/**
* Check if there is a previous page.
* Check if there is a previous page. Use search_before_uid and not search_before as null is a valid value for
* search_before.
*
* @param {PaginationModel} pm
* @returns {boolean}
*/
public hasPrevious(pm: PaginationModel): boolean {
// return (pm.from > 1);
return pm.search_before !== null;
return pm.search_before_uid !== null;
}

/**
Expand Down
7 changes: 4 additions & 3 deletions spa/src/app/files/shared/files.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,14 +355,15 @@ export class FilesService {
paramMap["order"] = tableParams.order;
}

// check if there is paging
if ( tableParams.search_after && tableParams.search_after_uid ) {
// check if there is paging - use search_after_uid and not search_after as null is a valid value for search_after
if ( tableParams.search_after_uid ) {

paramMap["search_after"] = tableParams.search_after;
paramMap["search_after_uid"] = tableParams.search_after_uid;
}

if ( tableParams.search_before && tableParams.search_before_uid ) {
// Use search_before_uid and not search_before as null is a valid value for search_before
if ( tableParams.search_before_uid ) {

paramMap["search_before"] = tableParams.search_before;
paramMap["search_before_uid"] = tableParams.search_before_uid;
Expand Down