TASK: Remove obsolete aggregate as Neos Ui handles nodeMove strategy now via special configuration

Neos.ContentRepository.Core/Classes/Feature/NodeMove/Command/MoveNodeAggregate.php

@@ -61,7 +61,7 @@ private function __construct(
         public WorkspaceName $workspaceName,
         public DimensionSpacePoint $dimensionSpacePoint,
         public NodeAggregateId $nodeAggregateId,
-        public RelationDistributionStrategy $relationDistributionStrategy,
+        public ?RelationDistributionStrategy $relationDistributionStrategy,
         public ?NodeAggregateId $newParentNodeAggregateId,
         public ?NodeAggregateId $newPrecedingSiblingNodeAggregateId,
         public ?NodeAggregateId $newSucceedingSiblingNodeAggregateId,
@@ -72,12 +72,12 @@ private function __construct(
      * @param WorkspaceName $workspaceName The workspace in which the move operation is to be performed
      * @param DimensionSpacePoint $dimensionSpacePoint This is one of the *covered* dimension space points of the node aggregate and not necessarily one of the occupied ones. This allows us to move virtual specializations only when using the scatter strategy
      * @param NodeAggregateId $nodeAggregateId The id of the node aggregate to move
-     * @param RelationDistributionStrategy $relationDistributionStrategy The relation distribution strategy to be used ({@see RelationDistributionStrategy})
+     * @param RelationDistributionStrategy|null $relationDistributionStrategy The relation distribution strategy to be used ({@see RelationDistributionStrategy})
      * @param NodeAggregateId|null $newParentNodeAggregateId The id of the new parent node aggregate. If given, it enforces that all nodes in the given aggregate are moved into nodes of the parent aggregate, even if the given siblings belong to other parents. In latter case, those siblings are ignored
      * @param NodeAggregateId|null $newPrecedingSiblingNodeAggregateId The id of the new preceding sibling node aggregate. If given and no successor found, it is attempted to insert the moved nodes right after nodes of this aggregate. In dimension space points this aggregate does not cover, other siblings, in order of proximity, are tried to be used instead
      * @param NodeAggregateId|null $newSucceedingSiblingNodeAggregateId The id of the new succeeding sibling node aggregate. If given, it is attempted to insert the moved nodes right before nodes of this aggregate. In dimension space points this aggregate does not cover, the preceding sibling is tried to be used instead
      */
-    public static function create(WorkspaceName $workspaceName, DimensionSpacePoint $dimensionSpacePoint, NodeAggregateId $nodeAggregateId, RelationDistributionStrategy $relationDistributionStrategy, ?NodeAggregateId $newParentNodeAggregateId = null, ?NodeAggregateId $newPrecedingSiblingNodeAggregateId = null, ?NodeAggregateId $newSucceedingSiblingNodeAggregateId = null): self
+    public static function create(WorkspaceName $workspaceName, DimensionSpacePoint $dimensionSpacePoint, NodeAggregateId $nodeAggregateId, ?RelationDistributionStrategy $relationDistributionStrategy = null, ?NodeAggregateId $newParentNodeAggregateId = null, ?NodeAggregateId $newPrecedingSiblingNodeAggregateId = null, ?NodeAggregateId $newSucceedingSiblingNodeAggregateId = null): self
     {
         return new self($workspaceName, $dimensionSpacePoint, $nodeAggregateId, $relationDistributionStrategy, $newParentNodeAggregateId, $newPrecedingSiblingNodeAggregateId, $newSucceedingSiblingNodeAggregateId);
     }
@@ -91,7 +91,9 @@ public static function fromArray(array $array): self
             WorkspaceName::fromString($array['workspaceName']),
             DimensionSpacePoint::fromArray($array['dimensionSpacePoint']),
             NodeAggregateId::fromString($array['nodeAggregateId']),
-            RelationDistributionStrategy::fromString($array['relationDistributionStrategy']),
+            isset($array['relationDistributionStrategy'])
+                ? RelationDistributionStrategy::fromString($array['relationDistributionStrategy'])
+                : null,
             isset($array['newParentNodeAggregateId'])
                 ? NodeAggregateId::fromString($array['newParentNodeAggregateId'])
                 : null,
@@ -118,6 +120,19 @@ public function matchesNodeId(NodeIdToPublishOrDiscard $nodeIdToPublish): bool
             && $this->dimensionSpacePoint === $nodeIdToPublish->dimensionSpacePoint;
     }
 
+    public function withRelationDistributionStrategy(RelationDistributionStrategy $relationDistributionStrategy): self
+    {
+        return new self(
+            $this->workspaceName,
+            $this->dimensionSpacePoint,
+            $this->nodeAggregateId,
+            $relationDistributionStrategy,
+            $this->newParentNodeAggregateId,
+            $this->newPrecedingSiblingNodeAggregateId,
+            $this->newSucceedingSiblingNodeAggregateId
+        );
+    }
+
     public function createCopyForWorkspace(
         WorkspaceName $targetWorkspaceName,
     ): self {

Neos.ContentRepository.Core/Classes/Feature/NodeMove/Dto/RelationDistributionStrategy.php

@@ -41,6 +41,17 @@ public static function fromString(?string $serialization): self
             : self::STRATEGY_GATHER_ALL;
     }
 
+    public static function fromName(string $name): self
+    {
+        $name = substr($name, strpos($name, '::') + 2);
+        foreach (self::cases() as $status) {
+            if ($name === $status->name) {
+                return $status;
+            }
+        }
+        return self::STRATEGY_GATHER_ALL;
+    }
+
     public function jsonSerialize(): string
     {
         return $this->value;

Neos.ContentRepository.Core/Classes/Feature/NodeMove/NodeMove.php

@@ -95,6 +95,12 @@ private function handleMoveNodeAggregate(
             $contentGraph,
             $command->nodeAggregateId,
         );
+
+        if ($command->relationDistributionStrategy === null) {
+            $nodeType = $this->nodeTypeManager->getNodeType($nodeAggregate->nodeTypeName);
+            $command = $command->withRelationDistributionStrategy($nodeType->getMoveNodeRelationDistributionStrategy());
+        }
+
         $this->requireNodeAggregateToNotBeRoot($nodeAggregate);
         $this->requireNodeAggregateToBeUntethered($nodeAggregate);
         $this->requireNodeAggregateToCoverDimensionSpacePoint($nodeAggregate, $command->dimensionSpacePoint);
@@ -125,11 +131,12 @@ private function handleMoveNodeAggregate(
             if ($nodeAggregate->nodeName) {
                 $this->requireNodeTypeNotToDeclareTetheredChildNodeName($newParentNodeAggregate->nodeTypeName, $nodeAggregate->nodeName);
             }
-
-            $this->requireNodeAggregateToCoverDimensionSpacePoints(
-                $newParentNodeAggregate,
-                $affectedDimensionSpacePoints
-            );
+            if ($command->relationDistributionStrategy !== RelationDistributionStrategy::STRATEGY_SCATTER) {
+                $this->requireNodeAggregateToCoverDimensionSpacePoints(
+                    $newParentNodeAggregate,
+                    $affectedDimensionSpacePoints
+                );
+            }
 
             $this->requireNodeAggregateToNotBeDescendant(
                 $contentGraph,

Neos.ContentRepository.Core/Classes/NodeType/NodeType.php

@@ -14,6 +14,7 @@
  * source code.
  */
 
+use Neos\ContentRepository\Core\Feature\NodeMove\Dto\RelationDistributionStrategy;
 use Neos\ContentRepository\Core\SharedModel\Exception\InvalidNodeTypePostprocessorException;
 use Neos\ContentRepository\Core\SharedModel\Exception\NodeConfigurationException;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeName;
@@ -543,4 +544,13 @@ protected function setFullConfiguration(array $fullConfiguration): void
     {
         $this->fullConfiguration = $fullConfiguration;
     }
+
+    /**
+     * Get the MoveNode strategy used when moving a node
+     */
+    public function getMoveNodeRelationDistributionStrategy(): RelationDistributionStrategy
+    {
+        $strategy = $this->getConfiguration('strategy.moveNode') ?: 'RelationDistributionStrategy::STRATEGY_GATHER_ALL';
+        return RelationDistributionStrategy::fromName($strategy);
+    }
 }

Neos.Neos/NodeTypes/Mixin/Content.yaml

@@ -3,6 +3,8 @@
     'Neos.Neos:Node': true
     'Neos.Neos:Hidable': true
   abstract: true
+  strategy:
+    moveNode: RelationDistributionStrategy::STRATEGY_SCATTER
   constraints:
     nodeTypes:
       '*': false

Neos.Neos/NodeTypes/Mixin/Document.yaml

@@ -7,6 +7,8 @@
     'Neos.Neos:Hidable': true
   abstract: true
   aggregate: true
+  strategy:
+    moveNode: RelationDistributionStrategy::STRATEGY_GATHER_ALL
   constraints:
     nodeTypes:
       '*': false