Merge pull request #3754 from ahaeslich/task/adjust-to-neos-changes

TASK: Adjust to removal of `workspaceName` in `NodeIdToPublishOrDiscard`
neos · Mar 15, 2024 · a0c5d13 · a0c5d13
2 parents 1d9df94 + 4ff3c30
commit a0c5d13
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/Classes/ContentRepository/Service/WorkspaceService.php b/Classes/ContentRepository/Service/WorkspaceService.php
@@ -179,8 +179,7 @@ public function predictRemoveNodeFeedbackFromDiscardIndividualNodesFromWorkspace
                     }
 
                     if (
-                        $nodeToDiscard->workspaceName->equals($workspace->workspaceName)
-                        && $nodeToDiscard->nodeAggregateId->equals($change->nodeAggregateId)
+                        $nodeToDiscard->nodeAggregateId->equals($change->nodeAggregateId)
                         && $nodeToDiscard->dimensionSpacePoint->equals($change->originDimensionSpacePoint)
                     ) {
                         $subgraph = $contentRepository->getContentGraph()

diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php
@@ -221,7 +221,6 @@ public function publishAction(array $nodeContextPaths, string $targetWorkspaceNa
             foreach ($nodeContextPaths as $contextPath) {
                 $nodeAddress = $nodeAddressFactory->createFromUriString($contextPath);
                 $nodeIdentifiersToPublish[] = new NodeIdToPublishOrDiscard(
-                    $workspaceName,
                     $nodeAddress->nodeAggregateId,
                     $nodeAddress->dimensionSpacePoint
                 );
@@ -279,7 +278,6 @@ public function discardAction(array $nodeContextPaths): void
             foreach ($nodeContextPaths as $contextPath) {
                 $nodeAddress = $nodeAddressFactory->createFromUriString($contextPath);
                 $nodeIdentifiersToDiscard[] = new NodeIdToPublishOrDiscard(
-                    $workspaceName,
                     $nodeAddress->nodeAggregateId,
                     $nodeAddress->dimensionSpacePoint
                 );