Merge pull request #4957 from neos/bugfix/sort-raw-content-properties

BUGFIX: Sort properties in raw content mode
neos · Apr 11, 2024 · a0d616d · a0d616d
2 parents 1867f49 + f15a8c0
commit a0d616d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/Neos.Neos/Classes/Fusion/Helper/ArrayHelper.php b/Neos.Neos/Classes/Fusion/Helper/ArrayHelper.php
@@ -15,6 +15,7 @@
 use Neos\Eel\ProtectedContextAwareInterface;
 use Neos\Flow\Annotations as Flow;
 use Neos\Utility\ObjectAccess;
+use Neos\Utility\PositionalArraySorter;
 
 /**
  * Some Functional Programming Array helpers for Eel contexts
@@ -90,6 +91,14 @@ public function groupBy($set, $groupingKey)
         return $result;
     }
 
+    /**
+     * Sorts the input array by the $positionProperty of each element.
+     */
+    public function sortByPropertyPath(array $set, $positionPropertyPath = 'position'): array
+    {
+        return (new PositionalArraySorter($set, $positionPropertyPath))->toArray();
+    }
+
     /**
      * All methods are considered safe
      *

diff --git a/Neos.Neos/Documentation/References/EelHelpersReference.rst b/Neos.Neos/Documentation/References/EelHelpersReference.rst
@@ -1214,6 +1214,16 @@ The input is assumed to be an array or Collection of objects. Groups this input
 
 **Return** (array)
 
+Neos.Array.sortByPropertyPath(set, positionPropertyPath)
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The input is assumed to be an array. Sorts this input by the $positionPropertyPath property of each element.
+
+* ``set`` (array)
+* ``positionPropertyPath`` (string)
+
+**Return** (array)
+
 
 
 
@@ -2467,8 +2477,3 @@ Get the variable type
 * ``variable`` (mixed)
 
 **Return** (string)
-
-
-
-
-
diff --git a/Neos.Neos/Resources/Private/Fusion/RawContent/NodeProperties.fusion b/Neos.Neos/Resources/Private/Fusion/RawContent/NodeProperties.fusion
@@ -1,7 +1,12 @@
 prototype(Neos.Neos:RawContent.NodeProperties) < prototype(Neos.Fusion:Component) {
+  @private {
+    items = ${node.nodeType.properties}
+    [email protected] = ${Neos.Array.sortByPropertyPath(value, 'ui.inspector.position')}
+  }
+
   renderer = afx`
     <dl class="neos-raw-content-properties" @if={!String.isBlank(this.content)}>
-      <Neos.Fusion:Loop items={node.nodeType.properties} itemKey="propertyName" itemName="propertyConfiguration">
+      <Neos.Fusion:Loop items={private.items} itemKey="propertyName" itemName="propertyConfiguration">
         <Neos.Neos:RawContent.NodeProperty propertyName={propertyName} propertyConfiguration={propertyConfiguration}/>
       </Neos.Fusion:Loop>
     </dl>