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')> (),
+    ...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,12 +152,63 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
   const handleSubmit = async (e: FormEvent) => {
     e.preventDefault ()
 
+    if (disabled) return
+
     setDisabled (true)
     try
     {
-      await update ({ id: post.id, title, tags, parentPostIds,
+      const current: PostEditData = {
-		      duration: videoFlg ? duration : null,
+	  title, tags, parentPostIds,
-		      originalCreatedFrom, originalCreatedBefore },
+	  duration: videoFlg ? duration : null,
+	  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 (!(await dialogue.confirm ({
+	  title: label ('shared:actions.diff'),
+	  confirmText: label ('shared:actions.update'),
+	  description: (
+	      <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, ...current },
 		    { baseVersionNo: post.versionNo })
     }
     finally

frontend/src/components/PostEmbed.tsx

@@ -196,39 +196,6 @@ const PostEmbed: FC<Props> = (
       return <TwitterEmbed userId={userId} statusId={statusId}/>
     }
 
-  case 'bilibili.com':
-    {
-      const videoId = url.pathname.match (
-	  /^\/video\/(BV[a-zA-Z0-9]{10}|av[1-9]\d*)\/?$/)?.[1]
-      if (!(videoId))
-	break
-
-      if (embedAutoLoadMode === 'off')
-	return externalLink
-      if (shouldLoadEmbed === false)
-	return manualLoadControl
-
-      const playerUrl = new URL ('https://player.bilibili.com/player.html')
-      const parameter = videoId.startsWith ('BV') ? 'bvid' : 'aid'
-      const identifier = parameter === 'bvid' ? videoId : videoId.slice (2)
-      playerUrl.searchParams.set (parameter, identifier)
-      playerUrl.searchParams.set ('autoplay', '1')
-
-      const page = url.searchParams.get ('p')
-      if (page != null && /^[1-9]\d*$/.test (page))
-	playerUrl.searchParams.set ('p', page)
-
-      return (
-	  <iframe
-	      src={playerUrl.toString ()}
-	      title={post.title || post.url}
-	      width={640}
-	      height={360}
-	      className="aspect-video h-auto max-w-full"
-	      allow="autoplay; fullscreen"
-	      allowFullScreen/>)
-    }
-
   case 'youtube.com':
     {
       const videoId = url.searchParams.get ('v')