🪢 Open source agent evals & observability: Trace, evaluate, and improve LLM applications with one open platform.
TypeScript analyticsautogenevaluationlangchainlarge-language-modelsllama-indexllmllm-evaluationllm-observabilityllmopsmonitoringobservabilityopen-sourceopenaiplaygroundprompt-engineeringprompt-managementself-hostedycombinator
fix(web): disable Owner role selection without ownership permission (#19092)
Mark Salpeterd34c213c71ac
diff --git a/web/src/features/rbac/components/CreateProjectMemberDialog.stories.tsx b/web/src/features/rbac/components/CreateProjectMemberDialog.stories.tsxindex b853093068..cc47c5f2d8 100644--- a/web/src/features/rbac/components/CreateProjectMemberDialog.stories.tsx+++ b/web/src/features/rbac/components/CreateProjectMemberDialog.stories.tsx@@ -10,6 +10,8 @@ const defaultArgs = {project: undefined,hasOnlySingleProjectAccess: false,hasProjectRoleEntitlement: false,+ canManageOrgOwnership: true,+ canManageProjectOwnership: true,isPending: false,createProjectMember: fn().mockResolvedValue(undefined),onSuccess: fn(),@@ -53,6 +55,33 @@ export const SingleProjectAccess = meta.story({},});+export const WithoutOwnershipAccess = meta.story({+ name: "(Test) Owner role requires ownership access",+ args: {+ ...defaultArgs,+ project: { id: "project-1", name: "Support assistant" },+ hasProjectRoleEntitlement: true,+ canManageOrgOwnership: false,+ canManageProjectOwnership: false,+ },+ play: async ({ canvasElement }) => {+ const body = within(canvasElement.ownerDocument.body);++ await userEvent.click(body.getAllByRole("combobox")[0]!);++ await expect(+ body.getByRole("option", { name: /Owner.*requires owner access/ }),+ ).toHaveAttribute("aria-disabled", "true");++ await userEvent.click(+ body.getByRole("button", { name: "View Owner permissions" }),+ );+ await expect(+ await body.findByRole("dialog", { name: /Owner/ }),+ ).toBeInTheDocument();+ },+});+export const SubmitsInvitation = meta.story({name: "(Test) Submits invitation",args: defaultArgs,diff --git a/web/src/features/rbac/components/CreateProjectMemberDialog.tsx b/web/src/features/rbac/components/CreateProjectMemberDialog.tsxindex 6e6c670f4f..943caba35a 100644--- a/web/src/features/rbac/components/CreateProjectMemberDialog.tsx+++ b/web/src/features/rbac/components/CreateProjectMemberDialog.tsx@@ -38,6 +38,8 @@ type CreateProjectMemberDialogProps = {project: { id: string; name: string } | undefined;hasOnlySingleProjectAccess: boolean;hasProjectRoleEntitlement: boolean;+ canManageOrgOwnership: boolean;+ canManageProjectOwnership: boolean;isPending: boolean;createProjectMember: (values: FormValues) => Promise<void>;onSuccess: () => void;@@ -47,6 +49,8 @@ export function CreateProjectMemberDialog({project,hasOnlySingleProjectAccess,hasProjectRoleEntitlement,+ canManageOrgOwnership,+ canManageProjectOwnership,isPending,createProjectMember,onSuccess,@@ -121,6 +125,7 @@ export function CreateProjectMemberDialog({<FormLabel>Organization Role</FormLabel><RoleSelectroles={Object.values(roleValues)}+ canManageOwnership={canManageOrgOwnership}value={field.value}onValueChange={field.onChange}/>@@ -138,6 +143,7 @@ export function CreateProjectMemberDialog({<FormLabel>Project Role</FormLabel><RoleSelectisProjectRole+ canManageOwnership={canManageProjectOwnership}roles={Object.values(roleValues).filter((role) =>!hasOnlySingleProjectAccess ||diff --git a/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx b/web/src/features/rbac/components/CreateProjectMemberDialogController.tsxindex 962d8ce64f..24cf30ccc9 100644--- a/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx+++ b/web/src/features/rbac/components/CreateProjectMemberDialogController.tsx@@ -41,6 +41,16 @@ export function CreateProjectMemberDialogController({projectId: project?.id,scope: "projectMembers:CUD",});+ const canManageOrgOwnership = useHasOrganizationAccess({+ organizationId: orgId,+ scope: "organizationMembers:manageOwnership",+ });+ // Org owners outrank any project role override they hold.+ const canManageProjectOwnership =+ useHasProjectAccess({+ projectId: project?.id,+ scope: "projectMembers:manageOwnership",+ }) || canManageOrgOwnership;const hasProjectRoleEntitlement = useHasEntitlement("rbac-project-roles");const hasOnlySingleProjectAccess =!hasOrgAccess && hasProjectAccess && hasProjectRoleEntitlement;@@ -90,6 +100,8 @@ export function CreateProjectMemberDialogController({project={project}hasOnlySingleProjectAccess={hasOnlySingleProjectAccess}hasProjectRoleEntitlement={hasProjectRoleEntitlement}+ canManageOrgOwnership={canManageOrgOwnership}+ canManageProjectOwnership={canManageProjectOwnership}isPending={createProjectMemberMutation.isPending}createProjectMember={(values) => {capture(diff --git a/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx b/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsxindex 593fe6a7be..83957c6cc9 100644--- a/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx+++ b/web/src/features/rbac/components/MembersSettingsTable/ConnectedMembersSettingsTable.tsx@@ -59,6 +59,18 @@ export function ConnectedMembersSettingsTable({scope: "projectMembers:CUD",});+ const canManageOrgOwnership = useHasOrganizationAccess({+ organizationId: orgId,+ scope: "organizationMembers:manageOwnership",+ });++ // Org owners outrank any project role override they hold.+ const canManageProjectOwnership =+ useHasProjectAccess({+ projectId: project?.id,+ scope: "projectMembers:manageOwnership",+ }) || canManageOrgOwnership;+const projectRolesEntitlement = useHasEntitlement("rbac-project-roles");const [updatingOrgRoleMembershipIds, setUpdatingOrgRoleMembershipIds] =useState<Set<string>>(() => new Set());@@ -217,6 +229,8 @@ export function ConnectedMembersSettingsTable({currentUserId={session.data?.user?.id}hasOrgCudAccess={hasOrgCudAccess}hasProjectCudAccess={hasProjectCudAccess}+ canManageOrgOwnership={canManageOrgOwnership}+ canManageProjectOwnership={canManageProjectOwnership}projectRolesEntitlement={projectRolesEntitlement}showFeaturePreviews={!project && hasOrgCudAccess && orgId !== env.NEXT_PUBLIC_DEMO_ORG_IDdiff --git a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsxindex af90d0e11d..4d691d3bb4 100644--- a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx+++ b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.stories.tsx@@ -1,4 +1,4 @@-import { fn } from "storybook/test";+import { expect, fn, within } from "storybook/test";import preview from "../../../../../.storybook/preview";import {@@ -66,6 +66,8 @@ export const Default = meta.story({orgId: "org-1",hasOrgCudAccess: true,hasProjectCudAccess: false,+ canManageOrgOwnership: true,+ canManageProjectOwnership: true,projectRolesEntitlement: true,showFeaturePreviews: false,updatingOrgRoleMembershipIds: new Set(),@@ -88,11 +90,45 @@ export const Default = meta.story({},});+export const AdminViewingOwner = meta.story({+ name: "(Test) Admin cannot change an owner",+ args: {+ ...Default.input.args,+ canManageOrgOwnership: false,+ data: {+ status: "success",+ data: [+ {+ user: { name: "Barbara Liskov", image: null },+ email: "[email protected]",+ providers: ["email"],+ createdAt: new Date("2026-04-02"),+ orgRole: "OWNER",+ featurePreviews: null,+ featurePreviewManagement: null,+ meta: { userId: "user-6", orgMembershipId: "membership-6" },+ },+ ...members,+ ],+ },+ },+ play: async ({ canvasElement }) => {+ const canvas = within(canvasElement);+ const roleSelectFor = (name: RegExp) =>+ within(canvas.getByRole("row", { name })).getByRole("combobox");++ await expect(roleSelectFor(/Barbara Liskov/)).toBeDisabled();+ await expect(roleSelectFor(/Ada Lovelace/)).toBeEnabled();+ },+});+export const FilteredByRole = meta.story({args: {orgId: "org-1",hasOrgCudAccess: true,hasProjectCudAccess: false,+ canManageOrgOwnership: true,+ canManageProjectOwnership: true,projectRolesEntitlement: true,showFeaturePreviews: false,updatingOrgRoleMembershipIds: new Set(),@@ -123,6 +159,8 @@ export const Loading = meta.story({orgId: "org-1",hasOrgCudAccess: true,hasProjectCudAccess: false,+ canManageOrgOwnership: true,+ canManageProjectOwnership: true,projectRolesEntitlement: true,showFeaturePreviews: false,updatingOrgRoleMembershipIds: new Set(),diff --git a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsxindex 391d4ba7e3..6966964a75 100644--- a/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx+++ b/web/src/features/rbac/components/MembersSettingsTable/MembersSettingsTable.tsx@@ -19,6 +19,7 @@ import type { FeaturePreviewFlag } from "@/src/features/feature-flags";import { UserFeaturePreviewsControl } from "@/src/features/feature-flags/components/UserFeaturePreviewsControl";import type { RouterOutput } from "@/src/utils/types";import { HoverCard } from "@/src/components/design-system/HoverCard/HoverCard";+import { Tooltip } from "@/src/components/design-system/Tooltip/Tooltip";import Link from "next/link";import { Popover, PopoverTrigger } from "@/src/components/ui/popover";import { Button } from "@/src/components/ui/button";@@ -28,6 +29,8 @@ const formatRoleLabel = (role: Role) =>const allRoles = Object.keys(orderedRoles) as Role[];+const ownerLockedLabel = "Requires owner access";+const roleFilterOptions = allRoles.toSorted((a, b) => orderedRoles[b] - orderedRoles[a]).map((role) => ({ value: role, label: formatRoleLabel(role) }));@@ -55,6 +58,8 @@ type MembersSettingsTableProps = Pick<currentUserId?: string;hasOrgCudAccess: boolean;hasProjectCudAccess: boolean;+ canManageOrgOwnership: boolean;+ canManageProjectOwnership: boolean;projectRolesEntitlement: boolean;showFeaturePreviews: boolean;updatingOrgRoleMembershipIds: ReadonlySet<string>;@@ -80,6 +85,8 @@ export function MembersSettingsTable({currentUserId,hasOrgCudAccess,hasProjectCudAccess,+ canManageOrgOwnership,+ canManageProjectOwnership,projectRolesEntitlement,showFeaturePreviews,updatingOrgRoleMembershipIds,@@ -120,14 +127,18 @@ export function MembersSettingsTable({},size: 160,cell: ({ row }) => {+ const isOwnerLocked =+ row.original.orgRole === "OWNER" && !canManageOrgOwnership;const select = (<RoleSelectroles={allRoles}+ canManageOwnership={canManageOrgOwnership}value={row.original.orgRole}size="compact"disabled={!hasOrgCudAccess ||Boolean(project) ||+ isOwnerLocked ||updatingOrgRoleMembershipIds.has(row.original.meta.orgMembershipId,)@@ -136,6 +147,18 @@ export function MembersSettingsTable({/>);+ if (!project && hasOrgCudAccess && isOwnerLocked) {+ return (+ <Tooltip label={ownerLockedLabel}>+ {({ getTriggerProps }) => (+ <span className="inline-flex" {...getTriggerProps()}>+ {select}+ </span>+ )}+ </Tooltip>+ );+ }+if (!project || !hasOrgCudAccess) return select;return (@@ -180,14 +203,21 @@ export function MembersSettingsTable({size: 160,cell: ({ row }) => {if (!projectRolesEntitlement) return "N/A on plan";- return (+ const hasRoleAccess = hasOrgCudAccess || hasProjectCudAccess;+ const isOwnerLocked =+ (row.original.projectRole === "OWNER" &&+ !canManageProjectOwnership) ||+ (row.original.orgRole === "OWNER" && !canManageOrgOwnership);+ const select = (<RoleSelectroles={allRoles}+ canManageOwnership={canManageProjectOwnership}value={row.original.projectRole ?? "NONE"}isProjectRolesize="compact"disabled={- (!hasOrgCudAccess && !hasProjectCudAccess) ||+ !hasRoleAccess ||+ isOwnerLocked ||updatingProjectRoleMembershipIds.has(row.original.meta.orgMembershipId,)@@ -197,6 +227,16 @@ export function MembersSettingsTable({}/>);+ if (!hasRoleAccess || !isOwnerLocked) return select;+ return (+ <Tooltip label={ownerLockedLabel}>+ {({ getTriggerProps }) => (+ <span className="inline-flex" {...getTriggerProps()}>+ {select}+ </span>+ )}+ </Tooltip>+ );},},] satisfies LangfuseColumnDef<MembersSettingsTableRow>[])@@ -246,6 +286,8 @@ export function MembersSettingsTable({}),],[+ canManageOrgOwnership,+ canManageProjectOwnership,hasOrgCudAccess,hasProjectCudAccess,onUpdateOrgRole,diff --git a/web/src/features/rbac/components/RoleSelect.tsx b/web/src/features/rbac/components/RoleSelect.tsxindex 9aeb855334..571dbaa07a 100644--- a/web/src/features/rbac/components/RoleSelect.tsx+++ b/web/src/features/rbac/components/RoleSelect.tsx@@ -28,12 +28,13 @@ const triggerVariants = cva("", {},});-/** RoleSelect offers permission previews for each role. */+/** RoleSelect offers permission previews for each role; the owner role is only selectable with `canManageOwnership`. */export function RoleSelect({roles,value,onValueChange,isProjectRole = false,+ canManageOwnership,disabled = false,triggerId,size,@@ -42,6 +43,7 @@ export function RoleSelect({value: Role;onValueChange: (role: Role) => void;isProjectRole?: boolean;+ canManageOwnership: boolean;disabled?: boolean;triggerId?: string;} & VariantProps<typeof triggerVariants>) {@@ -90,6 +92,11 @@ export function RoleSelect({key={role}role={role}isProjectRole={isProjectRole}+ disabledReason={+ role === "OWNER" && !canManageOwnership+ ? "requires owner access"+ : undefined+ }onViewPermissions={openPermissions}/>))}diff --git a/web/src/features/rbac/components/RoleSelectItem.tsx b/web/src/features/rbac/components/RoleSelectItem.tsxindex a79e1ba1e5..6859ebd01f 100644--- a/web/src/features/rbac/components/RoleSelectItem.tsx+++ b/web/src/features/rbac/components/RoleSelectItem.tsx@@ -11,12 +11,15 @@ export const RoleSelectItem = ({role,transformName = (name) => name,isProjectRole,+ disabledReason,onViewPermissions,}: {role: SystemRole;/** transformName rewrites the role name before it is shown. */transformName?: (name: string) => string;isProjectRole?: boolean;+ /** disabledReason makes the option unselectable and explains why. */+ disabledReason?: string;onViewPermissions: (role: SystemRole) => void;}) => {const def = systemRoleAccessRights[role];@@ -27,6 +30,7 @@ export const RoleSelectItem = ({return (<SelectItemvalue={role}+ disabled={disabledReason !== undefined}className="group pl-2 [&>span:not([data-checkmark])]:flex-1 [&>span[data-checkmark]]:hidden"><div className="flex w-full items-start gap-2 text-left">@@ -39,6 +43,11 @@ export const RoleSelectItem = ({<span className="text-muted-foreground text-xs">{def.description}</span>+ {disabledReason !== undefined && (+ <span className="text-muted-foreground text-xs italic">+ {disabledReason}+ </span>+ )}</div><Tooltip label="View permissions" hoverableContent={false} delay={0}>{({ getTriggerProps }) => (@@ -53,7 +62,7 @@ export const RoleSelectItem = ({onViewPermissions(role);}}aria-label={`View ${label} permissions`}- className="text-muted-foreground hover:bg-background hover:text-foreground ml-auto flex h-6 w-6 shrink-0 items-center justify-center self-center rounded-full opacity-0 group-hover:opacity-100 group-data-highlighted:opacity-100 focus-visible:opacity-100"+ className="text-muted-foreground hover:bg-background hover:text-foreground pointer-events-auto ml-auto flex h-6 w-6 shrink-0 items-center justify-center self-center rounded-full opacity-0 group-hover:opacity-100 group-data-disabled:opacity-100 group-data-highlighted:opacity-100 focus-visible:opacity-100"><SquareArrowOutUpRight size="base" /></button>