TASK: Introduce site variable in Neos 9

Adjustments for #70
Flowpack · Jun 21, 2024 · 383d614 · 383d614
1 parent e9c5b29
commit 383d614
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 6 deletions.
diff --git a/Classes/Domain/NodeCreation/PropertiesProcessor.php b/Classes/Domain/NodeCreation/PropertiesProcessor.php
@@ -58,7 +58,7 @@ public function processAndValidateProperties(TransientNode $node, ProcessingErro
                         // $messages->getFirstError() doesnt work see https://github.com/neos/flow-development-collection/issues/3370
                         $flattenedErrors = $messages->getFlattenedErrors();
                         /** @var Error $firstError */
-                        $firstError = current(current($flattenedErrors));
+                        $firstError = current(current($flattenedErrors) ?: []);
                         throw new PropertyIgnoredException($firstError->getMessage(), 1686779371122);
                     }
                 }

diff --git a/Classes/Domain/TemplateNodeCreationHandler.php b/Classes/Domain/TemplateNodeCreationHandler.php
@@ -7,8 +7,10 @@
 use Flowpack\NodeTemplates\Domain\NodeCreation\NodeCreationService;
 use Flowpack\NodeTemplates\Domain\TemplateConfiguration\TemplateConfigurationProcessor;
 use Neos\ContentRepository\Core\ContentRepository;
+use Neos\ContentRepository\Core\Projection\ContentGraph\Filter\FindClosestNodeFilter;
 use Neos\ContentRepository\Core\Projection\ContentGraph\VisibilityConstraints;
 use Neos\Flow\Annotations as Flow;
+use Neos\Neos\Domain\Service\NodeTypeNameFactory;
 use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationCommands;
 use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationElements;
 use Neos\Neos\Ui\Domain\NodeCreation\NodeCreationHandlerInterface;
@@ -63,7 +65,7 @@ public function handle(
 
         $evaluationContext = [
             'data' => iterator_to_array($elements->serialized()),
-            'site' => null, // todo
+            'site' => $subgraph->findClosestNode($commands->first->parentNodeAggregateId, FindClosestNodeFilter::create(NodeTypeNameFactory::NAME_SITE)),
             'parentNode' => $subgraph->findNodeById($commands->first->parentNodeAggregateId)
         ];
 

diff --git a/Tests/Functional/Features/Variables/NodeTypes.Variables.yaml b/Tests/Functional/Features/Variables/NodeTypes.Variables.yaml
@@ -10,4 +10,4 @@
   options:
     template:
       properties:
-        text: "${'parentNode(' + parentNode.nodeType.name + ', ' + parentNode.name + ') site(' + site.nodeType.name + ', ' + site.name + ')'}"
+        text: "${'parentNode(' + parentNode.nodeTypeName.value + ', ' + parentNode.name.value + ') site(' + site.nodeTypeName.value + ', ' + site.name.value + ')'}"
diff --git a/Tests/Functional/Features/Variables/Snapshots/Variables.nodes.json b/Tests/Functional/Features/Variables/Snapshots/Variables.nodes.json
@@ -1,5 +1,5 @@
 {
     "properties": {
-        "text": "parentNode(Neos.Neos:ContentCollection, main) site(unstructured, test-site)"
+        "text": "parentNode(Neos.Neos:ContentCollection, main) site(Flowpack.NodeTemplates:Document.HomePage, test-site)"
     }
 }
diff --git a/Tests/Functional/Features/Variables/Snapshots/Variables.template.json b/Tests/Functional/Features/Variables/Snapshots/Variables.template.json
@@ -1,6 +1,6 @@
 {
     "properties": {
-        "text": "parentNode(Neos.Neos:ContentCollection, main) site(unstructured, test-site)"
+        "text": "parentNode(Neos.Neos:ContentCollection, main) site(Flowpack.NodeTemplates:Document.HomePage, test-site)"
     },
     "childNodes": []
 }
diff --git a/Tests/Functional/Features/Variables/Snapshots/Variables.yaml b/Tests/Functional/Features/Variables/Snapshots/Variables.yaml
@@ -2,4 +2,4 @@
   options:
     template:
       properties:
-        text: 'parentNode(Neos.Neos:ContentCollection, main) site(unstructured, test-site)'
+        text: 'parentNode(Neos.Neos:ContentCollection, main) site(Flowpack.NodeTemplates:Document.HomePage, test-site)'