Commitc8d04af

authored

feat: Add status badge to the favicon (#2978)

1 parentbf1af21 commitc8d04afCopy full SHA for c8d04af

File tree

+74

-4

lines changed

+74

-4

lines changed

Lines changed: 8 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -22,9 +22,14 @@`
`22`	`22`	`data-statuscode="{{ .APIResponse.StatusCode }}"`
`23`	`23`	`data-message="{{ .APIResponse.Message }}"`
`24`	`24`	`/>`
`25`		`-<linkrel="mask-icon"href="/static/favicon.svg"color="#000000"crossorigin="use-credentials"/>`
`26`		`-<linkrel="alternate icon"type="image/png"href="/favicon.png"/>`
`27`		`-<linkrel="icon"type="image/svg+xml"href="/favicon.svg"/>`
	`25`	`+<!-- We need to set data-react-helmet to be able to override it in the workspace page -->`
	`26`	`+<link`
	`27`	`+rel="alternate icon"`
	`28`	`+type="image/png"`
	`29`	`+href="/favicons/favicon.png"`
	`30`	`+data-react-helmet="true"`
	`31`	`+/>`
	`32`	`+<linkrel="icon"type="image/svg+xml"href="/favicons/favicon.svg"data-react-helmet="true"/>`
`28`	`33`	`</head>`
`29`	`34`
`30`	`35`	`<body>`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ import { FullScreenLoader } from "../../components/Loader/FullScreenLoader"`
`10`	`10`	`import{Workspace}from"../../components/Workspace/Workspace"`
`11`	`11`	`import{firstOrItem}from"../../util/array"`
`12`	`12`	`import{pageTitle}from"../../util/page"`
	`13`	`+import{getFaviconByStatus}from"../../util/workspace"`
`13`	`14`	`import{selectUser}from"../../xServices/auth/authSelectors"`
`14`	`15`	`import{XServiceContext}from"../../xServices/StateContext"`
`15`	`16`	`import{workspaceMachine}from"../../xServices/workspace/workspaceXService"`
`@@ -50,10 +51,13 @@ export const WorkspacePage: React.FC = () => {`
`50`	`51`	`}elseif(!workspace){`
`51`	`52`	`return<FullScreenLoader/>`
`52`	`53`	`}else{`
	`54`	`+constfavicon=getFaviconByStatus(workspace.latest_build)`
`53`	`55`	`return(`
`54`	`56`	`<>`
`55`	`57`	`<Helmet>`
`56`	`58`	<title>{pageTitle(`${workspace.owner_name}/${workspace.name}`)}</title>
	`59`	+<linkrel="alternate icon"type="image/png"href={`/favicons/${favicon}.png`}/>
	`60`	+<linkrel="icon"type="image/svg+xml"href={`/favicons/${favicon}.svg`}/>
`57`	`61`	`</Helmet>`
`58`	`62`
`59`	`63`	`<Workspace`

Lines changed: 38 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -281,3 +281,41 @@ export const defaultWorkspaceExtension = (`
`281`	`281`	`deadline:fourHoursFromNow.format(),`
`282`	`282`	`}`
`283`	`283`	`}`
	`284`	`+`
	`285`	`+// You can see the favicon designs here: https://www.figma.com/file/YIGBkXUcnRGz2ZKNmLaJQf/Coder-v2-Design?node-id=560%3A620`
	`286`	`+`
	`287`	`+typeFaviconType=`
	`288`	`+\|"favicon"`
	`289`	`+\|"favicon-success"`
	`290`	`+\|"favicon-error"`
	`291`	`+\|"favicon-warning"`
	`292`	`+\|"favicon-running"`
	`293`	`+`
	`294`	`+exportconstgetFaviconByStatus=(build:TypesGen.WorkspaceBuild):FaviconType=>{`
	`295`	`+conststatus=getWorkspaceStatus(build)`
	`296`	`+switch(status){`
	`297`	`+caseundefined:`
	`298`	`+return"favicon"`
	`299`	`+case"started":`
	`300`	`+return"favicon-success"`
	`301`	`+case"starting":`
	`302`	`+return"favicon-running"`
	`303`	`+case"stopping":`
	`304`	`+return"favicon-running"`
	`305`	`+case"stopped":`
	`306`	`+return"favicon"`
	`307`	`+case"deleting":`
	`308`	`+return"favicon"`
	`309`	`+case"deleted":`
	`310`	`+return"favicon"`
	`311`	`+case"canceling":`
	`312`	`+return"favicon-warning"`
	`313`	`+case"canceled":`
	`314`	`+return"favicon"`
	`315`	`+case"error":`
	`316`	`+return"favicon-error"`
	`317`	`+case"queued":`
	`318`	`+return"favicon"`
	`319`	`+}`
	`320`	`+thrownewError("unknown status "+status)`
	`321`	`+}`