Commit089f960

authored

fix(site): only attempt to watch containers when agent connected (#18873)

This PR ensures we do not attempt to call `containers/watch` on theagent _before_ it is connected.

1 parent4354633 commit089f960Copy full SHA for 089f960

File tree

+23

-1

lines changed

+23

-1

lines changed

Lines changed: 18 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -193,4 +193,22 @@ describe("useAgentContainers", () => {`
`193`	`193`	`displayErrorSpy.mockRestore();`
`194`	`194`	`watchAgentContainersSpy.mockRestore();`
`195`	`195`	`});`
	`196`	`+`
	`197`	`+it("does not establish WebSocket connection when agent is not connected",()=>{`
	`198`	`+constwatchAgentContainersSpy=jest.spyOn(API,"watchAgentContainers");`
	`199`	`+`
	`200`	`+constdisconnectedAgent={`
	`201`	`+...MockWorkspaceAgent,`
	`202`	`+status:"disconnected"asconst,`
	`203`	`+};`
	`204`	`+`
	`205`	`+const{ result}=renderHook(()=>useAgentContainers(disconnectedAgent),{`
	`206`	`+wrapper:createWrapper(),`
	`207`	`+});`
	`208`	`+`
	`209`	`+expect(watchAgentContainersSpy).not.toHaveBeenCalled();`
	`210`	`+expect(result.current).toBeUndefined();`
	`211`	`+`
	`212`	`+watchAgentContainersSpy.mockRestore();`
	`213`	`+});`
`196`	`214`	`});`

Lines changed: 5 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,10 @@ export function useAgentContainers(`
`31`	`31`	`);`
`32`	`32`
`33`	`33`	`useEffect(()=>{`
	`34`	`+if(agent.status!=="connected"){`
	`35`	`+return;`
	`36`	`+}`
	`37`	`+`
`34`	`38`	`constsocket=watchAgentContainers(agent.id);`
`35`	`39`
`36`	`40`	`socket.addEventListener("message",(event)=>{`
`@@ -53,7 +57,7 @@ export function useAgentContainers(`
`53`	`57`	`});`
`54`	`58`
`55`	`59`	`return()=>socket.close();`
`56`		`-},[agent.id,updateDevcontainersCache]);`
	`60`	`+},[agent.id,agent.status,updateDevcontainersCache]);`
`57`	`61`
`58`	`62`	`returndevcontainers;`
`59`	`63`	`}`

Comments

(0)