Merge pull request #5563 from dlubitz/bugfix/node-disable-at-end

BUGFIX: Disable nodes after processing all node variants for export

Author: dlubitz

Neos.ContentRepository.LegacyNodeMigration/Classes/Processors/EventExportProcessor.php

@@ -67,6 +67,11 @@ final class EventExportProcessor implements ProcessorInterface
      */
     private array $nodeReferencesWereSetEvents = [];
 
+    /**
+     * @var SubtreeWasTagged[]
+     */
+    private array $subtreeWasTaggedEvents = [];
+
     private int $numberOfExportedEvents = 0;
 
     /**
@@ -107,6 +112,10 @@ public function run(ProcessingContext $context): void
             }
             $this->processNodeData($context, $nodeDataRow);
         }
+        // Disable nodes, when the full import is done.
+        foreach ($this->subtreeWasTaggedEvents as $subtreeWasTaggedEvent) {
+            $this->exportEvent($subtreeWasTaggedEvent);
+        }
         // Set References, now when the full import is done.
         foreach ($this->nodeReferencesWereSetEvents as $nodeReferencesWereSetEvent) {
             $this->exportEvent($nodeReferencesWereSetEvent);
@@ -274,7 +283,8 @@ public function processNodeDataWithoutFallbackToEmptyDimension(ProcessingContext
         }
         // nodes are hidden via SubtreeWasTagged event
         if ($this->isNodeHidden($nodeDataRow)) {
-            $this->exportEvent(new SubtreeWasTagged($this->workspaceName, $this->contentStreamId, $nodeAggregateId, $this->interDimensionalVariationGraph->getSpecializationSet($originDimensionSpacePoint->toDimensionSpacePoint(), true, $this->visitedNodes->alreadyVisitedOriginDimensionSpacePoints($nodeAggregateId)->toDimensionSpacePointSet()), NeosSubtreeTag::disabled()));
+            // Put event at the end of the export, so variants created after this node are not disabled on variation
+            $this->subtreeWasTaggedEvents[] = new SubtreeWasTagged($this->workspaceName, $this->contentStreamId, $nodeAggregateId, $this->interDimensionalVariationGraph->getSpecializationSet($originDimensionSpacePoint->toDimensionSpacePoint(), true, $this->visitedNodes->alreadyVisitedOriginDimensionSpacePoints($nodeAggregateId)->toDimensionSpacePointSet()), NeosSubtreeTag::disabled());
         }
 
         if (!$serializedPropertyValuesAndReferences->references->isEmpty()) {