Commite335ced

committed

Fix connecting to off workspaces

We made a change to always include the agent in the host name so thesession is stable, however for workspaces that are off there is no agentincluded in the response, and we were silently returning in these cases.So for these cases, fetch the first agent through a different API thatstill returns agents when the workspace is off.Workspace picker is broken out into a separate function, logic isunchanged.Instead of a possibly-undefined agent on a tree item, I switch on thetree item type. I feel the intent this way is easier to follow.To extract agents from both APIs, make extractAgents accept an array ofresources instead of a workspace.

1 parentcb2a4ec commite335cedCopy full SHA for e335ced

File tree

4 files changed

+195

-176

lines changed

4 files changed

+195

-176

lines changed

`‎src/api-helper.ts‎`

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`import{isApiError,isApiErrorResponse}from"coder/site/src/api/errors";`
`2`		`-import{Workspace,WorkspaceAgent}from"coder/site/src/api/typesGenerated";`
	`2`	`+import{`
	`3`	`+Workspace,`
	`4`	`+WorkspaceAgent,`
	`5`	`+WorkspaceResource,`
	`6`	`+}from"coder/site/src/api/typesGenerated";`
`3`	`7`	`import{ErrorEvent}from"eventsource";`
`4`	`8`	`import{z}from"zod";`
`5`	`9`
`@@ -24,12 +28,14 @@ export function extractAllAgents(`
`24`	`28`	`workspaces:readonlyWorkspace[],`
`25`	`29`	`):WorkspaceAgent[]{`
`26`	`30`	`returnworkspaces.reduce((acc,workspace)=>{`
`27`		`-returnacc.concat(extractAgents(workspace));`
	`31`	`+returnacc.concat(extractAgents(workspace.latest_build.resources));`
`28`	`32`	`},[]asWorkspaceAgent[]);`
`29`	`33`	`}`
`30`	`34`
`31`		`-exportfunctionextractAgents(workspace:Workspace):WorkspaceAgent[]{`
`32`		`-returnworkspace.latest_build.resources.reduce((acc,resource)=>{`
	`35`	`+exportfunctionextractAgents(`
	`36`	`+resources:readonlyWorkspaceResource[],`
	`37`	`+):WorkspaceAgent[]{`
	`38`	`+returnresources.reduce((acc,resource)=>{`
`33`	`39`	`returnacc.concat(resource.agents\|\|[]);`
`34`	`40`	`},[]asWorkspaceAgent[]);`
`35`	`41`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commite335ced

File tree

4 files changed

4 files changed

`‎src/api-helper.ts‎`

0 commit comments