Skip to content

fix(graphql): operation with disabled pagination #4930

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
webda2l wants to merge 3 commits into from
Closed

fix(graphql): operation with disabled pagination #4930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0deee1f
fix(graphql): operation with disabled pagination
webda2l Sep 8, 2022
2de3979
test(graphql): fixes
webda2l Sep 8, 2022
05c0ab2
fix(graphql): operation with disabled pagination
webda2l Sep 8, 2022
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
5 changes: 4 additions & 1 deletion src/GraphQl/Type/FieldsBuilder.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,10 @@ private function convertType(Type $type, bool $input, Operation $rootOperation,
}

if ($this->typeBuilder->isCollection($type)) {
return $this->pagination->isGraphQlEnabled($rootOperation) && !$input ? $this->typeBuilder->getResourcePaginatedCollectionType($graphqlType, $resourceClass, $rootOperation) : GraphQLType::listOf($graphqlType);
$resourceMetadataCollection = $this->resourceMetadataCollectionFactory->create($resourceClass);
$resolverOperation = $resourceMetadataCollection->getOperation(null, true, false, true);

@soyuka soyuka Sep 9, 2022

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can't you use an operation name instead of adding a flag?

@webda2l webda2l Sep 14, 2022

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

? Not sure to understand your point sorry.


return $this->pagination->isGraphQlEnabled($resolverOperation) && !$input ? $this->typeBuilder->getResourcePaginatedCollectionType($graphqlType, $resourceClass, $rootOperation) : GraphQLType::listOf($graphqlType);
}

return $forceNullable || !$graphqlType instanceof NullableType || $type->isNullable() || ($rootOperation instanceof Mutation && 'update' === $rootOperation->getName())
Expand Down
67 changes: 48 additions & 19 deletions src/Metadata/Resource/ResourceMetadataCollection.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use ApiPlatform\Metadata\CollectionOperationInterface;
use ApiPlatform\Metadata\HttpOperation;
use ApiPlatform\Metadata\Operation;
use ApiPlatform\Metadata\Operations;

/**
* @experimental
Expand All @@ -35,7 +36,7 @@ public function __construct(string $resourceClass, array $input = [])
parent::__construct($input);
}

public function getOperation(?string $operationName = null, bool $forceCollection = false, bool $httpOperation = false): Operation
public function getOperation(?string $operationName = null, bool $forceCollection = false, bool $httpOperation = false, bool $priorizeGraphQl = false): Operation
{
$operationName = $operationName ?? '';
if (isset($this->operationCache[$operationName])) {
Expand All @@ -53,29 +54,21 @@ public function getOperation(?string $operationName = null, bool $forceCollectio
/** @var ApiResource $metadata */
$metadata = $it->current();

foreach ($metadata->getOperations() ?? [] as $name => $operation) {
$isCollection = $operation instanceof CollectionOperationInterface;
if ('' === $operationName && \in_array($operation->getMethod() ?? HttpOperation::METHOD_GET, [HttpOperation::METHOD_GET, HttpOperation::METHOD_OPTIONS, HttpOperation::METHOD_HEAD], true) && ($forceCollection ? $isCollection : !$isCollection)) {
return $this->operationCache[$operationName] = $operation;
}

if ($name === $operationName) {
return $this->operationCache[$operationName] = $operation;
}

if ($operation->getUriTemplate() === $operationName) {
return $this->operationCache[$operationName] = $operation;
if ($priorizeGraphQl && ([] !== $graphQlOperations = ($metadata->getGraphQlOperations() ?? []))) {
if (null !== $graphQlOperation = $this->findGraphQlOperation($graphQlOperations, $operationName, $forceCollection, $httpOperation)) {
return $graphQlOperation;
}
}

foreach ($metadata->getGraphQlOperations() ?? [] as $name => $operation) {
$isCollection = $operation instanceof CollectionOperationInterface;
if ('' === $operationName && ($forceCollection ? $isCollection : !$isCollection) && false === $httpOperation) {
return $this->operationCache['graphql_'.$operationName] = $operation;
if (null !== $operations = $metadata->getOperations()) {
if (null !== $operation = $this->findHttpOperation($operations, $operationName, $forceCollection, $httpOperation)) {
return $operation;
}
}

if ($name === $operationName) {
return $this->operationCache['graphql_'.$operationName] = $operation;
if (!$priorizeGraphQl && ([] !== $graphQlOperations = ($metadata->getGraphQlOperations() ?? []))) {
if (null !== $graphQlOperation = $this->findGraphQlOperation($graphQlOperations, $operationName, $forceCollection, $httpOperation)) {
return $graphQlOperation;
}
}

Expand All @@ -85,6 +78,42 @@ public function getOperation(?string $operationName = null, bool $forceCollectio
$this->handleNotFound($operationName, $metadata);
}

private function findHttpOperation(Operations $operations, string $operationName, bool $forceCollection, bool $httpOperation): ?Operation
{
foreach ($operations as $name => $operation) {
$isCollection = $operation instanceof CollectionOperationInterface;
if ('' === $operationName && \in_array($operation->getMethod() ?? HttpOperation::METHOD_GET, [HttpOperation::METHOD_GET, HttpOperation::METHOD_OPTIONS, HttpOperation::METHOD_HEAD], true) && ($forceCollection ? $isCollection : !$isCollection)) {
return $this->operationCache[$operationName] = $operation;
}

if ($name === $operationName) {
return $this->operationCache[$operationName] = $operation;
}

if ($operation->getUriTemplate() === $operationName) {
return $this->operationCache[$operationName] = $operation;
}
}

return null;
}

private function findGraphQlOperation(array $operations, string $operationName, bool $forceCollection, bool $httpOperation): ?Operation
{
foreach ($operations as $name => $operation) {
$isCollection = $operation instanceof CollectionOperationInterface;
if ('' === $operationName && ($forceCollection ? $isCollection : !$isCollection) && false === $httpOperation) {
return $this->operationCache['graphql_'.$operationName] = $operation;
}

if ($name === $operationName) {
return $this->operationCache['graphql_'.$operationName] = $operation;
}
}

return null;
}

/**
* @throws OperationNotFoundException
*/
Expand Down