TASK: Move moveNodeStrategy to Neos UI

neos · Nov 19, 2024 · b0fbcbd · b0fbcbd
1 parent f1af995
commit b0fbcbd
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/Classes/Domain/Model/Changes/MoveAfter.php b/Classes/Domain/Model/Changes/MoveAfter.php
@@ -75,7 +75,7 @@ public function apply(): void
             $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
             $nodeType = $contentRepository->getNodeTypeManager()->getNodeType($this->subject->nodeTypeName);
             $strategy = $nodeType->getConfiguration('options.moveNodeStrategy') ?: throw new \RuntimeException('Nodetype is missing required option "moveNodeStrategy".', 1645577794);
-            $strategy = RelationDistributionStrategy::fromName($strategy) ?: throw new \RuntimeException('Nodetype has an invalid configuration for option "moveNodeStrategy".', 1645577794);;
+            $strategy = RelationDistributionStrategy::tryFrom($strategy) ?? throw new \RuntimeException('Nodetype has an invalid configuration for option "moveNodeStrategy".', 1645577794);;
             $command = MoveNodeAggregate::create(
                 $subject->workspaceName,
                 $subject->dimensionSpacePoint,

diff --git a/Classes/Domain/Model/Changes/MoveBefore.php b/Classes/Domain/Model/Changes/MoveBefore.php
@@ -70,7 +70,7 @@ public function apply(): void
             $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
             $nodeType = $contentRepository->getNodeTypeManager()->getNodeType($this->subject->nodeTypeName);
             $strategy = $nodeType->getConfiguration('options.moveNodeStrategy') ?: throw new \RuntimeException('Nodetype is missing required option "moveNodeStrategy".', 1645577794);
-            $strategy = RelationDistributionStrategy::fromName($strategy) ?: throw new \RuntimeException('Nodetype has an invalid configuration for option "moveNodeStrategy".', 1645577794);
+            $strategy = RelationDistributionStrategy::tryFrom($strategy) ?? throw new \RuntimeException('Nodetype has an invalid configuration for option "moveNodeStrategy".', 1645577794);
             $contentRepository->handle(
                 MoveNodeAggregate::create(
                     $subject->workspaceName,

diff --git a/Classes/Domain/Model/Changes/MoveInto.php b/Classes/Domain/Model/Changes/MoveInto.php
@@ -80,7 +80,7 @@ public function apply(): void
             $contentRepository = $this->contentRepositoryRegistry->get($subject->contentRepositoryId);
             $nodeType = $contentRepository->getNodeTypeManager()->getNodeType($this->subject->nodeTypeName);
             $strategy = $nodeType->getConfiguration('options.moveNodeStrategy') ?: throw new \RuntimeException('Nodetype is missing required option "moveNodeStrategy".', 1645577794);
-            $strategy = RelationDistributionStrategy::fromName($strategy) ?: throw new \RuntimeException('Nodetype has an invalid configuration for option "moveNodeStrategy".', 1645577794);
+            $strategy = RelationDistributionStrategy::tryFrom($strategy) ?? throw new \RuntimeException('Nodetype has an invalid configuration for option "moveNodeStrategy".', 1645577794);
             $contentRepository->handle(
                 MoveNodeAggregate::create(
                     $subject->workspaceName,

diff --git a/Configuration/NodeTypes.yaml b/Configuration/NodeTypes.yaml
@@ -24,6 +24,7 @@
         factoryClassName: 'Neos\Neos\Ui\Infrastructure\Neos\UriPathSegmentNodeCreationHandlerFactory'
       promotedElements:
         factoryClassName: 'Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialog\PromotedElementsCreationHandlerFactory'
+    moveNodeStrategy: gatherAll
 
 'Neos.Neos:Content':
   postprocessors:
@@ -34,6 +35,7 @@
     nodeCreationHandlers:
       promotedElements:
         factoryClassName: 'Neos\Neos\Ui\Infrastructure\ContentRepository\CreationDialog\PromotedElementsCreationHandlerFactory'
+    moveNodeStrategy: scatter
 
 'Neos.Neos:ContentCollection':
   ui: