Skip to content

Refactor pagination logic to ensure consistent total item count handling #2231

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

Closed
wants to merge 1 commit into from
Closed

Refactor pagination logic to ensure consistent total item count handling #2231

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
18 changes: 12 additions & 6 deletions src/Traits/WithData.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,17 +107,23 @@
$this->paginationTotalItemCount = $this->getBuilder()->count();

return $this->getBuilder()->simplePaginate($this->getPerPage() === -1 ? $this->paginationTotalItemCount : $this->getPerPage(), ['*'], $this->getComputedPageName());
} else {
$this->paginationTotalItemCount = -1;

return $this->getBuilder()->simplePaginate($this->getPerPage() === -1 ? 10 : $this->getPerPage(), ['*'], $this->getComputedPageName());
}

$this->paginationTotalItemCount = -1;

Check warning on line 112 in src/Traits/WithData.php

View check run for this annotation

Codecov / codecov/patch

src/Traits/WithData.php#L112 

Added line #L112 was not covered by tests

return $this->getBuilder()->simplePaginate($this->getPerPage() === -1 ? 10 : $this->getPerPage(), ['*'], $this->getComputedPageName());

Check warning on line 114 in src/Traits/WithData.php

View check run for this annotation

Codecov / codecov/patch

src/Traits/WithData.php#L114 

Added line #L114 was not covered by tests

} elseif ($this->isPaginationMethod('cursor')) {

$this->paginationTotalItemCount = $this->getBuilder()->count();
if ($this->getShouldRetrieveTotalItemCount()) {
$this->paginationTotalItemCount = $this->getBuilder()->count();

Check warning on line 119 in src/Traits/WithData.php

View check run for this annotation

Codecov / codecov/patch

src/Traits/WithData.php#L118-L119 

Added lines #L118 - L119 were not covered by tests

return $this->getBuilder()->cursorPaginate($this->getPerPage() === -1 ? $this->paginationTotalItemCount : $this->getPerPage(), ['*'], $this->getComputedPageName());

Check warning on line 121 in src/Traits/WithData.php

View check run for this annotation

Codecov / codecov/patch

src/Traits/WithData.php#L121 

Added line #L121 was not covered by tests
}

$this->paginationTotalItemCount = -1;

Check warning on line 124 in src/Traits/WithData.php

View check run for this annotation

Codecov / codecov/patch

src/Traits/WithData.php#L124 

Added line #L124 was not covered by tests

return $this->getBuilder()->cursorPaginate($this->getPerPage() === -1 ? $this->paginationTotalItemCount : $this->getPerPage(), ['*'], $this->getComputedPageName());
return $this->getBuilder()->cursorPaginate($this->getPerPage() === -1 ? 10 : $this->getPerPage(), ['*'], $this->getComputedPageName());

Check warning on line 126 in src/Traits/WithData.php

View check run for this annotation

Codecov / codecov/patch

src/Traits/WithData.php#L126 

Added line #L126 was not covered by tests
} else {
throw new DataTableConfigurationException('Pagination method must be either simple, standard or cursor');
}
Expand Down
Loading