Skip to content

Commit 6653917

Browse files
committed
Use page_parameter_name
1 parent 4ceb0d0 commit 6653917

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

src/DataProvider/Pagination.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -196,12 +196,9 @@ public function isPartialEnabled(string $resourceClass = null, string $operation
196196
return $this->getEnabled($context, $resourceClass, $operationName, true);
197197
}
198198

199-
public function getItemsPerPageOptions(): array
199+
public function getOptions(): array
200200
{
201-
return array_intersect_key($this->options, array_flip([
202-
'client_items_per_page',
203-
'items_per_page_parameter_name',
204-
]));
201+
return $this->options;
205202
}
206203

207204
public function getGraphQlPaginationType(string $resourceClass, string $operationName): string

src/GraphQl/Type/FieldsBuilder.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -307,16 +307,17 @@ private function getGraphQlPaginationArgs(string $resourceClass, string $queryNa
307307
];
308308
}
309309

310+
$paginationOptions = $this->pagination->getOptions();
311+
310312
$args = [
311-
'page' => [
313+
$paginationOptions['page_parameter_name'] => [
312314
'type' => GraphQLType::int(),
313315
'description' => 'Returns the current page.',
314316
],
315317
];
316318

317-
$itemsPerPageOptions = $this->pagination->getItemsPerPageOptions();
318-
if ($itemsPerPageOptions['client_items_per_page']) {
319-
$args[$itemsPerPageOptions['items_per_page_parameter_name']] = [
319+
if ($paginationOptions['client_items_per_page']) {
320+
$args[$paginationOptions['items_per_page_parameter_name']] = [
320321
'type' => GraphQLType::int(),
321322
'description' => 'Returns the number of items per page.',
322323
];

0 commit comments

Comments
 (0)