Skip to content

adapt paginator to request type as post #27

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 3 commits into from
Mar 8, 2023
Merged

adapt paginator to request type as post #27

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
19c30ca
adapt paginator to request type as post
Mar 8, 2023
7ab560c
refactor check request type and check key exists
Mar 8, 2023
1bf6319
check keys exists
Mar 8, 2023
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
35 changes: 23 additions & 12 deletions src/Controller/Component/DatatablesPaginatorComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@ class DatatablesPaginatorComponent extends PaginatorComponent

public function paginate(object $object, array $settings = []): ResultSetInterface
{
$request = $this->_registry->getController()->getRequest();
$settings = $this->applyOrder($request, $settings);
$settings = $this->applyLimits($request, $settings);
$request = $this->getController()->getRequest();
$dtData = $request->is('post') ? $request->getData() : $request->getQueryParams();

$settings = $this->applyOrder($dtData, $settings);
$settings = $this->applyLimits($dtData, $settings);
$resultSet = parent::paginate($object, $settings);

return $resultSet;
Expand All @@ -37,11 +39,11 @@ public function paginate(object $object, array $settings = []): ResultSetInterfa
* @param array $settings
* @return array
*/
protected function applyOrder(ServerRequest $request, array $settings): array
protected function applyOrder(array $data, array $settings): array
{
// translate ordering
$dtColumns = $request->getQuery('columns');
$dtOrders = (array)$request->getQuery('order');
$dtColumns = $data['columns'] ?? [];
$dtOrders = $data['order'] ?? [];

foreach ($dtOrders as $dtOrder) {
$colIndex = (int)($dtOrder['column'] ?? 0);
$colOrder = $dtOrder['dir'] ?? 'asc';
Expand All @@ -63,10 +65,10 @@ protected function applyOrder(ServerRequest $request, array $settings): array
* @param array $settings
* @return array
*/
protected function applyLimits(ServerRequest $request, array $settings): array
protected function applyLimits(array $data, array $settings): array
{
$dtStart = (int)$request->getQuery('start');
$dtLength = $request->getQuery('length') ? (int)$request->getQuery('length') : null;
$dtStart = (int)$data['start'] ?? 0;
$dtLength = (int)$data['length'] ?? 0;

$settings['limit'] = $dtLength;
if ($dtStart === 0) {
Expand Down Expand Up @@ -119,14 +121,22 @@ public function prepareRequestQueryParams(): void
{
// translate ordering
$request = $this->getController()->getRequest();
$dtColumns = $request->getQuery('columns', []);

$dtColumns = $request->is('post') ?
$request->getData('columns', []) : $request->getQuery('columns', []);

$newQueryParams = [];
foreach ($dtColumns as $dtColumn) {
if (($dtColumn['searchable'] ?? null) !== 'true') {
continue;
}
if (!array_key_exists('data',$dtColumn)) {
continue;
}

$colName = $dtColumn['data'];
if ($request->getQuery($colName)) {

if ($request->is('post') ? $request->getData($colName): $request->getQuery($colName)) {
// we already have a query param with values, ignoring this column
continue;
}
Expand All @@ -140,6 +150,7 @@ public function prepareRequestQueryParams(): void
}
$newQueryParams[$colName] = $colSearch;
}

$request = $request->withQueryParams($request->getQueryParams() + $newQueryParams);
$this->getController()->setRequest($request);
}
Expand Down