From 931715521a2f2bc288d64883553ad71976e9b99f Mon Sep 17 00:00:00 2001 From: Presley Pizzo Date: Fri, 14 Oct 2022 20:08:54 +0000 Subject: [PATCH] Doctor getWorkspaces --- site/src/api/api.ts | 16 +++++++++++++--- .../xServices/workspaces/workspacesXService.ts | 6 +++++- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/site/src/api/api.ts b/site/src/api/api.ts index cf7e8f30bf..80818a97c8 100644 --- a/site/src/api/api.ts +++ b/site/src/api/api.ts @@ -279,10 +279,20 @@ export const getURLWithSearchParams = ( } export const getWorkspaces = async ( - filter?: TypesGen.WorkspaceFilter, + options: TypesGen.AuditLogsRequest, ): Promise => { - const url = getURLWithSearchParams("/api/v2/workspaces", filter) - const response = await axios.get(url) + const searchParams = new URLSearchParams() + if (options.limit) { + searchParams.set("limit", options.limit.toString()) + } + if (options.offset) { + searchParams.set("offset", options.offset.toString()) + } + if (options.q) { + searchParams.set("q", options.q) + } + + const response = await axios.get(`/api/v2/workspaces?${searchParams.toString()}`) return response.data } diff --git a/site/src/xServices/workspaces/workspacesXService.ts b/site/src/xServices/workspaces/workspacesXService.ts index ca415ca8b0..822ae8b0a9 100644 --- a/site/src/xServices/workspaces/workspacesXService.ts +++ b/site/src/xServices/workspaces/workspacesXService.ts @@ -418,7 +418,11 @@ export const workspacesMachine = }, services: { getWorkspaces: (context) => - API.getWorkspaces(queryToFilter(context.filter)), + API.getWorkspaces({ + ...queryToFilter(context.filter), + offset: (context.page - 1) * context.limit, + limit: context.limit, + }), updateWorkspaceRefs: (context, event) => { const refsToKeep: WorkspaceItemMachineRef[] = [] context.workspaceRefs?.forEach((ref) => {