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

Commita2ba033

Browse files
committed
fix: cleanup
1 parent14a1d1a commita2ba033

File tree

2 files changed

+14
-11
lines changed

2 files changed

+14
-11
lines changed

‎site/src/pages/OrganizationSettingsPage/CustomRolesPage/CustomRolesPageView.tsx‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,11 @@ const RoleRow: FC<RoleRowProps> = ({
226226
</ShadcnButton>
227227
</DropdownMenuTrigger>
228228
<DropdownMenuContentalign="end">
229-
<DropdownMenuItemonClick={()=>navigate(role.name)}>
230-
Edit
231-
</DropdownMenuItem>
229+
{canUpdateOrgRole&&(
230+
<DropdownMenuItemonClick={()=>navigate(role.name)}>
231+
Edit
232+
</DropdownMenuItem>
233+
)}
232234
{canDeleteOrgRole&&(
233235
<DropdownMenuItem
234236
className="text-content-destructive focus:text-content-destructive"

‎site/src/pages/UsersPage/UsersTable/UsersTableBody.tsx‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import type { GroupsByUserId } from "api/queries/groups";
1010
importtype*asTypesGenfrom"api/typesGenerated";
1111
import{AvatarData}from"components/Avatar/AvatarData";
1212
import{AvatarDataSkeleton}from"components/Avatar/AvatarDataSkeleton";
13+
import{PremiumBadge}from"components/Badges/Badges";
1314
import{Button}from"components/Button/Button";
1415
import{ChooseOne,Cond}from"components/Conditionals/ChooseOne";
1516
import{
@@ -198,33 +199,32 @@ export const UsersTableBody: FC<UsersTableBodyProps> = ({
198199
data-testid="suspend-button"
199200
onClick={()=>onSuspendUser(user)}
200201
>
201-
<HideSourceOutlined/>
202202
Suspend&hellip;
203203
</DropdownMenuItem>
204204
) :(
205205
<DropdownMenuItemonClick={()=>onActivateUser(user)}>
206-
<ShieldOutlined/>
207206
Activate&hellip;
208207
</DropdownMenuItem>
209208
)}
210209

211210
<DropdownMenuItemonClick={()=>onListWorkspaces(user)}>
212-
<KeyOutlined/>
213-
List workspaces&hellip;
211+
View workspaces
214212
</DropdownMenuItem>
215213

216214
{canViewActivity&&(
217-
<DropdownMenuItemonClick={()=>onViewActivity(user)}>
218-
<GitHub/>
219-
View activity&hellip;
215+
<DropdownMenuItem
216+
onClick={()=>onViewActivity(user)}
217+
disabled={!canViewActivity}
218+
>
219+
View activity{!canViewActivity&&<PremiumBadge/>}
220220
</DropdownMenuItem>
221221
)}
222222

223223
{user.login_type==="password"&&(
224224
<DropdownMenuItem
225225
onClick={()=>onResetUserPassword(user)}
226+
disabled={user.login_type!=="password"}
226227
>
227-
<PasswordOutlined/>
228228
Reset password&hellip;
229229
</DropdownMenuItem>
230230
)}
@@ -234,6 +234,7 @@ export const UsersTableBody: FC<UsersTableBodyProps> = ({
234234
<DropdownMenuItem
235235
className="text-content-destructive focus:text-content-destructive"
236236
onClick={()=>onDeleteUser(user)}
237+
disabled={user.id===actorID}
237238
>
238239
<DeleteIcon/>
239240
Delete&hellip;

0 commit comments

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