AI: address review on PR #472

frontend/src/components/PostEditForm.test.tsx

@@ -1,13 +1,11 @@
-import { act, fireEvent, screen, waitFor } from '@testing-library/react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+import { fireEvent, screen, waitFor } from '@testing-library/react'
+import { 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 (),
 }))
@@ -20,27 +18,18 @@ 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: () => dialogue }))
+  ...await importOriginal<typeof import ('@/lib/dialogues/useDialogue')> (),
+  default: () => ({
+    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,
@@ -66,16 +55,6 @@ 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 ({
@@ -92,28 +71,6 @@ 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,
@@ -143,7 +100,6 @@ 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, ReactNode } from 'react'
+import type { FC, FormEvent } from 'react'
 
 import type { Post, TagWithSections } from '@/types'
 
@@ -23,8 +23,6 @@ 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 ?? []))]
 
@@ -152,63 +150,12 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
   const handleSubmit = async (e: FormEvent) => {
     e.preventDefault ()
 
-    if (disabled) return
-
     setDisabled (true)
     try
     {
-      const current: PostEditData = {
-	  title, tags, parentPostIds,
-	  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 },
+      await update ({ id: post.id, title, tags, parentPostIds,
+		      duration: videoFlg ? duration : null,
+		      originalCreatedFrom, originalCreatedBefore },
 		    { baseVersionNo: post.versionNo })
     }
     finally

frontend/src/components/PostEmbed.tsx

@@ -177,6 +177,39 @@ const PostEmbed: FC<Props> = (
 	      onError={onError}/>)
     }
 
+  case 'pixiv.net':
+    {
+      if (url.hostname !== 'pixiv.net' && url.hostname !== 'www.pixiv.net')
+	break
+
+      const artworkId =
+	  url.pathname === '/member_illust.php'
+	  ? url.searchParams.get ('illust_id')
+	  : url.pathname.match (
+	      /^\/(?:[a-z]{2}(?:-[A-Za-z]{2})?\/)?artworks\/(\d+)\/?$/)?.[1]
+
+      if (!(artworkId) || !(/^\d+$/.test (artworkId)))
+	break
+
+      if (embedAutoLoadMode === 'off')
+	return externalLink
+      if (shouldLoadEmbed === false)
+	return manualLoadControl
+
+      const embedUrl =
+	  `https://embed.pixiv.net/oembed_iframe.php?type=illust&id=${ artworkId }`
+
+      return (
+	  <iframe
+	      src={embedUrl}
+	      title={post.title || post.url}
+	      width={600}
+	      height={315}
+	      style={{ border: 0 }}
+	      loading="lazy"
+	      className="max-w-full"/>)
+    }
+
   case 'twitter.com':
   case 'x.com':
     {