From 0954d5ebf4eb8764e4d850259ce604d6fc9cf111 Mon Sep 17 00:00:00 2001
From: Mauro Amico <mauro.amico@gmail.com>
Date: Fri, 31 Oct 2025 17:48:18 +0100
Subject: [PATCH 1/2] backport https://github.com/plone/plone.restapi/pull/1954

---
 CHANGES.rst                     |  3 ++-
 src/redturtle/volto/monkey.py   | 10 ++++++++++
 src/redturtle/volto/monkey.zcml |  8 ++++++++
 3 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGES.rst b/CHANGES.rst
index 64c877c4..8b9f418c 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -4,7 +4,8 @@ Changelog
 5.9.2 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- backport https://github.com/plone/plone.restapi/pull/1954 sort_order in search handler
+  [mamico]
 
 
 5.9.1 (2025-09-25)
diff --git a/src/redturtle/volto/monkey.py b/src/redturtle/volto/monkey.py
index b3739d67..4cf7baac 100644
--- a/src/redturtle/volto/monkey.py
+++ b/src/redturtle/volto/monkey.py
@@ -217,3 +217,13 @@ def plone_restapi_blocks_linkintegrity_blocksretriever_retrieveLinks(self):
         ):
             links |= set(handler(block))
     return links
+
+
+def restapi_handler_filter_query(self, query):
+    if query:
+        sort_order = query.get("sort_order")
+    query = self._old_filter_query(query)
+    if sort_order and not query.get("sort_order"):
+        query["sort_order"] = sort_order
+    return query
+
diff --git a/src/redturtle/volto/monkey.zcml b/src/redturtle/volto/monkey.zcml
index 60786faf..50f89e15 100644
--- a/src/redturtle/volto/monkey.zcml
+++ b/src/redturtle/volto/monkey.zcml
@@ -74,4 +74,12 @@
       preserveOriginal="True"
       />
 
+  <monkey:patch
+      original="filter_query"
+      replacement=".monkey.restapi_handler_filter_query"
+      class="plone.restapi.search.handler.SearchHandler"
+      description="https://github.com/plone/plone.restapi/pull/1954"
+      preserveOriginal="True"
+      />
+
 </configure>

From 10ec0e78c94e0b06b0d0d85bd13926354bf3aa51 Mon Sep 17 00:00:00 2001
From: Mauro Amico <mauro.amico@gmail.com>
Date: Fri, 31 Oct 2025 17:52:56 +0100
Subject: [PATCH 2/2] search order (main)

---
 src/redturtle/volto/monkey.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/redturtle/volto/monkey.py b/src/redturtle/volto/monkey.py
index 4cf7baac..3343009a 100644
--- a/src/redturtle/volto/monkey.py
+++ b/src/redturtle/volto/monkey.py
@@ -226,4 +226,3 @@ def restapi_handler_filter_query(self, query):
     if sort_order and not query.get("sort_order"):
         query["sort_order"] = sort_order
     return query
-