Skip to content

feat: support multiple order fields #36

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 2 commits into from
Jun 22, 2024
Merged

feat: support multiple order fields #36

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e3fd646
feat: support multiple order fields, WIP
arodu Aug 8, 2023
abaccf7
fix: filterOrder default return
arodu Aug 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
19 changes: 18 additions & 1 deletion src/Controller/Component/DatatablesPaginatorComponent.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
use Cake\Controller\Component\PaginatorComponent;
use Cake\Datasource\ResultSetInterface;
use Cake\Http\ServerRequest;
use Migrations\ConfigurationTrait;

/**
* DatatablesPaginator component
Expand Down Expand Up @@ -52,12 +53,28 @@ protected function applyOrder(array $data, array $settings): array
continue;
}
$colName = $dtColumns[$colIndex]['data'];
$settings['order'][$colName] = $colOrder;

$settings['order'] = array_merge($settings['order'] ?? [], $this->filterOrder($colName, $colOrder));
}

return $settings;
}

/**
* @param string $colName
* @param string $colOrder
* @return array
*/
protected function filterOrder(string $colName, string $colOrder): array
{
$filters = $this->getConfig('filterOrder') ?? [];
if (isset($filters[$colName])) {
return array_fill_keys($filters[$colName] ?? [], $colOrder);
}

return [$colName => $colOrder];
}

/**
* Translate limit and offset from datatables
*
Expand Down