fix(editor): overview rows ask first, no empty save, board 31 icons
U2 Task 6 review by self: - The overview stays shown during a selection (A3): its rows and view rows now go through the drawing guard, so a started move or redraw asks before a click there drops it (R-12). Was a regression: the column was unreachable while selected before Task 6. - The edit form compares and merges trimmed names and colour: a space typed alone is no change and writes no `update`. - A layer opened with no opener (reload, Forward) returns the focus to its row on close. - Board 31 A: icons on « Modifier », « Modifier la forme » (the shape's glyph), « Marquer comme relu »; « Supprimer » as red text with its trash icon. - Tests: overview row and view row ask during a started move; a row asks during a started redraw; whitespace-only save; unnamed link read rows; focus back to the row with no opener. Dead helpers removed (tests/helpers openProperties, e2e propertiesDialog). Mapping: the point-edit « Enter on the selected row … asks first » test (which replaced « Toutes les annotations asks first ») keeps its place; the overview-row path it did not cover now has its own test.
This commit is contained in:
1 parent
cd794f3c39
commit
ebcf2723a0
10 files changed
+145
-25
No files matched your search
@@ -769,10 +769,6 @@ export async function pickAnnotation(
|
|||||||
await page.evaluate(() => window.scrollTo(0, 0))
|
await page.evaluate(() => window.scrollTo(0, 0))
|
||||||
}
|
}
|
||||||
|
|
||||||
/** The open properties dialog of an annotation (U2 Task 6), by its name. */
|
|
||||||
export const propertiesDialog = (page: Page, name?: string | RegExp) =>
|
|
||||||
page.getByRole('dialog', name === undefined ? {} : { name })
|
|
||||||
|
|
||||||
/** « Propriétés » in the strip: the selection's properties dialog (A1). */
|
/** « Propriétés » in the strip: the selection's properties dialog (A1). */
|
||||||
export async function openProperties(page: Page, dict: Dict) {
|
export async function openProperties(page: Page, dict: Dict) {
|
||||||
await page
|
await page
|
||||||
|
|||||||
@@ -12,6 +12,9 @@ export type GlyphName =
|
|||||||
| 'deselect'
|
| 'deselect'
|
||||||
| 'move'
|
| 'move'
|
||||||
| 'properties'
|
| 'properties'
|
||||||
|
| 'edit'
|
||||||
|
| 'check'
|
||||||
|
| 'trash'
|
||||||
|
|
||||||
/** The editor's one glyph table (24-unit grid strokes); `book` and `close` are in `Icon`. */
|
/** The editor's one glyph table (24-unit grid strokes); `book` and `close` are in `Icon`. */
|
||||||
const GLYPHS: Record<GlyphName, string> = {
|
const GLYPHS: Record<GlyphName, string> = {
|
||||||
@@ -27,6 +30,9 @@ const GLYPHS: Record<GlyphName, string> = {
|
|||||||
search: 'M11 4a7 7 0 1 0 0 14 7 7 0 0 0 0-14zM20 20l-4-4',
|
search: 'M11 4a7 7 0 1 0 0 14 7 7 0 0 0 0-14zM20 20l-4-4',
|
||||||
move: 'M12 3v18M3 12h18M9 6l3-3 3 3M9 18l3 3 3-3M6 9l-3 3 3 3M18 9l3 3-3 3',
|
move: 'M12 3v18M3 12h18M9 6l3-3 3 3M9 18l3 3 3-3M6 9l-3 3 3 3M18 9l3 3-3 3',
|
||||||
properties: 'M7 3h7l4 4v14H7zM14 3v4h4M10 12h5M10 16h5',
|
properties: 'M7 3h7l4 4v14H7zM14 3v4h4M10 12h5M10 16h5',
|
||||||
|
edit: 'M4 20h4L19 9l-4-4L4 16zM14 6l4 4',
|
||||||
|
check: 'M5 12l5 5L19 7',
|
||||||
|
trash: 'M5 7h14M10 7V4h4v3M7 7l1 13h8l1-13',
|
||||||
deselect:
|
deselect:
|
||||||
'M4 8V5a1 1 0 0 1 1-1h3M16 4h3a1 1 0 0 1 1 1v3M20 16v3a1 1 0 0 1-1 1h-3M8 20H5a1 1 0 0 1-1-1v-3M9 9l6 6M15 9l-6 6',
|
'M4 8V5a1 1 0 0 1 1-1h3M16 4h3a1 1 0 0 1 1 1v3M20 16v3a1 1 0 0 1-1 1h-3M8 20H5a1 1 0 0 1-1-1v-3M9 9l6 6M15 9l-6 6',
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -34,6 +34,13 @@ export interface AnnotationDialogProps {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const EDIT_BUTTON_ID = 'annotation-edit-button'
|
const EDIT_BUTTON_ID = 'annotation-edit-button'
|
||||||
|
|
||||||
|
/** « Modifier la forme » shows the shape it edits (board 31 A, B). */
|
||||||
|
const SHAPE_GLYPH = {
|
||||||
|
point: 'point',
|
||||||
|
zone: 'zone',
|
||||||
|
detail_trigger: 'link',
|
||||||
|
} as const
|
||||||
const ACTION = 'min-h-11 gap-1.5 xl:min-h-9'
|
const ACTION = 'min-h-11 gap-1.5 xl:min-h-9'
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -91,6 +98,7 @@ function StatusAction({ annotation }: { annotation: Annotation }) {
|
|||||||
className={ACTION}
|
className={ACTION}
|
||||||
onClick={() => mark(reviewed ? 'to_confirm' : 'reviewed')}
|
onClick={() => mark(reviewed ? 'to_confirm' : 'reviewed')}
|
||||||
>
|
>
|
||||||
|
{!reviewed && <EditorGlyph name="check" size={16} />}
|
||||||
{t(
|
{t(
|
||||||
reviewed
|
reviewed
|
||||||
? 'editor.annotations.to_confirm'
|
? 'editor.annotations.to_confirm'
|
||||||
@@ -143,6 +151,7 @@ function ReadActions(props: ReadProps) {
|
|||||||
className={ACTION}
|
className={ACTION}
|
||||||
onClick={props.onEdit}
|
onClick={props.onEdit}
|
||||||
>
|
>
|
||||||
|
<EditorGlyph name="edit" size={16} />
|
||||||
{t('editor.findings.edit')}
|
{t('editor.findings.edit')}
|
||||||
</Button>
|
</Button>
|
||||||
{shapeEditable && (
|
{shapeEditable && (
|
||||||
@@ -153,7 +162,7 @@ function ReadActions(props: ReadProps) {
|
|||||||
className={ACTION}
|
className={ACTION}
|
||||||
onClick={props.onEditShape}
|
onClick={props.onEditShape}
|
||||||
>
|
>
|
||||||
<EditorGlyph name="move" size={16} />
|
<EditorGlyph name={SHAPE_GLYPH[annotation.kind]} size={16} />
|
||||||
{t('editor.annotations.edit_shape')}
|
{t('editor.annotations.edit_shape')}
|
||||||
</Button>
|
</Button>
|
||||||
)}
|
)}
|
||||||
@@ -163,10 +172,12 @@ function ReadActions(props: ReadProps) {
|
|||||||
<Button
|
<Button
|
||||||
type="button"
|
type="button"
|
||||||
size="sm"
|
size="sm"
|
||||||
variant="danger"
|
variant="ghost"
|
||||||
className={ACTION}
|
// Board 31 A: red text on the right, the confirmation does the deleting.
|
||||||
|
className={`${ACTION} text-[var(--color-danger-strong)]!`}
|
||||||
onClick={() => setDeleting(true)}
|
onClick={() => setDeleting(true)}
|
||||||
>
|
>
|
||||||
|
<EditorGlyph name="trash" size={16} />
|
||||||
{t('editor.action.delete')}
|
{t('editor.action.delete')}
|
||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -54,8 +54,17 @@ function draftOf(annotation: Annotation): Draft {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/** The draft as it would be saved: names and colour trimmed. */
|
||||||
|
const normalized = (draft: Draft): Draft => ({
|
||||||
|
...draft,
|
||||||
|
fr: draft.fr.trim(),
|
||||||
|
en: draft.en.trim(),
|
||||||
|
color: draft.color.trim(),
|
||||||
|
})
|
||||||
|
|
||||||
|
/** A space typed and nothing else is no change: no dirty guard, no empty `update`. */
|
||||||
const sameDraft = (a: Draft, b: Draft) =>
|
const sameDraft = (a: Draft, b: Draft) =>
|
||||||
JSON.stringify(a) === JSON.stringify(b)
|
JSON.stringify(normalized(a)) === JSON.stringify(normalized(b))
|
||||||
|
|
||||||
/** The names as saved: trimmed, or none for a link left with both blank. */
|
/** The names as saved: trimmed, or none for a link left with both blank. */
|
||||||
function namesOf(annotation: Annotation, draft: Draft) {
|
function namesOf(annotation: Annotation, draft: Draft) {
|
||||||
@@ -69,7 +78,9 @@ function namesOf(annotation: Annotation, draft: Draft) {
|
|||||||
* change made meanwhile elsewhere (a drag, a review toggle) is never overwritten.
|
* change made meanwhile elsewhere (a drag, a review toggle) is never overwritten.
|
||||||
*/
|
*/
|
||||||
function merged(current: Annotation, first: Draft, draft: Draft): Annotation {
|
function merged(current: Annotation, first: Draft, draft: Draft): Annotation {
|
||||||
const changed = (key: keyof Draft) => first[key] !== draft[key]
|
const was = normalized(first)
|
||||||
|
const now = normalized(draft)
|
||||||
|
const changed = (key: keyof Draft) => was[key] !== now[key]
|
||||||
const value: Record<string, unknown> = { ...current }
|
const value: Record<string, unknown> = { ...current }
|
||||||
if (changed('fr') || changed('en')) value.name = namesOf(current, draft)
|
if (changed('fr') || changed('en')) value.name = namesOf(current, draft)
|
||||||
if (changed('categoryId')) value.category_id = draft.categoryId
|
if (changed('categoryId')) value.category_id = draft.categoryId
|
||||||
|
|||||||
@@ -362,9 +362,15 @@ function SidePanel({
|
|||||||
readOnly={false}
|
readOnly={false}
|
||||||
filter={ui.filter}
|
filter={ui.filter}
|
||||||
onFilter={(term) => dispatch({ type: 'filter', term })}
|
onFilter={(term) => dispatch({ type: 'filter', term })}
|
||||||
onSelectView={(id) => dispatch({ type: 'view', viewId: id })}
|
// The column stays shown during a selection (A3): a row or a view that would drop
|
||||||
|
// a started move or redraw asks first (R-12).
|
||||||
|
onSelectView={(id) =>
|
||||||
|
guarded(() => dispatch({ type: 'view', viewId: id }))()
|
||||||
|
}
|
||||||
selectedId={scene.selected?.id ?? null}
|
selectedId={scene.selected?.id ?? null}
|
||||||
onSelectAnnotation={(id) => dispatch({ type: 'select', id })}
|
onSelectAnnotation={(id) =>
|
||||||
|
guarded(() => dispatch({ type: 'select', id }))()
|
||||||
|
}
|
||||||
onOpenAnnotation={(id) => scene.onOpen(id, 'drawing')}
|
onOpenAnnotation={(id) => scene.onOpen(id, 'drawing')}
|
||||||
onOpenSection={scene.onOpenSection}
|
onOpenSection={scene.onOpenSection}
|
||||||
/>
|
/>
|
||||||
|
|||||||
@@ -48,6 +48,11 @@ export function useDialogOpening(
|
|||||||
const opened = useRef<{ id: string; by: OpenedBy } | null>(null)
|
const opened = useRef<{ id: string; by: OpenedBy } | null>(null)
|
||||||
const latest = useRef(layer)
|
const latest = useRef(layer)
|
||||||
latest.current = layer
|
latest.current = layer
|
||||||
|
// A layer opened by a reload or a Forward has no opener: its row is the way back.
|
||||||
|
const shown = layer?.view?.id
|
||||||
|
if (shown && opened.current?.id !== shown) {
|
||||||
|
opened.current = { id: shown, by: 'drawing' }
|
||||||
|
}
|
||||||
const open: OpenDialog = (id, by) => {
|
const open: OpenDialog = (id, by) => {
|
||||||
const go = () => {
|
const go = () => {
|
||||||
opened.current = { id, by }
|
opened.current = { id, by }
|
||||||
|
|||||||
@@ -24,17 +24,3 @@ export function LayeredTab(
|
|||||||
</AnnounceContext>
|
</AnnounceContext>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
/** « Propriétés » in the strip, then the dialog it opened. */
|
|
||||||
export async function openProperties(
|
|
||||||
user: { click: (element: Element) => Promise<void> },
|
|
||||||
within: (element: HTMLElement) => {
|
|
||||||
getByRole: (role: string, o: object) => HTMLElement
|
|
||||||
},
|
|
||||||
): Promise<HTMLElement> {
|
|
||||||
const strip = document.querySelector<HTMLElement>(
|
|
||||||
'[data-testid="edit-strip"]',
|
|
||||||
)!
|
|
||||||
await user.click(within(strip).getByRole('button', { name: 'Propriétés' }))
|
|
||||||
return document.querySelector<HTMLElement>('dialog[open]')!
|
|
||||||
}
|
|
||||||
@@ -219,6 +219,47 @@ describe('the read mode (board 31 A, B)', () => {
|
|||||||
expect(within(dialog()!).getByText('#aa0000')).toBeInTheDocument()
|
expect(within(dialog()!).getByText('#aa0000')).toBeInTheDocument()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('an unnamed link: its opened view, « Vue ouverte », no findings zone', async () => {
|
||||||
|
const detail = insert(drawnText(), {
|
||||||
|
kind: 'view',
|
||||||
|
value: {
|
||||||
|
kind: 'detail',
|
||||||
|
id: 'view-det',
|
||||||
|
name: { fr: 'Tête', en: 'Head' },
|
||||||
|
svg_asset_id: null,
|
||||||
|
view_box: { min_x: 10, min_y: 10, width: 80, height: 80 },
|
||||||
|
parent_view_id: 'view-main',
|
||||||
|
},
|
||||||
|
})
|
||||||
|
const link = {
|
||||||
|
id: 'link-a',
|
||||||
|
view_id: 'view-main',
|
||||||
|
category_id: 'cat-a',
|
||||||
|
laterality: 'unpaired',
|
||||||
|
geometry: { type: 'circle', cx: 90, cy: 90, r: 3 },
|
||||||
|
review_status: 'to_confirm',
|
||||||
|
color: null,
|
||||||
|
kind: 'detail_trigger',
|
||||||
|
name: null,
|
||||||
|
opens_view_id: 'view-det',
|
||||||
|
} as Annotation
|
||||||
|
await mount(insert(detail, { kind: 'annotation', value: link }))
|
||||||
|
await selectRow('link-a')
|
||||||
|
const opened = await openProperties()
|
||||||
|
expect(rows()).toEqual([
|
||||||
|
'Nom (FR)',
|
||||||
|
'Nom (EN)',
|
||||||
|
'Catégorie',
|
||||||
|
'Latéralité',
|
||||||
|
'Vue ouverte',
|
||||||
|
'Vue',
|
||||||
|
])
|
||||||
|
expect(within(opened).getByTestId('annotation-read')).toHaveTextContent(
|
||||||
|
'Accès',
|
||||||
|
)
|
||||||
|
expect(within(opened).getAllByText('Tête').length).toBeGreaterThan(0)
|
||||||
|
})
|
||||||
|
|
||||||
it('« Marquer comme relu » is one change and one undo (A10)', async () => {
|
it('« Marquer comme relu » is one change and one undo (A10)', async () => {
|
||||||
await mount(insert(drawnText(), point('a', 50, 50, 5)))
|
await mount(insert(drawnText(), point('a', 50, 50, 5)))
|
||||||
await selectRow('a')
|
await selectRow('a')
|
||||||
@@ -334,6 +375,22 @@ describe('the edit form (board 31 C, R-3)', () => {
|
|||||||
expect(store.getState().documentText).toBe(before)
|
expect(store.getState().documentText).toBe(before)
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('a space typed and nothing else: no change, no history entry', async () => {
|
||||||
|
await mount(insert(drawnText(), point('a', 50, 50, 5)))
|
||||||
|
await selectRow('a')
|
||||||
|
await startEdit()
|
||||||
|
const user = userEvent.setup()
|
||||||
|
const before = depth()
|
||||||
|
await user.type(field('Nom (FR)'), ' ')
|
||||||
|
await user.click(
|
||||||
|
within(dialog()!).getByRole('button', { name: 'Enregistrer' }),
|
||||||
|
)
|
||||||
|
expect(depth()).toBe(before)
|
||||||
|
expect(
|
||||||
|
within(dialog()!).getByRole('button', { name: 'Modifier' }),
|
||||||
|
).toBeInTheDocument()
|
||||||
|
})
|
||||||
|
|
||||||
it('« Annuler » with changes asks; « Abandonner » writes nothing', async () => {
|
it('« Annuler » with changes asks; « Abandonner » writes nothing', async () => {
|
||||||
await mount(insert(drawnText(), point('a', 50, 50, 5)))
|
await mount(insert(drawnText(), point('a', 50, 50, 5)))
|
||||||
await selectRow('a')
|
await selectRow('a')
|
||||||
@@ -483,6 +540,17 @@ describe('the layer (history)', () => {
|
|||||||
).toBeInTheDocument()
|
).toBeInTheDocument()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('a layer opened with no opener (a Forward, a reload) returns the focus to its row', async () => {
|
||||||
|
await mount(insert(drawnText(), point('a', 50, 50, 5)))
|
||||||
|
act(() => layered.nav!.openAnnotation('a'))
|
||||||
|
const opened = await screen.findByRole('dialog')
|
||||||
|
await userEvent
|
||||||
|
.setup()
|
||||||
|
.click(within(opened).getByRole('button', { name: 'Fermer' }))
|
||||||
|
await waitFor(() => expect(dialog()).toBeNull())
|
||||||
|
await waitFor(() => expect(document.activeElement).toBe(rowOf('a')))
|
||||||
|
})
|
||||||
|
|
||||||
it('a deletion from the dialog closes it, unsaid as a vanish', async () => {
|
it('a deletion from the dialog closes it, unsaid as a vanish', async () => {
|
||||||
await mount(insert(drawnText(), point('a', 50, 50, 5)))
|
await mount(insert(drawnText(), point('a', 50, 50, 5)))
|
||||||
await selectRow('a')
|
await selectRow('a')
|
||||||
|
|||||||
@@ -505,6 +505,26 @@ describe('review fixes: no silent loss, no empty commit, no lost focus', () => {
|
|||||||
expect(screen.queryByTestId('annotation-creation')).toBeNull()
|
expect(screen.queryByTestId('annotation-creation')).toBeNull()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('another row or a view row of the overview asks first (A3: the column stays shown)', async () => {
|
||||||
|
await started()
|
||||||
|
const list = screen.getByRole('list', { name: 'Annotations de la vue' })
|
||||||
|
const rows = within(list).getAllByRole('button')
|
||||||
|
const other = rows.find(
|
||||||
|
(row) => row.getAttribute('aria-current') !== 'true',
|
||||||
|
)!
|
||||||
|
fireEvent.click(other)
|
||||||
|
expect(question()).toBe('move')
|
||||||
|
expect(useAnnotationWork.getState().mode?.started).toBe(true)
|
||||||
|
expect(within(list).getByRole('button', { current: true })).not.toBe(other)
|
||||||
|
act(() => useAnnotationWork.setState({ question: null }))
|
||||||
|
const views = screen
|
||||||
|
.getByRole('heading', { name: 'Vues' })
|
||||||
|
.closest('section')!
|
||||||
|
fireEvent.click(within(views).getAllByRole('button')[0]!)
|
||||||
|
expect(question()).toBe('move')
|
||||||
|
expect(screen.getByTestId('move-mode-bar')).toBeInTheDocument()
|
||||||
|
})
|
||||||
|
|
||||||
it('an unstarted mode ends at once on a tool change', async () => {
|
it('an unstarted mode ends at once on a tool change', async () => {
|
||||||
await mount(two())
|
await mount(two())
|
||||||
await select()
|
await select()
|
||||||
|
|||||||
@@ -575,6 +575,17 @@ describe('redraw (R-12, board 06 C)', () => {
|
|||||||
).toBeInTheDocument()
|
).toBeInTheDocument()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
it('a row of the overview asks first once a vertex is placed (A3, R-12)', async () => {
|
||||||
|
await redrawing()
|
||||||
|
pressAt(canvas(), 30, 30)
|
||||||
|
const list = screen.getByRole('list', { name: 'Annotations de la vue' })
|
||||||
|
fireEvent.click(within(list).getAllByRole('button')[0]!)
|
||||||
|
expect(useAnnotationWork.getState().question?.work).toBe('redraw')
|
||||||
|
expect(
|
||||||
|
screen.getByRole('button', { name: 'Fermer le tracé' }),
|
||||||
|
).toBeInTheDocument()
|
||||||
|
})
|
||||||
|
|
||||||
it('a tool asks first once a vertex is placed; « Abandonner » ends the trace', async () => {
|
it('a tool asks first once a vertex is placed; « Abandonner » ends the trace', async () => {
|
||||||
await redrawing()
|
await redrawing()
|
||||||
pressAt(canvas(), 30, 30)
|
pressAt(canvas(), 30, 30)
|
||||||
|
|||||||
Reference in new issue
Block a user