Merge branch 'master' of https://github.com/punktDe/archivist

Classes/Archivist.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PunktDe\Archivist;
 
 /*
@@ -67,6 +68,12 @@ class Archivist
      */
     public function organizeNode(NodeInterface $triggeringNode, array $sortingInstructions)
     {
+        if (isset($sortingInstructions['condition'])) {
+            $condition = $this->eelEvaluationService->evaluate($sortingInstructions['condition'], ['node' => $triggeringNode]);
+            if ($condition !== true) {
+                return;
+            }
+        }
         if (isset($sortingInstructions['affectedNode'])) {
             $affectedNode = $this->eelEvaluationService->evaluate($sortingInstructions['affectedNode'], ['node' => $triggeringNode]);
 

Configuration/Testing/Settings.yaml

@@ -16,6 +16,9 @@ PunktDe:
         # or an eel expression like seen below
         sorting: title
 
+        # Optional: Trigger sorting only, when condition is met. Can be used to make sure that required properties are set as expected.
+        condition: "${node.properties.date != null}"
+
         # In the context is evaluated first. You can define variables here which you can use in
         # the remaining configuration
         context:

Readme.md

@@ -36,6 +36,9 @@ PunktDe:
         # or an eel expression like seen below
         sorting: title
 
+        # Optional: Trigger sorting only, when condition is met. Can be used to make sure that required properties are set as expected.
+        condition: "${node.properties.date != null}"
+
         # In the context is evaluated first. You can define variables here which you can use in
         # the remaining configuration
         context:

Tests/Functional/ArchivistTest.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace PunktDe\Archivist\Tests\Functional;
 
 /*
@@ -13,6 +14,7 @@
 use Neos\ContentRepository\Domain\Model\NodeTemplate;
 use Neos\ContentRepository\Domain\Service\NodeTypeManager;
 use Neos\ContentRepository\Tests\Functional\AbstractNodeTest;
+use Neos\Eel\Exception;
 use Neos\Eel\FlowQuery\FlowQuery;
 
 class ArchivistTest extends AbstractNodeTest
@@ -60,6 +62,19 @@ public function simpleCreateNode()
         $this->assertEquals($this->nodeContextPath . '/2018/1/trigger-node', $newNode->getPath());
     }
 
+
+    /**
+     * @test
+     */
+    public function doNotSortWhenConditionIsNotMet()
+    {
+        $triggerNode = $this->createNode('trigger-node', ['title' => 'New Article']);
+        $this->assertCount(0, $this->node->getChildNodes('PunktDe.Archivist.HierarchyNode'));
+
+        $triggerNode->setProperty('date', new \DateTime('2018-01-19'));
+        $this->assertEquals($this->nodeContextPath . '/2018/1/trigger-node', $triggerNode->getPath());
+    }
+
     /**
      * @test
      */