fix(editor): final review round, history, dialogs, Plus and limits
I1 scroll restored at once on a Back into layers; I2 Aller a opens the target dialog in one push; M1-M9, criteria 8 and 17 (left-draft notice), entry caps, no exhaustive-deps disables, locals within 5.
This commit is contained in:
1 parent
ce171427c0
commit
6bf9290da7
25 files changed
+1002
-202
No files matched your search
@@ -452,3 +452,94 @@ describe('read-only flip and the gone rule', () => {
|
||||
expect(findingDialog()).toBeNull()
|
||||
})
|
||||
})
|
||||
|
||||
const liveText = () =>
|
||||
document.querySelector('p.sr-only[aria-live="polite"]')!.textContent
|
||||
|
||||
describe('final review: a creation whose parent vanishes (M-1)', () => {
|
||||
it('says the dropped names with the gone text, never silently', async () => {
|
||||
const user = await mount()
|
||||
act(() => treeRow(/Cat A/).focus())
|
||||
await user.keyboard('{ArrowUp}{ArrowDown}')
|
||||
await user.click(screen.getByRole('button', { name: 'Ajouter un constat' }))
|
||||
await waitFor(() => expect(findingDialog()).not.toBeNull())
|
||||
await user.type(document.getElementById('finding-new-name-fr')!, 'Tête')
|
||||
act(() => {
|
||||
store.getState().commit({
|
||||
op: 'remove',
|
||||
key: { kind: 'finding', zone_id: 'zone-a', path: ['fcat-a'] },
|
||||
})
|
||||
})
|
||||
await closed()
|
||||
await waitFor(() =>
|
||||
expect(liveText()).toBe("Saisie abandonnée. Ce constat n'existe plus"),
|
||||
)
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: the zone of a new category is part of the draft (criterion 8)', () => {
|
||||
it('a zone changed alone asks before « Annuler » closes', async () => {
|
||||
serverHas(
|
||||
insert(sheetText(), {
|
||||
kind: 'zone',
|
||||
value: { id: 'zone-b', name: name('Zone B'), categories: [] },
|
||||
}),
|
||||
3,
|
||||
)
|
||||
const user = userEvent.setup()
|
||||
mountDraft({ width: 1280, probe })
|
||||
await screen.findByRole('heading', {
|
||||
level: 1,
|
||||
name: 'Brouillon, version 4',
|
||||
})
|
||||
await user.click(screen.getByRole('tab', { name: 'Constats' }))
|
||||
await user.click(
|
||||
screen.getByRole('button', { name: 'Ajouter une catégorie' }),
|
||||
)
|
||||
await waitFor(() => expect(findingDialog()).not.toBeNull())
|
||||
await user.selectOptions(inDialog().getByLabelText('Zone'), 'zone-b')
|
||||
await user.click(inDialog().getByRole('button', { name: 'Annuler' }))
|
||||
expect(inDialog().getByText('Abandonner les modifications ?')).toBeVisible()
|
||||
await user.click(
|
||||
inDialog().getByRole('button', { name: 'Continuer la saisie' }),
|
||||
)
|
||||
act(() => inDialog().getByLabelText('Zone').focus())
|
||||
await user.keyboard('{Escape}')
|
||||
expect(findingDialog()).not.toBeNull()
|
||||
expect(inDialog().getByText('Abandonner les modifications ?')).toBeVisible()
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: leaving the editor with a dirty dialog (criterion 17)', () => {
|
||||
const flagKey = `faunosteo:editor:left-draft:${SHEET}:${USER}`
|
||||
const notice =
|
||||
"Une saisie non enregistrée a été abandonnée en quittant l'éditeur"
|
||||
|
||||
it('leaves one flag without the text, then a notice once on the next mount', async () => {
|
||||
const user = await mount()
|
||||
await openFinding(user, /Node A/)
|
||||
await modify(user)
|
||||
await user.type(nameField(), ' bis')
|
||||
cleanup()
|
||||
const flag = sessionStorage.getItem(flagKey)
|
||||
expect(flag).not.toBeNull()
|
||||
expect(flag).not.toContain('bis')
|
||||
expect(JSON.parse(flag!)).toEqual({
|
||||
kind: 'finding',
|
||||
key: { kind: 'finding', zone_id: 'zone-a', path: ['fcat-a', 'fnode-a'] },
|
||||
})
|
||||
await mount()
|
||||
expect(screen.getByText(notice)).toBeVisible()
|
||||
expect(sessionStorage.getItem(flagKey)).toBeNull()
|
||||
cleanup()
|
||||
await mount()
|
||||
expect(screen.queryByText(notice)).toBeNull()
|
||||
})
|
||||
|
||||
it('a clean dialog leaves no flag', async () => {
|
||||
const user = await mount()
|
||||
await openFinding(user, /Node A/)
|
||||
cleanup()
|
||||
expect(sessionStorage.getItem(flagKey)).toBeNull()
|
||||
})
|
||||
})
|
||||
@@ -331,3 +331,57 @@ describe('the view the reducer holds', () => {
|
||||
expect(state.visitedTabs).toEqual(['findings'])
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: « Aller à » is a move of its own (I-2)', () => {
|
||||
it('pushes over the sheet it leaves, even with fewer layers on the same tab', () => {
|
||||
const sheet = view('findings', { finding: { key: node, citations: true } })
|
||||
const other: ElementKey = {
|
||||
kind: 'finding',
|
||||
zone_id: 'z',
|
||||
path: ['f', 'm'],
|
||||
}
|
||||
const target = view('findings', {
|
||||
finding: { key: other, citations: false },
|
||||
})
|
||||
const top = entry({ view: sheet, below: view('findings') })
|
||||
expect(planWrite(top, target, false)).toBe('replace')
|
||||
expect(planWrite(top, target, false, null, true)).toBe('push')
|
||||
// An arrow-key replace still wins.
|
||||
expect(planWrite(top, target, true, null, true)).toBe('replace')
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: read-back values are capped', () => {
|
||||
const long = 'x'.repeat(129)
|
||||
const atCap = 'x'.repeat(128)
|
||||
const deep = (length: number): ElementKey => ({
|
||||
kind: 'finding',
|
||||
zone_id: 'z',
|
||||
path: Array.from({ length }, (_, i) => `p${i}`),
|
||||
})
|
||||
const onFindings = (key: ElementKey) =>
|
||||
view('findings', { finding: { key, citations: false } })
|
||||
|
||||
it('drops an entry whose id, sheet or account is over 128 characters', () => {
|
||||
expect(readEntry(stateOf(entry({ id: atCap })))).not.toBeNull()
|
||||
expect(readEntry(stateOf(entry({ id: long })))).toBeNull()
|
||||
expect(readEntry(stateOf(entry({ sheetId: long })))).toBeNull()
|
||||
expect(readEntry(stateOf(entry({ userId: long })))).toBeNull()
|
||||
})
|
||||
|
||||
it('drops a key with an over-long id or a path deeper than the tree allows', () => {
|
||||
const zone: ElementKey = { kind: 'zone', id: long }
|
||||
expect(
|
||||
readEntry(stateOf(entry({ view: onFindings(zone) })))?.view.finding,
|
||||
).toBeNull()
|
||||
const wideZone: ElementKey = { kind: 'finding', zone_id: long, path: ['a'] }
|
||||
expect(sanitizeView(onFindings(wideZone))?.finding).toBeNull()
|
||||
const wideId: ElementKey = { kind: 'finding', zone_id: 'z', path: [long] }
|
||||
expect(sanitizeView(onFindings(wideId))?.finding).toBeNull()
|
||||
expect(sanitizeView(onFindings(deep(8)))?.finding).not.toBeNull()
|
||||
expect(sanitizeView(onFindings(deep(9)))?.finding).toBeNull()
|
||||
const edit = { ...onFindings(node), reference: { edit: long } }
|
||||
const sheet = { ...edit, finding: { key: node, citations: true } }
|
||||
expect(sanitizeView(sheet)?.reference).toBeNull()
|
||||
})
|
||||
})
|
||||
@@ -3,9 +3,11 @@ import { afterEach, describe, expect, it, vi } from 'vitest'
|
||||
import {
|
||||
act,
|
||||
cleanup,
|
||||
fireEvent,
|
||||
render,
|
||||
renderHook,
|
||||
screen,
|
||||
waitFor,
|
||||
} from '@testing-library/react'
|
||||
import userEvent from '@testing-library/user-event'
|
||||
import type { ElementKey } from '@faunosteo/core-wasm/types'
|
||||
@@ -21,7 +23,7 @@ import { useBeforeUnload } from '@/app/useLeaveGuard'
|
||||
import EditorTabs from '@/components/editor/EditorTabs'
|
||||
import { ENTRY_KEY, type HistoryEntry } from '@/editor/history/entry'
|
||||
import useEditorHistory from '@/editor/history/useEditorHistory'
|
||||
import { defaultView } from '@/editor/navigation'
|
||||
import { defaultView, targetOfKey } from '@/editor/navigation'
|
||||
import { useEditorNavigation } from '@/editor/useEditorNavigation'
|
||||
import { useLocaleStore } from '@/state/localeStore'
|
||||
|
||||
@@ -33,6 +35,11 @@ const finding: ElementKey = {
|
||||
zone_id: 'zone',
|
||||
path: ['family', 'node'],
|
||||
}
|
||||
const other: ElementKey = {
|
||||
kind: 'finding',
|
||||
zone_id: 'zone',
|
||||
path: ['family', 'other'],
|
||||
}
|
||||
|
||||
let navigate: NavigateFunction
|
||||
let location: Location
|
||||
@@ -48,6 +55,10 @@ function Page({ guard }: { guard?: () => { allowed: boolean } }) {
|
||||
<EditorTabs active={nav.state.tab} tier="wide" onSelect={nav.selectTab} />
|
||||
<button onClick={() => nav.openFinding(finding)}>open</button>
|
||||
<button onClick={() => nav.openCitations(finding)}>cite</button>
|
||||
<button onClick={() => nav.closeCitations()}>uncite</button>
|
||||
<button onClick={() => nav.closeFinding()}>close</button>
|
||||
<button onClick={() => nav.showAllReferences(finding)}>show all</button>
|
||||
<button onClick={() => nav.navigate(targetOfKey(other))}>go to</button>
|
||||
<button onClick={() => nav.guards.register('finding', guard ?? null)}>
|
||||
guard
|
||||
</button>
|
||||
@@ -59,9 +70,12 @@ function Page({ guard }: { guard?: () => { allowed: boolean } }) {
|
||||
)
|
||||
}
|
||||
|
||||
const mount = (guard?: () => { allowed: boolean }) =>
|
||||
const mount = (
|
||||
guard?: () => { allowed: boolean },
|
||||
entries: string[] = ['/x'],
|
||||
) =>
|
||||
render(
|
||||
<MemoryRouter initialEntries={['/x']}>
|
||||
<MemoryRouter initialEntries={entries} initialIndex={entries.length - 1}>
|
||||
<Page guard={guard} />
|
||||
</MemoryRouter>,
|
||||
)
|
||||
@@ -204,3 +218,144 @@ describe('useBeforeUnload', () => {
|
||||
expect(second.defaultPrevented).toBe(false)
|
||||
})
|
||||
})
|
||||
|
||||
const click = (name: string) =>
|
||||
userEvent.click(screen.getByRole('button', { name }))
|
||||
const findingLayer = () => JSON.parse(screen.getByTestId('layer').textContent!)
|
||||
/** A layer dialog on screen: what a Back that reopens the layers shows. */
|
||||
function openLayerDialog() {
|
||||
const dialog = document.createElement('dialog')
|
||||
dialog.setAttribute('open', '')
|
||||
dialog.setAttribute('data-layer', '')
|
||||
document.body.append(dialog)
|
||||
return dialog
|
||||
}
|
||||
async function settleDialogs(dialog: HTMLElement) {
|
||||
dialog.remove()
|
||||
await act(async () => {
|
||||
flushAfterModals()
|
||||
await Promise.resolve()
|
||||
await Promise.resolve()
|
||||
})
|
||||
}
|
||||
const setScrollY = (y: number) =>
|
||||
Object.defineProperty(window, 'scrollY', {
|
||||
configurable: true,
|
||||
writable: true,
|
||||
value: y,
|
||||
})
|
||||
|
||||
describe('final review: a Back into the layers (I-1)', () => {
|
||||
afterEach(() => {
|
||||
setScrollY(0)
|
||||
vi.restoreAllMocks()
|
||||
})
|
||||
|
||||
it('restores the page scroll, however the dialogs are closed afterwards', async () => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
const scrollTo = vi.spyOn(window, 'scrollTo').mockImplementation(() => {})
|
||||
mount()
|
||||
await userEvent.click(screen.getByRole('tab', { name: 'Constats' }))
|
||||
setScrollY(500)
|
||||
await click('open')
|
||||
await click('cite')
|
||||
await click('show all')
|
||||
setScrollY(0)
|
||||
scrollTo.mockClear()
|
||||
const dialog = openLayerDialog()
|
||||
act(() => navigate(-1))
|
||||
expect(findingLayer()).toMatchObject({ citations: true })
|
||||
// Closed by ✕ / Escape: each close dispatches and renders again.
|
||||
await click('uncite')
|
||||
await click('close')
|
||||
await settleDialogs(dialog)
|
||||
expect(scrollTo).toHaveBeenCalledWith(0, 500)
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: « Aller à » from the sheet (I-2)', () => {
|
||||
it('keeps the entry of the finding with its sheet: Back from the target returns to it', async () => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
mount()
|
||||
await userEvent.click(screen.getByRole('tab', { name: 'Constats' }))
|
||||
await click('open')
|
||||
await click('cite')
|
||||
await click('go to')
|
||||
expect(findingLayer()).toEqual({ key: other, citations: false })
|
||||
expect(entry().below?.finding).toEqual({ key: finding, citations: true })
|
||||
act(() => navigate(-1))
|
||||
expect(findingLayer()).toEqual({ key: finding, citations: true })
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: a location that is not the editor’s (M-3)', () => {
|
||||
it('writes nothing and asks no layer on a Back to another page', async () => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
const guard = vi.fn(() => ({ allowed: false }))
|
||||
mount(guard, ['/y', '/x'])
|
||||
await click('guard')
|
||||
await userEvent.click(screen.getByRole('tab', { name: 'Constats' }))
|
||||
await click('open')
|
||||
act(() => navigate(-3))
|
||||
expect(location.pathname).toBe('/y')
|
||||
expect(location.state).toBeNull()
|
||||
expect(guard).not.toHaveBeenCalled()
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: entry ids (M-4)', () => {
|
||||
it('two mounts never share an entry id', async () => {
|
||||
mount()
|
||||
await waitFor(() => expect(entry()).toBeTruthy())
|
||||
const first = entry().id
|
||||
cleanup()
|
||||
mount()
|
||||
await waitFor(() => expect(entry()).toBeTruthy())
|
||||
expect(entry().id).not.toBe(first)
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: past the write budget (M-5)', () => {
|
||||
it('a close over a push kept in memory never goes back a real entry', async () => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
mount()
|
||||
const tabOf = (name: string) => screen.getByRole('tab', { name })
|
||||
fireEvent.click(tabOf('Constats'))
|
||||
for (let i = 0; i < 19; i += 1) {
|
||||
fireEvent.click(tabOf('Général'))
|
||||
fireEvent.click(tabOf('Constats'))
|
||||
}
|
||||
// The 40th write of the window: sent. The 41st (the sheet) stays in memory.
|
||||
fireEvent.click(screen.getByRole('button', { name: 'open' }))
|
||||
fireEvent.click(screen.getByRole('button', { name: 'cite' }))
|
||||
const top = location.key
|
||||
fireEvent.click(screen.getByRole('button', { name: 'uncite' }))
|
||||
expect(findingLayer()).toEqual({ key: finding, citations: false })
|
||||
expect(screen.getByRole('tab', { selected: true })).toHaveTextContent(
|
||||
'Constats',
|
||||
)
|
||||
expect(location.key).toBe(top)
|
||||
expect(entry().view.finding).toEqual({ key: finding, citations: false })
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: queued landings (M-6)', () => {
|
||||
it('a Back during the exit cancels the stale « Tout afficher » landing', async () => {
|
||||
useLocaleStore.setState({ locale: 'fr' })
|
||||
mount()
|
||||
await userEvent.click(screen.getByRole('tab', { name: 'Constats' }))
|
||||
await click('open')
|
||||
await click('cite')
|
||||
const exiting = openLayerDialog()
|
||||
await click('show all')
|
||||
act(() => navigate(-1))
|
||||
expect(findingLayer()).toMatchObject({ citations: true })
|
||||
const focused: Element[] = []
|
||||
const record = (event: FocusEvent) => focused.push(event.target as Element)
|
||||
document.addEventListener('focusin', record)
|
||||
await settleDialogs(exiting)
|
||||
document.removeEventListener('focusin', record)
|
||||
const references = screen.getByRole('tab', { name: 'Références' })
|
||||
expect(focused).not.toContain(references)
|
||||
})
|
||||
})
|
||||
@@ -231,3 +231,18 @@ describe('the platform back request', () => {
|
||||
expect(more()).toHaveAttribute('aria-expanded', 'false')
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: keyboard focus leaving « Plus » (M-8)', () => {
|
||||
it('closes when the focus moves out of the trigger and the list', async () => {
|
||||
const { user } = mount()
|
||||
await user.click(more())
|
||||
const item = screen.getByRole('button', { name: 'Constats' })
|
||||
act(() => item.focus())
|
||||
expect(more()).toHaveAttribute('aria-expanded', 'true')
|
||||
act(() => more().focus())
|
||||
expect(more()).toHaveAttribute('aria-expanded', 'true')
|
||||
act(() => screen.getByRole('button', { name: 'outside' }).focus())
|
||||
expect(more()).toHaveAttribute('aria-expanded', 'false')
|
||||
await gone()
|
||||
})
|
||||
})
|
||||
@@ -104,11 +104,11 @@ describe('navigationReducer', () => {
|
||||
expect(state.focus?.target).toEqual(targetOfKey(key))
|
||||
})
|
||||
|
||||
it('go_to a tab closes the finding layers', () => {
|
||||
it('go_to a place that is no finding closes the finding layers', () => {
|
||||
const state = run(
|
||||
initialNavigation('general'),
|
||||
{ type: 'open_citations', citedBy: node },
|
||||
{ type: 'go_to', target: targetOfKey(finding) },
|
||||
{ type: 'go_to', target: targetOfKey(view) },
|
||||
)
|
||||
expect(state.finding).toBeNull()
|
||||
})
|
||||
@@ -306,3 +306,28 @@ describe('navigationReducer', () => {
|
||||
expect(state.visitedSections).toEqual(['drawing', 'categories'])
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review', () => {
|
||||
it('a go_to a finding or a zone opens its dialog in the same move (I-2)', () => {
|
||||
const state = run(
|
||||
initialNavigation('general'),
|
||||
{ type: 'open_citations', citedBy: node },
|
||||
{ type: 'go_to', target: targetOfKey(finding) },
|
||||
)
|
||||
expect(state.finding).toEqual({ key: finding, citations: false })
|
||||
const zone: ElementKey = { kind: 'zone', id: 'z1' }
|
||||
const onZone = run(state, { type: 'go_to', target: targetOfKey(zone) })
|
||||
expect(onZone.finding).toEqual({ key: zone, citations: false })
|
||||
})
|
||||
|
||||
it('close_finding takes the reference dialog over the sheet with it (M-2)', () => {
|
||||
const state = run(
|
||||
initialNavigation('findings'),
|
||||
{ type: 'open_citations', citedBy: node },
|
||||
{ type: 'open_reference', id: 'r1' },
|
||||
{ type: 'close_finding' },
|
||||
)
|
||||
expect(state.finding).toBeNull()
|
||||
expect(state.reference).toBeNull()
|
||||
})
|
||||
})
|
||||
@@ -532,3 +532,30 @@ describe('the finding filter', () => {
|
||||
expect(chip()).toBeVisible()
|
||||
})
|
||||
})
|
||||
|
||||
describe('final review: the creation dialog fades out as a creation (M-9)', () => {
|
||||
it('never shows the edit title while it closes', async () => {
|
||||
const user = await mount()
|
||||
await user.click(
|
||||
screen.getByRole('button', { name: 'Ajouter une référence' }),
|
||||
)
|
||||
await waitFor(() => expect(refDialog()).toBeDefined())
|
||||
await user.selectOptions(field('Type'), 'book')
|
||||
await user.type(field('Citation'), 'Nouvelle source')
|
||||
const titles = new Set<string>()
|
||||
const seen = new MutationObserver(() => {
|
||||
document
|
||||
.querySelectorAll('dialog h2')
|
||||
.forEach((h) => titles.add(h.textContent ?? ''))
|
||||
})
|
||||
seen.observe(document.body, {
|
||||
subtree: true,
|
||||
childList: true,
|
||||
characterData: true,
|
||||
})
|
||||
await save(user)
|
||||
await closed()
|
||||
seen.disconnect()
|
||||
expect(titles).not.toContain('Modifier la référence')
|
||||
})
|
||||
})
|
||||
Reference in new issue
Block a user