The Postgres development platform. Supabase gives you a dedicated Postgres database to build your web, mobile, and AI applications.
TypeScript aialternativeauthdatabasedenoembeddingsexamplefirebasenextjsoauth2pgvectorpostgispostgrespostgresqlpostgrestrealtimesupabasevectorswebsockets
fix(studio): load all org projects in UpdateRolesPanel (#51780)
Ivan Vasilov7e3d8dfe358a
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/MemberRow.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/MemberRow.tsxindex 8bd7abefdf9..f66002e1150 100644--- a/apps/studio/components/interfaces/Organization/TeamSettings/MemberRow.tsx+++ b/apps/studio/components/interfaces/Organization/TeamSettings/MemberRow.tsx@@ -23,8 +23,9 @@ import { type RowComponentBaseProps } from '@/components/ui/InfiniteList'import { InlineLink } from '@/components/ui/InlineLink'import PartnerIcon from '@/components/ui/PartnerIcon'import { ProfileImage } from '@/components/ui/ProfileImage'-import { OrganizationRole } from '@/data/organization-members/organization-roles-query'-import { OrganizationMember } from '@/data/organizations/organization-members-query'+import { type OrganizationRole } from '@/data/organization-members/organization-roles-query'+import { type OrganizationMember } from '@/data/organizations/organization-members-query'+import { pluralize } from '@/lib/helpers'import { useProfile } from '@/lib/profile'const MEMBER_ORIGIN_TO_MANAGED_BY = {@@ -38,7 +39,7 @@ export const MemberRow = memo(function MemberRow({}: RowComponentBaseProps<OrganizationMember>) {const { slug } = useParams()const { profile } = useProfile()- const { roles, isLoadingRoles, orgProjects } = useTeamSettingsData()+ const { roles, isLoadingRoles, totalNumOrgProjects } = useTeamSettingsData()const hasProjectScopedRoles = (roles?.project_scoped_roles ?? []).length > 0@@ -54,25 +55,16 @@ export const MemberRow = memo(function MemberRow({return map}, [roles])- const projectNameByRef = useMemo(- () => new Map(orgProjects.map((p) => [p.ref, p.name])),- [orgProjects]- )-const roleRows = useMemo(() => {return member.role_ids.map((id) => {const role = roleById.get(id)const roleName = (role?.name ?? '').split('_')[0]const appliesToAllProjects = role?.projects.length === 0- const projectsApplied = appliesToAllProjects- ? orgProjects.map((p) => ({ ref: p.ref, name: p.name }))- : (role?.projects ?? [])- .map(({ ref }) => ({ ref, name: projectNameByRef.get(ref) ?? '' }))- .filter(({ name }) => name.length > 0)+ const projectsApplied = role?.projects ?? []return { id, roleName, appliesToAllProjects, projectsApplied }})- }, [member.role_ids, roleById, orgProjects, projectNameByRef])+ }, [member.role_ids, roleById])return (<div@@ -177,31 +169,45 @@ export const MemberRow = memo(function MemberRow({<span className="text-foreground-light truncate">{appliesToAllProjects? 'Organization'- : `${projectsApplied.length} project${projectsApplied.length > 1 ? 's' : ''}`}+ : `${projectsApplied.length} ${pluralize(projectsApplied.length, 'project')}`}</span></HoverCardTrigger><HoverCardContent className="p-0">- <p className="p-2 text-xs">- {roleName} role applies to {projectsApplied.length} project- {projectsApplied.length > 1 ? 's' : ''}- </p>- <div className="border-t flex flex-col py-1">- <ScrollArea className={cn(projectsApplied.length > 5 ? 'h-[130px]' : '')}>- {projectsApplied.map(({ ref, name }) => (- <Link- key={ref}- href={`/project/${ref}`}- className="px-2 py-1 group hover:bg-surface-300 hover:text-foreground transition flex items-center justify-between"- >- <span className="text-xs truncate max-w-[60%]">{name}</span>- <span className="text-xs text-foreground flex items-center gap-x-1 opacity-0 group-hover:opacity-100 transition">- Go to project- <ArrowRightIcon size={14} />- </span>- </Link>- ))}- </ScrollArea>- </div>+ {+ // If the role is org scoped, don't list all projects+ appliesToAllProjects ? (+ <p className="p-2 text-xs">+ {roleName} role applies to {totalNumOrgProjects}{' '}+ {pluralize(totalNumOrgProjects, 'project')}+ </p>+ ) : (+ <>+ <p className="p-2 text-xs">+ {roleName} role applies to {projectsApplied.length}{' '}+ {pluralize(projectsApplied.length, 'project')}+ </p>+ <div className="border-t flex flex-col py-1">+ <ScrollArea+ className={cn(projectsApplied.length > 5 ? 'h-[130px]' : '')}+ >+ {projectsApplied.map(({ ref, name }) => (+ <Link+ key={ref}+ href={`/project/${ref}`}+ className="px-2 py-1 group hover:bg-surface-300 hover:text-foreground transition flex items-center justify-between"+ >+ <span className="text-xs truncate max-w-[60%]">{name}</span>+ <span className="text-xs text-foreground flex items-center gap-x-1 opacity-0 group-hover:opacity-100 transition">+ Go to project+ <ArrowRightIcon size={14} />+ </span>+ </Link>+ ))}+ </ScrollArea>+ </div>+ </>+ )+ }</HoverCardContent></HoverCard>)}diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsxindex 3f101e262b1..3911e3fc333 100644--- a/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx+++ b/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx@@ -23,7 +23,6 @@ import {type OrganizationMember,} from '@/data/organizations/organization-members-query'import { usePermissionsQuery } from '@/data/permissions/permissions-query'-import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'import { useIsFeatureEnabled } from '@/hooks/misc/useIsFeatureEnabled'import { useSelectedOrganizationQuery } from '@/hooks/misc/useSelectedOrganization'import { useProfile } from '@/lib/profile'@@ -38,9 +37,15 @@ export interface MembersViewProps {searchString: stringmfaFilter: MfaFilterroleNames: string[]+ totalNumOrgProjects: number}-export const MembersView = ({ searchString, mfaFilter, roleNames }: MembersViewProps) => {+export const MembersView = ({+ searchString,+ mfaFilter,+ roleNames,+ totalNumOrgProjects,+}: MembersViewProps) => {const { slug } = useParams()const { profile } = useProfile()@@ -68,12 +73,6 @@ export const MembersView = ({ searchString, mfaFilter, roleNames }: MembersViewPslug,})- const { data: projectsData } = useOrgProjectsInfiniteQuery({ slug })- const orgProjects = useMemo(- () => projectsData?.pages.flatMap((page) => page.projects) ?? [],- [projectsData?.pages]- )-const filteredMembers = useMemo(() => {const searchedMembers = !searchString? members@@ -146,8 +145,8 @@ export const MembersView = ({ searchString, mfaFilter, roleNames }: MembersViewPmembers={members}roles={roles}isLoadingRoles={isLoadingRoles}- orgProjects={orgProjects}permissions={permissions}+ totalNumOrgProjects={totalNumOrgProjects}selectedOrganization={selectedOrganization}organizationMembersDeletionEnabled={organizationMembersDeletionEnabled}onManageAccess={handleManageAccess}diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsxindex ed778982522..6d7e3d8ad51 100644--- a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx+++ b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx@@ -53,9 +53,7 @@ export const TeamSettings = () => {const { data: roles } = useOrganizationRolesV2Query({ slug })const hasProjectScopedRoles = (roles?.project_scoped_roles ?? []).length > 0- const organizationRoles = (roles?.org_scoped_roles ?? []).filter(- (role) => role.name.toLowerCase() !== 'no-access'- )+ const organizationRoles = roles?.org_scoped_roles ?? []const { data } = useOrgProjectsInfiniteQuery({ slug })const totalCount = data?.pages[0].pagination.count ?? 0@@ -136,6 +134,7 @@ export const TeamSettings = () => {searchString={searchString.length === 0 ? searchString : debouncedSearch}mfaFilter={mfaFilter}roleNames={rolesFilter}+ totalNumOrgProjects={totalCount}/></ScaffoldSectionContent></ScaffoldFilterAndContent>diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettingsDataContext.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettingsDataContext.tsxindex a24be7089f1..fec6685d059 100644--- a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettingsDataContext.tsx+++ b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettingsDataContext.tsx@@ -4,15 +4,14 @@ import { createContext, useContext, useMemo } from 'react'import type { OrganizationRolesResponse } from '@/data/organization-members/organization-roles-query'import type { OrganizationMember } from '@/data/organizations/organization-members-query'import type { OrganizationBase } from '@/data/organizations/organizations-query'-import type { OrgProject } from '@/data/projects/org-projects-infinite-query'import type { Permission } from '@/types'type TeamSettingsDataContextValue = {members: OrganizationMember[]roles: OrganizationRolesResponse | undefinedisLoadingRoles: boolean- orgProjects: OrgProject[]permissions: Permission[] | undefined+ totalNumOrgProjects: numberselectedOrganization: OrganizationBase | undefinedorganizationMembersDeletionEnabled: booleanonManageAccess: (member: OrganizationMember) => void@@ -33,8 +32,8 @@ export const TeamSettingsDataProvider = ({members,roles,isLoadingRoles,- orgProjects,permissions,+ totalNumOrgProjects,selectedOrganization,organizationMembersDeletionEnabled,onManageAccess,@@ -44,8 +43,8 @@ export const TeamSettingsDataProvider = ({members,roles,isLoadingRoles,- orgProjects,permissions,+ totalNumOrgProjects,selectedOrganization,organizationMembersDeletionEnabled,onManageAccess,@@ -54,8 +53,8 @@ export const TeamSettingsDataProvider = ({members,roles,isLoadingRoles,- orgProjects,permissions,+ totalNumOrgProjects,selectedOrganization,organizationMembersDeletionEnabled,onManageAccess,diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsxindex 23f0847858e..2cd0f5dee9b 100644--- a/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx+++ b/apps/studio/components/interfaces/Organization/TeamSettings/UpdateRolesPanel/UpdateRolesPanel.tsx@@ -1,16 +1,13 @@import { useParams } from 'common'import { isEqual } from 'lodash'-import { ChevronDownIcon, XIcon } from 'lucide-react'-import { useEffect, useMemo, useState } from 'react'+import { XIcon } from 'lucide-react'+import { useEffect, useState } from 'react'import {Alert,AlertDescription,AlertTitle,Button,cn,- Collapsible,- CollapsibleContent,- CollapsibleTrigger,Select,SelectContent,SelectGroup,@@ -27,6 +24,7 @@ import {TooltipTrigger,WarningIcon,} from 'ui'+import { Admonition } from 'ui-patterns/Admonition'import { ROLE_DESCRIPTIONS } from '../Roles.constants'import { useGetRolesManagementPermissions } from '../TeamSettings.utils'@@ -66,8 +64,6 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelPconst { data: projectsData } = useOrgProjectsInfiniteQuery({ slug })const totalNumOrgProjects = projectsData?.pages[0].pagination.count ?? 0- const orgProjects =- useMemo(() => projectsData?.pages.flatMap((page) => page.projects), [projectsData?.pages]) || []// [Joshen] We use the org scoped roles as the source for available rolesconst orgScopedRoles = allRoles?.org_scoped_roles ?? []@@ -100,9 +96,7 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelPconst canSaveRoles = projectsRoleConfiguration.length > 0const lowerPermissionsRole = orgScopedRoles.find((r) => r.name === 'Developer')?.id- const noAccessProjects = orgProjects.filter((project) => {- return !projectsRoleConfiguration.some((p) => p.ref === project.ref)- })+const numberOfProjectsWithAccess = projectsRoleConfiguration.filter((p) => p.ref !== undefined).length@@ -153,11 +147,7 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelPif (originalConfigurationType === 'project-scope') {setProjectsRoleConfiguration(originalConfiguration)} else {- setProjectsRoleConfiguration(- orgProjects.map((p) => {- return { ref: p.ref, name: p.name, roleId: roleIdToApply }- })- )+ setProjectsRoleConfiguration([])}}}@@ -186,9 +176,9 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP<DocsButton href={`${DOCS_URL}/guides/platform/access-control`} /></SheetHeader>- <SheetSection className="h-full overflow-auto flex flex-col">+ <SheetSection className="h-full overflow-auto flex flex-col gap-y-4">{isOptedIntoProjectLevelPermissions && (- <div className="flex items-center gap-x-4 border-b border-border pb-4">+ <div className="flex items-center gap-x-4"><Switchdisabled={cannotAddAnyRoles}checked={isApplyingRoleToAllProjects}@@ -211,31 +201,13 @@ export const UpdateRolesPanel = ({ visible, member, onClose }: UpdateRolesPanelP{!isApplyingRoleToAllProjects &&projectsRoleConfiguration.length > 0 &&projectsRoleConfiguration.length < totalNumOrgProjects && (- <Collapsible className="bg-alternative border rounded-lg py-4 group">- <CollapsibleTrigger className="w-full text-left px-4 flex items-center justify-between">- <span className="text-sm">- {hasNoChanges- ? `This member only has access to ${numberOfProjectsWithAccess} project${numberOfProjectsWithAccess > 1 ? 's' : ''}`- : `This member will only have access to ${numberOfProjectsWithAccess} project${numberOfProjectsWithAccess > 1 ? 's' : ''}`}- </span>- <ChevronDownIcon- size={14}- className="transition group-data-open:-rotate-180"- />- </CollapsibleTrigger>- <CollapsibleContent className="text-foreground-light text-sm px-4">- <p>- {member.username} {hasNoChanges ? 'does' : 'will'} not have access to the- following {noAccessProjects.length} project- {noAccessProjects.length > 1 ? 's' : ''}:- </p>- <ul className="list-disc pl-6">- {noAccessProjects.map((project) => {- return <li key={project.ref}>{project.name}</li>- })}- </ul>- </CollapsibleContent>- </Collapsible>+ <Admonition>+ <span className="text-sm">+ {hasNoChanges+ ? `This member only has access to ${numberOfProjectsWithAccess} project${numberOfProjectsWithAccess > 1 ? 's' : ''} out of ${totalNumOrgProjects} total project${totalNumOrgProjects > 1 ? 's' : ''}.`+ : `This member will only have access to ${numberOfProjectsWithAccess} project${numberOfProjectsWithAccess > 1 ? 's' : ''} out of ${totalNumOrgProjects} total project${totalNumOrgProjects > 1 ? 's' : ''}.`}+ </span>+ </Admonition>)}<div className="flex flex-col divide-y divide-border">