diff --git a/Overlord-Server/src/httpHandlers.ts b/Overlord-Server/src/httpHandlers.ts index a7a99c4..6394543 100644 --- a/Overlord-Server/src/httpHandlers.ts +++ b/Overlord-Server/src/httpHandlers.ts @@ -22,7 +22,7 @@ export function handleClientsRequest(req: Request): Response { const statusFilter = url.searchParams.get("status") || "all"; const osFilter = url.searchParams.get("os") || "all"; - const result = listClients({ page, pageSize, search, sort, statusFilter, osFilter }); + const result = listClients({ page, pageSize, search, sort, statusFilter, osFilter, enrollmentFilter: "approved" }); const items = result.items.map((item) => { const live = clientManager.getClient(item.id); if (live?.monitorInfo?.length) { diff --git a/Overlord-Server/src/server/routes/client-routes.ts b/Overlord-Server/src/server/routes/client-routes.ts index 3eb1f38..17295f5 100644 --- a/Overlord-Server/src/server/routes/client-routes.ts +++ b/Overlord-Server/src/server/routes/client-routes.ts @@ -76,7 +76,7 @@ export async function handleClientRoutes( const statusFilter = url.searchParams.get("status") || "all"; const osFilter = url.searchParams.get("os") || "all"; const countryFilter = url.searchParams.get("country") || "all"; - const enrollmentFilter = url.searchParams.get("enrollmentFilter") || "all"; + const enrollmentFilter = url.searchParams.get("enrollmentFilter") || "approved"; if (user.role === "admin") { const result = listClients({ page, pageSize, search, sort, statusFilter, osFilter, countryFilter, enrollmentFilter }); return Response.json(result, { headers: deps.CORS_HEADERS });