Merge branch 'master' into 19-support-both-gridjs-and-datagrids-own-f…

…rontend

.rmt.yml

@@ -26,7 +26,9 @@ _default:
 # BRANCH SPECIFIC CONFIG
 #  On master, we override the general config
 master:
-    version-generator: semantic # More complex versionning (semantic)
+    version-generator:
+        semantic:
+            allow-label: true
     version-persister:
         vcs-tag:
             tag-prefix: ''         # No more prefix for tags
@@ -37,4 +39,4 @@ master:
             exclude-merge-commits: true
         composer-update:
             name: composer.json
-        vcs-commit: ~              # Commit the CHANGELOG
+        vcs-commit: ~              # Commit the CHANGELOG

CHANGELOG

@@ -3,6 +3,8 @@ VERSION 0  INITIAL RELEASE
 ==========================
 
    Version 0.6 - Rendering with Inertia and Vue3 - Alpha release!
+      14/03/2024 18:25  0.6.1-beta  Clear default order when sorting
+         21a644d Update .rmt.yml
       14/11/2023 13:45  0.6.0-alpha  Alpha release
          383ec5c Add inertia components
          b92d9e9 Fix the search
@@ -60,4 +62,4 @@ VERSION 0  INITIAL RELEASE
          8146a66 Add test badge
 
    Version 0.1 - Initial release
-      23/03/2021 19:22  0.1.0  initial release
+      23/03/2021 19:22  0.1.0  initial release

src/DataGrid/DataSources/QueryDataSource.php

@@ -32,6 +32,9 @@ public function search(?string $search, array $columns): void
 
     public function sort(?array $orders, ?array $dirs): void
     {
+        // Remove existing, default ordering
+        $this->query->reorder();
+
         collect($orders)->each(fn ($field, $index) => $this->query->orderBy($field, $dirs[$index] ?? 'asc'));
     }