Merge pull request #3703 from mhsdesign/task/avoidHeavilyUseOfControl…

…lerContext TASK: Avoid heavily use of controller context and make `Neos.Ui.NodeInfo` internal
neos · Feb 14, 2024 · 0d87792 · 0d87792
2 parents 13dccc9 + ce7cd45
commit 0d87792
Show file tree

Hide file tree

Showing 14 changed files with 87 additions and 139 deletions.
diff --git a/Classes/Controller/BackendController.php b/Classes/Controller/BackendController.php
@@ -198,17 +198,17 @@ public function indexAction(string $node = null)
                 ),
             'frontendConfiguration' =>
                 $this->frontendConfigurationProvider->getFrontendConfiguration(
-                    controllerContext: $this->controllerContext,
+                    actionRequest: $this->request,
                 ),
             'nodeTypes' =>
                 $this->nodeTypeGroupsAndRolesProvider->getNodeTypes(),
             'menu' =>
                 $this->menuProvider->getMenu(
-                    controllerContext: $this->controllerContext,
+                    actionRequest: $this->request,
                 ),
             'initialState' =>
                 $this->initialStateProvider->getInitialState(
-                    controllerContext: $this->controllerContext,
+                    actionRequest: $this->request,
                     contentRepositoryId: $siteDetectionResult->contentRepositoryId,
                     documentNode: $node,
                     site: $siteNode,

diff --git a/Classes/Controller/BackendServiceController.php b/Classes/Controller/BackendServiceController.php
@@ -590,15 +590,15 @@ public function flowQueryAction(array $chain): string
         $nodeInfoHelper = new NodeInfoHelper();
         $type = $finisher['type'] ?? null;
         $result = match ($type) {
-            'get' => $nodeInfoHelper->renderNodes(array_filter($flowQuery->get()), $this->getControllerContext()),
+            'get' => $nodeInfoHelper->renderNodes(array_filter($flowQuery->get()), $this->request),
             'getForTree' => $nodeInfoHelper->renderNodes(
                 array_filter($flowQuery->get()),
-                $this->getControllerContext(),
+                $this->request,
                 true
             ),
             'getForTreeWithParents' => $nodeInfoHelper->renderNodesWithParents(
                 array_filter($flowQuery->get()),
-                $this->getControllerContext()
+                $this->request
             ),
             default => []
         };

diff --git a/Classes/Domain/InitialData/FrontendConfigurationProviderInterface.php b/Classes/Domain/InitialData/FrontendConfigurationProviderInterface.php
@@ -14,7 +14,7 @@
 
 namespace Neos\Neos\Ui\Domain\InitialData;
 
-use Neos\Flow\Mvc\Controller\ControllerContext;
+use Neos\Flow\Mvc\ActionRequest;
 
 /**
  * Reads and preprocesses the `Neos.Neos.Ui.frontendConfiguration` settings
@@ -27,6 +27,6 @@ interface FrontendConfigurationProviderInterface
 {
     /** @return array<mixed> */
     public function getFrontendConfiguration(
-        ControllerContext $controllerContext
+        ActionRequest $actionRequest
     ): array;
 }
diff --git a/Classes/Domain/InitialData/InitialStateProviderInterface.php b/Classes/Domain/InitialData/InitialStateProviderInterface.php
@@ -16,7 +16,7 @@
 
 use Neos\ContentRepository\Core\Factory\ContentRepositoryId;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
-use Neos\Flow\Mvc\Controller\ControllerContext;
+use Neos\Flow\Mvc\ActionRequest;
 use Neos\Neos\Domain\Model\User;
 
 /**
@@ -29,7 +29,7 @@ interface InitialStateProviderInterface
 {
     /** @return array<mixed> */
     public function getInitialState(
-        ControllerContext $controllerContext,
+        ActionRequest $actionRequest,
         ContentRepositoryId $contentRepositoryId,
         ?Node $documentNode,
         ?Node $site,

diff --git a/Classes/Domain/InitialData/MenuProviderInterface.php b/Classes/Domain/InitialData/MenuProviderInterface.php
@@ -14,7 +14,7 @@
 
 namespace Neos\Neos\Ui\Domain\InitialData;
 
-use Neos\Flow\Mvc\Controller\ControllerContext;
+use Neos\Flow\Mvc\ActionRequest;
 
 /**
  * Retrieves all data needed to render the main burger menu located in the
@@ -27,5 +27,5 @@ interface MenuProviderInterface
     /**
      * @return array<int,array{label:string,icon:string,uri:string,target:string,children:array<int,array{icon:string,label:string,uri:string,position?:string,isActive:bool,target:string,skipI18n:bool}>}>
      */
-    public function getMenu(ControllerContext $controllerContext): array;
+    public function getMenu(ActionRequest $actionRequest): array;
 }
