Skip to content

The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.

feat(studio): multiselect for team member projects selector (#51948)

kemal.earth4b5b2a3d71df
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx
index 26636a8301d..2c1d1d6af48 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.tsx
@@ -49,7 +49,7 @@ import { DiscardChangesConfirmationDialog } from '@/components/ui-patterns/Dialo
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DocsButton } from '@/components/ui/DocsButton'
import { InlineLink } from '@/components/ui/InlineLink'
-import { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'
+import { OrganizationProjectsMultiSelect } from '@/components/ui/OrganizationProjectsMultiSelect'
import { Shortcut } from '@/components/ui/Shortcut'
import { UpgradePlanButton } from '@/components/ui/UpgradePlanButton'
import { useOrganizationCreateInvitationMutation } from '@/data/organization-members/organization-invitation-create-mutation'
@@ -79,7 +79,6 @@ export const InviteMemberButton = () => {
const [isOpen, setIsOpen] = useState(false)
const [pendingInvite, setPendingInvite] = useState<z.infer<typeof FormSchema>>()
- const [projectDropdownOpen, setProjectDropdownOpen] = useState(false)
const { data: members } = useOrganizationMembersQuery({ slug })
const { data: allRoles, isSuccess } = useOrganizationRolesV2Query({ slug })
@@ -92,7 +91,7 @@ export const InviteMemberButton = () => {
email: '',
role: orgScopedRoles.find((role) => role.name === 'Developer')?.id.toString() ?? '',
applyToOrg: true,
- projectRef: '',
+ projectRefs: [] as string[],
requireSso: 'auto' as const,
}
@@ -140,15 +139,15 @@ export const InviteMemberButton = () => {
email: emailSchema,
role: z.string().min(1, 'Role is required'),
applyToOrg: z.boolean(),
- projectRef: z.string(),
+ projectRefs: z.array(z.string()),
requireSso: z.enum(['auto', 'sso', 'non-sso']),
})
.superRefine((data, ctx) => {
- if (!data.applyToOrg && !data.projectRef) {
+ if (!data.applyToOrg && data.projectRefs.length === 0) {
ctx.addIssue({
code: z.ZodIssueCode.custom,
- message: 'A project must be selected',
- path: ['projectRef'],
+ message: 'Select at least one project',
+ path: ['projectRefs'],
})
}
})
@@ -160,9 +159,9 @@ export const InviteMemberButton = () => {
defaultValues,
})
- const [applyToOrg, projectRef, email] = useWatch({
+ const [applyToOrg, email] = useWatch({
control: form.control,
- name: ['applyToOrg', 'projectRef', 'email'],
+ name: ['applyToOrg', 'email'],
})
const emailCount = parseEmails(email ?? '').length
@@ -198,7 +197,7 @@ export const InviteMemberButton = () => {
if (toInvite.length === 0) return
}
- const projectPayload = buildProjectPayload(values.applyToOrg, values.projectRef)
+ const projectPayload = buildProjectPayload(values.applyToOrg, values.projectRefs)
const ssoPayload = buildSsoPayload(values.requireSso)
let result: BatchInvitationResult
@@ -261,7 +260,6 @@ export const InviteMemberButton = () => {
const hasUnsavedChanges = form.formState.isDirty
const closeInviteSheet = () => {
- setProjectDropdownOpen(false)
setIsOpen(false)
form.reset(defaultValues)
}
@@ -446,25 +444,19 @@ export const InviteMemberButton = () => {
)}
{!applyToOrg && (
<FormField
- name="projectRef"
+ name="projectRefs"
control={form.control}
render={({ field }) => (
<FormItemLayout
layout="horizontal"
- label="Select a project"
+ label="Select projects"
description="Project access can be adjusted after the user joins"
>
<FormControl className="col-span-6">
- <OrganizationProjectSelector
- fetchOnMount
- sameWidthAsTrigger
- checkPosition="left"
- selectedRef={projectRef}
- open={projectDropdownOpen}
- setOpen={setProjectDropdownOpen}
- searchPlaceholder="Search project..."
- onSelect={(project) => field.onChange(project.ref)}
- onInitialLoad={(projects) => field.onChange(projects[0]?.ref ?? '')}
+ <OrganizationProjectsMultiSelect
+ selectedRefs={field.value}
+ onChange={(refs) => field.onChange(refs)}
+ triggerLabel="Select projects..."
/>
</FormControl>
</FormItemLayout>
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.utils.ts b/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.utils.ts
index a58dc5be922..a66feb52f95 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.utils.ts
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/InviteMemberButton.utils.ts
@@ -91,13 +91,13 @@ export function categorizeInviteEmails(
export function buildProjectPayload(
applyToOrg: boolean,
- projectRef: string
+ projectRefs: string[]
): { projects: string[] } | Record<string, never> {
if (applyToOrg) return {}
- if (!projectRef) {
- throw new Error('projectRef is required when applyToOrg is false')
+ if (projectRefs.length === 0) {
+ throw new Error('At least one project is required when applyToOrg is false')
}
- return { projects: [projectRef] }
+ return { projects: projectRefs }
}
export function buildSsoPayload(
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/MemberRow.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/MemberRow.tsx
index f66002e1150..9ae9c4eeb76 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/MemberRow.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/MemberRow.tsx
@@ -66,6 +66,21 @@ export const MemberRow = memo(function MemberRow({
})
}, [member.role_ids, roleById])
+ const roleBreakdown = useMemo(
+ () =>
+ roleRows.flatMap(({ id, roleName, appliesToAllProjects, projectsApplied }) =>
+ appliesToAllProjects
+ ? [{ key: `${id}-all`, roleName, label: 'Organization' }]
+ : projectsApplied.map((project) => ({
+ key: `${id}-${project.ref}`,
+ roleName,
+ label: project.name,
+ }))
+ ),
+ [roleRows]
+ )
+ const totalProjectsApplied = roleRows.reduce((sum, row) => sum + row.projectsApplied.length, 0)
+
return (
<div
role="row"
@@ -149,6 +164,31 @@ export const MemberRow = memo(function MemberRow({
<div role="cell" className="min-w-0">
{isLoadingRoles ? (
<ShimmeringLoader className="w-32" />
+ ) : roleRows.length > 1 ? (
+ <div className="flex items-center gap-x-2 min-w-0 text-sm">
+ <p className="text-foreground-light whitespace-nowrap">Multiple roles</p>
+ <ChevronRightIcon className="text-foreground-muted/50 shrink-0" size={14} />
+ <HoverCard openDelay={200}>
+ <HoverCardTrigger asChild>
+ <span className="text-foreground-light truncate">
+ {totalProjectsApplied} {pluralize(totalProjectsApplied, 'project')}
+ </span>
+ </HoverCardTrigger>
+ <HoverCardContent className="p-0">
+ <div className="flex flex-col py-1">
+ <ScrollArea className={cn(roleBreakdown.length > 5 ? 'h-[130px]' : '')}>
+ {roleBreakdown.map(({ key, roleName, label }) => (
+ <div key={key} className="px-2 py-1 flex items-center gap-x-2 text-xs">
+ <span className="whitespace-nowrap">{roleName}</span>
+ <ChevronRightIcon className="text-foreground-muted/50 shrink-0" size={12} />
+ <span className="text-foreground-light truncate">{label}</span>
+ </div>
+ ))}
+ </ScrollArea>
+ </div>
+ </HoverCardContent>
+ </HoverCard>
+ </div>
) : (
roleRows.map(({ id, roleName, appliesToAllProjects, projectsApplied }) => (
<div key={`role-${id}`} className="flex items-center gap-x-2 min-w-0 text-sm">
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx
index 2cd0f5dee9b..833de3e64bf 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx
@@ -1,12 +1,12 @@
import { useParams } from 'common'
-import { isEqual } from 'lodash'
-import { XIcon } from 'lucide-react'
+import { PlusIcon, XIcon } from 'lucide-react'
import { useEffect, useState } from 'react'
import {
Alert,
AlertDescription,
AlertTitle,
Button,
+ Card,
cn,
Select,
SelectContent,
@@ -31,18 +31,16 @@ import { useGetRolesManagementPermissions } from '../TeamSettings.utils'
import { UpdateRolesConfirmationModal } from './UpdateRolesConfirmationModal'
import {
formatMemberRoleToProjectRoleConfiguration,
+ hasRoleConfigurationChanges,
ProjectRoleConfiguration,
} from './UpdateRolesPanel.utils'
import { ButtonTooltip } from '@/components/ui/ButtonTooltip'
import { DocsButton } from '@/components/ui/DocsButton'
-import { OrganizationProjectSelector } from '@/components/ui/OrganizationProjectSelector'
+import { OrganizationProjectsMultiSelect } from '@/components/ui/OrganizationProjectsMultiSelect'
import { useOrganizationRolesV2Query } from '@/data/organization-members/organization-roles-query'
import { OrganizationMember } from '@/data/organizations/organization-members-query'
import { usePermissionsQuery } from '@/data/permissions/permissions-query'
-import {
- OrgProject,
- useOrgProjectsInfiniteQuery,
-} from '@/data/projects/org-projects-infinite-query'
+import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
import { useHasAccessToProjectLevelPermissions } from '@/data/subscriptions/org-subscription-query'
import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
import { DOCS_URL } from '@/lib/constants'
@@ -78,7 +76,6 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
const isStripeProjectsOrg = organization?.managed_by === MANAGED_BY.STRIPE_PROJECTS
const [showConfirmation, setShowConfirmation] = useState(false)
- const [showProjectDropdown, setShowProjectDropdown] = useState(false)
const [projectsRoleConfiguration, setProjectsRoleConfiguration] = useState<
ProjectRoleConfiguration[]
>([])
@@ -100,24 +97,40 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
const numberOfProjectsWithAccess = projectsRoleConfiguration.filter(
(p) => p.ref !== undefined
).length
- const hasNoChanges = isEqual(projectsRoleConfiguration, originalConfiguration)
+ const hasNoChanges = !hasRoleConfigurationChanges(
+ originalConfiguration,
+ projectsRoleConfiguration
+ )
- const onSelectProject = (project: OrgProject) => {
- setProjectsRoleConfiguration(
- projectsRoleConfiguration.concat({
- ref: project.ref,
- name: project.name,
- roleId: lowerPermissionsRole ?? orgScopedRoles[0].id,
- })
- )
- setShowProjectDropdown(false)
- }
+ const getRoleForProject = (project: ProjectRoleConfiguration) =>
+ orgScopedRoles.find((r) => r.id === (project.baseRoleId ?? project.roleId))
+
+ const projectsWithRef = projectsRoleConfiguration.filter(
+ (p): p is ProjectRoleConfiguration & { ref: string } => p.ref !== undefined
+ )
+ const selectedRefs = projectsWithRef.map((p) => p.ref)
+ const knownProjects = projectsWithRef.map((p) => ({ ref: p.ref, name: p.name ?? p.ref }))
+ const disabledRefs = projectsWithRef
+ .filter((p) => !rolesRemovable.includes(getRoleForProject(p)?.id ?? 0))
+ .map((p) => p.ref)
const onRemoveProject = (ref?: string) => {
if (ref === undefined) return
setProjectsRoleConfiguration(projectsRoleConfiguration.filter((p) => p.ref !== ref))
}
+ const onProjectSelectionChange = (refs: string[], selected: { ref: string; name: string }[]) => {
+ const removedRefs = selectedRefs.filter((ref) => !refs.includes(ref))
+ const addedProjects = selected.filter((p) => !selectedRefs.includes(p.ref))
+ const roleIdToApply = lowerPermissionsRole ?? orgScopedRoles[0].id
+
+ setProjectsRoleConfiguration(
+ projectsRoleConfiguration
+ .filter((p) => p.ref === undefined || !removedRefs.includes(p.ref))
+ .concat(addedProjects.map((p) => ({ ref: p.ref, name: p.name, roleId: roleIdToApply })))
+ )
+ }
+
const onSelectRole = (value: string, project: ProjectRoleConfiguration) => {
if (project.ref !== undefined) {
setProjectsRoleConfiguration(
@@ -166,7 +179,7 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
<SheetContent
showClose={false}
size="default"
- className="bg-surface-200 p-0 flex flex-row gap-0 md:w-[600px] lg:w-[600px] w-full"
+ className="p-0 flex flex-row gap-0 md:w-[600px] lg:w-[600px] w-full"
>
<div className="flex flex-col grow w-full">
<SheetHeader className="py-3 flex flex-row justify-between gap-x-4 items-center border-b bg-transparent">
@@ -178,13 +191,29 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
<SheetSection className="h-full overflow-auto flex flex-col gap-y-4">
{isOptedIntoProjectLevelPermissions && (
- <div className="flex items-center gap-x-4">
- <Switch
- disabled={cannotAddAnyRoles}
- checked={isApplyingRoleToAllProjects}
- onCheckedChange={onToggleApplyToAllProjects}
- />
- <p className="text-sm">Apply roles to all projects in the organization</p>
+ <div className="flex items-center justify-between gap-x-4">
+ <div className="flex items-center gap-x-4">
+ <Switch
+ disabled={cannotAddAnyRoles}
+ checked={isApplyingRoleToAllProjects}
+ onCheckedChange={onToggleApplyToAllProjects}
+ />
+ <p className="text-sm">Apply roles to all projects in the organization</p>
+ </div>
+ {isSuccessRoles && !isApplyingRoleToAllProjects && (
+ <OrganizationProjectsMultiSelect
+ selectedRefs={selectedRefs}
+ onChange={onProjectSelectionChange}
+ knownProjects={knownProjects}
+ disabledRefs={disabledRefs}
+ disabledTooltip="Additional permission required to remove role from member"
+ renderTrigger={() => (
+ <Button type="button" variant="primary" icon={<PlusIcon size={14} />}>
+ Add new
+ </Button>
+ )}
+ />
+ )}
</div>
)}
@@ -210,136 +239,111 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP
</Admonition>
)}
- <div className="flex flex-col divide-y divide-border">
- {projectsRoleConfiguration.map((project) => {
- const name = project.ref === undefined ? 'All projects' : project.name
- const role = orgScopedRoles.find((r) => {
- if (project.baseRoleId !== undefined) return r.id === project.baseRoleId
- else return r.id === project.roleId
- })
- const canRemoveRole = rolesRemovable.includes(role?.id ?? 0)
-
- return (
- <div
- key={`${project.ref}-${project.roleId}`}
- className="flex items-center justify-between py-2"
- >
- <p className="text-sm">{name}</p>
-
- <div className="flex items-center gap-x-2">
- {cannotAddAnyRoles ? (
- <Tooltip>
- <TooltipTrigger asChild>
- <div className="flex items-center justify-between rounded-md border border-button bg-button px-3 py-2 text-sm h-10 w-56 text-foreground-light">
- {role?.name ?? 'Unknown'}
- </div>
- </TooltipTrigger>
- <TooltipContent side="bottom">
- Additional permissions required to update role
- </TooltipContent>
- </Tooltip>
- ) : (
- <Select
- value={(project?.baseRoleId ?? project.roleId).toString()}
- onValueChange={(value) => onSelectRole(value, project)}
- >
- <SelectTrigger
- className={cn(
- ' w-40',
- role?.name === undefined && 'text-foreground-light'
- )}
- >
- {role?.name ?? 'Please select a role'}
- </SelectTrigger>
- <SelectContent align="end">
- <SelectGroup>
- {(orgScopedRoles ?? []).map((role) => {
- const canAssignRole = rolesAddable.includes(role.id)
- const isOwnerRole = role.name === 'Owner'
- const disabledForStripe = isStripeProjectsOrg && isOwnerRole
-
- const isNoAccessRole = role.name === 'No-access'
- const disabledForProjectRole =
- !isApplyingRoleToAllProjects && isNoAccessRole
- const disabled =
- !canAssignRole || disabledForStripe || disabledForProjectRole
- const disabledReason = disabledForStripe
- ? 'Cannot be assigned in Stripe Projects organizations'
- : disabledForProjectRole
- ? 'Cannot assign No-access role to project-scoped members'
- : !canAssignRole
- ? 'Additional permissions required to assign role'
- : undefined
-
- return (
- <SelectItem
- key={role.id}
- value={role.id.toString()}
- className="text-sm hover:bg-selection cursor-pointer"
- disabled={disabled}
- >
- <div className="flex flex-col gap-0.5 max-w-xs">
- <span>{role.name}</span>
- <span className="text-xs text-foreground-lighter">
- {ROLE_DESCRIPTIONS[role.name] ??
- 'Permissions are based on the configured organization role.'}
- {disabledReason && ` ${disabledReason}`}
- </span>
- </div>
- </SelectItem>
- )
- })}
- </SelectGroup>
- </SelectContent>
- </Select>
- )}
-
- {!isApplyingRoleToAllProjects && (
- <ButtonTooltip
- variant="text"
- disabled={!canRemoveRole}
- className="px-1"
- icon={<XIcon />}
- onClick={() => onRemoveProject(project?.ref)}
- tooltip={{
- content: {
- side: 'bottom',
- text: !canRemoveRole
- ? 'Additional permission required to remove role from member'
- : 'Remove access to project',
- },
- }}
- />
- )}
- </div>
- </div>
- )
- })}
- </div>
-
- {!isApplyingRoleToAllProjects && (
- <OrganizationProjectSelector
- open={showProjectDropdown}
- setOpen={setShowProjectDropdown}
- modal={true}
- onSelect={onSelectProject}
- renderTrigger={() => <Button className="w-min">Add project</Button>}
- renderRow={(project) => {
- const hasRoleAssigned = projectsRoleConfiguration.some(
- (p) => p.ref === project.ref
- )
+ <Card className="overflow-hidden">
+ <div className="flex flex-col divide-y divide-border">
+ {projectsRoleConfiguration.map((project) => {
+ const name = project.ref === undefined ? 'All projects' : project.name
+ const role = getRoleForProject(project)
+ const canRemoveRole = rolesRemovable.includes(role?.id ?? 0)
+
return (
- <div className="w-full flex items-center justify-between">
- <span className="truncate">{project.name}</span>
- {hasRoleAssigned && <p className="w-[45%] text-right">Already assigned</p>}
+ <div
+ key={`${project.ref}-${project.roleId}`}
+ className="flex items-center justify-between px-4 py-3"
+ >
+ <p className="text-sm">{name}</p>
+
+ <div className="flex items-center gap-x-2">
+ {cannotAddAnyRoles ? (
+ <Tooltip>
+ <TooltipTrigger asChild>
+ <div className="flex items-center justify-between rounded-md border border-button bg-button px-3 py-2 text-sm h-10 w-56 text-foreground-light">
+ {role?.name ?? 'Unknown'}
+ </div>
+ </TooltipTrigger>
+ <TooltipContent side="bottom">
+ Additional permissions required to update role
+ </TooltipContent>
+ </Tooltip>
+ ) : (
+ <Select
+ value={(project?.baseRoleId ?? project.roleId).toString()}
+ onValueChange={(value) => onSelectRole(value, project)}
+ >
+ <SelectTrigger
+ className={cn(
+ ' w-40',
+ role?.name === undefined && 'text-foreground-light'
+ )}
+ >
+ {role?.name ?? 'Please select a role'}
+ </SelectTrigger>
+ <SelectContent align="end" className="max-h-[32rem]">
+ <SelectGroup>
+ {(orgScopedRoles ?? []).map((role) => {
+ const canAssignRole = rolesAddable.includes(role.id)
+ const isOwnerRole = role.name === 'Owner'
+ const disabledForStripe = isStripeProjectsOrg && isOwnerRole
+
+ const isNoAccessRole = role.name === 'No-access'
+ const disabledForProjectRole =
+ !isApplyingRoleToAllProjects && isNoAccessRole
+ const disabled =
+ !canAssignRole || disabledForStripe || disabledForProjectRole
+ const disabledReason = disabledForStripe
+ ? 'Cannot be assigned in Stripe Projects organizations'
+ : disabledForProjectRole
+ ? 'Cannot assign No-access role to project-scoped members'
+ : !canAssignRole
+ ? 'Additional permissions required to assign role'
+ : undefined
+
+ return (
+ <SelectItem
+ key={role.id}
+ value={role.id.toString()}
+ className="text-sm hover:bg-selection cursor-pointer"
+ disabled={disabled}
+ >
+ <div className="flex flex-col gap-0.5 max-w-xs">
+ <span>{role.name}</span>
+ <span className="text-xs text-foreground-lighter">
+ {ROLE_DESCRIPTIONS[role.name] ??
+ 'Permissions are based on the configured organization role.'}
+ {disabledReason && ` ${disabledReason}`}
+ </span>
+ </div>
+ </SelectItem>
+ )
+ })}
+ </SelectGroup>
+ </SelectContent>
+ </Select>
+ )}
+
+ {!isApplyingRoleToAllProjects && (
+ <ButtonTooltip
+ variant="text"
+ disabled={!canRemoveRole}
+ className="px-1"
+ icon={<XIcon />}
+ onClick={() => onRemoveProject(project?.ref)}
+ tooltip={{
+ content: {
+ side: 'bottom',
+ text: !canRemoveRole
+ ? 'Additional permission required to remove role from member'
+ : 'Remove access to project',
+ },
+ }}
+ />
+ )}
+ </div>
</div>
)
- }}
- isOptionDisabled={(project) =>
- projectsRoleConfiguration.some((p) => p.ref === project.ref)
- }
- />
- )}
+ })}
+ </div>
+ </Card>
</SheetSection>
<SheetFooter className="flex items-center justify-end! px-5 py-4 w-full border-t">
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.utils.test.ts b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.utils.test.ts
index f60155040eb..0d61847a63e 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.utils.test.ts
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.utils.test.ts
@@ -1,6 +1,6 @@
import { describe, expect, test } from 'vitest'
-import { deriveRoleChangeActions } from './UpdateRolesPanel.utils'
+import { deriveRoleChangeActions, hasRoleConfigurationChanges } from './UpdateRolesPanel.utils'
// [Joshen] This is specifically testing the project scope changes
describe('UpdateRolesPanel.utils.ts:deriveRoleChangeActions', () => {
@@ -436,3 +436,28 @@ describe('UpdateRolesPanel.utils.ts:deriveRoleChangeActions', () => {
])
})
})
+
+describe('UpdateRolesPanel.utils.ts:hasRoleConfigurationChanges', () => {
+ const original = [
+ { ref: 'a', name: 'A', roleId: 10, baseRoleId: 3 },
+ { ref: 'b', name: 'B', roleId: 11, baseRoleId: 3 },
+ ]
+
+ test('returns false for the same projects in a different order', () => {
+ expect(hasRoleConfigurationChanges(original, [original[1], original[0]])).toBe(false)
+ })
+
+ test('ignores baseRoleId when the role is unchanged', () => {
+ const reAdded = [original[0], { ref: 'b', name: 'B', roleId: 11 }]
+ expect(hasRoleConfigurationChanges(original, reAdded)).toBe(false)
+ })
+
+ test('returns true when a project is added, removed or its role changes', () => {
+ const roleChanged = [original[0], { ...original[1], roleId: 12 }]
+ expect(hasRoleConfigurationChanges(original, [original[0]])).toBe(true)
+ expect(
+ hasRoleConfigurationChanges(original, [...original, { ref: 'c', name: 'C', roleId: 3 }])
+ ).toBe(true)
+ expect(hasRoleConfigurationChanges(original, roleChanged)).toBe(true)
+ })
+})
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.utils.ts b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.utils.ts
index 53ab7d8dd89..6acda8158e4 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.utils.ts
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.utils.ts
@@ -94,6 +94,15 @@ export const deriveChanges = (
return { removed, added, updated }
}
+/** Order-insensitive: the same projects with the same roles count as unchanged */
+export const hasRoleConfigurationChanges = (
+ original: ProjectRoleConfiguration[],
+ final: ProjectRoleConfiguration[]
+) => {
+ const { removed, added, updated } = deriveChanges(original, final)
+ return removed.length > 0 || added.length > 0 || updated.length > 0
+}
+
// [Joshen] Essentially spit out 3 arrays
// What to (1) Remove (2) Assign (3) Update
// And so that we can unit test this
diff --git a/apps/studio/components/ui/OrganizationProjectsMultiSelect.test.tsx b/apps/studio/components/ui/OrganizationProjectsMultiSelect.test.tsx
new file mode 100644
index 00000000000..8d6a96a66ee
--- /dev/null
+++ b/apps/studio/components/ui/OrganizationProjectsMultiSelect.test.tsx
@@ -0,0 +1,250 @@
+import { screen, waitFor, within } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
+import { platformComponents as components } from 'api-types'
+import { mockIntersectionObserver } from 'jsdom-testing-mocks'
+import { HttpResponse } from 'msw'
+import { useState } from 'react'
+import { describe, expect, test, vi } from 'vitest'
+
+import {
+ OrganizationProjectsMultiSelect,
+ SelectedProject,
+} from '@/components/ui/OrganizationProjectsMultiSelect'
+import type { OrgProject } from '@/data/projects/org-projects-infinite-query'
+import { createMockOrganizationResponse } from '@/tests/helpers'
+import { customRender } from '@/tests/lib/custom-render'
+import { addAPIMock } from '@/tests/lib/msw'
+import { createMockProfileContext } from '@/tests/lib/profile-helpers'
+
+type OrganizationResponse = components['schemas']['OrganizationResponse_Output']
+type OrganizationProjectsResponse = components['schemas']['OrganizationProjectsResponse_Output']
+
+// The infinite-scroll sentinel uses IntersectionObserver, which jsdom lacks
+mockIntersectionObserver()
+
+const ORG_SLUG = 'test-org'
+
+vi.mock('common', async (importOriginal) => {
+ const actual = (await importOriginal()) as typeof import('common')
+ return { ...actual, useParams: () => ({ slug: ORG_SLUG }), useIsLoggedIn: () => true }
+})
+
+vi.mock('@/lib/constants', async (importOriginal) => {
+ const actual = await importOriginal<Record<string, unknown>>()
+ return { ...actual, IS_PLATFORM: true }
+})
+
+const makeProject = (ref: string, name: string): OrgProject => ({
+ cloud_provider: 'AWS',
+ databases: [],
+ inserted_at: '2026-01-01T00:00:00.000Z',
+ integration_source: null,
+ is_branch: false,
+ ref,
+ name,
+ region: 'us-east-1',
+ status: 'ACTIVE_HEALTHY',
+})
+
+function setupProjectsMock(projects: OrgProject[]) {
+ const requestedSearches: string[] = []
+
+ addAPIMock({
+ method: 'get',
+ path: '/platform/organizations/:slug/projects',
+ response: ({ request }) => {
+ const url = new URL(request.url)
+ const limit = Number(url.searchParams.get('limit') ?? projects.length)
+ const offset = Number(url.searchParams.get('offset') ?? 0)
+ const search = url.searchParams.get('search') ?? ''
+ requestedSearches.push(search)
+
+ const filtered = search
+ ? projects.filter((p) => p.name.toLowerCase().includes(search.toLowerCase()))
+ : projects
+ const paginated = filtered.slice(offset, offset + limit)
+
+ return HttpResponse.json<OrganizationProjectsResponse>({
+ projects: paginated,
+ pagination: { count: filtered.length, limit, offset },
+ })
+ },
+ })
+
+ addAPIMock({
+ method: 'get',
+ path: '/platform/organizations',
+ response: () =>
+ HttpResponse.json<OrganizationResponse[]>([
+ createMockOrganizationResponse({ id: 1, slug: ORG_SLUG, name: 'Test Org' }),
+ ]),
+ })
+
+ return { requestedSearches }
+}
+
+function Harness({
+ initialSelectedRefs = [],
+ knownProjects,
+ disabledRefs,
+ onChange,
+}: {
+ initialSelectedRefs?: string[]
+ knownProjects?: SelectedProject[]
+ disabledRefs?: string[]
+ onChange?: (refs: string[], selected: SelectedProject[]) => void
+}) {
+ const [selectedRefs, setSelectedRefs] = useState<string[]>(initialSelectedRefs)
+ return (
+ <OrganizationProjectsMultiSelect
+ selectedRefs={selectedRefs}
+ onChange={(refs, selected) => {
+ setSelectedRefs(refs)
+ onChange?.(refs, selected)
+ }}
+ knownProjects={knownProjects}
+ disabledRefs={disabledRefs}
+ />
+ )
+}
+
+function renderHarness(props: Parameters<typeof Harness>[0] = {}) {
+ return customRender(<Harness {...props} />, { profileContext: createMockProfileContext() })
+}
+
+async function openDropdown() {
+ const trigger = screen.getByRole('combobox')
+ await userEvent.click(trigger)
+ return trigger
+}
+
+describe('OrganizationProjectsMultiSelect', () => {
+ test('lists every project as an unchecked option when nothing is selected', async () => {
+ setupProjectsMock([makeProject('ref-1', 'Alpha'), makeProject('ref-2', 'Beta')])
+ renderHarness()
+
+ await openDropdown()
+
+ const alpha = await screen.findByRole('option', { name: /Alpha/ })
+ const beta = screen.getByRole('option', { name: /Beta/ })
+ expect(within(alpha).getByRole('checkbox')).not.toBeChecked()
+ expect(within(beta).getByRole('checkbox')).not.toBeChecked()
+ })
+
+ test('selecting a project checks it and reports the new selection', async () => {
+ setupProjectsMock([makeProject('ref-1', 'Alpha'), makeProject('ref-2', 'Beta')])
+ const onChange = vi.fn()
+ renderHarness({ onChange })
+
+ await openDropdown()
+ await userEvent.click(await screen.findByRole('option', { name: /Alpha/ }))
+
+ expect(onChange).toHaveBeenCalledWith(['ref-1'], [{ ref: 'ref-1', name: 'Alpha' }])
+ await waitFor(() => {
+ expect(
+ within(screen.getByRole('option', { name: /Alpha/ })).getByRole('checkbox')
+ ).toBeChecked()
+ })
+ })
+
+ test('clicking a selected project again deselects it', async () => {
+ setupProjectsMock([makeProject('ref-1', 'Alpha'), makeProject('ref-2', 'Beta')])
+ const onChange = vi.fn()
+ renderHarness({ initialSelectedRefs: ['ref-1'], onChange })
+
+ await openDropdown()
+ await userEvent.click(await screen.findByRole('option', { name: /Alpha/ }))
+
+ expect(onChange).toHaveBeenCalledWith([], [])
+ })
+
+ test('removing a badge from the trigger deselects that project', async () => {
+ setupProjectsMock([makeProject('ref-1', 'Alpha'), makeProject('ref-2', 'Beta')])
+ const onChange = vi.fn()
+ renderHarness({
+ initialSelectedRefs: ['ref-1', 'ref-2'],
+ knownProjects: [
+ { ref: 'ref-1', name: 'Alpha' },
+ { ref: 'ref-2', name: 'Beta' },
+ ],
+ onChange,
+ })
+
+ expect(screen.getByText('Alpha')).toBeInTheDocument()
+ expect(screen.getByText('Beta')).toBeInTheDocument()
+
+ // Badges render in selectedRefs order (Alpha, then Beta); each has a delete icon
+ // with no accessible role, so index into them in that order.
+ const [removeAlphaBadge] = document.querySelectorAll<HTMLElement>('.cursor-pointer')
+ await userEvent.click(removeAlphaBadge)
+
+ expect(onChange).toHaveBeenCalledWith(['ref-2'], [{ ref: 'ref-2', name: 'Beta' }])
+ })
+
+ test('shows a known project name on the trigger before the list has loaded', () => {
+ setupProjectsMock([makeProject('ref-1', 'Alpha')])
+ renderHarness({
+ initialSelectedRefs: ['ref-1'],
+ knownProjects: [{ ref: 'ref-1', name: 'Alpha' }],
+ })
+
+ expect(screen.getByText('Alpha')).toBeInTheDocument()
+ })
+
+ test('typing searches the project list', async () => {
+ const { requestedSearches } = setupProjectsMock([
+ makeProject('ref-1', 'Alpha'),
+ makeProject('ref-2', 'Beta'),
+ ])
+ renderHarness()
+
+ await openDropdown()
+ await screen.findByRole('option', { name: /Alpha/ })
+
+ await userEvent.type(screen.getByPlaceholderText('Search project...'), 'Bet')
+
+ await waitFor(
+ () => {
+ expect(requestedSearches).toContain('Bet')
+ },
+ { timeout: 2000 }
+ )
+ await waitFor(() => {
+ expect(screen.queryByRole('option', { name: /Alpha/ })).not.toBeInTheDocument()
+ expect(screen.getByRole('option', { name: /Beta/ })).toBeInTheDocument()
+ })
+ })
+
+ test('a disabled (permission-locked) project cannot be deselected', async () => {
+ setupProjectsMock([makeProject('ref-1', 'Alpha'), makeProject('ref-2', 'Beta')])
+ const onChange = vi.fn()
+ renderHarness({
+ initialSelectedRefs: ['ref-1'],
+ knownProjects: [{ ref: 'ref-1', name: 'Alpha' }],
+ disabledRefs: ['ref-1'],
+ onChange,
+ })
+
+ await openDropdown()
+ const option = await screen.findByRole('option', { name: /Alpha/ })
+ expect(within(option).getByRole('checkbox')).toBeChecked()
+ expect(within(option).getByRole('checkbox')).toBeDisabled()
+
+ await userEvent.click(option)
+ expect(onChange).not.toHaveBeenCalled()
+ })
+
+ test('renders a large project list without selecting everything eagerly', async () => {
+ const manyProjects = Array.from({ length: 120 }, (_, i) =>
+ makeProject(`ref-${i}`, `Project ${String(i).padStart(3, '0')}`)
+ )
+ setupProjectsMock(manyProjects)
+ renderHarness()
+
+ await openDropdown()
+
+ await screen.findByRole('option', { name: /Project 000/ })
+ expect(screen.getAllByRole('option')).toHaveLength(96)
+ expect(screen.queryByRole('option', { name: /Project 119/ })).not.toBeInTheDocument()
+ })
+})
diff --git a/apps/studio/components/ui/OrganizationProjectsMultiSelect.tsx b/apps/studio/components/ui/OrganizationProjectsMultiSelect.tsx
new file mode 100644
index 00000000000..7404e0ace91
--- /dev/null
+++ b/apps/studio/components/ui/OrganizationProjectsMultiSelect.tsx
@@ -0,0 +1,275 @@
+import { keepPreviousData } from '@tanstack/react-query'
+import { useDebounce, useIntersectionObserver } from '@uidotdev/usehooks'
+import { HelpCircleIcon } from 'lucide-react'
+import { ReactNode, useEffect, useMemo, useState } from 'react'
+import {
+ Checkbox,
+ cn,
+ Command,
+ CommandGroup,
+ CommandInput,
+ CommandItem,
+ CommandList,
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+ ScrollArea,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
+} from 'ui'
+import { MultiSelector, MultiSelectorContent, MultiSelectorTrigger } from 'ui-patterns/multi-select'
+import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
+
+import {
+ OrgProject,
+ useOrgProjectsInfiniteQuery,
+} from '@/data/projects/org-projects-infinite-query'
+import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'
+
+export interface SelectedProject {
+ ref: string
+ name: string
+}
+
+export interface OrganizationProjectsMultiSelectProps {
+ slug?: string
+ selectedRefs: string[]
+ onChange: (refs: string[], selected: SelectedProject[]) => void
+ /** Seeds the ref -> name lookup so badges render real names before the list has loaded them. */
+ knownProjects?: SelectedProject[]
+ /** Refs that are currently selected but cannot be deselected (e.g. missing permission). */
+ disabledRefs?: string[]
+ disabledTooltip?: string
+ disabled?: boolean
+ error?: string
+ searchPlaceholder?: string
+ triggerLabel?: string
+ /** Replaces the default combobox/badge trigger with a custom one (e.g. a plain "Add new" button). */
+ renderTrigger?: () => ReactNode
+}
+
+export const OrganizationProjectsMultiSelect = ({
+ slug: _slug,
+ selectedRefs,
+ onChange,
+ knownProjects = [],
+ disabledRefs = [],
+ disabledTooltip = 'Additional permission required to remove this project',
+ disabled = false,
+ error,
+ searchPlaceholder = 'Search project...',
+ triggerLabel = 'Select projects...',
+ renderTrigger,
+}: OrganizationProjectsMultiSelectProps) => {
+ const { data: organization } = useSelectedOrganizationQuery()
+ const slug = _slug ?? organization?.slug
+
+ const [open, setOpen] = useState(false)
+ const [search, setSearch] = useState('')
+ const debouncedSearch = useDebounce(search, 500)
+
+ const [sentinelRef, entry] = useIntersectionObserver({
+ threshold: 0,
+ rootMargin: '0px',
+ })
+
+ const {
+ data,
+ error: projectsError,
+ isLoading: isLoadingProjects,
+ isError: isErrorProjects,
+ isFetching,
+ isFetchingNextPage,
+ hasNextPage,
+ fetchNextPage,
+ } = useOrgProjectsInfiniteQuery(
+ { slug, search: search.length === 0 ? search : debouncedSearch },
+ { enabled: open, placeholderData: keepPreviousData }
+ )
+
+ const projects = useMemo(() => data?.pages.flatMap((page) => page.projects) ?? [], [data?.pages])
+
+ // Accumulate ref -> name across every page we've ever seen so badges can always render a
+ // name, even for a ref that's since scrolled out of the current search results.
+ const [seenNamesByRef, setSeenNamesByRef] = useState<Record<string, string>>({})
+ const knownNamesByRef = Object.fromEntries(knownProjects.map((p) => [p.ref, p.name]))
+ const getProjectName = (ref: string) => knownNamesByRef[ref] ?? seenNamesByRef[ref] ?? ref
+
+ const toSelected = (refs: string[]): SelectedProject[] =>
+ refs.map((ref) => ({ ref, name: getProjectName(ref) }))
+
+ // Badge deletion and keyboard removal go through the generic multi-select's own
+ // onValuesChange, which has no concept of a non-removable ref — reinstate any that
+ // got removed so permission-locked projects can't be dropped this way either.
+ const handleValuesChange = (nextRefs: string[]) => {
+ const preserved = disabledRefs.filter((ref) => !nextRefs.includes(ref))
+ const merged =
+ preserved.length === 0 ? nextRefs : Array.from(new Set([...nextRefs, ...preserved]))
+ onChange(merged, toSelected(merged))
+ }
+
+ const handleToggleProject = (project: OrgProject) => {
+ if (disabledRefs.includes(project.ref)) return
+ const next = selectedRefs.includes(project.ref)
+ ? selectedRefs.filter((ref) => ref !== project.ref)
+ : [...selectedRefs, project.ref]
+ onChange(next, toSelected(next))
+ }
+
+ function renderListContent() {
+ if (isLoadingProjects) {
+ return (
+ <>
+ <div className="px-2 py-1">
+ <ShimmeringLoader className="py-2" />
+ </div>
+ <div className="px-2 py-1 w-4/5">
+ <ShimmeringLoader className="py-2" />
+ </div>
+ </>
+ )
+ }
+ if (isErrorProjects) {
+ return (
+ <div className="flex items-center gap-x-2 py-3 justify-center">
+ <p className="text-xs text-foreground-lighter">Failed to retrieve projects</p>
+ <Tooltip>
+ <TooltipTrigger>
+ <HelpCircleIcon size={14} />
+ </TooltipTrigger>
+ <TooltipContent side="bottom">Error: {projectsError?.message}</TooltipContent>
+ </Tooltip>
+ </div>
+ )
+ }
+ if (projects.length === 0) {
+ return (
+ <p className="text-xs text-center text-foreground-lighter py-3">
+ {search.length > 0 ? 'No projects found based on your search' : 'No projects found'}
+ </p>
+ )
+ }
+ return (
+ <ScrollArea className={projects.length > 7 ? 'h-full md:h-[210px]' : ''}>
+ {projects.map((project) => {
+ const isSelected = selectedRefs.includes(project.ref)
+ const isLocked = isSelected && disabledRefs.includes(project.ref)
+
+ const row = (
+ <CommandItem
+ key={project.ref}
+ value={`${project.name.replaceAll('"', '')}-${project.ref}`}
+ disabled={isLocked}
+ className={cn(
+ 'cursor-pointer w-full flex items-center gap-x-2',
+ isLocked && 'cursor-not-allowed opacity-50'
+ )}
+ onSelect={() => handleToggleProject(project)}
+ >
+ <Checkbox checked={isSelected} disabled={isLocked} className="pointer-events-none" />
+ <span className="truncate">{project.name}</span>
+ </CommandItem>
+ )
+
+ return isLocked ? (
+ <Tooltip key={project.ref}>
+ <TooltipTrigger asChild>
+ <div>{row}</div>
+ </TooltipTrigger>
+ <TooltipContent side="right">{disabledTooltip}</TooltipContent>
+ </Tooltip>
+ ) : (
+ row
+ )
+ })}
+ <div ref={sentinelRef} className="h-1 -mt-1" />
+ {hasNextPage && (
+ <div className="px-2 py-1">
+ <ShimmeringLoader className="py-2" />
+ </div>
+ )}
+ </ScrollArea>
+ )
+ }
+
+ useEffect(() => {
+ if (projects.length === 0) return
+ setSeenNamesByRef((prev) => {
+ let changed = false
+ const next = { ...prev }
+ for (const p of projects) {
+ if (next[p.ref] !== p.name) {
+ next[p.ref] = p.name
+ changed = true
+ }
+ }
+ return changed ? next : prev
+ })
+ }, [projects])
+
+ useEffect(() => {
+ if (
+ !isLoadingProjects &&
+ !isFetching &&
+ entry?.isIntersecting &&
+ hasNextPage &&
+ !isFetchingNextPage
+ ) {
+ fetchNextPage()
+ }
+ }, [
+ entry?.isIntersecting,
+ hasNextPage,
+ isFetching,
+ isFetchingNextPage,
+ isLoadingProjects,
+ fetchNextPage,
+ ])
+
+ const popoverBody = (
+ <>
+ <CommandInput
+ showResetIcon
+ value={search}
+ onValueChange={setSearch}
+ placeholder={searchPlaceholder}
+ handleReset={() => setSearch('')}
+ className="text-base sm:text-sm"
+ />
+ <CommandList className="max-h-none md:max-h-[300px] overflow-y-auto overflow-x-hidden">
+ <CommandGroup>{renderListContent()}</CommandGroup>
+ </CommandList>
+ </>
+ )
+
+ if (renderTrigger) {
+ return (
+ <div className="flex flex-col gap-2">
+ <Popover open={open} onOpenChange={setOpen} modal>
+ <PopoverTrigger asChild>{renderTrigger()}</PopoverTrigger>
+ <PopoverContent className="p-0" side="bottom" align="end">
+ <Command shouldFilter={false}>{popoverBody}</Command>
+ </PopoverContent>
+ </Popover>
+ {error && <p className="text-xs text-destructive">{error}</p>}
+ </div>
+ )
+ }
+
+ return (
+ <div className="flex w-full flex-col gap-2">
+ <MultiSelector
+ values={selectedRefs}
+ onValuesChange={handleValuesChange}
+ onOpenChange={setOpen}
+ shouldFilter={false}
+ disabled={disabled}
+ >
+ <MultiSelectorTrigger label={triggerLabel} badgeLimit={4} renderValue={getProjectName} />
+ <MultiSelectorContent>{popoverBody}</MultiSelectorContent>
+ </MultiSelector>
+ {error && <p className="text-xs text-destructive">{error}</p>}
+ </div>
+ )
+}
diff --git a/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx b/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx
index 3757891f86d..01bc398769a 100644
--- a/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx
+++ b/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.network.test.tsx
@@ -1,6 +1,7 @@
import { fireEvent, screen, waitFor, within } from '@testing-library/react'
import userEvent from '@testing-library/user-event'
import { platformComponents as components, operations } from 'api-types'
+import { mockIntersectionObserver } from 'jsdom-testing-mocks'
import { HttpResponse } from 'msw'
import { describe, expect, test, vi } from 'vitest'
@@ -15,10 +16,15 @@ type Member = components['schemas']['Member_Output']
type InvitationResponse = components['schemas']['InvitationResponse_Output']
type OrganizationRoleResponse = components['schemas']['OrganizationRoleResponse_Output']
type ListEntitlementsResponse = components['schemas']['ListEntitlementsResponse_Output']
+type OrganizationProjectsResponse = components['schemas']['OrganizationProjectsResponse_Output']
+type OrgProject = OrganizationProjectsResponse['projects'][number]
type CreateInvitationResponse =
operations['InvitationsController_createInvitation']['responses']['201']['content']['application/json']
type AccessControlPermission = components['schemas']['AccessControlPermission']
+// The project multi-select's infinite-scroll sentinel uses IntersectionObserver, which jsdom lacks
+mockIntersectionObserver()
+
const ORG_SLUG = 'test-org'
const ROLE_IDS = { owner: 1, administrator: 2, developer: 3, readOnly: 4 } as const
@@ -89,7 +95,35 @@ const buildPermission = (resource: string): AccessControlPermission => ({
restrictive: false,
})
-function setupMocks(members: Member[] = [buildMember({})]) {
+const PROJECTS: OrgProject[] = [
+ {
+ cloud_provider: 'AWS',
+ databases: [],
+ inserted_at: '2026-01-01T00:00:00.000Z',
+ integration_source: null,
+ is_branch: false,
+ ref: 'project-alpha',
+ name: 'Alpha',
+ region: 'us-east-1',
+ status: 'ACTIVE_HEALTHY',
+ },
+ {
+ cloud_provider: 'AWS',
+ databases: [],
+ inserted_at: '2026-01-01T00:00:00.000Z',
+ integration_source: null,
+ is_branch: false,
+ ref: 'project-beta',
+ name: 'Beta',
+ region: 'us-east-1',
+ status: 'ACTIVE_HEALTHY',
+ },
+]
+
+function setupMocks(
+ members: Member[] = [buildMember({})],
+ { projectScoped = false }: { projectScoped?: boolean } = {}
+) {
const invitePayloads: unknown[] = []
addAPIMock({
@@ -151,10 +185,35 @@ function setupMocks(members: Member[] = [buildMember({})]) {
),
})
+ // Empty entitlements => project-level permissions are off, so the panel
+ // renders the org-scoped role flow (no "all projects" toggle or selector). When
+ // projectScoped is true, both appear.
addAPIMock({
method: 'get',
path: '/platform/organizations/:slug/entitlements',
- response: () => HttpResponse.json<ListEntitlementsResponse>({ entitlements: [] }),
+ response: () =>
+ HttpResponse.json<ListEntitlementsResponse>({
+ entitlements: projectScoped
+ ? [
+ {
+ config: { enabled: true },
+ feature: { key: 'project_scoped_roles', type: 'boolean' },
+ hasAccess: true,
+ type: 'boolean',
+ },
+ ]
+ : [],
+ }),
+ })
+
+ addAPIMock({
+ method: 'get',
+ path: '/platform/organizations/:slug/projects',
+ response: () =>
+ HttpResponse.json<OrganizationProjectsResponse>({
+ pagination: { count: PROJECTS.length, limit: 96, offset: 0 },
+ projects: PROJECTS,
+ }),
})
addAPIMock({
@@ -260,4 +319,49 @@ describe('InviteMemberButton (network)', () => {
role_id: ROLE_IDS.developer,
})
})
+
+ describe('project-scoped access', () => {
+ test('requires at least one project when "Grant this role on all projects" is off', async () => {
+ const { invitePayloads } = setupMocks(undefined, { projectScoped: true })
+ customRender(<InviteMemberButton />, { profileContext: PROFILE_CONTEXT })
+ await openDialog()
+
+ const toggle = await screen.findByRole('switch')
+ expect(toggle).toBeChecked()
+ await userEvent.click(toggle)
+ expect(toggle).not.toBeChecked()
+
+ fireEvent.change(screen.getByPlaceholderText(/name@example\.com/i), {
+ target: { value: '[email protected]' },
+ })
+ fireEvent.click(screen.getByRole('button', { name: /send invitation/i }))
+
+ expect(await screen.findByText('Select at least one project')).toBeInTheDocument()
+ expect(invitePayloads).toHaveLength(0)
+ })
+
+ test('sends the selected projects as role_scoped_projects when multiple are chosen', async () => {
+ const { invitePayloads } = setupMocks(undefined, { projectScoped: true })
+ customRender(<InviteMemberButton />, { profileContext: PROFILE_CONTEXT })
+ await openDialog()
+
+ await userEvent.click(await screen.findByRole('switch'))
+
+ await userEvent.click(screen.getByRole('combobox'))
+ await userEvent.click(await screen.findByRole('option', { name: /Alpha/ }))
+ await userEvent.click(await screen.findByRole('option', { name: /Beta/ }))
+
+ fireEvent.change(screen.getByPlaceholderText(/name@example\.com/i), {
+ target: { value: '[email protected]' },
+ })
+ fireEvent.click(screen.getByRole('button', { name: /send invitation/i }))
+
+ await waitFor(() => expect(invitePayloads).toHaveLength(1))
+ expect(invitePayloads[0]).toEqual({
+ emails: ['[email protected]'],
+ role_id: ROLE_IDS.developer,
+ role_scoped_projects: ['project-alpha', 'project-beta'],
+ })
+ })
+ })
})
diff --git a/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.utils.test.ts b/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.utils.test.ts
index 3012b9a0209..9c8e4cff4bf 100644
--- a/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.utils.test.ts
+++ b/apps/studio/tests/components/Organization/TeamSettings/InviteMemberButton.utils.test.ts
@@ -154,22 +154,22 @@ describe('categorizeInviteEmails', () => {
describe('buildProjectPayload', () => {
test('returns empty object when applyToOrg is true', () => {
- expect(buildProjectPayload(true, 'ref_abc')).toStrictEqual({})
+ expect(buildProjectPayload(true, [])).toStrictEqual({})
})
- test('throws an error when applyToOrg is false but projectRef is empty', () => {
- expect(() => buildProjectPayload(false, '')).toThrowError(
- 'projectRef is required when applyToOrg is false'
+ test('throws an error when applyToOrg is false but no projects are selected', () => {
+ expect(() => buildProjectPayload(false, [])).toThrowError(
+ 'At least one project is required when applyToOrg is false'
)
})
- test('returns projects array when applyToOrg is false and projectRef is set', () => {
- expect(buildProjectPayload(false, 'ref_abc')).toStrictEqual({ projects: ['ref_abc'] })
+ test('returns a projects array when applyToOrg is false and one project is selected', () => {
+ expect(buildProjectPayload(false, ['ref_abc'])).toStrictEqual({ projects: ['ref_abc'] })
})
- test('wraps the projectRef in a single-element array', () => {
- expect(buildProjectPayload(false, 'my-project-ref')).toStrictEqual({
- projects: ['my-project-ref'],
+ test('returns all selected projects when applyToOrg is false and multiple are selected', () => {
+ expect(buildProjectPayload(false, ['ref_abc', 'ref_def', 'ref_ghi'])).toStrictEqual({
+ projects: ['ref_abc', 'ref_def', 'ref_ghi'],
})
})
})