Switch to backend fix

presleyp · presleyp · commit e163ea42630b · 2023-01-11T15:31:13.000Z
diff --git a/coderd/workspacebuilds.go b/coderd/workspacebuilds.go
@@ -897,7 +897,8 @@ func (api *API) convertWorkspaceBuilds(
 		templateVersionByID[templateVersion.ID] = templateVersion
 	}
 
-	var apiBuilds []codersdk.WorkspaceBuild
+	// Should never be nil for API consistency
+	apiBuilds := []codersdk.WorkspaceBuild{}
 	for _, build := range workspaceBuilds {
 		job, exists := jobByID[build.JobID]
 		if !exists {
diff --git a/coderd/workspacebuilds_test.go b/coderd/workspacebuilds_test.go
@@ -171,6 +171,8 @@ func TestWorkspaceBuilds(t *testing.T) {
 		)
 		require.NoError(t, err)
 		require.Len(t, builds, 0)
+		// Should never be nil for API consistency
+		require.NotNil(t, builds)
 
 		builds, err = client.WorkspaceBuilds(ctx,
 			codersdk.WorkspaceBuildsRequest{WorkspaceID: workspace.ID, Since: database.Now().Add(-time.Hour)},
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[] | null> => {
+): Promise<TypesGen.WorkspaceBuild[]> => {
   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,11 +717,10 @@ 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.
-          const builds = await API.getWorkspaceBuilds(
+          return 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
`@@ -897,7 +897,8 @@ func (api *API) convertWorkspaceBuilds(`
`897`	`897`	`templateVersionByID[templateVersion.ID] = templateVersion`
`898`	`898`	`}`
`899`	`899`
`900`		`- var apiBuilds []codersdk.WorkspaceBuild`
	`900`	`+ // Should never be nil for API consistency`
	`901`	`+ apiBuilds := []codersdk.WorkspaceBuild{}`
`901`	`902`	`for _, build := range workspaceBuilds {`
`902`	`903`	`job, exists := jobByID[build.JobID]`
`903`	`904`	`if !exists {`
Original file line number	Diff line number	Diff line change
`@@ -171,6 +171,8 @@ func TestWorkspaceBuilds(t *testing.T) {`
`171`	`171`	`)`
`172`	`172`	`require.NoError(t, err)`
`173`	`173`	`require.Len(t, builds, 0)`
	`174`	`+ // Should never be nil for API consistency`
	`175`	`+ require.NotNil(t, builds)`
`174`	`176`
`175`	`177`	`builds, err = client.WorkspaceBuilds(ctx,`
`176`	`178`	`codersdk.WorkspaceBuildsRequest{WorkspaceID: workspace.ID, Since: database.Now().Add(-time.Hour)},`
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[] \| null> => {`
	`567`	`+): Promise<TypesGen.WorkspaceBuild[]> => {`
`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,11 +717,10 @@ 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`		`- const builds = await API.getWorkspaceBuilds(`
	`720`	`+ return await API.getWorkspaceBuilds(`
`721`	`721`	`context.workspace.id,`
`722`	`722`	`dayjs().add(-30, "day").toDate(),`
`723`	`723`	`)`
`724`		`- return builds ?? []`
`725`	`724`	`} else {`
`726`	`725`	`throw Error("Cannot get builds without id")`
`727`	`726`	`}`