Skip to content

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

(feat) Allow to filter organization users by role (#51653)

Gildas Garciac829b26bd529
diff --git a/apps/studio/components/interfaces/Account/AuditLogs.tsx b/apps/studio/components/interfaces/Account/AuditLogs.tsx
index 072a1a0097c..6240f80e3b1 100644
--- a/apps/studio/components/interfaces/Account/AuditLogs.tsx
+++ b/apps/studio/components/interfaces/Account/AuditLogs.tsx
@@ -159,6 +159,7 @@ export const AuditLogs = () => {
isFetching={isFetchingProjects}
isFetchingNextPage={isFetchingNextPage}
fetchNextPage={fetchNextPage}
+ searchPlaceholder="Search for a project..."
/>
<LogsDatePicker
hideWarnings
diff --git a/apps/studio/components/interfaces/HomePageActions.tsx b/apps/studio/components/interfaces/HomePageActions.tsx
index deda0a3d29e..f7623a25c6a 100644
--- a/apps/studio/components/interfaces/HomePageActions.tsx
+++ b/apps/studio/components/interfaces/HomePageActions.tsx
@@ -108,10 +108,12 @@ export const HomePageActions = ({ slug: _slug, hideNewProject = false }: HomePag
<FilterPopover
name="Status"
title="Filter projects by status"
- options={[
- { key: PROJECT_STATUS.ACTIVE_HEALTHY, label: 'Active' },
- { key: PROJECT_STATUS.INACTIVE, label: 'Paused' },
- ]}
+ options={
+ [
+ { key: PROJECT_STATUS.ACTIVE_HEALTHY, label: 'Active' },
+ { key: PROJECT_STATUS.INACTIVE, label: 'Paused' },
+ ] as { key: string; label: string }[]
+ }
activeOptions={filterStatus}
valueKey="key"
labelKey="label"
diff --git a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
index adb3ffdcfcd..08c4a1d4b03 100644
--- a/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
+++ b/apps/studio/components/interfaces/Organization/AuditLogs/AuditLogs.tsx
@@ -246,6 +246,7 @@ export const AuditLogs = () => {
isFetching={isFetchingProjects}
isFetchingNextPage={isFetchingNextPage}
fetchNextPage={fetchNextPage}
+ searchPlaceholder="Search for a project..."
/>
<LogsDatePicker
hideWarnings
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx
index 326229be13d..3f101e262b1 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/MembersView.tsx
@@ -8,7 +8,7 @@ import { GenericSkeletonLoader } from 'ui-patterns/ShimmeringLoader'
import { MemberRow } from './MemberRow'
import { MEMBERS_GRID_CLASS, type MfaFilter } from './MembersList.constants'
-import { getMemberRowHeight, matchesMfaFilter } from './TeamSettings.utils'
+import { getMemberRowHeight, matchesMfaFilter, matchesOrgRole } from './TeamSettings.utils'
import { TeamSettingsDataProvider } from './TeamSettingsDataContext'
import { UpdateRolesPanel } from './UpdateRolesPanel/UpdateRolesPanel'
import { AlertError } from '@/components/ui/AlertError'
@@ -37,9 +37,10 @@ const getMemberKey = (member: OrganizationMember) =>
export interface MembersViewProps {
searchString: string
mfaFilter: MfaFilter
+ roleNames: string[]
}
-export const MembersView = ({ searchString, mfaFilter }: MembersViewProps) => {
+export const MembersView = ({ searchString, mfaFilter, roleNames }: MembersViewProps) => {
const { slug } = useParams()
const { profile } = useProfile()
@@ -88,8 +89,14 @@ export const MembersView = ({ searchString, mfaFilter }: MembersViewProps) => {
return false
})
- return searchedMembers.filter((member) => matchesMfaFilter(member, mfaFilter))
- }, [members, searchString, mfaFilter])
+ const roleIds = (roles?.org_scoped_roles ?? [])
+ .filter((role) => roleNames.includes(role.name))
+ .map((role) => role.id)
+
+ return searchedMembers.filter(
+ (member) => matchesMfaFilter(member, mfaFilter) && matchesOrgRole(member, roleIds)
+ )
+ }, [members, searchString, mfaFilter, roleNames, roles?.org_scoped_roles])
const handleManageAccess = useCallback((member: OrganizationMember) => {
setMemberForRoleUpdate(member)
@@ -131,7 +138,7 @@ export const MembersView = ({ searchString, mfaFilter }: MembersViewProps) => {
[listedMembers]
)
- const isFiltering = searchString.length > 0 || mfaFilter !== 'all'
+ const isFiltering = searchString.length > 0 || mfaFilter !== 'all' || roleNames.length > 0
const hasLimitedVisibility = isSuccessRoles && isSuccessMembers && !isOrgScopedRole
return (
@@ -206,12 +213,12 @@ export const MembersView = ({ searchString, mfaFilter }: MembersViewProps) => {
<p className="text-foreground-lighter text-sm">
{searchString.length > 0
? `No members matched the search query "${searchString}"`
- : 'No members match the selected MFA filter'}
+ : 'No members match the selected filters'}
</p>
</div>
)}
- <div className="px-4 py-3 text-sm text-foreground-muted border-t">
+ <div aria-live="polite" className="px-4 py-3 text-sm text-foreground-muted border-t">
{isFiltering
? `${filteredMembers.length} of ${members.length} ${members.length === 1 ? 'member' : 'members'}`
: `${members.length || 0} ${members.length === 1 ? 'member' : 'members'}`}
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx
index c1ad236ec1a..ed778982522 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.tsx
@@ -1,8 +1,7 @@
import { useDebounce } from '@uidotdev/usehooks'
import { useParams } from 'common'
import { SearchIcon } from 'lucide-react'
-import { parseAsStringEnum, useQueryState } from 'nuqs'
-import { useState } from 'react'
+import { parseAsArrayOf, parseAsString, parseAsStringEnum, useQueryState } from 'nuqs'
import { cn, Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from 'ui'
import { Admonition } from 'ui-patterns/Admonition'
import { Input } from 'ui-patterns/DataInputs/Input'
@@ -26,19 +25,24 @@ import {
ScaffoldSectionContent,
} from '@/components/layouts/Scaffold'
import { DocsButton } from '@/components/ui/DocsButton'
+import { FilterPopover } from '@/components/ui/FilterPopover'
import { useOrganizationRolesV2Query } from '@/data/organization-members/organization-roles-query'
import { useOrgProjectsInfiniteQuery } from '@/data/projects/org-projects-infinite-query'
import { DOCS_URL } from '@/lib/constants'
export const TeamSettings = () => {
const { slug } = useParams()
- const [searchString, setSearchString] = useState('')
+ const [searchString, setSearchString] = useQueryState('search', parseAsString.withDefault(''))
const [mfaFilter, setMfaFilter] = useQueryState(
'mfa',
parseAsStringEnum<MfaFilter>(MFA_FILTER_OPTIONS.map((option) => option.value)).withDefault(
'all'
)
)
+ const [rolesFilter, setRoleNamesFilter] = useQueryState(
+ 'roles',
+ parseAsArrayOf(parseAsString).withDefault([])
+ )
const mfaFilterLabel =
mfaFilter === 'all'
@@ -49,6 +53,9 @@ 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 { data } = useOrgProjectsInfiniteQuery({ slug })
const totalCount = data?.pages[0].pagination.count ?? 0
@@ -101,6 +108,14 @@ export const TeamSettings = () => {
</SelectGroup>
</SelectContent>
</Select>
+ <FilterPopover
+ name="Roles"
+ options={organizationRoles}
+ labelKey="name"
+ valueKey="name"
+ activeOptions={rolesFilter}
+ onSaveFilters={(values) => setRoleNamesFilter(values)}
+ />
</div>
<ScaffoldActionsGroup className="w-full md:w-auto">
<DocsButton href={`${DOCS_URL}/guides/platform/access-control`} />
@@ -120,6 +135,7 @@ export const TeamSettings = () => {
<MembersView
searchString={searchString.length === 0 ? searchString : debouncedSearch}
mfaFilter={mfaFilter}
+ roleNames={rolesFilter}
/>
</ScaffoldSectionContent>
</ScaffoldFilterAndContent>
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.test.ts b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.test.ts
index 549068365cd..bdcb02cd26e 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.test.ts
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.test.ts
@@ -1,6 +1,6 @@
import { describe, expect, it } from 'vitest'
-import { getMemberRowHeight, matchesMfaFilter } from './TeamSettings.utils'
+import { getMemberRowHeight, matchesMfaFilter, matchesOrgRole } from './TeamSettings.utils'
describe('getMemberRowHeight', () => {
it('uses the minimum height for members with one role', () => {
@@ -45,3 +45,31 @@ describe('matchesMfaFilter', () => {
expect(matchesMfaFilter(invite, 'disabled')).toBe(false)
})
})
+
+describe('matchesOrgRole', () => {
+ const noRole = { role_ids: [] }
+ const singleRole = { role_ids: [2] }
+ const anotherSingleRole = { role_ids: [3] }
+ const multipleRoles = { role_ids: [1, 2, 3] }
+
+ it('keeps everyone when roles filter is empty', () => {
+ expect(matchesOrgRole(noRole, [])).toBe(true)
+ expect(matchesOrgRole(singleRole, [])).toBe(true)
+ expect(matchesOrgRole(anotherSingleRole, [])).toBe(true)
+ expect(matchesOrgRole(multipleRoles, [])).toBe(true)
+ })
+
+ it('keeps only members who have the provided role', () => {
+ expect(matchesOrgRole(noRole, [2])).toBe(false)
+ expect(matchesOrgRole(singleRole, [2])).toBe(true)
+ expect(matchesOrgRole(anotherSingleRole, [2])).toBe(false)
+ expect(matchesOrgRole(multipleRoles, [2])).toBe(true)
+ })
+
+ it('keeps only members who have any of the provided roles', () => {
+ expect(matchesOrgRole(noRole, [2, 3])).toBe(false)
+ expect(matchesOrgRole(singleRole, [2, 3])).toBe(true)
+ expect(matchesOrgRole(anotherSingleRole, [2, 3])).toBe(true)
+ expect(matchesOrgRole(multipleRoles, [2, 3])).toBe(true)
+ })
+})
diff --git a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.ts b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.ts
index 621c39ac655..085aa0076b3 100644
--- a/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.ts
+++ b/apps/studio/components/interfaces/Organization/TeamSettings/TeamSettings.utils.ts
@@ -67,3 +67,8 @@ export const matchesMfaFilter = (
if (member.invited_id) return false
return filter === 'enabled' ? member.mfa_enabled : !member.mfa_enabled
}
+
+export const matchesOrgRole = (member: Pick<OrganizationMember, 'role_ids'>, roles: number[]) => {
+ if (roles.length === 0) return true
+ return member.role_ids.some((r) => roles.includes(r))
+}
diff --git a/apps/studio/components/ui/FilterPopover.tsx b/apps/studio/components/ui/FilterPopover.tsx
index 2f659a950af..532d2c02729 100644
--- a/apps/studio/components/ui/FilterPopover.tsx
+++ b/apps/studio/components/ui/FilterPopover.tsx
@@ -15,11 +15,11 @@ import {
import { Input } from 'ui-patterns/DataInputs/Input'
import { ShimmeringLoader } from 'ui-patterns/ShimmeringLoader'
-interface FilterPopoverProps<T> {
+interface FilterPopoverProps<T, ValueType extends keyof T = keyof T> {
title?: string
options: T[]
- activeOptions: string[]
- valueKey: keyof T
+ activeOptions: Array<T[ValueType]>
+ valueKey: ValueType
labelKey: keyof T
iconKey?: string
name: string
@@ -32,11 +32,12 @@ interface FilterPopoverProps<T> {
className?: string
isMinimized?: boolean
showOnlyButton?: boolean
- onSaveFilters: (options: string[]) => void
+ onSaveFilters: (options: Array<T[ValueType]>) => void
// [Joshen] These props are to support async data with infinite loading if applicable
search?: string
setSearch?: (value: string) => void
+ searchPlaceholder?: string
hasNextPage?: boolean
isLoading?: boolean
isFetching?: boolean
@@ -54,7 +55,7 @@ interface FilterPopoverProps<T> {
// [Joshen] Known issue currently that FilterPopover trigger label will not show selected options properly
// for async data with infinite loading. Thinking this requires quite a bit of change that I'd rather do in
// a separate PR
-export const FilterPopover = <T extends Record<string, any>>({
+export const FilterPopover = <T extends Record<string, any>, ValueType extends keyof T = keyof T>({
title,
options = [],
activeOptions = [],
@@ -75,6 +76,7 @@ export const FilterPopover = <T extends Record<string, any>>({
search,
setSearch = noop,
+ searchPlaceholder = 'Search for an option...',
hasNextPage = false,
isLoading = false,
isFetching = false,
@@ -82,9 +84,9 @@ export const FilterPopover = <T extends Record<string, any>>({
fetchNextPage = noop,
groups,
renderLabel,
-}: FilterPopoverProps<T>) => {
+}: FilterPopoverProps<T, ValueType>) => {
const [open, setOpen] = useState(false)
- const [selectedOptions, setSelectedOptions] = useState<string[]>([])
+ const [selectedOptions, setSelectedOptions] = useState<Array<T[ValueType]>>([])
// Helper function to render an option
const renderOption = (option: T) => {
@@ -164,7 +166,6 @@ export const FilterPopover = <T extends Record<string, any>>({
!isFetching &&
!isFetchingNextPage
) {
- console.log('Fetch next page')
fetchNextPage()
}
}, [
@@ -223,7 +224,7 @@ export const FilterPopover = <T extends Record<string, any>>({
if (!!setSearch) setSearch(e.target.value)
}}
className="rounded-none border-x-0 border-t-0 bg-surface-100 px-3"
- placeholder="Search for a project..."
+ placeholder={searchPlaceholder}
actions={
(search ?? '').length > 0 ? (
<XIcon size={14} className="cursor-pointer mr-1" onClick={() => setSearch('')} />
@@ -283,7 +284,7 @@ export const FilterPopover = <T extends Record<string, any>>({
variant="primary"
onClick={() => {
// Order the selection based on the options provided
- const sortingOrder = options.map((option) => option[valueKey]) as string[]
+ const sortingOrder = options.map((option) => option[valueKey])
const sortedSelection = selectedOptions.sort(
(a, b) => sortingOrder.indexOf(a) - sortingOrder.indexOf(b)
)
diff --git a/apps/studio/data/organization-members/organization-roles-query.ts b/apps/studio/data/organization-members/organization-roles-query.ts
index 669d1a8de5f..fa41fe7ccf9 100644
--- a/apps/studio/data/organization-members/organization-roles-query.ts
+++ b/apps/studio/data/organization-members/organization-roles-query.ts
@@ -61,6 +61,6 @@ const OVERRIDE_ROLE_NAMES: Record<string, string> = {
None: 'No-access',
}
-export function getOverrideRoleName(rolename: string) {
+function getOverrideRoleName(rolename: string) {
return OVERRIDE_ROLE_NAMES[rolename] ?? rolename
}