diff --git a/Classes/Domain/Model/Feedback/Operations/ReloadDocument.php b/Classes/Domain/Model/Feedback/Operations/ReloadDocument.php
@@ -80,7 +80,7 @@ public function serializePayload(ControllerContext $controllerContext): array
 
         if ($documentNode) {
             return [
-                'uri' => $nodeInfoHelper->previewUri($documentNode, $controllerContext)
+                'uri' => $nodeInfoHelper->previewUri($documentNode, $controllerContext->getRequest())
             ];
         }
 

diff --git a/Classes/Domain/Model/Feedback/Operations/UpdateNodeInfo.php b/Classes/Domain/Model/Feedback/Operations/UpdateNodeInfo.php
@@ -13,6 +13,7 @@
 
 use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindChildNodesFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
+use Neos\Flow\Mvc\ActionRequest;
 use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
@@ -106,7 +107,7 @@ public function serializePayload(ControllerContext $controllerContext): array
     {
         return $this->node
             ? [
-                'byContextPath' => $this->serializeNodeRecursively($this->node, $controllerContext)
+                'byContextPath' => $this->serializeNodeRecursively($this->node, $controllerContext->getRequest())
             ]
             : [];
     }
@@ -116,7 +117,7 @@ public function serializePayload(ControllerContext $controllerContext): array
      *
      * @return array<string,?array<string,mixed>>
      */
-    private function serializeNodeRecursively(Node $node, ControllerContext $controllerContext): array
+    private function serializeNodeRecursively(Node $node, ActionRequest $actionRequest): array
     {
         $contentRepository = $this->contentRepositoryRegistry->get($node->subgraphIdentity->contentRepositoryId);
         $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
@@ -125,14 +126,14 @@ private function serializeNodeRecursively(Node $node, ControllerContext $control
             $nodeAddressFactory->createFromNode($node)->serializeForUri()
             => $this->nodeInfoHelper->renderNodeWithPropertiesAndChildrenInformation(
                 $node,
-                $controllerContext
+                $actionRequest
             )
         ];
 
         if ($this->isRecursive === true) {
             $subgraph = $this->contentRepositoryRegistry->subgraphForNode($node);
             foreach ($subgraph->findChildNodes($node->nodeAggregateId, FindChildNodesFilter::create()) as $childNode) {
-                $result = array_merge($result, $this->serializeNodeRecursively($childNode, $controllerContext));
+                $result = array_merge($result, $this->serializeNodeRecursively($childNode, $actionRequest));
             }
         }
 

diff --git a/Classes/Domain/Model/Feedback/Operations/UpdateNodePreviewUrl.php b/Classes/Domain/Model/Feedback/Operations/UpdateNodePreviewUrl.php
@@ -106,7 +106,7 @@ public function serializePayload(ControllerContext $controllerContext): array
             $nodeInfoHelper = new NodeInfoHelper();
             $contentRepository = $this->contentRepositoryRegistry->get($this->node->subgraphIdentity->contentRepositoryId);
             $nodeAddressFactory = NodeAddressFactory::create($contentRepository);
-            $newPreviewUrl = $nodeInfoHelper->createRedirectToNode($this->node, $controllerContext);
+            $newPreviewUrl = $nodeInfoHelper->createRedirectToNode($this->node, $controllerContext->getRequest());
             $contextPath = $nodeAddressFactory->createFromNode($this->node)->serializeForUri();
         }
         return [