fix(editor): sign-out and shell links ask the drawing guard first

With a started move, sign-out and an in-app link now ask « Abandonner
le déplacement ? » (R-12) through the page's own question, registered by
the draft route in leaveGuardStore (`ask`; the shell imports no editor
module). The generic leave and sign-out dialogs cover only sheet-level
unsaved work; with both pending the drawing asks first, then the sheet
question, as useLeaveConfirm orders them. A move with nothing started
arms nothing (it ends); a started one still guards a reload.

Tests: sign-out and link with a started move (alone and with sheet
changes), the history jump with only a move and after dirty layers, a
section entry and « Tout afficher ».
This commit is contained in:
bchanot committed 2026-11-17 19:25:04 +01:00
1 parent 44de465c6d
commit e01d8519ea
8 files changed
+311 -26

No files matched your search

@@ -28,6 +28,14 @@ import { useAuthStore } from '@/state/authStore'
import { useLeaveGuardStore } from '@/state/leaveGuardStore'
import { useLocaleStore } from '@/state/localeStore'
import { fr } from '@/i18n/fr'
import DrawingGuardDialog from '@/components/editor/annotations/DrawingGuardDialog'
import { guardDrawing } from '@/editor/annotations/drawingGuard'
import {
resetWork,
setModePreview,
startMove,
useAnnotationWork,
} from '@/editor/annotations/workStore'
let fake: FakeSupabase
@@ -271,6 +279,78 @@ describe('AppLayout, editor sidebar from 1 280 px', () => {
})
})
describe('AppLayout and a started move on the drawing (R-12)', () => {
const STORED = { type: 'circle' as const, cx: 1, cy: 2, r: 3 }
afterEach(() => {
useLeaveGuardStore.getState().setAsk(null)
resetWork()
})
function mountDraft() {
render(
<MemoryRouter initialEntries={['/app/admin/sheets/s-1/draft']}>
<Routes>
<Route path="/app" element={<AppLayout />}>
<Route path="account" element={<p>account page</p>} />
<Route
path="admin/sheets/:sheetId/draft"
element={
<>
<p>draft page</p>
<DrawingGuardDialog />
</>
}
/>
</Route>
</Routes>
</MemoryRouter>,
)
useLeaveGuardStore.getState().setAsk(guardDrawing)
}
const account = () =>
screen.getAllByRole('link', {
name: new RegExp(fr['shell.nav.account']),
})[0]
const started = () => {
startMove('a', 'doc')
setModePreview({ ...STORED, cx: 9 }, STORED)
}
it('a link asks the drawing question, not the form one; « Abandonner » follows it', async () => {
const user = userEvent.setup()
mountDraft()
started()
await user.click(account())
expect(
screen.getByRole('dialog', { name: 'Abandonner le déplacement ?' }),
).toBeInTheDocument()
expect(screen.queryByText(fr['leave.title'])).toBeNull()
expect(screen.queryByText('account page')).toBeNull()
await user.click(screen.getByRole('button', { name: 'Abandonner' }))
expect(await screen.findByText('account page')).toBeInTheDocument()
})
it('with sheet changes too: the drawing question, then the leave question', async () => {
const user = userEvent.setup()
mountDraft()
started()
useLeaveGuardStore.getState().arm(true)
await user.click(account())
expect(screen.queryByText(fr['leave.title'])).toBeNull()
await user.click(screen.getByRole('button', { name: 'Abandonner' }))
expect(await screen.findByText(fr['leave.title'])).toBeInTheDocument()
expect(screen.queryByText('account page')).toBeNull()
})
it('a move with nothing started leaves at once and ends', async () => {
const user = userEvent.setup()
mountDraft()
startMove('a', 'doc')
await user.click(account())
expect(await screen.findByText('account page')).toBeInTheDocument()
expect(useAnnotationWork.getState().mode).toBeNull()
})
})
describe('monogram', () => {
it('takes initials, else two letters, else ?', () => {
expect(monogram('Alice Local', undefined)).toBe('AL')