Doctor getWorkspaces

presleyp · presleyp · commit 931715521a2f · 2022-10-14T20:08:54.000Z
diff --git 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<TypesGen.Workspace[]> => {
-  const url = getURLWithSearchParams("/api/v2/workspaces", filter)
-  const response = await axios.get<TypesGen.Workspace[]>(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<TypesGen.Workspace[]>(`/api/v2/workspaces?${searchParams.toString()}`)
   return response.data
 }
 
diff --git 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) => {
