from order to sort

Author: cblanquera

src/Package/System/SystemPackage.php

@@ -131,11 +131,11 @@ public function cleanQuery(array $query): array
       }
     }
 
-    //eg. order = [product_id => DESC
-    if (isset($query['order']) && is_array($query['order'])) {
-      foreach ($query['order'] as $key => $value) {
+    //eg. sort = [product_id => DESC
+    if (isset($query['sort']) && is_array($query['sort'])) {
+      foreach ($query['sort'] as $key => $value) {
         if (!preg_match('/^[a-zA-Z0-9_\.]+$/', $key)) {
-          unset($query['order'][$key]);
+          unset($query['sort'][$key]);
         }
       }
     }
@@ -321,7 +321,7 @@ public function getQuery(array $data): array
       'q',      'filter',
       'like',   'in',
       'span',   'empty',
-      'nempty', 'order',
+      'nempty', 'sort',
       'start',  'range'
     ];
 

src/Package/System/events/collection.php

@@ -493,6 +493,10 @@
     $data['columns'] = '*';
   }
 
+  if (!isset($data['sort'])) {
+    $data['sort'] = [];
+  }
+
   if (!isset($data['start'])) {
     $data['start'] = 0;
   }
@@ -559,6 +563,7 @@
     'columns' => $data['columns'],
     'joins' => $joins,
     'filters' => $filters,
+    'sort' => $data['sort'],
     'start' => $data['start'],
     'range' => $data['range']
   ]);