Merge branch '4.x' of https://github.com/craftcms/cms into 5.x

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 ## Unreleased
 
+- Element indexes now sort by ID by default, for sources that don’t define a default sort option.
 - Fixed a bug where element indexes were sorting by the first sortable attribute alphabetically by default, rather than the first sortable attribute defined by the element type.
 
 ## 5.5.2 - 2024-11-19

src/base/Element.php

@@ -1411,6 +1411,12 @@ public static function sortOptions(): array
     {
         $sortOptions = static::defineSortOptions();
 
+        // Make sure ID is listed first
+        $sortOptions = [
+            'id' => Craft::t('app', 'ID'),
+            ...ArrayHelper::without($sortOptions, 'id'),
+        ];
+
         // Fire a 'registerSortOptions' event
         if (Event::hasHandlers(static::class, self::EVENT_REGISTER_SORT_OPTIONS)) {
             $event = new RegisterElementSortOptionsEvent(['sortOptions' => $sortOptions]);

src/elements/Asset.php

@@ -586,7 +586,6 @@ protected static function defineSortOptions(): array
                 'orderBy' => 'dateUpdated',
                 'defaultDir' => 'desc',
             ],
-            'id' => Craft::t('app', 'ID'),
             'width' => Craft::t('app', 'Width'),
             'height' => Craft::t('app', 'Height'),
         ];

src/elements/Category.php

@@ -315,7 +315,6 @@ protected static function defineSortOptions(): array
                 'orderBy' => 'dateUpdated',
                 'defaultDir' => 'desc',
             ],
-            'id ' => Craft::t('app', 'ID'),
         ];
     }
 

src/elements/Entry.php

@@ -580,7 +580,6 @@ protected static function defineSortOptions(): array
                 'orderBy' => 'dateUpdated',
                 'defaultDir' => 'desc',
             ],
-            'id' => Craft::t('app', 'ID'),
         ];
     }
 

src/elements/User.php

@@ -421,7 +421,6 @@ protected static function defineSortOptions(): array
                     'orderBy' => 'dateUpdated',
                     'defaultDir' => 'desc',
                 ],
-                'id' => Craft::t('app', 'ID'),
             ];
         } else {
             $attributes = [
@@ -445,7 +444,6 @@ protected static function defineSortOptions(): array
                     'orderBy' => 'dateUpdated',
                     'defaultDir' => 'desc',
                 ],
-                'id' => Craft::t('app', 'ID'),
             ];
         }