Skip to content

Commit d99e02f

Browse files
committed
Merge branch 'main' of github.com:rustfs/console
2 parents 00517bb + ca678d2 commit d99e02f

4 files changed

Lines changed: 148 additions & 148 deletions

File tree

components/user/dropdown.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ export function UserDropdown() {
9191
<DropdownMenuItem asChild>
9292
<div className="flex cursor-default items-center gap-2">
9393
<RiUserLine className="h-4 w-4" />
94-
<span>{(userInfo as { account_name?: string })?.account_name ?? (isAdmin ? "rustfsAdmin" : "")}</span>
94+
<span>{(userInfo as { account_name?: string })?.account_name ?? ""}</span>
9595
</div>
9696
</DropdownMenuItem>
9797
{!isAdmin && (

hooks/use-permissions.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,10 @@ export function PermissionsProvider({ children }: { children: React.ReactNode })
126126
}, [api, isAuthenticated, hasResolvedAdmin, fetchAdminStatus])
127127

128128
useEffect(() => {
129-
if (api && isAuthenticated && hasResolvedAdmin && !isAdmin && !hasFetchedPolicy && !isLoading) {
129+
if (api && isAuthenticated && hasResolvedAdmin && !hasFetchedPolicy && !isLoading) {
130130
fetchUserPolicy()
131131
}
132-
}, [api, isAuthenticated, hasResolvedAdmin, isAdmin, hasFetchedPolicy, isLoading, fetchUserPolicy])
132+
}, [api, isAuthenticated, hasResolvedAdmin, hasFetchedPolicy, isLoading, fetchUserPolicy])
133133

134134
const canChangePassword = isAdmin || hasPermission(CONSOLE_SCOPES.CONSOLE_ADMIN)
135135

0 commit comments

Comments
 (0)