TASK: Adjust to NodeLabelRenderer

See neos/neos-development-collection#5020
mhsdesign · May 13, 2024 · 4598ee2 · 4598ee2
1 parent 23472ac
commit 4598ee2
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 7 deletions.
diff --git a/Classes/Domain/Model/Feedback/Operations/Redirect.php b/Classes/Domain/Model/Feedback/Operations/Redirect.php
@@ -5,6 +5,7 @@
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\Controller\ControllerContext;
+use Neos\Neos\Domain\NodeLabel\NodeLabelRendererInterface;
 use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\Neos\Service\LinkingService;
 use Neos\Neos\Ui\Domain\Model\AbstractFeedback;
@@ -26,6 +27,12 @@ class Redirect extends AbstractFeedback
      */
     protected $contentRepositoryRegistry;
 
+    /**
+     * @Flow\Inject
+     * @var NodeLabelRendererInterface
+     */
+    protected $nodeLabelRenderer;
+
     /**
      * @Flow\Inject
      * @var LinkingService
@@ -70,7 +77,7 @@ public function getType()
      */
     public function getDescription()
     {
-        return sprintf('Redirect to node "%s".', $this->getNode()->getLabel());
+        return sprintf('Redirect to node "%s".', $this->nodeLabelRenderer->renderNodeLabel($this->getNode())->value);
     }
 
     /**

diff --git a/Classes/Domain/Model/Feedback/Operations/RemoveNode.php b/Classes/Domain/Model/Feedback/Operations/RemoveNode.php
@@ -13,6 +13,7 @@
 
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
+use Neos\Neos\Domain\NodeLabel\NodeLabelRendererInterface;
 use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\Neos\FrontendRouting\NodeAddress;
 use Neos\ContentRepository\Core\Projection\ContentGraph\Node;
@@ -33,6 +34,12 @@ class RemoveNode extends AbstractFeedback
 
     private NodeAddress $parentNodeAddress;
 
+    /**
+     * @Flow\Inject
+     * @var NodeLabelRendererInterface
+     */
+    protected $nodeLabelRenderer;
+
     /**
      * @Flow\Inject
      * @var ContentRepositoryRegistry
@@ -76,7 +83,7 @@ public function getType()
      */
     public function getDescription(): string
     {
-        return sprintf('Node "%s" has been removed.', $this->getNode()->getLabel());
+        return sprintf('Node "%s" has been removed.', $this->nodeLabelRenderer->renderNodeLabel($this->getNode())->value);
     }
 
     /**

diff --git a/Classes/Domain/Model/Feedback/Operations/UpdateNodePreviewUrl.php b/Classes/Domain/Model/Feedback/Operations/UpdateNodePreviewUrl.php
@@ -15,6 +15,7 @@
 use Neos\ContentRepositoryRegistry\ContentRepositoryRegistry;
 use Neos\Flow\Annotations as Flow;
 use Neos\Flow\Mvc\Controller\ControllerContext;
+use Neos\Neos\Domain\NodeLabel\NodeLabelRendererInterface;
 use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\Neos\Ui\Domain\Model\AbstractFeedback;
 use Neos\Neos\Ui\Domain\Model\FeedbackInterface;
@@ -36,6 +37,12 @@ class UpdateNodePreviewUrl extends AbstractFeedback
      */
     protected $contentRepositoryRegistry;
 
+    /**
+     * @Flow\Inject
+     * @var NodeLabelRendererInterface
+     */
+    protected $nodeLabelRenderer;
+
     /**
      * Set the node
      *
@@ -74,7 +81,7 @@ public function getType()
      */
     public function getDescription()
     {
-        return sprintf('The "preview URL" of node "%s" has been changed potentially.', $this->getNode()->getLabel());
+        return sprintf('The "preview URL" of node "%s" has been changed potentially.', $this->nodeLabelRenderer->renderNodeLabel($this->getNode())->value);
     }
 
     /**

diff --git a/Classes/Fusion/Helper/NodeInfoHelper.php b/Classes/Fusion/Helper/NodeInfoHelper.php
@@ -22,6 +22,7 @@
 use Neos\Flow\Mvc\ActionRequest;
 use Neos\Flow\Mvc\Routing\UriBuilder;
 use Neos\Flow\Persistence\PersistenceManagerInterface;
+use Neos\Neos\Domain\NodeLabel\NodeLabelRendererInterface;
 use Neos\Neos\FrontendRouting\NodeAddress;
 use Neos\Neos\FrontendRouting\NodeAddressFactory;
 use Neos\Neos\FrontendRouting\NodeUriBuilder;
@@ -41,6 +42,9 @@ class NodeInfoHelper implements ProtectedContextAwareInterface
     #[Flow\Inject]
     protected ContentRepositoryRegistry $contentRepositoryRegistry;
 
+    #[Flow\Inject]
+    protected NodeLabelRendererInterface $nodeLabelRenderer;
+
     /**
      * @Flow\Inject
      * @var UserLocaleService
@@ -187,7 +191,7 @@ protected function getBasicNodeInformation(Node $node): array
             'name' => $node->nodeName?->value ?? '',
             'identifier' => $node->nodeAggregateId->jsonSerialize(),
             'nodeType' => $node->nodeTypeName->value,
-            'label' => $node->getLabel(),
+            'label' => $this->nodeLabelRenderer->renderNodeLabel($node),
             'isAutoCreated' => $node->classification === NodeAggregateClassification::CLASSIFICATION_TETHERED,
             // TODO: depth is expensive to calculate; maybe let's get rid of this?
             'depth' => $subgraph->countAncestorNodes(

diff --git a/Tests/Unit/CreationDialogNodeTypePostprocessorTest.php b/Tests/Unit/CreationDialogNodeTypePostprocessorTest.php
@@ -1,7 +1,6 @@
 <?php
 namespace Neos\Neos\Ui\Tests\Unit;
 
-use Neos\ContentRepository\Core\NodeType\DefaultNodeLabelGeneratorFactory;
 use Neos\ContentRepository\Core\NodeType\NodeType;
 use Neos\ContentRepository\Core\NodeType\NodeTypeName;
 use Neos\Flow\Tests\UnitTestCase;
@@ -472,7 +471,7 @@ public function processDoesNotThrowExceptionIfNoCreationDialogEditorCanBeResolve
 
     private function processConfigurationFully(array $configuration, array $dataTypesDefaultConfiguration, array $editorDefaultConfiguration): array
     {
-        $mockNodeType = new NodeType(NodeTypeName::fromString('Some.NodeType:Name'), [], [], new DefaultNodeLabelGeneratorFactory());
+        $mockNodeType = new NodeType(NodeTypeName::fromString('Some.NodeType:Name'), [], []);
 
         $firstProcessor = new DefaultPropertyEditorPostprocessor();
         $this->inject($firstProcessor, 'dataTypesDefaultConfiguration', $dataTypesDefaultConfiguration);
@@ -492,7 +491,7 @@ private function processConfigurationFully(array $configuration, array $dataType
 
     private function processConfigurationLegacyOnlyOnce(array $configuration, array $dataTypesDefaultConfiguration, array $editorDefaultConfiguration): array
     {
-        $mockNodeType = new NodeType(NodeTypeName::fromString('Some.NodeType:Name'), [], [], new DefaultNodeLabelGeneratorFactory());
+        $mockNodeType = new NodeType(NodeTypeName::fromString('Some.NodeType:Name'), [], []);
 
         $postprocessor = new CreationDialogNodeTypePostprocessor();
         $this->inject($postprocessor, 'dataTypesDefaultConfiguration', $dataTypesDefaultConfiguration);