Fix builds to show empty instead of loading

presleyp · presleyp · commit 845367ee6d89 · 2023-01-11T02:00:12.000Z
diff --git a/site/src/api/api.ts b/site/src/api/api.ts
@@ -564,7 +564,7 @@ export const regenerateUserSSHKey = async (
 export const getWorkspaceBuilds = async (
   workspaceId: string,
   since: Date,
-): Promise<TypesGen.WorkspaceBuild[]> => {
+): Promise<TypesGen.WorkspaceBuild[] | null> => {
   const response = await axios.get<TypesGen.WorkspaceBuild[]>(
     `/api/v2/workspaces/${workspaceId}/builds?since=${since.toISOString()}`,
   )
diff --git a/site/src/xServices/workspace/workspaceXService.ts b/site/src/xServices/workspace/workspaceXService.ts
@@ -717,10 +717,11 @@ export const workspaceMachine = createMachine(
         if (context.workspace) {
           // For now, we only retrieve the last month of builds to minimize
           // page bloat. We should add pagination in the future.
-          return await API.getWorkspaceBuilds(
+          const builds = await API.getWorkspaceBuilds(
             context.workspace.id,
             dayjs().add(-30, "day").toDate(),
           )
+          return builds ?? []
         } else {
           throw Error("Cannot get builds without id")
         }

Original file line number	Diff line number	Diff line change
`@@ -564,7 +564,7 @@ export const regenerateUserSSHKey = async (`
`564`	`564`	`export const getWorkspaceBuilds = async (`
`565`	`565`	`workspaceId: string,`
`566`	`566`	`since: Date,`
`567`		`-): Promise<TypesGen.WorkspaceBuild[]> => {`
	`567`	`+): Promise<TypesGen.WorkspaceBuild[] \| null> => {`
`568`	`568`	`const response = await axios.get<TypesGen.WorkspaceBuild[]>(`
`569`	`569`	`/api/v2/workspaces/${workspaceId}/builds?since=${since.toISOString()}`,
`570`	`570`	`)`
Original file line number	Diff line number	Diff line change
`@@ -717,10 +717,11 @@ export const workspaceMachine = createMachine(`
`717`	`717`	`if (context.workspace) {`
`718`	`718`	`// For now, we only retrieve the last month of builds to minimize`
`719`	`719`	`// page bloat. We should add pagination in the future.`
`720`		`- return await API.getWorkspaceBuilds(`
	`720`	`+ const builds = await API.getWorkspaceBuilds(`
`721`	`721`	`context.workspace.id,`
`722`	`722`	`dayjs().add(-30, "day").toDate(),`
`723`	`723`	`)`
	`724`	`+ return builds ?? []`
`724`	`725`	`} else {`
`725`	`726`	`throw Error("Cannot get builds without id")`
`726`	`727`	`}`