fix: only uploaders filter list

api/data_ingestion/routers/users.py

@@ -11,7 +11,7 @@
 from data_ingestion.internal.auth import azure_scheme
 from data_ingestion.internal.groups import GroupsApi
 from data_ingestion.internal.users import UsersApi
-from data_ingestion.models import Role, User
+from data_ingestion.models import FileUpload, Role, User
 from data_ingestion.permissions.permissions import IsPrivileged
 from data_ingestion.schemas.group import ModifyUserAccessRequest
 from data_ingestion.schemas.invitation import (
@@ -48,6 +48,20 @@ async def list_users(db: AsyncSession = Depends(get_db)):
     )
 
 
+@router.get(
+    "/uploaders",
+    response_model=list[DatabaseUser],
+    dependencies=[Security(IsPrivileged())],
+)
+async def list_uploaders(db: AsyncSession = Depends(get_db)):
+    return await db.scalars(
+        select(User)
+        .join(FileUpload, FileUpload.uploader_id == User.id)
+        .distinct()
+        .order_by(User.given_name, User.surname, User.email)
+    )
+
+
 @router.post("", response_model=DatabaseUser, dependencies=[Security(IsPrivileged())])
 async def create_user(
     body: DatabaseUserCreateRequest,

ui/src/api/routers/users.ts

@@ -11,6 +11,9 @@ export default function routes(axi: AxiosInstance) {
     list: (): Promise<AxiosResponse<DatabaseUserWithRoles[]>> => {
       return axi.get("/users");
     },
+    listUploaders: (): Promise<AxiosResponse<DatabaseUser[]>> => {
+      return axi.get("/users/uploaders");
+    },
     get: (id: string): Promise<AxiosResponse<DatabaseUserWithRoles>> => {
       return axi.get(`/users/${id}`);
     },

ui/src/components/upload/FilterModal.tsx

@@ -59,8 +59,8 @@ function FilterModal({
   }, [open]);
 
   const { data: usersData } = useQuery({
-    queryKey: ["users"],
-    queryFn: api.users.list,
+    queryKey: ["uploaders"],
+    queryFn: api.users.listUploaders,
     enabled: isPrivileged,
   });