fix: Fixed AjaxNodesExplorerController with SearchResultsInterface

roadiz · Mar 19, 2024 · a9775d1 · a9775d1
1 parent dca99f2
commit a9775d1
Showing 1 changed file with 19 additions and 12 deletions.
diff --git a/src/AjaxControllers/AjaxNodesExplorerController.php b/src/AjaxControllers/AjaxNodesExplorerController.php
@@ -14,6 +14,7 @@
 use RZ\Roadiz\CoreBundle\EntityApi\NodeTypeApi;
 use RZ\Roadiz\CoreBundle\SearchEngine\ClientRegistry;
 use RZ\Roadiz\CoreBundle\SearchEngine\NodeSourceSearchHandlerInterface;
+use RZ\Roadiz\CoreBundle\SearchEngine\SolrSearchResultItem;
 use RZ\Roadiz\CoreBundle\Security\Authorization\Voter\NodeVoter;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -250,32 +251,38 @@ public function listAction(Request $request): JsonResponse
     /**
      * Normalize response Node list result.
      *
-     * @param iterable<Node|NodesSources> $nodes
+     * @param iterable<Node|NodesSources|SolrSearchResultItem> $nodes
      * @return array
      */
     private function normalizeNodes(iterable $nodes): array
     {
         $nodesArray = [];
 
         foreach ($nodes as $node) {
-            if (null !== $node) {
-                if ($node instanceof NodesSources) {
-                    if (!key_exists($node->getNode()->getId(), $nodesArray)) {
-                        $nodeModel = new NodeSourceModel($node, $this->urlGenerator, $this->security);
-                        $nodesArray[$node->getNode()->getId()] = $nodeModel->toArray();
-                    }
-                } else {
-                    if (!key_exists($node->getId(), $nodesArray)) {
-                        $nodeModel = new NodeModel($node, $this->urlGenerator, $this->security);
-                        $nodesArray[$node->getId()] = $nodeModel->toArray();
-                    }
+            if ($node instanceof SolrSearchResultItem) {
+                $item = $node->getItem();
+                if ($item instanceof NodesSources || $item instanceof Node) {
+                    $this->normalizeItem($item, $nodesArray);
                 }
+            } else {
+                $this->normalizeItem($node, $nodesArray);
             }
         }
 
         return array_values($nodesArray);
     }
 
+    private function normalizeItem(NodesSources|Node $item, array &$nodesArray): void
+    {
+        if ($item instanceof NodesSources && !key_exists($item->getNode()->getId(), $nodesArray)) {
+            $nodeSourceModel = new NodeSourceModel($item, $this->urlGenerator, $this->security);
+            $nodesArray[$item->getNode()->getId()] = $nodeSourceModel->toArray();
+        } elseif ($item instanceof Node && !key_exists($item->getId(), $nodesArray)) {
+            $nodeModel = new NodeModel($item, $this->urlGenerator, $this->security);
+            $nodesArray[$item->getId()] = $nodeModel->toArray();
+        }
+    }
+
     /**
      * @param array $data
      * @return JsonResponse