BUGFIX: Consider entry node in nodes endpoint for filtering (used in …

…reference editor)
neos · Aug 4, 2024 · 4715f33 · 4715f33
1 parent ef93f94
commit 4715f33
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 5 deletions.
diff --git a/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Nodes.php b/Neos.ContentRepository.Core/Classes/Projection/ContentGraph/Nodes.php
@@ -124,6 +124,11 @@ public function merge(self $other): self
         return self::fromArray($nodes);
     }
 
+    public function append(Node $node): self
+    {
+        return new self([...$this->nodes, $node]);
+    }
+
     public function reverse(): self
     {
         return new self(array_reverse($this->nodes));

diff --git a/Neos.Neos/Classes/Controller/Service/NodesController.php b/Neos.Neos/Classes/Controller/Service/NodesController.php
@@ -23,8 +23,11 @@
 use Neos\ContentRepository\Core\Projection\ContentGraph\ContentSubgraphInterface;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindChildNodesFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindDescendantNodesFilter;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\ExpandedNodeTypeCriteria;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\NodeType\NodeTypeCriteria;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\SearchTerm\SearchTermMatcher;
 use Neos\ContentRepository\Core\Projection\ContentGraph\NodeAggregate;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Nodes;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\ContentRepository\Core\SharedModel\Node\NodeAggregateId;
 use Neos\ContentRepository\Core\SharedModel\Workspace\WorkspaceName;
@@ -148,16 +151,27 @@ public function indexAction(
                 $entryNode = $subgraph->findNodeByAbsolutePath($nodePath);
             }
 
-            $nodes = !is_null($entryNode) ? $subgraph->findDescendantNodes(
-                $entryNode->aggregateId,
-                FindDescendantNodesFilter::create(
+            $nodes = Nodes::createEmpty();
+            if (!is_null($entryNode)) {
+                $filter = FindDescendantNodesFilter::create(
                     nodeTypes: NodeTypeCriteria::create(
                         NodeTypeNames::fromStringArray($nodeTypes),
                         NodeTypeNames::createEmpty()
                     ),
                     searchTerm: $searchTerm,
-                )
-            ) : [];
+                );
+                if (
+                    SearchTermMatcher::matchesNode($entryNode, $filter->searchTerm)
+                    && ExpandedNodeTypeCriteria::create($filter->nodeTypes, $contentRepository->getNodeTypeManager())
+                        ->matches($entryNode->nodeTypeName)
+                ) {
+                    // include the starting node if it matches
+                    $nodes = $nodes->append($entryNode);
+                }
+                $nodes = $nodes->merge(
+                    $subgraph->findDescendantNodes($entryNode->aggregateId, $filter)
+                );
+            }
         } else {
             if (!empty($searchTerm)) {
                 throw new \RuntimeException('Combination of $nodeIdentifiers and $searchTerm not supported');