From 6dc633d23eb987ef7b346b7d5762fccfcb22e657 Mon Sep 17 00:00:00 2001 From: Codex Night Worker Date: Wed, 18 Nov 2026 12:47:08 +0900 Subject: [PATCH] AI: address issue #484 --- frontend/src/components/PostEditForm.test.tsx | 101 ++++++++++++++++-- frontend/src/components/PostEditForm.tsx | 68 +++++++++++- 2 files changed, 158 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/PostEditForm.test.tsx b/frontend/src/components/PostEditForm.test.tsx index 60c4170..8540c2d 100644 --- a/frontend/src/components/PostEditForm.test.tsx +++ b/frontend/src/components/PostEditForm.test.tsx @@ -1,5 +1,5 @@ -import { fireEvent, screen, waitFor } from '@testing-library/react' -import { describe, expect, it, vi } from 'vitest' +import { fireEvent, screen, waitFor, within } from '@testing-library/react' +import { beforeEach, describe, expect, it, vi } from 'vitest' import { textContentOf } from '@/test/text' import PostEditForm from '@/components/PostEditForm' @@ -21,14 +21,99 @@ const toastApi = vi.hoisted (() => ({ vi.mock ('@/lib/posts', () => postsApi) vi.mock ('@/lib/api', () => api) vi.mock ('@/components/ui/use-toast', () => toastApi) -vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({ - ...await importOriginal (), - default: () => ({ - choice: vi.fn (), - }), -})) describe ('PostEditForm', () => { + beforeEach (() => { + postsApi.updatePost.mockReset () + api.isApiError.mockReset ().mockReturnValue (false) + toastApi.toast.mockClear () + }) + + it ('shows all conflict values before a choice and preserves edits on cancel', async () => { + const post = buildPost ({ versionNo: 4, title: 'original title' }) + const onSave = vi.fn () + api.isApiError.mockReturnValue (true) + postsApi.updatePost.mockRejectedValueOnce ({ response: { + status: 409, + data: { base_version_no: 4, current_version_no: 5, mergeable: false, + changes: [ + { field: 'title', label: 'server label', base: 'original title', + current: 'server title', mine: 'my title' }, + { field: 'video_ms', base: null, current: 180_500, mine: 0 }, + { field: 'original_created_from', base: null, + current: '2026-01-01T00:00:00Z', mine: '2026-02-01T00:00:00Z' }, + { field: 'original_created_before', base: '2026-01-02T00:00:00Z', + current: '2026-01-03T00:00:00Z', mine: null }, + { field: 'tag_names', base: ['old-tag'], current: ['tag-a', 'tag-b'], + mine: [] }, + { field: 'parent_post_ids', base: [2], current: [], mine: [3, 4] }] } } }) + + render () + const title = screen.getAllByRole ('textbox')[0] + fireEvent.change (title, { target: { value: 'my title' } }) + fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!) + + const dialogue = within (await screen.findByRole ('dialog')) + const table = dialogue.getByRole ('table') + expect (within (table).getAllByRole ('columnheader').map (cell => cell.textContent)) + .toEqual (['版 4', '版 5', '編輯']) + const rows = within (table).getAllByRole ('row').slice (1) + expect (rows.map (row => within (row).getByRole ('rowheader').textContent)) + .toEqual (['タイトル', '動画時間', 'オリジナルの作成日時 以降', + 'オリジナルの作成日時 より前', 'タグ', '親投稿']) + expect (rows.map (row => within (row).getAllByRole ('cell') + .map (cell => cell.textContent))).toEqual ([ + ['original title', 'server title', 'my title'], + ['', '3:00.500', '0:00'], + ['', '2026-01-01T00:00:00Z', '2026-02-01T00:00:00Z'], + ['2026-01-02T00:00:00Z', '2026-01-03T00:00:00Z', ''], + ['old-tag', 'tag-a\ntag-b', ''], ['2', '', '3\n4']]) + expect (table.querySelector ('b')).toBeNull () + expect (dialogue.queryByText ('server label')).not.toBeInTheDocument () + expect (dialogue.queryByRole ('button', { name: '差分をマージ' })) + .not.toBeInTheDocument () + expect (postsApi.updatePost).toHaveBeenCalledTimes (1) + expect (onSave).not.toHaveBeenCalled () + + fireEvent.click (dialogue.getByRole ('button', { name: '取消' })) + await waitFor (() => expect (screen.queryByRole ('dialog')).not.toBeInTheDocument ()) + expect (title).toHaveValue ('my title') + await waitFor (() => expect (screen.getByRole ('button', { name: '更新' })) + .not.toBeDisabled ()) + expect (postsApi.updatePost).toHaveBeenCalledTimes (1) + expect (onSave).not.toHaveBeenCalled () + }) + + it.each ([ + { action: '差分をマージ', mergeable: true, options: { merge: true } }, + { action: '強制上書き', mergeable: false, options: { force: true } }]) ( + 'keeps the $action flow after displaying conflict values', + async ({ action, mergeable, options }) => { + const post = buildPost ({ id: 8, versionNo: 4, title: 'original' }) + const onSave = vi.fn () + api.isApiError.mockReturnValue (true) + postsApi.updatePost.mockRejectedValueOnce ({ response: { + status: 409, + data: { base_version_no: 4, current_version_no: 5, mergeable, + changes: [{ field: 'title', base: 'original', + current: 'server', mine: 'mine' }] } } }) + .mockResolvedValueOnce ({ ...post, versionNo: 6, title: 'mine' }) + + render () + fireEvent.change (screen.getAllByRole ('textbox')[0], { target: { value: 'mine' } }) + fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!) + + const dialogue = within (await screen.findByRole ('dialog')) + expect (dialogue.getByRole ('table')).toHaveTextContent ('server') + fireEvent.click (dialogue.getByRole ('button', { name: action })) + await waitFor (() => expect (onSave) + .toHaveBeenCalledWith (expect.objectContaining ({ versionNo: 6 }))) + expect (postsApi.updatePost).toHaveBeenCalledTimes (2) + expect (postsApi.updatePost).toHaveBeenLastCalledWith ( + expect.objectContaining ({ id: 8, title: 'mine' }), + { baseVersionNo: 4, ...options }, 'ja') + }) + it ('submits edited post fields with the current base version', async () => { const onSave = vi.fn () const post = buildPost ({ diff --git a/frontend/src/components/PostEditForm.tsx b/frontend/src/components/PostEditForm.tsx index 99039d9..5ec0e3b 100644 --- a/frontend/src/components/PostEditForm.tsx +++ b/frontend/src/components/PostEditForm.tsx @@ -23,6 +23,27 @@ type PostFormField = 'parentPostIds' | 'tags' | 'videoMs' | 'originalCreatedAt' | 'originalCreatedFrom' | 'originalCreatedBefore' +type PostConflictValue = string | number | null | (string | number)[] + +type PostConflict = { + base_version_no: number + current_version_no: number + mergeable?: boolean + changes?: { + field: 'title' | 'video_ms' | 'original_created_from' + | 'original_created_before' | 'tag_names' | 'parent_post_ids' + base: PostConflictValue + current: PostConflictValue + mine: PostConflictValue }[] } + + +const formatConflictValue = (field: string, value: PostConflictValue): string => { + if (value == null) return '' + if (Array.isArray (value)) return value.join ('\n') + return (field === 'video_ms' && typeof value === 'number') ? msToTime (value) : String (value) +} + + const groupedMessages = (...values: (string[] | undefined)[]): string[] => [...new Set (values.flatMap (value => value ?? []))] @@ -97,7 +118,7 @@ const PostEditForm: FC = ({ post, onSave }) => { } catch (e) { - const response = isApiError<{ mergeable?: boolean }> (e) ? e.response : undefined + const response = isApiError (e) ? e.response : undefined if (response?.status !== 409) { @@ -113,11 +134,54 @@ const PostEditForm: FC = ({ post, onSave }) => { return } + const conflict = response.data + const fieldLabels = { + title: label ('shared:labels.title'), + video_ms: label ('shared:labels.duration'), + original_created_from: <>{label ('shared:labels.originalCreatedAt')} + {' '}{label ('shared:labels.since')}, + original_created_before: <>{label ('shared:labels.originalCreatedAt')} + {' '}{label ('shared:labels.before')}, + tag_names: label ('navigation:tags'), + parent_post_ids: label ('shared:labels.parentPosts') } + const action = await dialogue.choice ({ title: label ('edit.conflictTitle'), description: (

{label ('edit.conflictDescription')}

+ {(conflict.changes?.length ?? 0) > 0 && ( +
+ + + + + + + + + + {conflict.changes?.map (change => ( + + + {(['base', 'current', 'mine'] as const).map (column => ( + ))} + ))} + +
+ + {label ('history:version')} {conflict.base_version_no} + + {label ('history:version')} {conflict.current_version_no} + + {label ('shared:actions.edit')} +
+ {fieldLabels[change.field]} + + {formatConflictValue (change.field, change[column])} +
+
)}

{label ('edit.conflictQuestion')}

), cancelText: label ('shared:actions.cancel'), @@ -128,7 +192,6 @@ const PostEditForm: FC = ({ post, onSave }) => { if (action === 'merge') { - // TODO: 差分 UI await update ({ id: post.id, title, tags, parentPostIds, duration: videoFlg ? duration : null, originalCreatedFrom, originalCreatedBefore }, @@ -218,5 +281,4 @@ const PostEditForm: FC = ({ post, onSave }) => { ) } - export default PostEditForm