mirror of
https://github.com/supabase/supabase.git
synced 2026-09-22 13:37:53 +08:00
82d7d347c4
## Summary * Fixes extreme slowness (browser-crashing on filter) on `/org/[slug]/team` for orgs with 200+ members. * Root cause: `MemberRow`/`MemberActions` each independently subscribed to org-wide React Query data (roles, projects, permissions, feature flags) and rendered a hidden `UpdateRolesPanel` per row. Filtering caused hundreds of duplicate query observers to mount/unmount on every keystroke, each scheduling its own stale-timeout bookkeeping and blocking the main thread for multiple seconds. * Hoisted all org-wide data fetching (`useOrganizationRolesV2Query`, `useOrgProjectsInfiniteQuery`, `usePermissionsQuery`, `useSelectedOrganizationQuery`, `useIsFeatureEnabled`) to `MembersView` and passed the results down as props. * Replaced the per-row `useAsyncCheckPermissions` hook calls in `MemberActions` with the underlying pure `doPermissionsCheck` function memoized locally, removing their internal query subscriptions. * Simplified `useGetRolesManagementPermissions` to stop calling a query-fetching fallback hook that was unreachable given all current call sites already pass `permissions`/`orgSlug` directly. * Replaced 200 hidden per-row `UpdateRolesPanel` instances with a single shared instance owned by `MembersView`, opened via an `onManageAccess` callback. * Cached the regex built by `doPermissionsCheck`'s `toRegexpString` instead of rebuilding it on every permission check. Diagnosed from two Chrome performance traces of the team page while typing in the filter box (multi-second main-thread blocking tasks traced to React Query `QueryObserver` mount/unmount storms). ## Test plan - [X] `tsc --noEmit` clean (only one pre-existing, unrelated error in `packages/ui-patterns`) - [X] `eslint` clean on all changed files (only pre-existing warnings) - [X] `vitest run tests/components/Organization/TeamSettings` — 51 tests pass - [X] Manually verify filtering is smooth on an org with 200+ members <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **New Features** * Team Settings provides centralized member access and role management. * Members can update roles through the access-management panel. * **Improvements** * Permission checks now more accurately handle organization and project scopes, including wildcard patterns. * Member search is debounced for smoother filtering while typing. * Access-management actions use current organization members, roles, permissions, and feature settings. <!-- end of auto-generated comment: release notes by coderabbit.ai --> --------- Co-authored-by: Joshen Lim <joshenlimek@gmail.com>
100 lines
3.6 KiB
TypeScript
100 lines
3.6 KiB
TypeScript
import { describe, expect, it } from 'vitest'
|
|
|
|
import { doPermissionsCheck } from './useCheckPermissions'
|
|
import type { Permission } from '@/types'
|
|
|
|
function permission(overrides: Partial<Permission>): Permission {
|
|
return {
|
|
actions: ['read'] as any,
|
|
condition: null as unknown as Permission['condition'],
|
|
organization_slug: 'org-slug',
|
|
resources: ['tables'],
|
|
restrictive: false,
|
|
project_refs: null,
|
|
...overrides,
|
|
}
|
|
}
|
|
|
|
describe('doPermissionsCheck', () => {
|
|
it('returns false when permissions are missing', () => {
|
|
expect(doPermissionsCheck(undefined, 'read', 'tables', undefined, 'org-slug')).toBe(false)
|
|
})
|
|
|
|
it('matches a literal action and resource', () => {
|
|
const permissions = [permission({ actions: ['read'] as any, resources: ['tables'] })]
|
|
expect(doPermissionsCheck(permissions, 'read', 'tables', undefined, 'org-slug')).toBe(true)
|
|
expect(doPermissionsCheck(permissions, 'read', 'columns', undefined, 'org-slug')).toBe(false)
|
|
})
|
|
|
|
it('treats every "." in a resource as literal, not "any character"', () => {
|
|
// Regression for the incomplete-escaping bug: only the first "." used to get escaped,
|
|
// so a resource with two dots would let any single character stand in for the second one.
|
|
const permissions = [permission({ resources: ['queue_job.projects.update_jwt'] })]
|
|
expect(
|
|
doPermissionsCheck(
|
|
permissions,
|
|
'read',
|
|
'queue_job.projects.update_jwt',
|
|
undefined,
|
|
'org-slug'
|
|
)
|
|
).toBe(true)
|
|
expect(
|
|
doPermissionsCheck(
|
|
permissions,
|
|
'read',
|
|
'queue_jobXprojectsXupdate_jwt',
|
|
undefined,
|
|
'org-slug'
|
|
)
|
|
).toBe(false)
|
|
})
|
|
|
|
it('expands every "%" wildcard in a resource, not just the first one', () => {
|
|
const permissions = [permission({ resources: ['queue_job.%.%'] })]
|
|
expect(
|
|
doPermissionsCheck(permissions, 'read', 'queue_job.restore.prepare', undefined, 'org-slug')
|
|
).toBe(true)
|
|
expect(
|
|
doPermissionsCheck(
|
|
permissions,
|
|
'read',
|
|
'queue_job.walg.prepare_restore',
|
|
undefined,
|
|
'org-slug'
|
|
)
|
|
).toBe(true)
|
|
})
|
|
|
|
it('treats a literal backslash in a resource as a literal character, not a regex escape', () => {
|
|
const permissions = [permission({ resources: ['a\\d'] })]
|
|
// If the backslash weren't escaped, "\d" would be interpreted as the regex digit class
|
|
// and incorrectly match "a1".
|
|
expect(doPermissionsCheck(permissions, 'read', 'a1', undefined, 'org-slug')).toBe(false)
|
|
expect(doPermissionsCheck(permissions, 'read', 'a\\d', undefined, 'org-slug')).toBe(true)
|
|
})
|
|
|
|
it('denies when a restrictive permission matches, even if a non-restrictive one also matches', () => {
|
|
const permissions = [
|
|
permission({ restrictive: false, resources: ['tables'] }),
|
|
permission({ restrictive: true, resources: ['tables'] }),
|
|
]
|
|
expect(doPermissionsCheck(permissions, 'read', 'tables', undefined, 'org-slug')).toBe(false)
|
|
})
|
|
|
|
it('only matches permissions for the given organization', () => {
|
|
const permissions = [permission({ organization_slug: 'other-org' })]
|
|
expect(doPermissionsCheck(permissions, 'read', 'tables', undefined, 'org-slug')).toBe(false)
|
|
})
|
|
|
|
it('prefers a project-scoped permission over an org-level one when a projectRef is given', () => {
|
|
const permissions = [
|
|
permission({ resources: ['tables'], project_refs: [] }),
|
|
permission({ resources: ['tables'], project_refs: ['project-ref'], restrictive: true }),
|
|
]
|
|
expect(
|
|
doPermissionsCheck(permissions, 'read', 'tables', undefined, 'org-slug', 'project-ref')
|
|
).toBe(false)
|
|
})
|
|
})
|