From e1f99a2824b0451b391100e0765d8721136d0e07 Mon Sep 17 00:00:00 2001
From: Luciano Righetti <luciano.righetti@gmail.com>
Date: Thu, 9 Nov 2023 09:56:57 +0100
Subject: [PATCH] fix: api order not working because of dropped param/incorrect
 handling, related to #9359

---
 app/Controller/Component/RestSearchComponent.php | 6 ++++--
 app/Model/Attribute.php                          | 2 +-
 app/Model/GalaxyCluster.php                      | 2 +-
 app/Model/Workflow.php                           | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/Controller/Component/RestSearchComponent.php b/app/Controller/Component/RestSearchComponent.php
index 82022dd4c..9be41228b 100644
--- a/app/Controller/Component/RestSearchComponent.php
+++ b/app/Controller/Component/RestSearchComponent.php
@@ -59,7 +59,8 @@ class RestSearchComponent extends Component
             'event_ids',
             'includeAllTags',
             'includeAttributeUuid',
-            'includeGalaxy'
+            'includeGalaxy',
+            'order'
         ],
         'Event' => [
             'returnFormat',
@@ -188,7 +189,8 @@ class RestSearchComponent extends Component
             'minimal',
             'list',
             'first',
-            'count'
+            'count',
+            'order'
         ],
     );
 
diff --git a/app/Model/Attribute.php b/app/Model/Attribute.php
index d9a821c91..32a8dcc03 100644
--- a/app/Model/Attribute.php
+++ b/app/Model/Attribute.php
@@ -1688,7 +1688,7 @@ class Attribute extends AppModel
         }
         $params['order'] = [];
         if (!empty($options['order'])) {
-            $options['order'] = $this->findOrder(
+            $params['order'] = $this->findOrder(
                 $options['order'],
                 'Attribute',
                 ['id', 'event_id', 'object_id', 'type', 'category', 'value', 'distribution', 'timestamp', 'object_relation']
diff --git a/app/Model/GalaxyCluster.php b/app/Model/GalaxyCluster.php
index a2321079e..781d31033 100644
--- a/app/Model/GalaxyCluster.php
+++ b/app/Model/GalaxyCluster.php
@@ -1064,7 +1064,7 @@ class GalaxyCluster extends AppModel
             $params['group'] = $options['group'];
         }
         if (!empty($options['order'])) {
-            $options['order'] = $this->findOrder(
+            $params['order'] = $this->findOrder(
                 $options['order'],
                 'GalaxyCluster',
                 ['id', 'event_id', 'version', 'type', 'value', 'distribution', 'orgc_id', 'org_id', 'tag_name', 'galaxy_id']
diff --git a/app/Model/Workflow.php b/app/Model/Workflow.php
index c99fbf074..7ac46ccfc 100644
--- a/app/Model/Workflow.php
+++ b/app/Model/Workflow.php
@@ -1214,7 +1214,7 @@ class Workflow extends AppModel
 
         $params['order'] = [];
         if (!empty($options['order'])) {
-            $options['order'] = $this->findOrder(
+            $params['order'] = $this->findOrder(
                 $options['order'],
                 'Workflow',
                 ['id', 'name', 'timestmap', 'trigger_id', 'counter']