Update to latest references commits

neos · Oct 23, 2024 · b6673a7 · b6673a7
1 parent 9e7a7cd
commit b6673a7
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/Classes/Domain/Model/Changes/Property.php b/Classes/Domain/Model/Changes/Property.php
@@ -239,7 +239,7 @@ private function handleNodeReferenceChange(Node $subject, string $propertyName):
                 $subject->workspaceName,
                 $subject->aggregateId,
                 $subject->originDimensionSpacePoint,
-                NodeReferencesToWrite::fromReferenceNameAndNodeAggregateIds(ReferenceName::fromString($propertyName), NodeAggregateIds::fromArray($destinationNodeAggregateIds))
+                NodeReferencesToWrite::fromNameAndTargets(ReferenceName::fromString($propertyName), NodeAggregateIds::fromArray($destinationNodeAggregateIds))
             )
         );
     }

diff --git a/Classes/Domain/NodeCreation/NodeCreationCommands.php b/Classes/Domain/NodeCreation/NodeCreationCommands.php
@@ -21,6 +21,7 @@
 use Neos\ContentRepository\Core\Feature\NodeModification\Command\SetNodeProperties;
 use Neos\ContentRepository\Core\Feature\NodeModification\Dto\PropertyValuesToWrite;
 use Neos\ContentRepository\Core\Feature\NodeReferencing\Command\SetNodeReferences;
+use Neos\ContentRepository\Core\Feature\NodeReferencing\Dto\NodeReferencesToWrite;
 use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
 
 /**
@@ -107,6 +108,14 @@ public function withInitialPropertyValues(PropertyValuesToWrite $newInitialPrope
         );
     }
 
+    public function withInitialReferences(NodeReferencesToWrite $newInitialReferences): self
+    {
+        return new self(
+            $this->first->withReferences($newInitialReferences),
+            ...$this->additionalCommands
+        );
+    }
+
     public function withAdditionalCommands(
         CreateNodeAggregateWithNode|SetNodeProperties|DisableNodeAggregate|EnableNodeAggregate|SetNodeReferences|CopyNodesRecursively ...$additionalCommands
     ): self {

diff --git a/...nfrastructure/ContentRepository/CreationDialog/PromotedElementsCreationHandlerFactory.php b/...nfrastructure/ContentRepository/CreationDialog/PromotedElementsCreationHandlerFactory.php
@@ -5,7 +5,6 @@
 namespace Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialog;
 
 use Neos\ContentRepository\Core\ContentRepository;
-use Neos\ContentRepository\Core\Feature\NodeReferencing\Command\SetNodeReferences;
 use Neos\ContentRepository\Core\Feature\NodeReferencing\Dto\NodeReferencesToWrite;
 use Neos\ContentRepository\Core\NodeType\NodeTypeManager;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateIds;
@@ -39,7 +38,7 @@ public function handle(NodeCreationCommands $commands, NodeCreationElements $ele
                     return $commands;
                 }
                 $propertyValues = $commands->first->initialPropertyValues;
-                $setReferencesCommands = [];
+                $initialReferences = null;
                 foreach ($elements as $elementName => $elementValue) {
                     // handle properties
                     if ($nodeType->hasProperty($elementName)) {
@@ -56,23 +55,19 @@ public function handle(NodeCreationCommands $commands, NodeCreationElements $ele
                     if ($nodeType->hasReference($elementName)) {
                         assert($elementValue instanceof NodeAggregateIds);
                         $referenceConfiguration = $nodeType->getReferences()[$elementName];
-                        if (
-                            ($referenceConfiguration['ui']['showInCreationDialog'] ?? false) === true
-                        ) {
-                            // a promoted element
-                            $setReferencesCommands[] = SetNodeReferences::create(
-                                $commands->first->workspaceName,
-                                $commands->first->nodeAggregateId,
-                                $commands->first->originDimensionSpacePoint,
-                                NodeReferencesToWrite::fromReferenceNameAndNodeAggregateIds(ReferenceName::fromString($elementName), $elementValue)
-                            );
+                        if (($referenceConfiguration['ui']['showInCreationDialog'] ?? false) === true) {
+                            $referencesToWriteForCurrentElement = NodeReferencesToWrite::fromNameAndTargets(ReferenceName::fromString($elementName), $elementValue);
+                            $initialReferences = $initialReferences === null ? $referencesToWriteForCurrentElement : $initialReferences->merge($referencesToWriteForCurrentElement);
                         }
                     }
                 }
 
+                if ($initialReferences !== null) {
+                    $commands = $commands->withInitialReferences($initialReferences);
+                }
+
                 return $commands
-                    ->withInitialPropertyValues($propertyValues)
-                    ->withAdditionalCommands(...$setReferencesCommands);
+                    ->withInitialPropertyValues($propertyValues);
             }
         };
     }