Mar 27, 2023 · Mar 27, 2023 · Mar 27, 2023
diff --git a/site/src/components/AppLink/AppLink.stories.tsx b/site/src/components/AppLink/AppLink.stories.tsx
  agent: MockWorkspaceAgent,
 }

 export constWithIconExternal = Template.bind({})
 WithIconExternal.args = {
 export constExternalApp = Template.bind({})
 ExternalApp.args = {
  workspace: MockWorkspace,
  app: {
    ...MockWorkspaceApp,
  agent: MockWorkspaceAgent,
 }

 export constWithoutIcon = Template.bind({})
 WithoutIcon.args = {
 export constSharingLevelOwner = Template.bind({})
 SharingLevelOwner.args = {
  workspace: MockWorkspace,
  app: {
    ...MockWorkspaceApp,
    sharing_level: "owner",
    health: "healthy",
  },
  agent: MockWorkspaceAgent,
 }

 export const SharingLevelAuthenticated = Template.bind({})
 SharingLevelAuthenticated.args = {
  workspace: MockWorkspace,
  app: {
    ...MockWorkspaceApp,
    sharing_level: "authenticated",
  },
  agent: MockWorkspaceAgent,
 }

 export const SharingLevelPublic = Template.bind({})
 SharingLevelPublic.args = {
  workspace: MockWorkspace,
  app: {
    ...MockWorkspaceApp,
    sharing_level: "public",
  },
  agent: MockWorkspaceAgent,
 }
diff --git a/site/src/components/AppLink/AppLink.tsx b/site/src/components/AppLink/AppLink.tsx
 import Tooltip from "@material-ui/core/Tooltip"
 import ErrorOutlineIcon from "@material-ui/icons/ErrorOutline"
 import { FC } from "react"
 import { combineClasses } from "util/combineClasses"
 import * as TypesGen from "../../api/typesGenerated"
 import { generateRandomString } from "../../util/random"
 import { BaseIcon } from "./BaseIcon"
      "Your admin has not configured subdomain application access"
  }

  const isPrivateApp = app.sharing_level === "owner"

  const button = (
    <Button
      size="small"
      startIcon={icon}
      endIcon={<ShareIcon app={app} />}
      endIcon={isPrivateApp ? undefined :<ShareIcon app={app} />}
      className={styles.button}
      disabled={!canClick}
    >
      <span className={styles.appName}>{appDisplayName}</span>
      <span className={combineClasses({ [styles.appName]: !isPrivateApp })}>
        {appDisplayName}
      </span>
    </Button>
  )

diff --git a/site/src/components/AppLink/ShareIcon.stories.tsx b/site/src/components/AppLink/ShareIcon.stories.tsx
diff --git a/site/src/components/AppLink/ShareIcon.tsx b/site/src/components/AppLink/ShareIcon.tsx
 import PublicOutlinedIcon from "@material-ui/icons/PublicOutlined"
 import LockOutlinedIcon from "@material-ui/icons/LockOutlined"
 import GroupOutlinedIcon from "@material-ui/icons/GroupOutlined"
 import LaunchOutlinedIcon from "@material-ui/icons/LaunchOutlined"
 import { FC } from "react"
 import * as TypesGen from "../../api/typesGenerated"
 import Tooltip from "@material-ui/core/Tooltip"
 import { useTranslation } from "react-i18next"
  app: TypesGen.WorkspaceApp
 }

 export const ShareIcon: FC<ShareIconProps>= ({ app }) => {
 export const ShareIcon= ({ app }: ShareIconProps) => {
  const { t } = useTranslation("agent")

  let shareIcon = <LockOutlinedIcon />
  let shareTooltip = t("shareTooltip.private")
  if (app.external) {
    return (
      <Tooltip title={t("shareTooltip.external")}>
        <LaunchOutlinedIcon />
      </Tooltip>
    )
  }
  if (app.sharing_level === "authenticated") {
    shareIcon = <GroupOutlinedIcon />
    shareTooltip = t("shareTooltip.authenticated")
    return (
      <Tooltip title={t("shareTooltip.authenticated")}>
        <GroupOutlinedIcon />
      </Tooltip>
    )
  }
  if (app.sharing_level === "public") {
    shareIcon = <PublicOutlinedIcon />
    shareTooltip = t("shareTooltip.public")
  }
  if (app.external) {
    shareIcon = <LaunchOutlinedIcon />
    shareTooltip = t("shareTooltip.external")
    return (
      <Tooltip title={t("shareTooltip.public")}>
        <PublicOutlinedIcon />
      </Tooltip>
    )
  }

  return<Tooltip title={shareTooltip}>{shareIcon}</Tooltip>
  returnnull
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,8 +25,8 @@ WithIcon.args = {
		agent: MockWorkspaceAgent,
		}

		export constWithIconExternal = Template.bind({})
		WithIconExternal.args = {
		export constExternalApp = Template.bind({})
		ExternalApp.args = {
		workspace: MockWorkspace,
		app: {
		...MockWorkspaceApp,
Expand All		@@ -35,13 +35,32 @@ WithIconExternal.args = {
		agent: MockWorkspaceAgent,
		}

		export constWithoutIcon = Template.bind({})
		WithoutIcon.args = {
		export constSharingLevelOwner = Template.bind({})
		SharingLevelOwner.args = {
		workspace: MockWorkspace,
		app: {
		...MockWorkspaceApp,
		sharing_level: "owner",
		health: "healthy",
		},
		agent: MockWorkspaceAgent,
		}

		export const SharingLevelAuthenticated = Template.bind({})
		SharingLevelAuthenticated.args = {
		workspace: MockWorkspace,
		app: {
		...MockWorkspaceApp,
		sharing_level: "authenticated",
		},
		agent: MockWorkspaceAgent,
		}

		export const SharingLevelPublic = Template.bind({})
		SharingLevelPublic.args = {
		workspace: MockWorkspace,
		app: {
		...MockWorkspaceApp,
		sharing_level: "public",
		},
		agent: MockWorkspaceAgent,
		}
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,6 +5,7 @@ import { makeStyles } from "@material-ui/core/styles"
		import Tooltip from "@material-ui/core/Tooltip"
		import ErrorOutlineIcon from "@material-ui/icons/ErrorOutline"
		import { FC } from "react"
		import { combineClasses } from "util/combineClasses"
		import * as TypesGen from "../../api/typesGenerated"
		import { generateRandomString } from "../../util/random"
		import { BaseIcon } from "./BaseIcon"
Expand DownExpand Up		@@ -79,15 +80,19 @@ export const AppLink: FC<AppLinkProps> = ({
		"Your admin has not configured subdomain application access"
		}

		const isPrivateApp = app.sharing_level === "owner"

		const button = (
		<Button
		size="small"
		startIcon={icon}
		endIcon={<ShareIcon app={app} />}
		endIcon={isPrivateApp ? undefined :<ShareIcon app={app} />}
		className={styles.button}
		disabled={!canClick}
		>
		<span className={styles.appName}>{appDisplayName}</span>
		<span className={combineClasses({ [styles.appName]: !isPrivateApp })}>
		{appDisplayName}
		</span>
		</Button>
		)

Expand Down
Original file line number	Diff line number	Diff line change
		@@ -1,8 +1,6 @@
		import PublicOutlinedIcon from "@material-ui/icons/PublicOutlined"
		import LockOutlinedIcon from "@material-ui/icons/LockOutlined"
		import GroupOutlinedIcon from "@material-ui/icons/GroupOutlined"
		import LaunchOutlinedIcon from "@material-ui/icons/LaunchOutlined"
		import { FC } from "react"
		import * as TypesGen from "../../api/typesGenerated"
		import Tooltip from "@material-ui/core/Tooltip"
		import { useTranslation } from "react-i18next"
Expand All		@@ -11,23 +9,29 @@ export interface ShareIconProps {
		app: TypesGen.WorkspaceApp
		}

		export const ShareIcon: FC<ShareIconProps>= ({ app }) => {
		export const ShareIcon= ({ app }: ShareIconProps) => {
		const { t } = useTranslation("agent")

		let shareIcon = <LockOutlinedIcon />
		let shareTooltip = t("shareTooltip.private")
		if (app.external) {
		return (
		<Tooltip title={t("shareTooltip.external")}>
		<LaunchOutlinedIcon />
		</Tooltip>
		)
		}
		if (app.sharing_level === "authenticated") {
		shareIcon = <GroupOutlinedIcon />
		shareTooltip = t("shareTooltip.authenticated")
		return (
		<Tooltip title={t("shareTooltip.authenticated")}>
		<GroupOutlinedIcon />
		</Tooltip>
		)
		}
		if (app.sharing_level === "public") {
		shareIcon = <PublicOutlinedIcon />
		shareTooltip = t("shareTooltip.public")
		}
		if (app.external) {
		shareIcon = <LaunchOutlinedIcon />
		shareTooltip = t("shareTooltip.external")
		return (
		<Tooltip title={t("shareTooltip.public")}>
		<PublicOutlinedIcon />
		</Tooltip>
		)
		}

		return<Tooltip title={shareTooltip}>{shareIcon}</Tooltip>
		returnnull
		}