Skip to content

[feature] Pass entityDto to queryBuilderCallable in AssociationField #7293

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

Open
dmitryuk wants to merge 1 commit into
base: 4.x
Choose a base branch
from
+12 −4
Open

[feature] Pass entityDto to queryBuilderCallable in AssociationField #7293

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion doc/fields/AssociationField.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ If you already define custom queries in repository methods, you can reuse them
inside the callable::

yield AssociationField::new('...')->setQueryBuilder(
fn (QueryBuilder $queryBuilder): QueryBuilder => $queryBuilder->getEntityManager()->getRepository(Foo::class)->getSomeQueryBuilder();
fn (QueryBuilder $queryBuilder, ?EntityDto $dto): QueryBuilder => $queryBuilder->getEntityManager()->getRepository(Foo::class)->getSomeQueryBuilder();
);

Alternatively, you can use the `query_builder option`_ of Symfony's
Expand Down
8 changes: 7 additions & 1 deletion src/Controller/AbstractCrudController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,13 @@ public function autocomplete(AdminContext $context): JsonResponse
$queryBuilderCallable = $field?->getCustomOption(AssociationField::OPTION_QUERY_BUILDER_CALLABLE);

if (null !== $queryBuilderCallable) {
$queryBuilderCallable($queryBuilder);
$entityId = $autocompleteContext[EA::ENTITY_ID] ?? '';
$entityFcqn = $autocompleteContext[EA::ENTITY_FQCN] ?? '';
if ('' !== $entityId && '' !== $entityFcqn) {
$entityDto = $this->container->get(EntityFactory::class)->create($entityFcqn, $entityId);
}

$queryBuilderCallable($queryBuilder, $entityDto ?? null);
}

$paginator = $this->container->get(PaginatorFactory::class)->create($queryBuilder);
Expand Down
6 changes: 4 additions & 2 deletions src/Field/Configurator/AssociationConfigurator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c
EA::CRUD_CONTROLLER_FQCN => $context->getRequest()->attributes->get(EA::CRUD_CONTROLLER_FQCN) ?? $context->getRequest()->query->get(EA::CRUD_CONTROLLER_FQCN),
'propertyName' => $propertyName,
'originatingPage' => $context->getCrud()->getCurrentPage(),
EA::ENTITY_ID => $entityDto->getPrimaryKeyValueAsString(),
EA::ENTITY_FQCN => $entityDto->getFqcn(),
])
->generateUrl();
} catch (RouteNotFoundException $e) {
Expand All @@ -177,12 +179,12 @@ public function configure(FieldDto $field, EntityDto $entityDto, AdminContext $c

$field->setFormTypeOption('attr.data-ea-autocomplete-endpoint-url', $autocompleteEndpointUrl ?? null);
} else {
$field->setFormTypeOptionIfNotSet('query_builder', static function (EntityRepository $repository) use ($field) {
$field->setFormTypeOptionIfNotSet('query_builder', static function (EntityRepository $repository) use ($entityDto, $field) {
// TODO: should this use `createIndexQueryBuilder` instead, so we get the default ordering etc.?
// it would then be identical to the one used in autocomplete action, but it is a bit complex getting it in here
$queryBuilder = $repository->createQueryBuilder('entity');
if (null !== $queryBuilderCallable = $field->getCustomOption(AssociationField::OPTION_QUERY_BUILDER_CALLABLE)) {
$queryBuilderCallable($queryBuilder);
$queryBuilderCallable($queryBuilder, $entityDto);
}

return $queryBuilder;
Expand Down