Commit13d0dac

authored

feat: display error if app is not installed (#16980)

1 parent13a3ddd commit13d0dacCopy full SHA for 13d0dac

File tree

+30

-0

lines changed

+30

-0

lines changed

Lines changed: 14 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import {`
`8`	`8`	`MockWorkspaceApp,`
`9`	`9`	`MockWorkspaceProxies,`
`10`	`10`	`}from"testHelpers/entities";`
	`11`	`+import{withGlobalSnackbar}from"testHelpers/storybook";`
`11`	`12`	`import{AppLink}from"./AppLink";`
`12`	`13`
`13`	`14`	`constmeta:Meta<typeofAppLink>={`
`@@ -72,6 +73,19 @@ export const ExternalApp: Story = {`
`72`	`73`	`},`
`73`	`74`	`};`
`74`	`75`
	`76`	`+exportconstExternalAppNotInstalled:Story={`
	`77`	`+decorators:[withGlobalSnackbar],`
	`78`	`+args:{`
	`79`	`+workspace:MockWorkspace,`
	`80`	`+app:{`
	`81`	`+...MockWorkspaceApp,`
	`82`	`+external:true,`
	`83`	`+url:"foobar-foobaz://open-me",`
	`84`	`+},`
	`85`	`+agent:MockWorkspaceAgent,`
	`86`	`+},`
	`87`	`+};`
	`88`	`+`
`75`	`89`	`exportconstSharingLevelOwner:Story={`
`76`	`90`	`args:{`
`77`	`91`	`workspace:MockWorkspace,`

Lines changed: 16 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,9 @@ import Link from "@mui/material/Link";`
`5`	`5`	`importTooltipfrom"@mui/material/Tooltip";`
`6`	`6`	`import{API}from"api/api";`
`7`	`7`	`importtype*asTypesGenfrom"api/typesGenerated";`
	`8`	`+import{displayError}from"components/GlobalSnackbar/utils";`
`8`	`9`	`import{useProxy}from"contexts/ProxyContext";`
	`10`	`+import{useEffect}from"react";`
`9`	`11`	`import{typeFC,typeMouseEvent,useState}from"react";`
`10`	`12`	`import{createAppLinkHref}from"utils/apps";`
`11`	`13`	`import{generateRandomString}from"utils/random";`
`@@ -152,6 +154,20 @@ export const AppLink: FC<AppLinkProps> = ({ app, workspace, agent }) => {`
`152`	`154`	`url=href.replaceAll(magicTokenString,key.key);`
`153`	`155`	`setFetchingSessionToken(false);`
`154`	`156`	`}`
	`157`	`+`
	`158`	`+// When browser recognizes the protocol and is able to navigate to the app,`
	`159`	`+// it will blur away, and will stop the timer. Otherwise,`
	`160`	`+// an error message will be displayed.`
	`161`	`+constopenAppExternallyFailedTimeout=500;`
	`162`	`+constopenAppExternallyFailed=setTimeout(()=>{`
	`163`	`+displayError(`
	`164`	+`${app.display_name!=="" ?app.display_name :app.slug} must be installed first.`,
	`165`	`+);`
	`166`	`+},openAppExternallyFailedTimeout);`
	`167`	`+window.addEventListener("blur",()=>{`
	`168`	`+clearTimeout(openAppExternallyFailed);`
	`169`	`+});`
	`170`	`+`
`155`	`171`	`window.location.href=url;`
`156`	`172`	`return;`
`157`	`173`	`}`

Comments

(0)