allow configuring default sort behaviour in the model

Author: Guite

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/controller/config/ConfigureCrud.xtend

@@ -81,6 +81,12 @@ class ConfigureCrud implements ControllerMethodInterface {
         IF hasDateIntervalFieldsEntity»
             ->setDateIntervalFormat(t('%%y year(s) %%m month(s) %%d day(s)'))
         «ENDIF*/»
+        «IF null !== orderBy && !orderBy.empty»«/*
+         * null values are not ignored,
+         * see https://github.com/EasyCorp/EasyAdminBundle/issues/6879
+         */»
+            ->setDefaultSort([«orderByDetails(orderBy, 'crud')»])
+        «ENDIF»
         ->addFormTheme('@ZikulaTheme/Form/form_layout_addons.html.twig')
     '''
 }

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/cartridges/symfony/models/entity/Association.xtend

@@ -158,7 +158,7 @@ class Association {
              */
             #[ORM\ManyToMany(targetEntity: «entityClass»::class, mappedBy: '«targetName»'«additionalOptions(true)»)]
             «IF null !== orderByReverse && !orderByReverse.empty»
-                #[ORM\OrderBy([«orderByDetails(orderByReverse)»])]
+                #[ORM\OrderBy([«orderByDetails(orderByReverse, 'orm')»])]
             «ENDIF»
             «IF !nullable»
                 «val aliasName = getRelationAliasName(false).toFirstLower»
@@ -232,7 +232,7 @@ class Association {
         «ENDIF»
         «joinDetails(true)»
         «IF null !== orderBy && !orderBy.empty»
-            #[ORM\OrderBy([«orderByDetails(orderBy)»])]
+            #[ORM\OrderBy([«orderByDetails(orderBy, 'orm')»])]
         «ENDIF»
         «IF !nullable»
             «val aliasName = getRelationAliasName(true).toFirstLower»
@@ -255,7 +255,7 @@ class Association {
         #[ORM\ManyToMany(targetEntity: «entityClass»::class«IF bidirectional», inversedBy: '«sourceName»'«ENDIF»«additionalOptions(false)»«outgoingMappingAdditions»)]
         «joinDetails(true)»
         «IF null !== orderBy && !orderBy.empty»
-            #[ORM\OrderBy([«orderByDetails(orderBy)»])]
+            #[ORM\OrderBy([«orderByDetails(orderBy, 'orm')»])]
         «ENDIF»
         «IF !nullable»
             «val aliasName = getRelationAliasName(true).toFirstLower»
@@ -342,23 +342,6 @@ class Association {
         else if (cascadeProperty == CascadeType.ALL) '\'all\''
     }
 
-    def private orderByDetails(String orderBy) {
-        val criteria = newArrayList
-        val orderByFields = orderBy.replace(', ', ',').split(',')
-
-        for (orderByField : orderByFields) {
-            var fieldName = orderByField
-            var sorting = 'ASC'
-            if (orderByField.contains(':')) {
-                val criteriaParts = orderByField.split(':')
-                fieldName = criteriaParts.head
-                sorting = criteriaParts.lastOrNull
-            }
-            criteria.add('"' + fieldName + '" = "' + sorting.toUpperCase + '"')
-        }
-        criteria.join(', ')
-    }
-
     def initCollections(Entity it) '''
         «FOR relation : getOutgoingCollections»«relation.initCollection(true)»«ENDFOR»
         «FOR relation : getIncomingCollections»«relation.initCollection(false)»«ENDFOR»

bundles/org.zikula.modulestudio.generator/src/org/zikula/modulestudio/generator/extensions/FormattingExtensions.xtend

@@ -134,4 +134,28 @@ class FormattingExtensions {
 
         output
     }
+
+    def orderByDetails(String orderBy, String context) {
+        val criteria = newArrayList
+        val orderByFields = orderBy.replace(', ', ',').split(',')
+
+        for (orderByField : orderByFields) {
+            var fieldName = orderByField
+            var sorting = 'ASC'
+            if (orderByField.contains(':')) {
+                val criteriaParts = orderByField.split(':')
+                fieldName = criteriaParts.head
+                sorting = criteriaParts.lastOrNull
+                if (null === sorting || !#['ASC', 'DESC'].contains(sorting.toUpperCase)) {
+                    sorting = 'ASC'
+                }
+            }
+            if ('orm' === context) {
+                criteria.add('"' + fieldName + '" = "' + sorting.toUpperCase + '"')
+            } else if ('crud' === context) {
+                criteria.add('\'' + fieldName + '\' => \'' + sorting.toUpperCase + '\'')
+            }
+        }
+        criteria.join(', ')
+    }
 }

tests/org.zikula.modulestudio.generator.tests/model/test3.mostapp.xt

@@ -26,8 +26,8 @@ application "SimpleNews" targets SF74 {
             lockType PESSIMISTIC_WRITE
             standardFields true
             approval true
-            hasArchive true
             ownerPermission true
+            hasArchive true
             fields {
                 string "title" {
                     sluggablePosition 1

tests/org.zikula.modulestudio.generator.tests/model/test4.mostapp.xt

@@ -26,8 +26,8 @@ application "SimpleNews" targets SF74 {
             lockType OPTIMISTIC
             standardFields false
             approval false
-            hasArchive false
             ownerPermission false
+            hasArchive false
             fields {
                 string "title" {
                     sluggablePosition 1