NotificationsYou must be signed in to change notification settings
Fork928
Star10.1k

Commit8a12ee7

authored

fix(site): show wsproxy errors in context in WorkspaceProxyPage (#11556)

* Shows the overall report error at the top of the page, if present.* Shows workspaceproxy errors above warnings inside the corresponding element, if present.* Improves unregistered proxy status

1 parent8701dbc commit8a12ee7Copy full SHA for 8a12ee7

File tree

1 file changed

+18

-5

lines changed

site/src/pages/HealthPage
- WorkspaceProxyPage.tsx

1 file changed

+18

-5

lines changed

`‎site/src/pages/HealthPage/WorkspaceProxyPage.tsx`

Lines changed: 18 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@ export const WorkspaceProxyPage = () => {`
`39`	`39`	`</Header>`
`40`	`40`
`41`	`41`	`<Main>`
	`42`	`+{workspace_proxy.error&&(`
	`43`	`+<Alertseverity="error">{workspace_proxy.error}</Alert>`
	`44`	`+)}`
`42`	`45`	`{workspace_proxy.warnings.map((warning)=>{`
`43`	`46`	`return(`
`44`	`47`	`<Alertkey={warning.code}severity="warning">`
`@@ -48,6 +51,7 @@ export const WorkspaceProxyPage = () => {`
`48`	`51`	`})}`
`49`	`52`
`50`	`53`	`{regions.map((region)=>{`
	`54`	`+consterrors=region.status?.report?.errors??[];`
`51`	`55`	`constwarnings=region.status?.report?.warnings??[];`
`52`	`56`
`53`	`57`	`return(`
`@@ -138,14 +142,23 @@ export const WorkspaceProxyPage = () => {`
`138`	`142`	`color:theme.palette.text.secondary,`
`139`	`143`	`}}`
`140`	`144`	`>`
`141`		`-{warnings.length>0 ?(`
	`145`	`+{region.status?.status==="unregistered" ?(`
	`146`	`+<span>Has not connected yet</span>`
	`147`	`+) :warnings.length===0&&errors.length===0 ?(`
	`148`	`+<span>OK</span>`
	`149`	`+) :(`
`142`	`150`	`<divcss={{display:"flex",flexDirection:"column"}}>`
`143`		`-{warnings.map((warning,i)=>(`
`144`		`-<spankey={i}>{warning}</span>`
	`151`	`+{[...errors, ...warnings].map((msg,i)=>(`
	`152`	`+<span`
	`153`	`+css={{`
	`154`	`+":first-letter":{textTransform:"uppercase"},`
	`155`	`+}}`
	`156`	`+key={i}`
	`157`	`+>`
	`158`	`+{msg}`
	`159`	`+</span>`
`145`	`160`	`))}`
`146`	`161`	`</div>`
`147`		`-) :(`
`148`		`-<span>No warnings</span>`
`149`	`162`	`)}`
`150`	`163`	`<spandata-chromatic="ignore">`
`151`	`164`	`{createDayString(region.updated_at)}`

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!

Commit8a12ee7

File tree

1 file changed

1 file changed

`‎site/src/pages/HealthPage/WorkspaceProxyPage.tsx`

0 commit comments