NotificationsYou must be signed in to change notification settings
Fork1k
Star11.2k

Commit8b5a18c

authored

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

Closes#15292.Currently, if the frontend never sees a build job enter 'running', it'llnever end up watching the logs. If we start watching the logs earlierwe're able to catch cases where the job goes `pending` -> `failed`, suchas when the build fails immediately.

1 parent3c60dc3 commit8b5a18cCopy full SHA for 8b5a18c

File tree

2 files changed

+10

-4

lines changed

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

2 files changed

+10

-4

lines changed

`‎site/src/modules/templates/useWatchVersionLogs.ts‎`

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`

`‎site/src/pages/TemplateVersionEditorPage/TemplateVersionEditorPage.test.tsx‎`

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");`

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!

Commit8b5a18c

File tree

2 files changed

2 files changed

`‎site/src/modules/templates/useWatchVersionLogs.ts‎`

`‎site/src/pages/TemplateVersionEditorPage/TemplateVersionEditorPage.test.tsx‎`

0 commit comments