fix(app): unreadable permissions show a retry, never the form (V1-2.5 L1)
Owner checkpoint 2026-11-02: creation page checks loading, server refusal, failed read, then the editor rule; Administration home shows the same notice. reloadAccess re-reads roles and grants without wiping held state; refreshAccount (no caller) removed. Zone panel live region always mounted. Unit and e2e for reviewer-only and editor.
This commit is contained in:
1 parent
14ff890761
commit
4111efa1d1
15 files changed
+856
-56
No files matched your search
@@ -408,6 +408,43 @@ for (const [locale, dict] of LANGUAGES) {
|
||||
).toBe('1')
|
||||
})
|
||||
|
||||
test('creation page: unreadable permissions show a retry, never the form', async ({
|
||||
page,
|
||||
requests,
|
||||
}, info) => {
|
||||
test.skip(
|
||||
isPhone(info),
|
||||
'desktop journey (the admin screens at 375 px are covered below)',
|
||||
)
|
||||
const { account, secret } = await staff(locale, 'admin', ['sheet_editor'])
|
||||
requests.forbid(account.email, account.password, account.displayName)
|
||||
await openAdmin(page, dict, info, account, secret)
|
||||
await page.goto('/app/admin/sheets/new')
|
||||
await expect(heading(page, dict['admin.sheets.new'])).toBeVisible()
|
||||
await expect(page.locator('#sheet-species-id')).toBeVisible()
|
||||
|
||||
// The own-grants read fails: the unavailable screen, no field.
|
||||
const grants = '**/rest/v1/anatomical_catalog_grants*'
|
||||
await page.route(grants, (route) =>
|
||||
route.fulfill({
|
||||
status: 500,
|
||||
contentType: 'application/json',
|
||||
body: '{}',
|
||||
}),
|
||||
)
|
||||
await page.reload()
|
||||
await expect(
|
||||
heading(page, dict['permissions_unavailable.title']),
|
||||
).toBeVisible()
|
||||
await expect(page.locator('#sheet-species-id')).toHaveCount(0)
|
||||
await expectAccessible(page, 'the unavailable permissions screen')
|
||||
|
||||
// Restored: Retry reads again and the form comes back.
|
||||
await page.unroute(grants)
|
||||
await page.getByRole('button', { name: dict['common.retry'] }).click()
|
||||
await expect(page.locator('#sheet-species-id')).toBeVisible()
|
||||
})
|
||||
|
||||
test('A1: an editor at aal2 creates a sheet on a new inactive species; it opens on draft v1', async ({
|
||||
page,
|
||||
requests,
|
||||
@@ -641,6 +678,9 @@ for (const [locale, dict] of LANGUAGES) {
|
||||
// The rights screen by its address: refused by the server.
|
||||
await page.goto('/app/admin/access')
|
||||
await expect(heading(page, dict['access_denied.title'])).toBeVisible()
|
||||
// The creation page: no form for a reviewer-only account.
|
||||
await page.goto('/app/admin/sheets/new')
|
||||
await expect(heading(page, dict['access_denied.title'])).toBeVisible()
|
||||
await signOut(page, dict, info)
|
||||
|
||||
const admin = await staff(locale, 'admin', [])
|
||||
|
||||
@@ -195,6 +195,40 @@ for (const [locale, dict] of LANGUAGES) {
|
||||
await expectNoHorizontalOverflow(page, `the sheet page at ${width} px`)
|
||||
}
|
||||
|
||||
// Narrow screens (viewport set here, whatever the project): the zone
|
||||
// panel keeps its live region from the first render, and the references
|
||||
// card never covers the drawing.
|
||||
const original = page.viewportSize()!
|
||||
for (const width of [320, 375]) {
|
||||
await page.setViewportSize({ width, height: 667 })
|
||||
await openSheet(page, `/app/anatomy/${listed.id}`, name(listed))
|
||||
const panel = page.locator('[aria-live="polite"]', {
|
||||
has: page.locator('#catalogue-zone-title'),
|
||||
})
|
||||
await expect(panel, `live region before a pick at ${width} px`).toHaveCount(1)
|
||||
const chooser = page.getByRole('combobox', {
|
||||
name: dict['catalogue.zone.choose'],
|
||||
})
|
||||
const first = await chooser.locator('option').nth(1).getAttribute('value')
|
||||
await chooser.selectOption(first!)
|
||||
const zoneName = (await chooser.locator('option:checked').textContent()) ?? ''
|
||||
await expect(panel, `live region after a pick at ${width} px`).toContainText(zoneName)
|
||||
const drawingBox = await page
|
||||
.getByTestId('catalogue-canvas-drawing')
|
||||
.locator('svg')
|
||||
.first()
|
||||
.boundingBox()
|
||||
const referencesBox = await page
|
||||
.getByRole('heading', { level: 2, name: dict['catalogue.references.title'] })
|
||||
.locator('xpath=ancestor::section[1]')
|
||||
.boundingBox()
|
||||
expect(
|
||||
referencesBox!.y,
|
||||
`references below the drawing at ${width} px`,
|
||||
).toBeGreaterThanOrEqual(drawingBox!.y + drawingBox!.height - 1)
|
||||
}
|
||||
await page.setViewportSize(original)
|
||||
|
||||
// A zone picked on the drawing, then one from the list: its panel shows.
|
||||
const zone = page.getByRole('combobox', {
|
||||
name: dict['catalogue.zone.choose'],
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { useRef } from 'react'
|
||||
import { Link } from 'react-router-dom'
|
||||
import {
|
||||
listOfficialSheetsAdmin,
|
||||
@@ -5,6 +6,7 @@ import {
|
||||
} from '@faunosteo/supabase'
|
||||
import SheetBadges from '@/components/admin/SheetBadges'
|
||||
import WorkingCopyAction from '@/components/admin/WorkingCopyAction'
|
||||
import PermissionsUnavailable from '@/components/shell/PermissionsUnavailable'
|
||||
import Button from '@/components/ui/Button'
|
||||
import ButtonLink from '@/components/ui/ButtonLink'
|
||||
import Card from '@/components/ui/Card'
|
||||
@@ -13,6 +15,7 @@ import { failureMessage, localized } from '@/admin/labels'
|
||||
import { useAdminPermissions, type AdminPermissions } from '@/admin/permissions'
|
||||
import { isRightsRefusal, useAdminQuery } from '@/admin/useAdminQuery'
|
||||
import { usePageHeading } from '@/app/usePageHeading'
|
||||
import { useAuthStore } from '@/state/authStore'
|
||||
import { useLocaleStore } from '@/state/localeStore'
|
||||
import { useT } from '@/i18n/useT'
|
||||
|
||||
@@ -164,6 +167,14 @@ export default function AdminHomeRoute() {
|
||||
const t = useT()
|
||||
const heading = usePageHeading()
|
||||
const permissions = useAdminPermissions()
|
||||
const grantsStatus = useAuthStore((s) => s.catalogGrantsStatus)
|
||||
const reloadAccess = useAuthStore((s) => s.reloadAccess)
|
||||
const access = useRef<HTMLDivElement>(null)
|
||||
// Focus stays on the wrapper when the Retry button unmounts with the notice.
|
||||
const retry = async () => {
|
||||
await reloadAccess()
|
||||
access.current?.focus()
|
||||
}
|
||||
return (
|
||||
<div className="space-y-5">
|
||||
<header className="space-y-1">
|
||||
@@ -174,9 +185,21 @@ export default function AdminHomeRoute() {
|
||||
>
|
||||
{t('shell.nav.admin')}
|
||||
</h1>
|
||||
<p className="text-sm text-[var(--color-ink-muted)]">
|
||||
{permissionsLine(t, permissions)}
|
||||
</p>
|
||||
<div ref={access} tabIndex={-1} className="outline-none">
|
||||
{grantsStatus === 'loading' && (
|
||||
<p role="status" className="text-sm text-[var(--color-ink-muted)]">
|
||||
{t('shell.loading_session')}
|
||||
</p>
|
||||
)}
|
||||
{grantsStatus === 'failed' && (
|
||||
<PermissionsUnavailable asPage={false} onRetry={() => void retry()} />
|
||||
)}
|
||||
{grantsStatus === 'ready' && (
|
||||
<p className="text-sm text-[var(--color-ink-muted)]">
|
||||
{permissionsLine(t, permissions)}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
</header>
|
||||
<div className="grid gap-4 md:grid-cols-2">
|
||||
<SheetsCard editor={permissions.editor} />
|
||||
|
||||
@@ -11,6 +11,7 @@ import SpeciesDialog, {
|
||||
type SpeciesDialogMode,
|
||||
} from '@/components/admin/SpeciesDialog'
|
||||
import AccessDenied from '@/components/shell/AccessDenied'
|
||||
import PermissionsUnavailable from '@/components/shell/PermissionsUnavailable'
|
||||
import Button, { buttonClassName } from '@/components/ui/Button'
|
||||
import Card from '@/components/ui/Card'
|
||||
import FormField, { fieldDescribedBy } from '@/components/ui/FormField'
|
||||
@@ -97,6 +98,7 @@ export default function AdminSheetCreateRoute() {
|
||||
const locale = useLocaleStore((s) => s.locale)
|
||||
const { editor } = useAdminPermissions()
|
||||
const grantsStatus = useAuthStore((s) => s.catalogGrantsStatus)
|
||||
const reloadAccess = useAuthStore((s) => s.reloadAccess)
|
||||
const species = useAdminQuery('species', listCatalogSpecies)
|
||||
const [values, setValues] = useState<SheetFormValues>(EMPTY)
|
||||
const [slugEdited, setSlugEdited] = useState(false)
|
||||
@@ -112,11 +114,13 @@ export default function AdminSheetCreateRoute() {
|
||||
if (first) document.getElementById(fieldId(first))?.focus()
|
||||
}, [errorRound, errors])
|
||||
|
||||
// A display rule like the « Nouvelle fiche » button: once the caller's own
|
||||
// grants are read, a reviewer or a publisher reaching the address is not
|
||||
// offered the form. While they load nothing is decided; if the read failed
|
||||
// the form shows and the server, which refuses creation to anyone without
|
||||
// the editor capability, decides.
|
||||
// Three states (owner 2026-11-02), checked in this order: own grants still
|
||||
// loading (wait); the server refused (its `rights.*` answer wins, BDR-094);
|
||||
// own grants unreadable (retry, never the form and never a refusal deduced
|
||||
// from a technical error); then, grants read, the display rule: no editor
|
||||
// capability, no form. The server decides creation either way. Every hook
|
||||
// stays above these returns so the form values survive a state switch: do
|
||||
// not move the form state into a child.
|
||||
if (grantsStatus === 'loading')
|
||||
return (
|
||||
<p role="status" className="text-sm text-[var(--color-ink-muted)]">
|
||||
@@ -124,11 +128,18 @@ export default function AdminSheetCreateRoute() {
|
||||
</p>
|
||||
)
|
||||
if (
|
||||
(grantsStatus === 'ready' && !editor) ||
|
||||
(species.state.status === 'error' &&
|
||||
isRightsRefusal(species.state.failure))
|
||||
species.state.status === 'error' &&
|
||||
isRightsRefusal(species.state.failure)
|
||||
)
|
||||
return <AccessDenied />
|
||||
if (grantsStatus === 'failed') {
|
||||
const retry = () => {
|
||||
void reloadAccess()
|
||||
if (species.state.status === 'error') species.refresh()
|
||||
}
|
||||
return <PermissionsUnavailable asPage onRetry={retry} />
|
||||
}
|
||||
if (!editor) return <AccessDenied />
|
||||
|
||||
const set = (key: keyof SheetFormValues) => (value: string) =>
|
||||
setValues((v) => {
|
||||
|
||||
@@ -96,36 +96,38 @@ export default function ZonePanel({ state, viewId, selectedId, onSelect }: ZoneP
|
||||
))}
|
||||
</select>
|
||||
</label>
|
||||
{annotation ? (
|
||||
<div aria-live="polite" className="space-y-2">
|
||||
<h2 id="catalogue-zone-title" className="font-serif text-lg text-[var(--color-ink)]">
|
||||
{t('catalogue.zone.title').replace('{name}', nameOf(annotation.id))}
|
||||
</h2>
|
||||
<p className="text-sm text-[var(--color-ink-muted)]">
|
||||
{zoneLine(state, annotation, locale, t)}
|
||||
<div aria-live="polite" className="space-y-2">
|
||||
{annotation ? (
|
||||
<>
|
||||
<h2 id="catalogue-zone-title" className="font-serif text-lg text-[var(--color-ink)]">
|
||||
{t('catalogue.zone.title').replace('{name}', nameOf(annotation.id))}
|
||||
</h2>
|
||||
<p className="text-sm text-[var(--color-ink-muted)]">
|
||||
{zoneLine(state, annotation, locale, t)}
|
||||
</p>
|
||||
{findingZone && findingZone.categories.length > 0 ? (
|
||||
findingZone.categories.map((category) => (
|
||||
<section key={category.id} className="space-y-1 pt-1">
|
||||
<h3 className="text-xs font-semibold uppercase tracking-wide text-[var(--color-ink-muted)]">
|
||||
{pickLabel(category.name, locale)}
|
||||
</h3>
|
||||
<ul className="divide-y divide-[var(--color-border)]">
|
||||
{category.children.map((node) => (
|
||||
<FindingItem key={node.id} node={node} locale={locale} />
|
||||
))}
|
||||
</ul>
|
||||
</section>
|
||||
))
|
||||
) : (
|
||||
<p className="text-sm text-[var(--color-ink-muted)]">{t('catalogue.zone.no_findings')}</p>
|
||||
)}
|
||||
</>
|
||||
) : (
|
||||
<p id="catalogue-zone-title" className="text-sm text-[var(--color-ink-muted)]">
|
||||
{t('catalogue.zone.prompt')}
|
||||
</p>
|
||||
{findingZone && findingZone.categories.length > 0 ? (
|
||||
findingZone.categories.map((category) => (
|
||||
<section key={category.id} className="space-y-1 pt-1">
|
||||
<h3 className="text-xs font-semibold uppercase tracking-wide text-[var(--color-ink-muted)]">
|
||||
{pickLabel(category.name, locale)}
|
||||
</h3>
|
||||
<ul className="divide-y divide-[var(--color-border)]">
|
||||
{category.children.map((node) => (
|
||||
<FindingItem key={node.id} node={node} locale={locale} />
|
||||
))}
|
||||
</ul>
|
||||
</section>
|
||||
))
|
||||
) : (
|
||||
<p className="text-sm text-[var(--color-ink-muted)]">{t('catalogue.zone.no_findings')}</p>
|
||||
)}
|
||||
</div>
|
||||
) : (
|
||||
<p id="catalogue-zone-title" className="text-sm text-[var(--color-ink-muted)]">
|
||||
{t('catalogue.zone.prompt')}
|
||||
</p>
|
||||
)}
|
||||
)}
|
||||
</div>
|
||||
</Card>
|
||||
)
|
||||
}
|
||||
@@ -7,9 +7,10 @@ import { useT } from '@/i18n/useT'
|
||||
* « Accès non autorisé » (contract §5.3, BDR-094): what a catalogue or
|
||||
* administration page shows when the server refuses (`rights.*`, and
|
||||
* `not_found` under /app/anatomy), the same whether the sheet exists or not;
|
||||
* also the sheet creation page for an account whose own grants hold no editor
|
||||
* capability (a display rule, the server still decides). Nothing from the
|
||||
* address is echoed.
|
||||
* also the sheet creation page once the own grants are read and hold no
|
||||
* editor capability (a display rule, the server still decides). Never shown
|
||||
* for a failed read (PermissionsUnavailable). Nothing from the address is
|
||||
* echoed.
|
||||
*/
|
||||
export default function AccessDenied() {
|
||||
const t = useT()
|
||||
|
||||
@@ -0,0 +1,50 @@
|
||||
import Button from '@/components/ui/Button'
|
||||
import Card from '@/components/ui/Card'
|
||||
import { usePageHeading } from '@/app/usePageHeading'
|
||||
import { useAuthStore } from '@/state/authStore'
|
||||
import { useT } from '@/i18n/useT'
|
||||
|
||||
interface Props {
|
||||
/** The whole page (h1, focused on open) or a section inside one (h2). */
|
||||
asPage: boolean
|
||||
onRetry?: () => void
|
||||
}
|
||||
|
||||
/**
|
||||
* « Impossible de vérifier vos autorisations » (owner 2026-11-02): the own
|
||||
* grants could not be read. A technical error never reads as an absence of
|
||||
* right, so no form and no refusal; Retry reads them again. The server still
|
||||
* decides every action.
|
||||
*/
|
||||
export default function PermissionsUnavailable({ asPage, onRetry }: Props) {
|
||||
const t = useT()
|
||||
const heading = usePageHeading()
|
||||
const retry = onRetry ?? (() => void useAuthStore.getState().reloadAccess())
|
||||
const body = (
|
||||
<>
|
||||
<p className="text-sm text-[var(--color-ink-muted)]">
|
||||
{t('permissions_unavailable.body')}
|
||||
</p>
|
||||
<Button type="button" variant="secondary" onClick={retry}>
|
||||
{t('common.retry')}
|
||||
</Button>
|
||||
</>
|
||||
)
|
||||
if (asPage)
|
||||
return (
|
||||
<Card as="section" className="space-y-3 p-5 sm:p-6">
|
||||
<h1 ref={heading} tabIndex={-1} className="outline-none font-serif text-2xl text-[var(--color-ink)]">
|
||||
{t('permissions_unavailable.title')}
|
||||
</h1>
|
||||
{body}
|
||||
</Card>
|
||||
)
|
||||
return (
|
||||
<Card as="section" aria-labelledby="permissions-unavailable-title" className="space-y-3 p-5 sm:p-6">
|
||||
<h2 id="permissions-unavailable-title" className="font-serif text-lg text-[var(--color-ink)]">
|
||||
{t('permissions_unavailable.title')}
|
||||
</h2>
|
||||
{body}
|
||||
</Card>
|
||||
)
|
||||
}
|
||||
@@ -863,6 +863,8 @@ export const en: Dict = {
|
||||
'access_denied.title': 'Access denied',
|
||||
'access_denied.body': "You don't have permission to access this page.",
|
||||
'access_denied.back': 'Back to dashboard',
|
||||
'permissions_unavailable.title': 'Unable to verify your permissions',
|
||||
'permissions_unavailable.body': 'The check did not complete, probably because of a connection problem. This error does not change your permissions.',
|
||||
'admin.sheets.title': 'Official sheets',
|
||||
'admin.sheets.new': 'New sheet',
|
||||
'admin.species.title': 'Species',
|
||||
|
||||
@@ -894,6 +894,8 @@ export const fr: Dict = {
|
||||
'access_denied.title': 'Accès non autorisé',
|
||||
'access_denied.body': 'Vous ne disposez pas des autorisations nécessaires pour accéder à cette page.',
|
||||
'access_denied.back': 'Retour au tableau de bord',
|
||||
'permissions_unavailable.title': 'Impossible de vérifier vos autorisations',
|
||||
'permissions_unavailable.body': "La vérification n'a pas abouti, probablement à cause d'un problème de connexion. Cette erreur ne modifie pas vos droits.",
|
||||
'admin.sheets.title': 'Fiches officielles',
|
||||
'admin.sheets.new': 'Nouvelle fiche',
|
||||
'admin.species.title': 'Espèces',
|
||||
|
||||
@@ -68,11 +68,16 @@ export interface AuthState {
|
||||
* Empty until loaded and when the read fails.
|
||||
*/
|
||||
catalogGrants: OwnCatalogGrant[]
|
||||
/** Whether `catalogGrants` is read yet: a display rule waits for `ready`, and a `failed` read leaves the decision to the server. */
|
||||
/** Whether `catalogGrants` is read yet: a display rule waits for `ready`; `failed` = the read failed, pages show the unavailable state and never deduce an absence of right from it. */
|
||||
catalogGrantsStatus: 'loading' | 'ready' | 'failed'
|
||||
/** Subscribes to the client; returns the unsubscribe. Safe to call twice. */
|
||||
start: () => () => void
|
||||
refreshAccount: () => Promise<void>
|
||||
/**
|
||||
* Reads the platform roles and own grants again after a failed permission
|
||||
* read (owner 2026-11-02): pages wait, then show what the answer gives; a
|
||||
* technical error never wipes what the account already holds. Never rejects.
|
||||
*/
|
||||
reloadAccess: () => Promise<void>
|
||||
/** Reads the personal workspace again (after a failure). */
|
||||
refreshWorkspace: () => Promise<void>
|
||||
updateProfile: (patch: OwnProfilePatch) => Promise<Profile>
|
||||
@@ -260,8 +265,21 @@ export const useAuthStore = create<AuthState>((set, get) => ({
|
||||
return () => data.subscription.unsubscribe()
|
||||
},
|
||||
|
||||
refreshAccount: async () => {
|
||||
await loadAccount(requireClient(), requireUser(get().user), set, get)
|
||||
reloadAccess: async () => {
|
||||
const user = get().user
|
||||
const client = getSupabaseClient()
|
||||
if (!user || !client) return set({ catalogGrants: [], catalogGrantsStatus: 'failed' })
|
||||
const setOwn = setForUser(user, set, get)
|
||||
setOwn({ catalogGrantsStatus: 'loading' })
|
||||
try {
|
||||
const [roles, catalogGrants] = await Promise.all([
|
||||
fetchOwnPlatformRoles(client, user.id),
|
||||
listOwnCatalogGrants(client, user.id),
|
||||
])
|
||||
setOwn({ roles, catalogGrants, catalogGrantsStatus: 'ready' })
|
||||
} catch {
|
||||
setOwn({ catalogGrants: [], catalogGrantsStatus: 'failed' })
|
||||
}
|
||||
},
|
||||
|
||||
refreshWorkspace: async () => {
|
||||
|
||||
@@ -148,8 +148,9 @@ function mount(
|
||||
path: string,
|
||||
grants: OwnCatalogGrant[],
|
||||
roles: PlatformRole[] = [],
|
||||
status: 'loading' | 'ready' | 'failed' = 'ready',
|
||||
) {
|
||||
useAuthStore.setState({ catalogGrants: grants, catalogGrantsStatus: 'ready', roles })
|
||||
useAuthStore.setState({ catalogGrants: grants, catalogGrantsStatus: status, roles })
|
||||
return render(
|
||||
<MemoryRouter initialEntries={[path]}>
|
||||
<Routes>
|
||||
@@ -171,6 +172,7 @@ function mount(
|
||||
beforeAll(async () => {
|
||||
setCoreRuntime(await testCoreRuntime())
|
||||
})
|
||||
const realReloadAccess = useAuthStore.getState().reloadAccess
|
||||
beforeEach(() => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
fake = createFakeSupabase()
|
||||
@@ -180,7 +182,39 @@ beforeEach(() => {
|
||||
fake.rpcResults.list_catalog_species = { data: SPECIES }
|
||||
mocks.fake = fake
|
||||
})
|
||||
afterEach(() => cleanup())
|
||||
afterEach(() => {
|
||||
cleanup()
|
||||
useAuthStore.setState({ reloadAccess: realReloadAccess })
|
||||
})
|
||||
|
||||
describe('Administration page: own grants states', () => {
|
||||
it('loading: the waiting status, not « aucune »', () => {
|
||||
mount('/app/admin', [], [], 'loading')
|
||||
expect(screen.getByText(fr['shell.loading_session'])).toHaveAttribute('role', 'status')
|
||||
expect(screen.queryByText(/aucune/)).toBeNull()
|
||||
})
|
||||
|
||||
it('failed: the unavailable notice as a section, Retry, focus kept on the wrapper', async () => {
|
||||
const user = userEvent.setup()
|
||||
const reloadAccess = vi.fn(async () =>
|
||||
useAuthStore.setState({ catalogGrants: [grant('sheet_editor')], catalogGrantsStatus: 'ready' }),
|
||||
)
|
||||
mount('/app/admin', [], [], 'failed')
|
||||
useAuthStore.setState({ reloadAccess })
|
||||
expect(screen.getAllByRole('heading', { level: 1 })).toHaveLength(1)
|
||||
expect(
|
||||
screen.getByRole('heading', { level: 2, name: fr['permissions_unavailable.title'] }),
|
||||
).toBeInTheDocument()
|
||||
expect(screen.queryByText(/aucune/)).toBeNull()
|
||||
await user.click(screen.getByRole('button', { name: 'Réessayer' }))
|
||||
expect(reloadAccess).toHaveBeenCalledTimes(1)
|
||||
await waitFor(() =>
|
||||
expect(screen.getByText(/Vos habilitations : éditeur de fiches/)).toBeInTheDocument(),
|
||||
)
|
||||
const wrapper = screen.getByText(/Vos habilitations/).parentElement
|
||||
expect(wrapper).toHaveFocus()
|
||||
})
|
||||
})
|
||||
|
||||
describe('Administration page (board 10)', () => {
|
||||
it('editor and publisher: permissions line, sheets with badges, the working copy action disabled with its reason', async () => {
|
||||
@@ -655,13 +689,82 @@ describe('Sheet creation (A1)', () => {
|
||||
expect(rpcArgs('create_official_sheet')).toEqual([])
|
||||
})
|
||||
|
||||
it('decides nothing while the own grants load, and leaves a failed read to the server', async () => {
|
||||
mount('/app/admin/sheets/new', [])
|
||||
useAuthStore.setState({ catalogGrantsStatus: 'loading' })
|
||||
expect(await screen.findByRole('status')).toHaveTextContent(fr['shell.loading_session'])
|
||||
expect(screen.queryByRole('heading', { name: fr['access_denied.title'] })).toBeNull()
|
||||
useAuthStore.setState({ catalogGrantsStatus: 'failed' })
|
||||
expect(await screen.findByLabelText('Espèce')).toBeInTheDocument()
|
||||
describe.each([
|
||||
['a reviewer-only account', [grant('sheet_reviewer')], false],
|
||||
['an editor account', [grant('sheet_editor')], true],
|
||||
] as const)('permission states for %s', (_, grants, canCreate) => {
|
||||
const denied = () =>
|
||||
screen.queryByRole('heading', { name: fr['access_denied.title'] })
|
||||
const unavailable = () =>
|
||||
screen.queryByRole('heading', {
|
||||
name: fr['permissions_unavailable.title'],
|
||||
})
|
||||
|
||||
it('ready: the form for the editor, « Accès non autorisé » otherwise', async () => {
|
||||
mount('/app/admin/sheets/new', [...grants])
|
||||
if (canCreate) {
|
||||
expect(await screen.findByLabelText('Espèce')).toBeInTheDocument()
|
||||
expect(denied()).toBeNull()
|
||||
} else {
|
||||
expect(await screen.findByRole('heading', { name: fr['access_denied.title'] })).toBeInTheDocument()
|
||||
expect(screen.queryByLabelText('Espèce')).toBeNull()
|
||||
}
|
||||
expect(unavailable()).toBeNull()
|
||||
})
|
||||
|
||||
it('failed: the unavailable state, no form, no refusal deduced', async () => {
|
||||
mount('/app/admin/sheets/new', [...grants], [], 'failed')
|
||||
expect(await screen.findByRole('heading', { name: fr['permissions_unavailable.title'] })).toBeInTheDocument()
|
||||
expect(screen.getByText(fr['permissions_unavailable.body'])).toBeInTheDocument()
|
||||
expect(screen.getByRole('button', { name: 'Réessayer' })).toBeInTheDocument()
|
||||
expect(document.querySelector('input, select')).toBeNull()
|
||||
expect(denied()).toBeNull()
|
||||
})
|
||||
|
||||
it('loading: waits, decides nothing', async () => {
|
||||
mount('/app/admin/sheets/new', [...grants], [], 'loading')
|
||||
expect(await screen.findByRole('status')).toHaveTextContent(fr['shell.loading_session'])
|
||||
expect(denied()).toBeNull()
|
||||
expect(unavailable()).toBeNull()
|
||||
expect(document.querySelector('input, select')).toBeNull()
|
||||
})
|
||||
|
||||
it('Retry lands on what the new answer gives', async () => {
|
||||
const user = userEvent.setup()
|
||||
const reloadAccess = vi.fn(async () =>
|
||||
useAuthStore.setState({ catalogGrants: [...grants], catalogGrantsStatus: 'ready' }),
|
||||
)
|
||||
mount('/app/admin/sheets/new', [], [], 'failed')
|
||||
useAuthStore.setState({ reloadAccess })
|
||||
await user.click(await screen.findByRole('button', { name: 'Réessayer' }))
|
||||
expect(reloadAccess).toHaveBeenCalledTimes(1)
|
||||
if (canCreate) expect(await screen.findByLabelText('Espèce')).toBeInTheDocument()
|
||||
else expect(await screen.findByRole('heading', { name: fr['access_denied.title'] })).toBeInTheDocument()
|
||||
})
|
||||
})
|
||||
|
||||
it('Retry also reads a failed species list again', async () => {
|
||||
const user = userEvent.setup()
|
||||
let calls = 0
|
||||
fake.rpcResults.list_catalog_species = () =>
|
||||
++calls === 1 ? { error: new TypeError('fetch failed') } : { data: SPECIES }
|
||||
mount('/app/admin/sheets/new', [], [], 'failed')
|
||||
useAuthStore.setState({
|
||||
reloadAccess: vi.fn(async () =>
|
||||
useAuthStore.setState({ catalogGrants: [grant('sheet_editor')], catalogGrantsStatus: 'ready' }),
|
||||
),
|
||||
})
|
||||
await user.click(await screen.findByRole('button', { name: 'Réessayer' }))
|
||||
const species = await screen.findByLabelText('Espèce')
|
||||
await waitFor(() => expect(within(species).getAllByRole('option')).toHaveLength(3))
|
||||
expect(calls).toBe(2)
|
||||
})
|
||||
|
||||
it('a server rights refusal wins over a failed grants read', async () => {
|
||||
fake.rpcResults.list_catalog_species = refusal('rights.capability')
|
||||
mount('/app/admin/sheets/new', [], [], 'failed')
|
||||
expect(await screen.findByRole('heading', { name: fr['access_denied.title'] })).toBeInTheDocument()
|
||||
expect(screen.queryByRole('heading', { name: fr['permissions_unavailable.title'] })).toBeNull()
|
||||
})
|
||||
|
||||
it('proposes a slug from the French name', () => {
|
||||
|
||||
@@ -117,6 +117,91 @@ describe('authStore', () => {
|
||||
expect(useAuthStore.getState().catalogGrantsStatus).toBe('loading')
|
||||
})
|
||||
|
||||
describe('reloadAccess', () => {
|
||||
type Answer = { data: unknown; error: unknown; status?: number }
|
||||
const FAILED: Answer = { data: null, error: { code: '', message: 'FetchError' }, status: 0 }
|
||||
const GRANT = { user_id: 'user-1', kind: 'sheet_editor', expires_at: null, revoked_at: null }
|
||||
|
||||
/** Every chain on `table` ends in `answer()`, as a dropped request or a late reply would. */
|
||||
function answerTable(table: string, answer: () => Answer | Promise<Answer>) {
|
||||
const from = fake.client.from.bind(fake.client)
|
||||
const chain: unknown = new Proxy(() => undefined, {
|
||||
get: (_, key) =>
|
||||
key === 'then'
|
||||
? (resolve: (v: unknown) => void, reject: (e: unknown) => void) =>
|
||||
Promise.resolve(answer()).then(resolve, reject)
|
||||
: () => chain,
|
||||
})
|
||||
;(fake.client as unknown as { from: (t: string) => unknown }).from = (t: string) =>
|
||||
t === table ? chain : from(t as never)
|
||||
}
|
||||
|
||||
async function signedIn() {
|
||||
fake.tables.profiles = [fakeProfile(), fakeProfile({ id: 'user-2' })]
|
||||
stop = useAuthStore.getState().start()
|
||||
fake.emit('SIGNED_IN', fakeSession())
|
||||
await flush()
|
||||
await flush()
|
||||
}
|
||||
|
||||
it('goes loading then ready, replacing the roles and the grants', async () => {
|
||||
await signedIn()
|
||||
expect(useAuthStore.getState().roles).toEqual(['admin'])
|
||||
fake.tables.profile_roles = [{ user_id: 'user-1', role: 'owner', revoked_at: null }]
|
||||
fake.tables.anatomical_catalog_grants = [GRANT]
|
||||
const reload = useAuthStore.getState().reloadAccess()
|
||||
expect(useAuthStore.getState().catalogGrantsStatus).toBe('loading')
|
||||
await reload
|
||||
const s = useAuthStore.getState()
|
||||
expect(s.catalogGrantsStatus).toBe('ready')
|
||||
expect(s.roles).toEqual(['owner'])
|
||||
expect(s.catalogGrants).toEqual([GRANT])
|
||||
})
|
||||
|
||||
it.each(['anatomical_catalog_grants', 'profile_roles'])(
|
||||
'ends failed with no grants and keeps the roles, profile and workspace when the %s read rejects',
|
||||
async (table) => {
|
||||
fake.tables.workspaces = [{ id: 'ws-1', personal_user_id: 'user-1' }]
|
||||
fake.tables.anatomical_catalog_grants = [GRANT]
|
||||
await signedIn()
|
||||
const before = useAuthStore.getState()
|
||||
expect(before.catalogGrants).toEqual([GRANT])
|
||||
answerTable(table, () => FAILED)
|
||||
await expect(useAuthStore.getState().reloadAccess()).resolves.toBeUndefined()
|
||||
const s = useAuthStore.getState()
|
||||
expect(s.catalogGrantsStatus).toBe('failed')
|
||||
expect(s.catalogGrants).toEqual([])
|
||||
expect(s.roles).toEqual(['admin'])
|
||||
expect(s.profile).toEqual(before.profile)
|
||||
expect(s.workspace).toEqual({ status: 'ready', id: 'ws-1' })
|
||||
},
|
||||
)
|
||||
|
||||
it('ends failed and resolves without a user', async () => {
|
||||
useAuthStore.setState({ catalogGrants: [], catalogGrantsStatus: 'ready' })
|
||||
await expect(useAuthStore.getState().reloadAccess()).resolves.toBeUndefined()
|
||||
expect(useAuthStore.getState().catalogGrantsStatus).toBe('failed')
|
||||
})
|
||||
|
||||
it('drops a late answer once another account signed in', async () => {
|
||||
await signedIn()
|
||||
const releases: Array<(a: Answer) => void> = []
|
||||
answerTable(
|
||||
'anatomical_catalog_grants',
|
||||
() => new Promise<Answer>((resolve) => releases.push(resolve)),
|
||||
)
|
||||
const reload = useAuthStore.getState().reloadAccess()
|
||||
await flush()
|
||||
fake.emit('SIGNED_IN', fakeSession(fakeUser({ id: 'user-2' })))
|
||||
releases.forEach((release) => release({ data: [GRANT], error: null }))
|
||||
await reload
|
||||
await flush()
|
||||
expect(useAuthStore.getState().catalogGrants).toEqual([])
|
||||
expect(useAuthStore.getState().roles).not.toEqual(['owner'])
|
||||
expect(useAuthStore.getState().user?.id).toBe('user-2')
|
||||
})
|
||||
})
|
||||
|
||||
it('updateProfile writes the row and keeps the store in sync', async () => {
|
||||
stop = useAuthStore.getState().start()
|
||||
fake.emit('SIGNED_IN', fakeSession())
|
||||
|
||||
Reference in new issue
Block a user