Skip to content
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

BUGFIX Fix conversion in CreationDialogPropertiesCreationHandler #3720

Merged
merged 3 commits into from
Mar 16, 2024
Merged

BUGFIX Fix conversion in CreationDialogPropertiesCreationHandler #3720

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55f0dc0
BUGFIX Fix conversion in CreationDialogPropertiesCreationHandler
kdambekalns Feb 16, 2024
5c1fcd0
TASK: Skip null values, too
kdambekalns Feb 16, 2024
af67870
BUGFIX: Don't expect each `element` to map to a property configuration
mhsdesign Mar 16, 2024
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
33 changes: 8 additions & 25 deletions Classes/NodeCreationHandler/CreationDialogPropertiesCreationHandler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,8 @@

use Neos\ContentRepository\Domain\Model\NodeInterface;
use Neos\Flow\Annotations as Flow;
use Neos\Flow\Property\Exception as PropertyException;
use Neos\Flow\Property\PropertyMapper;
use Neos\Flow\Property\TypeConverter\PersistentObjectConverter;
use Neos\Flow\Security\Exception as SecurityException;
use Neos\Neos\Ui\Domain\Service\NodePropertyConversionService;
use Neos\Neos\Ui\NodeCreationHandler\NodeCreationHandlerInterface;
use Neos\Utility\ObjectAccess;
use Neos\Utility\TypeHandling;

Expand All @@ -27,37 +25,22 @@ class CreationDialogPropertiesCreationHandler implements NodeCreationHandlerInte
{
/**
* @Flow\Inject
* @var PropertyMapper
* @var NodePropertyConversionService
*/
protected $propertyMapper;
protected $nodePropertyConversionService;

/**
* @param NodeInterface $node The newly created node
* @param array $data incoming data from the creationDialog
* @return void
* @throws PropertyException | SecurityException
*/
public function handle(NodeInterface $node, array $data): void
{
$propertyMappingConfiguration = $this->propertyMapper->buildPropertyMappingConfiguration();
$propertyMappingConfiguration->forProperty('*')->allowAllProperties();
$propertyMappingConfiguration->setTypeConverterOption(PersistentObjectConverter::class, PersistentObjectConverter::CONFIGURATION_OVERRIDE_TARGET_TYPE_ALLOWED, true);

foreach ($node->getNodeType()->getConfiguration('properties') as $propertyName => $propertyConfiguration) {
foreach ($data as $propertyName => $propertyValue) {
mhsdesign marked this conversation as resolved.
Show resolved Hide resolved
$propertyConfiguration = $node->getNodeType()->getConfiguration('properties')[$propertyName] ?? null;
if (!isset($propertyConfiguration['ui']['showInCreationDialog']) || $propertyConfiguration['ui']['showInCreationDialog'] !== true) {
continue;
}
$propertyType = TypeHandling::normalizeType($propertyConfiguration['type'] ?? 'string');
if (!isset($data[$propertyName])) {
if ($propertyValue === null || ($propertyValue === '' && !TypeHandling::isSimpleType($propertyType))) {
mhsdesign marked this conversation as resolved.
Show resolved Hide resolved
continue;
}
$propertyValue = $data[$propertyName];
if ($propertyValue === '' && !TypeHandling::isSimpleType($propertyType)) {
continue;
}
if ($propertyType !== 'references' && $propertyType !== 'reference' && $propertyType !== TypeHandling::getTypeForValue($propertyValue)) {
$propertyValue = $this->propertyMapper->convert($propertyValue, $propertyType, $propertyMappingConfiguration);
}
$propertyValue = $this->nodePropertyConversionService->convert($node->getNodeType(), $propertyName, $propertyValue, $node->getContext());
if (strncmp($propertyName, '_', 1) === 0) {
ObjectAccess::setProperty($node, substr($propertyName, 1), $propertyValue);
} else {
Expand Down
Loading