AI: address review on PR #465

frontend/src/components/PostEditForm.test.tsx

@@ -1,11 +1,13 @@
-import { fireEvent, screen, waitFor } from '@testing-library/react'
+import { act, fireEvent, screen, waitFor } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { textContentOf } from '@/test/text'
 import PostEditForm from '@/components/PostEditForm'
 import { buildPost, buildTag } from '@/test/factories'
 import { renderWithProviders as render } from '@/test/render'
 
+import type { DialogueAPI } from '@/lib/dialogues/useDialogue'
+
 const postsApi = vi.hoisted (() => ({
   updatePost: vi.fn (),
 }))
@@ -18,18 +20,27 @@ const toastApi = vi.hoisted (() => ({
   toast: vi.fn (),
 }))
 
+const dialogue = vi.hoisted (() => ({
+    confirm: vi.fn<DialogueAPI['confirm']> (),
+    choice: vi.fn () }))
+
 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<typeof import ('@/lib/dialogues/useDialogue')> (),
-  default: () => ({
+    default: () => dialogue }))
-    choice: vi.fn (),
-  }),
-}))
 
 describe ('PostEditForm', () => {
+  beforeEach (() => {
+    vi.resetAllMocks ()
+  })
+
   it ('submits edited post fields with the current base version', async () => {
+    const confirm = vi.fn<(value: boolean) => void> ()
+    dialogue.confirm.mockReturnValueOnce (new Promise<boolean> (resolve => {
+      confirm.mockImplementation (resolve)
+    }))
     const onSave = vi.fn ()
     const post = buildPost ({
       id:        8,
@@ -55,6 +66,16 @@ describe ('PostEditForm', () => {
     fireEvent.change (parentIds, { target: { value: '3 4' } })
     fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
 
+    expect (postsApi.updatePost).not.toHaveBeenCalled ()
+    expect (dialogue.confirm).toHaveBeenCalledTimes (1)
+    const difference = textContentOf (
+	dialogue.confirm.mock.calls[0][0].description)
+    expect (difference).toContain ('oldnew')
+    expect (difference).toContain ('23 4')
+    expect (difference).not.toContain ('general-tag')
+
+    await act (async () => { confirm (true) })
+
     await waitFor (() => {
       expect (postsApi.updatePost).toHaveBeenCalledWith (
           expect.objectContaining ({
@@ -71,6 +92,28 @@ describe ('PostEditForm', () => {
     expect (textContentOf (toastApi.toast.mock.calls[0][0].description)).toBe ('更新しました．')
   })
 
+  it ('keeps edited fields without submitting when confirmation is cancelled', async () => {
+    const onSave = vi.fn ()
+    dialogue.confirm.mockResolvedValueOnce (false)
+    render (<PostEditForm post={buildPost ()} onSave={onSave}/>)
+
+    const [title, parentIds] = screen.getAllByRole ('textbox')
+    fireEvent.change (title, { target: { value: 'new' } })
+    fireEvent.change (parentIds, { target: { value: '3 4' } })
+    const button = screen.getByRole ('button', { name: '更新' })
+    fireEvent.submit (button.closest ('form')!)
+
+    await waitFor (() => {
+      expect (button).toBeEnabled ()
+    })
+    expect (dialogue.confirm).toHaveBeenCalledTimes (1)
+    expect (postsApi.updatePost).not.toHaveBeenCalled ()
+    expect (onSave).not.toHaveBeenCalled ()
+    expect (toastApi.toast).not.toHaveBeenCalled ()
+    expect (title).toHaveValue ('new')
+    expect (parentIds).toHaveValue ('3 4')
+  })
+
   it ('preserves duration while the video tag is temporarily removed', () => {
     const post = buildPost ({
       videoMs: 180_500,
@@ -100,6 +143,7 @@ describe ('PostEditForm', () => {
       'shows deduplicated original-created endpoint errors on the shared datetime field',
       async () => {
     const post = buildPost ()
+    dialogue.confirm.mockResolvedValueOnce (true)
     api.isApiError.mockReturnValue (true)
     postsApi.updatePost.mockRejectedValueOnce ({
       response: {

frontend/src/components/PostEditForm.tsx

@@ -15,7 +15,7 @@ import { msToTime } from '@/lib/utils'
 import { useValidationErrors } from '@/lib/useValidationErrors'
 import { useUITranslation } from '@/lib/useUITranslation'
 
-import type { FC, FormEvent } from 'react'
+import type { FC, FormEvent, ReactNode } from 'react'
 
 import type { Post, TagWithSections } from '@/types'
 
@@ -23,6 +23,8 @@ type PostFormField =
     'parentPostIds' | 'tags' | 'videoMs'
     | 'originalCreatedAt' | 'originalCreatedFrom' | 'originalCreatedBefore'
 
+type PostEditData = Omit<Parameters<typeof updatePost>[0], 'id'>
+
 const groupedMessages = (...values: (string[] | undefined)[]): string[] =>
     [...new Set (values.flatMap (value => value ?? []))]
 
@@ -150,27 +152,63 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
   const handleSubmit = async (e: FormEvent) => {
     e.preventDefault ()
 
+    if (disabled) return
+
     setDisabled (true)
     try
     {
-      const titleMissing = !title?.trim ()
+      const current: PostEditData = {
-      const thumbnailMissing =
+	  title, tags, parentPostIds,
-	  !titleMissing
+	  duration: videoFlg ? duration : null,
-	  && !(post.thumbnail?.trim () || post.thumbnailBase?.trim ())
+	  originalCreatedFrom, originalCreatedBefore }
+      const fields: {
+	  [Key in keyof PostEditData]-?: {
+	      name: ReactNode
+	      prev: PostEditData[Key] } } = {
+	  title: { name: label ('shared:labels.title'), prev: post.title },
+	  parentPostIds: {
+	      name: label ('shared:labels.parentPosts'),
+	      prev: (post.parentPosts ?? []).map (parent => parent.id).join (' ') },
+	  tags: { name: label ('tags:title'), prev: tagsToStr (post.tags) },
+	  duration: {
+	      name: label ('shared:labels.duration'),
+	      prev: videoMsToDurationValue (post.videoMs) },
+	  originalCreatedFrom: {
+	      name: <>{label ('shared:labels.originalCreatedAt')}{' '}
+			{label ('shared:labels.since')}</>,
+	      prev: post.originalCreatedFrom },
+	  originalCreatedBefore: {
+	      name: <>{label ('shared:labels.originalCreatedAt')}{' '}
+			{label ('shared:labels.before')}</>,
+	      prev: post.originalCreatedBefore } }
+      const differences = (Object.keys (fields) as (keyof PostEditData)[])
+	  .map (key => ({ key, name: fields[key].name,
+	      prev: fields[key].prev ?? '', current: current[key] ?? '' }))
+	  .filter (row => row.prev !== row.current)
 
-      if ((titleMissing || thumbnailMissing)
+      if (!(await dialogue.confirm ({
-	  && !(await dialogue.confirm ({
+	  title: label ('shared:actions.diff'),
-	      title: titleMissing
-		  ? label ('edit.titleMissingConfirmation')
-		  : label ('edit.thumbnailMissingConfirmation'),
 	  confirmText: label ('shared:actions.update'),
-	      cancelText: label ('shared:actions.cancel'),
+	  description: (
-	      closeLabel: label ('settings:actions.close') })))
+	      <dl className="max-h-[60dvh] overflow-y-auto space-y-3 text-left">
+		{differences.map (row => (
+		    <div key={row.key}>
+		      <dt className="font-semibold">{row.name}</dt>
+		      <dd className="whitespace-pre-wrap break-words">
+			{row.prev && (
+			    <del className="block text-red-600 dark:text-red-400">
+			      {row.prev}
+			    </del>)}
+			{row.current && (
+			    <ins className="block text-green-700 dark:text-green-400">
+			      {row.current}
+			    </ins>)}
+		      </dd>
+		    </div>))}
+	      </dl>) })))
 	return
 
-      await update ({ id: post.id, title, tags, parentPostIds,
+      await update ({ id: post.id, ...current },
-		      duration: videoFlg ? duration : null,
-		      originalCreatedFrom, originalCreatedBefore },
 		    { baseVersionNo: post.versionNo })
     }
     finally

frontend/src/components/layout/SidebarComponent.test.tsx

@@ -70,16 +70,6 @@ describe ('SidebarComponent', () => {
     vi.spyOn (HTMLElement.prototype, 'hasPointerCapture').mockReturnValue (true)
   })
 
-  it ('limits sidebar scrolling to desktop to avoid clipping mobile suggestions', () => {
-    renderSidebar ()
-
-    // jsdom has no layout; guard the responsive classes responsible for clipping.
-    const sidebar = screen.getByText ('Sidebar body')
-
-    expect (sidebar).not.toHaveClass ('overflow-y-auto')
-    expect (sidebar).toHaveClass ('md:overflow-y-auto')
-  })
-
   it ('uses maxWidth without applying the container main-width reserve twice', async () => {
     localStorage.setItem ('sidebar:test-sidebar:left:width', '700')
     const onWidthChange = vi.fn ()

frontend/src/components/layout/SidebarComponent.tsx

@@ -339,7 +339,7 @@ const SidebarComponent: FC<Props> = ({
 	  </style>
 	</Helmet>
 
-	<div className="h-full md:overflow-y-auto p-4 sidebar">
+	<div className="h-full overflow-y-auto p-4 sidebar">
 	  {children}
 	</div>
 

frontend/src/locales/ain-Kana/posts.json

@@ -1,5 +1,4 @@
 {
-  "_untranslated": ["edit.titleMissingConfirmation", "edit.thumbnailMissingConfirmation"],
   "list": {
     "tagline": "{{brand}}",
     "empty": "ミンタㇻ　タ　ネン　カ　イサㇺ",
@@ -32,8 +31,6 @@
     "showExternal": "ソイタㇰ　ソㇱ　アヌカレ"
   },
   "edit": {
-    "titleMissingConfirmation": "タイトルが設定されてゐません．更新しますか?",
-    "thumbnailMissingConfirmation": "サムネールが設定されてゐません．更新しますか?",
     "validationFailed": "アシㇼ　カㇻ　カ　エアイカㇷ゚……",
     "conflictTitle": "モㇱマ　クㇽ　アシㇼ　カㇻ　ワ　アン！",
     "conflictDescription": "モㇱマ　イカㇻ　クㇽ　エエトコ　アシㇼ　カㇻ　ワ　アン。",

frontend/src/locales/ja/posts.json

@@ -22,8 +22,6 @@
     "question": "表示しますか?", "showExternal": "外部ページを表示"
   },
   "edit": {
-    "titleMissingConfirmation": "タイトルが設定されてゐません．更新しますか?",
-    "thumbnailMissingConfirmation": "サムネールが設定されてゐません．更新しますか?",
     "validationFailed": "更新はできなかったよ……",
     "conflictTitle": "競合が発生しました．",
     "conflictDescription": "ほかの耕作員が先に更新してゐます．",

frontend/src/pages/tags/TagDetailPage.test.tsx

@@ -35,10 +35,6 @@ const renderPage = () =>
 describe ('TagDetailPage', () => {
   beforeEach (() => {
     vi.clearAllMocks ()
-    tagsApi.fetchTag.mockReset ()
-    api.apiPut.mockReset ()
-    api.isApiError.mockReset ()
-    toastApi.toast.mockReset ()
     api.isApiError.mockReturnValue (false)
   })
 
@@ -55,11 +51,8 @@ describe ('TagDetailPage', () => {
   })
 
   it ('submits edited tag fields', async () => {
-    const updatedTag = buildTag ({ id: 7, name: 'new', aliases: ['alias'] })
+    tagsApi.fetchTag.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
-    tagsApi.fetchTag
+    api.apiPut.mockResolvedValueOnce (buildTag ({ id: 7, name: 'new', aliases: ['alias'] }))
-	.mockResolvedValue (updatedTag)
-	.mockResolvedValueOnce (buildTag ({ id: 7, name: 'old' }))
-    api.apiPut.mockResolvedValueOnce (updatedTag)
 
     renderPage ()