Fix forms ordering and redirecting

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):
@@ -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):

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"],

app/next-client-app/api/datasets.ts

@@ -11,10 +11,10 @@ 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",
+  users: () => "v2/usersfilter/?is_active=true&ordering=username",
   updateDataset: (id: number) => `v2/datasets/${id}/`,
   permissions: (id: string) => `v2/datasets/${id}/permissions/`,
   create: "v2/datasets/",

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}`);
   }
 }