From 080f262f8588a8f947f38c30fbec0f51793e59fe Mon Sep 17 00:00:00 2001
From: Andy Rae <1127507+AndyRae@users.noreply.github.com>
Date: Fri, 1 Aug 2025 13:48:51 +0100
Subject: [PATCH 1/4] Fix order for data partner

---
 app/api/api/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/api/api/views.py b/app/api/api/views.py
index 305bb0f12..001c9997e 100644
--- a/app/api/api/views.py
+++ b/app/api/api/views.py
@@ -98,7 +98,7 @@ class DataPartnerViewSet(GenericAPIView, ListModelMixin):
             Handles GET requests to return a list of DataPartner objects.
     """
 
-    queryset = DataPartner.objects.all()
+    queryset = DataPartner.objects.all().order_by("name")
     serializer_class = DataPartnerSerializer
 
     def get(self, request, *args, **kwargs):

From 283d64768a2e4ffedb2039e088546c952bc21a6a Mon Sep 17 00:00:00 2001
From: Andy Rae <1127507+AndyRae@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:03:37 +0100
Subject: [PATCH 2/4] Fix ordering datasets

---
 app/api/datasets/views.py           | 3 ++-
 app/next-client-app/api/datasets.ts | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/api/datasets/views.py b/app/api/datasets/views.py
index af2ba1445..37ad3e945 100644
--- a/app/api/datasets/views.py
+++ b/app/api/datasets/views.py
@@ -55,7 +55,8 @@ class DatasetIndex(GenericAPIView, ListModelMixin, CreateModelMixin):
     """
 
     serializer_class = DatasetViewSerializerV2
-    filter_backends = [DjangoFilterBackend]
+    filter_backends = [DjangoFilterBackend, OrderingFilter]
+    ordering_fields = ["id", "name", "created_at", "visibility"]
     filterset_fields = {
         "id": ["in"],
         "data_partner": ["in", "exact"],
diff --git a/app/next-client-app/api/datasets.ts b/app/next-client-app/api/datasets.ts
index ee7537bf5..aaece6883 100644
--- a/app/next-client-app/api/datasets.ts
+++ b/app/next-client-app/api/datasets.ts
@@ -11,8 +11,8 @@ const fetchKeys = {
   dataset: (id: string) => `v2/datasets/${id}/`,
   datasetList: (dataPartnerId?: string) =>
     dataPartnerId
-      ? `v2/datasets/?data_partner=${dataPartnerId}&hidden=false`
-      : "v2/datasets/",
+      ? `v2/datasets/?data_partner=${dataPartnerId}&hidden=false&ordering=name`
+      : "v2/datasets/?ordering=name",
   dataPartners: () => "v2/datapartners/",
   users: () => "v2/usersfilter/?is_active=true",
   updateDataset: (id: number) => `v2/datasets/${id}/`,

From 705b5b374161bd2a0ca1e9aa7089b16a95f4a8d9 Mon Sep 17 00:00:00 2001
From: Andy Rae <1127507+AndyRae@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:06:30 +0100
Subject: [PATCH 3/4] Add ordering filter to UserFilterViewSet and update API
 endpoint for users

---
 app/api/api/views.py                | 3 ++-
 app/next-client-app/api/datasets.ts | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/api/api/views.py b/app/api/api/views.py
index 001c9997e..46af91236 100644
--- a/app/api/api/views.py
+++ b/app/api/api/views.py
@@ -182,7 +182,8 @@ class UserFilterViewSet(GenericAPIView, ListModelMixin):
 
     queryset = User.objects.all()
     serializer_class = UserSerializer
-    filter_backends = [DjangoFilterBackend]
+    filter_backends = [DjangoFilterBackend, OrderingFilter]
+    ordering_fields = ["id", "username"]
     filterset_fields = {"id": ["in", "exact"], "is_active": ["exact"]}
 
     def get(self, request, *args, **kwargs):
diff --git a/app/next-client-app/api/datasets.ts b/app/next-client-app/api/datasets.ts
index aaece6883..3c9f5255e 100644
--- a/app/next-client-app/api/datasets.ts
+++ b/app/next-client-app/api/datasets.ts
@@ -14,7 +14,7 @@ const fetchKeys = {
       ? `v2/datasets/?data_partner=${dataPartnerId}&hidden=false&ordering=name`
       : "v2/datasets/?ordering=name",
   dataPartners: () => "v2/datapartners/",
-  users: () => "v2/usersfilter/?is_active=true",
+  users: () => "v2/usersfilter/?is_active=true&ordering=username",
   updateDataset: (id: number) => `v2/datasets/${id}/`,
   permissions: (id: string) => `v2/datasets/${id}/permissions/`,
   create: "v2/datasets/",

From 2b657d3c31362b31a4ef3ba44985bf04561c4376 Mon Sep 17 00:00:00 2001
From: Andy Rae <1127507+AndyRae@users.noreply.github.com>
Date: Fri, 1 Aug 2025 14:08:56 +0100
Subject: [PATCH 4/4] Fix redirect URL in updateScanReport function to include
 scan report ID

---
 app/next-client-app/api/scanreports.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/next-client-app/api/scanreports.ts b/app/next-client-app/api/scanreports.ts
index 7e93f2135..7361ec8e4 100644
--- a/app/next-client-app/api/scanreports.ts
+++ b/app/next-client-app/api/scanreports.ts
@@ -87,7 +87,7 @@ export async function updateScanReport(
     return { errorMessage: error.message };
   }
   if (needRedirect) {
-    redirect(`/scanreports/`);
+    redirect(`/scanreports/${id}`);
   }
 }