Merge pull request #4675 from neos/siblingReordering

Sort siblings before reassigning positions
neos · Nov 1, 2023 · 5df5430 · 5df5430
2 parents 0e4e210 + 7e2a09c
commit 5df5430
Show file tree

Hide file tree

Showing 7 changed files with 188 additions and 107 deletions.
diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/DoctrineDbalContentGraphProjection.php
@@ -517,12 +517,6 @@ private function connectHierarchy(
     }
 
     /**
-     * @param NodeRelationAnchorPoint|null $parentAnchorPoint
-     * @param NodeRelationAnchorPoint|null $childAnchorPoint
-     * @param NodeRelationAnchorPoint|null $succeedingSiblingAnchorPoint
-     * @param ContentStreamId $contentStreamId
-     * @param DimensionSpacePoint $dimensionSpacePoint
-     * @return int
      * @throws \Doctrine\DBAL\DBALException
      */
     private function getRelationPosition(
@@ -590,6 +584,12 @@ private function getRelationPositionAfterRecalculation(
                 $dimensionSpacePoint
             );
 
+        usort(
+            $hierarchyRelations,
+            fn (HierarchyRelation $relationA, HierarchyRelation $relationB): int
+                => $relationA->position <=> $relationB->position
+        );
+
         foreach ($hierarchyRelations as $relation) {
             $offset += self::RELATION_DEFAULT_OFFSET;
             if (

diff --git a/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeMove.php b/Neos.ContentGraph.DoctrineDbalAdapter/src/Domain/Projection/Feature/NodeMove.php
@@ -44,7 +44,6 @@ private function whenNodeAggregateWasMoved(NodeAggregateWasMoved $event): void
         $this->transactional(function () use ($event) {
             foreach ($event->nodeMoveMappings as $moveNodeMapping) {
                 // for each materialized node in the DB which we want to adjust, we have one MoveNodeMapping.
-                /* @var \Neos\ContentRepository\Core\Feature\NodeMove\Dto\OriginNodeMoveMapping $moveNodeMapping */
                 $nodeToBeMoved = $this->getProjectionContentGraph()->findNodeByIds(
                     $event->contentStreamId,
                     $event->nodeAggregateId,

diff --git a/...atures/NodeMove/MoveNodeAggregate.feature → ...res/08-NodeMove/MoveNodeAggregate.feature b/...atures/NodeMove/MoveNodeAggregate.feature → ...res/08-NodeMove/MoveNodeAggregate.feature
diff --git a/...ringDisableStateWithoutDimensions.feature → ...ringDisableStateWithoutDimensions.feature b/...ringDisableStateWithoutDimensions.feature → ...ringDisableStateWithoutDimensions.feature
diff --git a/...oveNodeAggregateWithoutDimensions.feature → ...oveNodeAggregateWithoutDimensions.feature b/...oveNodeAggregateWithoutDimensions.feature → ...oveNodeAggregateWithoutDimensions.feature
diff --git a/...odeAggregate_NewParent_Dimensions.feature → ...odeAggregate_NewParent_Dimensions.feature b/...odeAggregate_NewParent_Dimensions.feature → ...odeAggregate_NewParent_Dimensions.feature
diff --git a/...eAggregate_NoNewParent_Dimensions.feature → ...eAggregate_NoNewParent_Dimensions.feature b/...eAggregate_NoNewParent_Dimensions.feature → ...eAggregate_NoNewParent_Dimensions.feature