Skip to content

Propagate embedded controllers' field assets to parent form page #7595

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
lacatoire wants to merge 1 commit into
base: 5.x
Choose a base branch
from
+27 −4
Open

Propagate embedded controllers' field assets to parent form page #7595

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
18 changes: 14 additions & 4 deletions src/Field/Configurator/AssociationConfigurator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,10 +354,20 @@ private function configureCrudForm(FieldDto $field, EntityDto $entityDto, string
$crudPageName = Crud::PAGE_EDIT;
}

$field->setFormTypeOption(
'entityDto',
$this->createEntityDto($targetEntityFqcn, $targetCrudControllerFqcn, $targetCrudControllerAction, $targetCrudControllerPageName, $crudPageName),
);
$embeddedEntityDto = $this->createEntityDto($targetEntityFqcn, $targetCrudControllerFqcn, $targetCrudControllerAction, $targetCrudControllerPageName, $crudPageName);
$field->setFormTypeOption('entityDto', $embeddedEntityDto);

// The assets declared by the embedded controller's fields (e.g. TextEditorField,
// FileField, a nested CollectionField...) live on the embedded EntityDto, not on
// the parent AssociationField. Propagate them up so that
// AbstractCrudController::getFieldAssets(), which only walks top-level fields,
// picks them up and outputs the required CSS/JS on the form page that hosts the
// embedded CRUD form. See #6127.
$assets = $field->getAssets();
foreach ($embeddedEntityDto->getFields() ?? [] as $embeddedField) {
$assets = $assets->mergeWith($embeddedField->getAssets());
}
$field->setAssets($assets);
}

/**
Expand Down
13 changes: 13 additions & 0 deletions src/Field/Configurator/CollectionConfigurator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,19 @@ private function configureEntryType(FieldDto $fieldDto, EntityDto $entityDto, Ad
$fieldDto->setFormTypeOption('entry_type', CrudFormType::class);
$fieldDto->setFormTypeOption('entry_options.entityDto', $editEntityDto);
$fieldDto->setFormTypeOption('prototype_options.entityDto', $newEntityDto);

// The assets declared by entry fields (e.g. TextEditorField, FileField, a nested
// CollectionField...) live on the entry EntityDto, not on the parent CollectionField.
// Propagate them up so that AbstractCrudController::getFieldAssets(), which only
// walks top-level fields, picks them up and outputs the required CSS/JS on the
// form page that hosts the embedded CRUD form. See #6127.
$assets = $fieldDto->getAssets();
foreach ([$editEntityDto, $newEntityDto] as $entryEntityDto) {
foreach ($entryEntityDto->getFields() ?? [] as $entryField) {
$assets = $assets->mergeWith($entryField->getAssets());
}
}
$fieldDto->setAssets($assets);
}

/**
Expand Down
Loading