Commitf3e5bb9

authored

fix: convert workspace id in db2sdk.WorkspaceAppStatus (#17201)

This was causing no status to be rendered in the list, and`latest_app_status` to always be nil.

1 parent900e125 commitf3e5bb9Copy full SHA for f3e5bb9

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -539,6 +539,7 @@ func WorkspaceAppStatus(status database.WorkspaceAppStatus) codersdk.WorkspaceAp`
`539`	`539`	`return codersdk.WorkspaceAppStatus{`
`540`	`540`	`ID:status.ID,`
`541`	`541`	`CreatedAt:status.CreatedAt,`
	`542`	`+WorkspaceID:status.WorkspaceID,`
`542`	`543`	`AgentID:status.AgentID,`
`543`	`544`	`AppID:status.AppID,`
`544`	`545`	`NeedsUserAttention:status.NeedsUserAttention,`

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import AppsIcon from "@mui/icons-material/Apps";`
`4`	`4`	`importCheckCirclefrom"@mui/icons-material/CheckCircle";`
`5`	`5`	`importErrorIconfrom"@mui/icons-material/Error";`
`6`	`6`	`importHelpOutlinefrom"@mui/icons-material/HelpOutline";`
	`7`	`+importHourglassEmptyfrom"@mui/icons-material/HourglassEmpty";`
`7`	`8`	`importInsertDriveFilefrom"@mui/icons-material/InsertDriveFile";`
`8`	`9`	`importOpenInNewfrom"@mui/icons-material/OpenInNew";`
`9`	`10`	`importWarningfrom"@mui/icons-material/Warning";`
`@@ -18,7 +19,6 @@ import type {`
`18`	`19`	`}from"api/typesGenerated";`
`19`	`20`	`import{useProxy}from"contexts/ProxyContext";`
`20`	`21`	`import{formatDistance,formatDistanceToNow}from"date-fns";`
`21`		`-import{DividerWithText}from"pages/DeploymentSettingsPage/LicensesSettingsPage/DividerWithText";`
`22`	`22`	`importtype{FC}from"react";`
`23`	`23`	`import{createAppLinkHref}from"utils/apps";`
`24`	`24`
`@@ -54,7 +54,12 @@ const getStatusIcon = (`
`54`	`54`	`case"failure":`
`55`	`55`	`return<ErrorIconsx={{ color,fontSize:18}}/>;`
`56`	`56`	`case"working":`
`57`		`-return<CircularProgresssize={18}sx={{ color}}/>;`
	`57`	`+// Use Hourglass for past "working" states, spinner for the current one`
	`58`	`+returnisLatest ?(`
	`59`	`+<CircularProgresssize={18}sx={{ color}}/>`
	`60`	`+) :(`
	`61`	`+<HourglassEmptysx={{ color,fontSize:18}}/>`
	`62`	`+);`
`58`	`63`	`default:`
`59`	`64`	`return<Warningsx={{ color,fontSize:18}}/>;`
`60`	`65`	`}`

Comments

(0)