Commitc8662c6

committed

fix(site): watch build logs while job is pending or running

1 parentcf96d91 commitc8662c6Copy full SHA for c8662c6

File tree

+10

-4

lines changed

site/src
- modules/templates
  - useWatchVersionLogs.ts
- pages/TemplateVersionEditorPage
  - TemplateVersionEditorPage.test.tsx

+10

-4

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,10 @@ export const useWatchVersionLogs = (`
`20`	`20`	`return;`
`21`	`21`	`}`
`22`	`22`
`23`		`-if(templateVersionStatus!=="running"){`
	`23`	`+if(`
	`24`	`+templateVersionStatus!=="running"&&`
	`25`	`+templateVersionStatus!=="pending"`
	`26`	`+){`
`24`	`27`	`return;`
`25`	`28`	`}`
`26`	`29`

Lines changed: 6 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -324,14 +324,13 @@ test("display pending badge and update it to running when status changes", async`
`324`	`324`	`},`
`325`	`325`	`};`
`326`	`326`
`327`		`-letcalls=0;`
	`327`	`+letrunning=false;`
`328`	`328`	`server.use(`
`329`	`329`	`http.get(`
`330`	`330`	`"/api/v2/organizations/:org/templates/:template/versions/:version",`
`331`	`331`	`()=>{`
`332`		`-calls+=1;`
`333`	`332`	`returnHttpResponse.json(`
`334`		`-calls>1 ?MockRunningTemplateVersion :MockPendingTemplateVersion,`
	`333`	`+running ?MockRunningTemplateVersion :MockPendingTemplateVersion,`
`335`	`334`	`);`
`336`	`335`	`},`
`337`	`336`	`),`
`@@ -348,6 +347,10 @@ test("display pending badge and update it to running when status changes", async`
`348`	`347`	`conststatus=awaitscreen.findByRole("status");`
`349`	`348`	`expect(status).toHaveTextContent("Pending");`
`350`	`349`
	`350`	`+// Manually update the endpoint, as to not rely on the editor page`
	`351`	`+// making a specific number of requests.`
	`352`	`+running=true;`
	`353`	`+`
`351`	`354`	`awaitwaitFor(`
`352`	`355`	`()=>{`
`353`	`356`	`expect(status).toHaveTextContent("Running");`

Comments

(0)