Commita2d4b99

authored

fix: hide app icon if not found (#16684)

1 parent6bdddd5 commita2d4b99Copy full SHA for a2d4b99

File tree

+49

-2

lines changed

+49

-2

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {`
`37`	`37`	`constpreferredPathBase=proxy.preferredPathAppURL;`
`38`	`38`	`constappsHost=proxy.preferredWildcardHostname;`
`39`	`39`	`const[fetchingSessionToken,setFetchingSessionToken]=useState(false);`
	`40`	`+const[iconError,setIconError]=useState(false);`
`40`	`41`
`41`	`42`	`consttheme=useTheme();`
`42`	`43`	`constusername=workspace.owner_name;`
`@@ -67,7 +68,9 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {`
`67`	`68`	`// To avoid bugs in the healthcheck code locking users out of apps, we no`
`68`	`69`	`// longer block access to apps if they are unhealthy/initializing.`
`69`	`70`	`letcanClick=true;`
`70`		`-leticon=<BaseIconapp={app}/>;`
	`71`	`+leticon=!iconError&&(`
	`72`	`+<BaseIconapp={app}onIconPathError={()=>setIconError(true)}/>`
	`73`	`+);`
`71`	`74`
`72`	`75`	`letprimaryTooltip="";`
`73`	`76`	`if(app.health==="initializing"){`

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -4,14 +4,21 @@ import type { FC } from "react";`
`4`	`4`
`5`	`5`	`interfaceBaseIconProps{`
`6`	`6`	`app:WorkspaceApp;`
	`7`	`+onIconPathError?:()=>void;`
`7`	`8`	`}`
`8`	`9`
`9`		`-exportconstBaseIcon:FC<BaseIconProps>=({ app})=>{`
	`10`	`+exportconstBaseIcon:FC<BaseIconProps>=({ app, onIconPathError})=>{`
`10`	`11`	`returnapp.icon ?(`
`11`	`12`	`<img`
`12`	`13`	alt={`${app.display_name} Icon`}
`13`	`14`	`src={app.icon}`
`14`	`15`	`style={{pointerEvents:"none"}}`
	`16`	`+onError={()=>{`
	`17`	`+console.warn(`
	`18`	+`Application icon for "${app.id}" has invalid source "${app.icon}".`,
	`19`	`+);`
	`20`	`+onIconPathError?.();`
	`21`	`+}}`
`15`	`22`	`/>`
`16`	`23`	`) :(`
`17`	`24`	`<ComputerIcon/>`

Lines changed: 37 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -80,6 +80,43 @@ export const Running: Story = {`
`80`	`80`	`},`
`81`	`81`	`};`
`82`	`82`
	`83`	`+exportconstAppIcons:Story={`
	`84`	`+args:{`
	`85`	`+...Running.args,`
	`86`	`+workspace:{`
	`87`	`+...Mocks.MockWorkspace,`
	`88`	`+latest_build:{`
	`89`	`+...Mocks.MockWorkspace.latest_build,`
	`90`	`+resources:[`
	`91`	`+{`
	`92`	`+...Mocks.MockWorkspaceResource,`
	`93`	`+agents:[`
	`94`	`+{`
	`95`	`+...Mocks.MockWorkspaceAgent,`
	`96`	`+apps:[`
	`97`	`+{`
	`98`	`+...Mocks.MockWorkspaceApp,`
	`99`	`+id:"test-app-1",`
	`100`	`+slug:"test-app-1",`
	`101`	`+display_name:"Default Icon",`
	`102`	`+},`
	`103`	`+{`
	`104`	`+...Mocks.MockWorkspaceApp,`
	`105`	`+id:"test-app-2",`
	`106`	`+slug:"test-app-2",`
	`107`	`+display_name:"Broken Icon",`
	`108`	`+icon:"/foobar/broken.png",`
	`109`	`+},`
	`110`	`+],`
	`111`	`+},`
	`112`	`+],`
	`113`	`+},`
	`114`	`+],`
	`115`	`+},`
	`116`	`+},`
	`117`	`+},`
	`118`	`+};`
	`119`	`+`
`83`	`120`	`exportconstFavorite:Story={`
`84`	`121`	`args:{`
`85`	`122`	`...Running.args,`

Comments

(0)