Skip to content

fix: Allow Collections to work on nested associations #7584

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

Draft
KDederichs wants to merge 1 commit into
base: 5.x
Choose a base branch
from
+13 −10
Draft

fix: Allow Collections to work on nested associations #7584

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
1 change: 1 addition & 0 deletions config/services.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,7 @@
->arg(2, service(ControllerFactory::class))
->arg(3, new Reference(FieldFactory::class))
->arg(4, service(AdminContextProvider::class))
->arg(5, service(EntityRepository::class))

->set(SlugConfigurator::class)

Expand Down
22 changes: 12 additions & 10 deletions src/Field/Configurator/CollectionConfigurator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
use EasyCorp\Bundle\EasyAdminBundle\Factory\FieldFactory;
use EasyCorp\Bundle\EasyAdminBundle\Field\CollectionField;
use EasyCorp\Bundle\EasyAdminBundle\Form\Type\CrudFormType;
use EasyCorp\Bundle\EasyAdminBundle\Orm\EntityRepository;
use Symfony\Component\Form\Extension\Core\Type\CountryType;
use Symfony\Component\Form\Extension\Core\Type\CurrencyType;
use Symfony\Component\Form\Extension\Core\Type\LanguageType;
Expand All @@ -36,6 +37,7 @@
private ControllerFactory $controllerFactory,
private FieldFactory $fieldFactory,
private AdminContextProviderInterface $adminContextProvider,
private EntityRepository $entityRepository,
) {
}

Expand Down Expand Up @@ -125,24 +127,24 @@

private function configureEntryType(FieldDto $fieldDto, EntityDto $entityDto, AdminContext $context): void
{
$resolvedProperty = $this->entityRepository->resolveNestedAssociations(null, $entityDto, $fieldDto->getProperty(), true);

Check failure on line 130 in src/Field/Configurator/CollectionConfigurator.php

View workflow job for this annotation

GitHub Actions / phpstan 

Call to an undefined method EasyCorp\Bundle\EasyAdminBundle\Orm\EntityRepository::resolveNestedAssociations().
/** @var EntityDto $entityDtoResolved */
$entityDtoResolved = $resolvedProperty['entity_dto'];
/** @var string $resolvedProperty */
$resolvedProperty = $resolvedProperty['property_name'];
if (true === $fieldDto->getCustomOption(CollectionField::OPTION_ENTRY_USES_CRUD_FORM)) {
if (!$entityDto->getClassMetadata()->hasAssociation($fieldDto->getProperty())) {
throw new \RuntimeException(sprintf('The "%s" collection field of "%s" cannot use the "useEntryCrudForm()" method because it is not a Doctrine association.', $fieldDto->getProperty(), $context->getCrud()?->getControllerFqcn()));
}

if (null !== $fieldDto->getCustomOptions()->get(CollectionField::OPTION_ENTRY_TYPE)) {
throw new \RuntimeException(sprintf('The "%s" collection field of "%s" can render its entries using a Symfony Form (via the "setEntryType()" method) or using an EasyAdmin CRUD Form (via the "useEntryCrudForm()" method) but you cannot use both methods at the same time. Remove one of those two methods.', $fieldDto->getProperty(), $context->getCrud()?->getControllerFqcn()));
}

$targetCrudControllerFqcn = $fieldDto->getCustomOption(CollectionField::OPTION_ENTRY_CRUD_CONTROLLER_FQCN)
?? $context->getAdminControllers()->findCrudControllerByEntity($entityDto->getClassMetadata()->getAssociationTargetClass($fieldDto->getProperty()));
?? $context->getAdminControllers()->findCrudControllerByEntity($entityDtoResolved->getClassMetadata()->getAssociationTargetClass($resolvedProperty));

if (null === $targetCrudControllerFqcn) {
throw new \RuntimeException(sprintf('The "%s" collection field of "%s" wants to render its entries using an EasyAdmin CRUD form. However, no CRUD form was found related to this field. You can either create a CRUD controller for the entity "%s" or pass the CRUD controller to use as the first argument of the "useEntryCrudForm()" method.', $fieldDto->getProperty(), $context->getCrud()?->getControllerFqcn(), $entityDto->getClassMetadata()->getAssociationTargetClass($fieldDto->getProperty())));
}
} elseif (null === $fieldDto->getFormTypeOption('entry_type')
&& $entityDto->getClassMetadata()->hasAssociation($fieldDto->getProperty())) {
$targetCrudControllerFqcn = $context->getAdminControllers()->findCrudControllerByEntity($entityDto->getClassMetadata()->getAssociationTargetClass($fieldDto->getProperty()));
} elseif (null === $fieldDto->getFormTypeOption('entry_type')) {
$targetCrudControllerFqcn = $context->getAdminControllers()->findCrudControllerByEntity($entityDtoResolved->getClassMetadata()->getAssociationTargetClass($resolvedProperty));

if (null === $targetCrudControllerFqcn) {
return;
Expand All @@ -152,14 +154,14 @@
}

$editEntityDto = $this->createEntityDto(
$entityDto->getClassMetadata()->getAssociationTargetClass($fieldDto->getProperty()),
$entityDtoResolved->getClassMetadata()->getAssociationTargetClass($resolvedProperty),
$targetCrudControllerFqcn,
Action::EDIT,
$fieldDto->getCustomOption(CollectionField::OPTION_ENTRY_CRUD_EDIT_PAGE_NAME) ?? Crud::PAGE_EDIT,
Crud::PAGE_EDIT,
);
$newEntityDto = $this->createEntityDto(
$entityDto->getClassMetadata()->getAssociationTargetClass($fieldDto->getProperty()),
$entityDtoResolved->getClassMetadata()->getAssociationTargetClass($resolvedProperty),
$targetCrudControllerFqcn,
Action::NEW,
$fieldDto->getCustomOption(CollectionField::OPTION_ENTRY_CRUD_NEW_PAGE_NAME) ?? Crud::PAGE_NEW,
Expand Down
Loading