Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const Actions: React.FC<{
}> = ({member, hidden, organizationId, workspaceId, onResendInvite, selfMenu}) => {
const {user} = member
const isMember = user.status === "member"
const {canModifyRoles, canInviteMembers} = useWorkspacePermissions()
const {canInviteMembers, canRemoveMembers} = useWorkspacePermissions()

const [resendLoading, setResendLoading] = useState(false)
const {refetch} = useOrgData()
Expand All @@ -41,7 +41,7 @@ export const Actions: React.FC<{
const [renameValue, setRenameValue] = useState(user.username || "")

if (hidden && !selfMenu) return null
if (!selfMenu && !canInviteMembers && !canModifyRoles) return null
if (!selfMenu && !canInviteMembers && !canRemoveMembers) return null

const handleResendInvite = () => {
if (!organizationId || !user.email || !workspaceId) return
Expand Down Expand Up @@ -128,7 +128,7 @@ export const Actions: React.FC<{
},
]
: []),
...(canModifyRoles
...(canRemoveMembers
? [
{
key: "remove",
Expand Down
12 changes: 11 additions & 1 deletion web/oss/src/hooks/useWorkspacePermissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {useProjectPermissions} from "./useProjectPermissions"
*/
export const useWorkspacePermissions = () => {
const {hasRBAC} = useEntitlements()
const {hasPermission, isOrgOwner} = useProjectPermissions()
const {hasPermission, hasRole, isOrgOwner} = useProjectPermissions()

// OSS always enforces; EE only when RBAC-entitled.
const rbacActive = !isEE() || hasRBAC
Expand All @@ -32,12 +32,22 @@ export const useWorkspacePermissions = () => {
return hasPermission("modify_user_roles")
}, [hasPermission, rbacActive])

/**
* Check if the current user can remove members from the workspace.
* Mirrors the backend gate on DELETE /workspaces/{id}/users (org owner or
* owner/admin role; allow-all for not-RBAC-entitled EE).
*/
const canRemoveMembers = useMemo(() => {
return hasRole("owner") || hasRole("admin")
}, [hasRole])

/**
* Check if the current user is the organization owner.
*/
return {
canInviteMembers,
canModifyRoles,
canRemoveMembers,
isOrgOwner,
}
}
Loading