Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit08afe3c

Browse files
authored
chore(UI): remove private icon from apps in dashboard (#6801)
* chore(UI): remove private icon from apps in dashboard* clean up redudant snapshots
1 parent0b22c88 commit08afe3c

File tree

4 files changed

+50
-22
lines changed

4 files changed

+50
-22
lines changed

‎site/src/components/AppLink/AppLink.stories.tsx

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ WithIcon.args = {
2525
agent:MockWorkspaceAgent,
2626
}
2727

28-
exportconstWithIconExternal=Template.bind({})
29-
WithIconExternal.args={
28+
exportconstExternalApp=Template.bind({})
29+
ExternalApp.args={
3030
workspace:MockWorkspace,
3131
app:{
3232
...MockWorkspaceApp,
@@ -35,13 +35,32 @@ WithIconExternal.args = {
3535
agent:MockWorkspaceAgent,
3636
}
3737

38-
exportconstWithoutIcon=Template.bind({})
39-
WithoutIcon.args={
38+
exportconstSharingLevelOwner=Template.bind({})
39+
SharingLevelOwner.args={
4040
workspace:MockWorkspace,
4141
app:{
4242
...MockWorkspaceApp,
4343
sharing_level:"owner",
44-
health:"healthy",
44+
},
45+
agent:MockWorkspaceAgent,
46+
}
47+
48+
exportconstSharingLevelAuthenticated=Template.bind({})
49+
SharingLevelAuthenticated.args={
50+
workspace:MockWorkspace,
51+
app:{
52+
...MockWorkspaceApp,
53+
sharing_level:"authenticated",
54+
},
55+
agent:MockWorkspaceAgent,
56+
}
57+
58+
exportconstSharingLevelPublic=Template.bind({})
59+
SharingLevelPublic.args={
60+
workspace:MockWorkspace,
61+
app:{
62+
...MockWorkspaceApp,
63+
sharing_level:"public",
4564
},
4665
agent:MockWorkspaceAgent,
4766
}

‎site/src/components/AppLink/AppLink.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import { makeStyles } from "@material-ui/core/styles"
55
importTooltipfrom"@material-ui/core/Tooltip"
66
importErrorOutlineIconfrom"@material-ui/icons/ErrorOutline"
77
import{FC}from"react"
8+
import{combineClasses}from"util/combineClasses"
89
import*asTypesGenfrom"../../api/typesGenerated"
910
import{generateRandomString}from"../../util/random"
1011
import{BaseIcon}from"./BaseIcon"
@@ -79,15 +80,19 @@ export const AppLink: FC<AppLinkProps> = ({
7980
"Your admin has not configured subdomain application access"
8081
}
8182

83+
constisPrivateApp=app.sharing_level==="owner"
84+
8285
constbutton=(
8386
<Button
8487
size="small"
8588
startIcon={icon}
86-
endIcon={<ShareIconapp={app}/>}
89+
endIcon={isPrivateApp ?undefined :<ShareIconapp={app}/>}
8790
className={styles.button}
8891
disabled={!canClick}
8992
>
90-
<spanclassName={styles.appName}>{appDisplayName}</span>
93+
<spanclassName={combineClasses({[styles.appName]:!isPrivateApp})}>
94+
{appDisplayName}
95+
</span>
9196
</Button>
9297
)
9398

‎site/src/components/AppLink/ShareIcon.stories.tsx

Whitespace-only changes.
Lines changed: 19 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
importPublicOutlinedIconfrom"@material-ui/icons/PublicOutlined"
2-
importLockOutlinedIconfrom"@material-ui/icons/LockOutlined"
32
importGroupOutlinedIconfrom"@material-ui/icons/GroupOutlined"
43
importLaunchOutlinedIconfrom"@material-ui/icons/LaunchOutlined"
5-
import{FC}from"react"
64
import*asTypesGenfrom"../../api/typesGenerated"
75
importTooltipfrom"@material-ui/core/Tooltip"
86
import{useTranslation}from"react-i18next"
@@ -11,23 +9,29 @@ export interface ShareIconProps {
119
app:TypesGen.WorkspaceApp
1210
}
1311

14-
exportconstShareIcon:FC<ShareIconProps>=({ app})=>{
12+
exportconstShareIcon=({ app}:ShareIconProps)=>{
1513
const{ t}=useTranslation("agent")
16-
17-
letshareIcon=<LockOutlinedIcon/>
18-
letshareTooltip=t("shareTooltip.private")
14+
if(app.external){
15+
return(
16+
<Tooltiptitle={t("shareTooltip.external")}>
17+
<LaunchOutlinedIcon/>
18+
</Tooltip>
19+
)
20+
}
1921
if(app.sharing_level==="authenticated"){
20-
shareIcon=<GroupOutlinedIcon/>
21-
shareTooltip=t("shareTooltip.authenticated")
22+
return(
23+
<Tooltiptitle={t("shareTooltip.authenticated")}>
24+
<GroupOutlinedIcon/>
25+
</Tooltip>
26+
)
2227
}
2328
if(app.sharing_level==="public"){
24-
shareIcon=<PublicOutlinedIcon/>
25-
shareTooltip=t("shareTooltip.public")
26-
}
27-
if(app.external){
28-
shareIcon=<LaunchOutlinedIcon/>
29-
shareTooltip=t("shareTooltip.external")
29+
return(
30+
<Tooltiptitle={t("shareTooltip.public")}>
31+
<PublicOutlinedIcon/>
32+
</Tooltip>
33+
)
3034
}
3135

32-
return<Tooltiptitle={shareTooltip}>{shareIcon}</Tooltip>
36+
returnnull
3337
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp