AI: address issue #170

frontend/src/components/PostEditForm.test.tsx

@@ -1,13 +1,11 @@
-import { act, fireEvent, screen, waitFor } from '@testing-library/react'
+import { fireEvent, screen, waitFor } from '@testing-library/react'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
+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 }))
+  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

@@ -1,6 +1,8 @@
+import { useQuery } from '@tanstack/react-query'
 import { useEffect, useMemo, useState } from 'react'
 
 import { useLocale } from '@/lib/useLocale'
+import PostList from '@/components/PostList'
 import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
 import FieldError from '@/components/common/FieldError'
 import PostDurationField from '@/components/posts/PostDurationField'
@@ -10,21 +12,20 @@ import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
 import { isApiError } from '@/lib/api'
 import useDialogue from '@/lib/dialogues/useDialogue'
-import { updatePost } from '@/lib/posts'
+import { fetchPosts, updatePost } from '@/lib/posts'
+import { postsKeys } from '@/lib/queryKeys'
 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'
+import type { FetchPostsParams, Post, TagWithSections } from '@/types'
 
 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 ?? []))]
 
@@ -70,6 +71,33 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
   const [tags, setTags] = useState<string> (() => tagsToStr (post.tags))
   const [title, setTitle] = useState (post.title)
 
+  const [importVisible, setImportVisible] = useState (false)
+  const [sourceTitle, setSourceTitle] = useState ('')
+  const [sourcePage, setSourcePage] = useState (1)
+  const sourceParams: FetchPostsParams = {
+      title: sourceTitle, page: sourcePage, limit: 20,
+      url: '', tags: '', match: 'all', order: 'original_created_at:desc',
+      originalCreatedFrom: '', originalCreatedTo: '',
+      createdFrom: '', createdTo: '', updatedFrom: '', updatedTo: '' }
+  const { data: sources, isError: sourceError } = useQuery ({
+      queryKey: postsKeys.index (sourceParams, locale),
+      queryFn: () => fetchPosts (sourceParams, locale),
+      enabled: importVisible && !disabled })
+
+  const importTags = (source: Post) => {
+    if (disabled)
+      return
+    setTags (current => {
+      const existing = new Set (current.split (/\s+/))
+      const additions = tagsToStr (source.tags).split (/\s+/)
+	  .filter (tag => tag !== '' && !existing.has (tag))
+      return additions.length > 0
+	  ? `${current}${current.trim () === '' ? '' : ' '}${additions.join (' ')}`
+	  : current
+    })
+    setImportVisible (false)
+  }
+
   const videoFlg =
       useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
 	       [tags])
@@ -152,63 +180,12 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
   const handleSubmit = async (e: FormEvent) => {
     e.preventDefault ()
 
-    if (disabled) return
-
     setDisabled (true)
     try
     {
-      const current: PostEditData = {
+      await update ({ id: post.id, title, tags, parentPostIds,
-	  title, tags, parentPostIds,
 		      duration: videoFlg ? duration : null,
-	  originalCreatedFrom, originalCreatedBefore }
+		      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
@@ -245,6 +222,48 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
 	    setTags={setTags}
 	    errors={fieldErrors.tags}/>
 
+	<Button
+	    type="button"
+	    variant="outline"
+	    disabled={disabled}
+	    aria-expanded={importVisible}
+	    onClick={() => setImportVisible (visible => !visible)}>
+	  {label ('edit.import')}
+	</Button>
+	{importVisible && (
+	    <div className="space-y-2" onKeyDown={event => {
+	      if (event.key === 'Enter' && event.target instanceof HTMLInputElement)
+		event.preventDefault ()
+	    }}>
+	      <PostTextField
+		  label={label ('shared:labels.title')}
+		  type="search"
+		  value={sourceTitle}
+		  disabled={disabled}
+		  onChange={value => {
+		    setSourceTitle (value)
+		    setSourcePage (1)
+		  }}/>
+	      <FieldError messages={sourceError ? [label ('common:fetchError')] : []}/>
+	      {!disabled && <PostList posts={sources?.posts ?? []} onSelect={importTags}/>}
+	      <div className="flex flex-col gap-2 md:flex-row">
+		<Button
+		    type="button"
+		    variant="outline"
+		    disabled={disabled || sourcePage <= 1}
+		    onClick={() => setSourcePage (page => page - 1)}>
+		  {label ('common:pagination.previous')}
+		</Button>
+		<Button
+		    type="button"
+		    variant="outline"
+		    disabled={disabled || sourcePage * 20 >= (sources?.count ?? 0)}
+		    onClick={() => setSourcePage (page => page + 1)}>
+		  {label ('common:pagination.next')}
+		</Button>
+	      </div>
+	    </div>)}
+
 	{/* オリジナルの作成日時 */}
 	<PostOriginalCreatedTimeField
 	    disabled={disabled}

frontend/src/components/PostList.tsx

@@ -3,6 +3,7 @@ import { useRef } from 'react'
 import { useLocation } from 'react-router-dom'
 
 import PrefetchLink from '@/components/PrefetchLink'
+import { Button } from '@/components/ui/button'
 import { useUITranslation } from '@/lib/useUITranslation'
 import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
 import { cn } from '@/lib/utils'
@@ -13,10 +14,11 @@ import type { FC, MouseEvent } from 'react'
 import type { Post } from '@/types'
 
 type Props = { posts:     Post[]
+	       onSelect?: (post: Post) => void
 	       onClick?:  (event: MouseEvent<HTMLElement>) => void }
 
 
-const PostList: FC<Props> = ({ posts, onClick }) => {
+const PostList: FC<Props> = ({ posts, onClick, onSelect }) => {
   const { label } = useUITranslation ('shared')
   const location = useLocation ()
   const behaviourSettings = useClientBehaviourSettings ()
@@ -39,20 +41,11 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
 	  const sharedId = `page-${ post.id }`
 	  const layoutId = sharedId
 
-	  return (
+	  const card = (
-	      <PrefetchLink
-		  to={`/posts/${ post.id }`}
-		  key={post.id}
-		  className="w-40 h-40"
-		  state={{ sharedId }}
-		  onClick={e => {
-		    setForLocationKey (location.key, sharedId)
-		    onClick?.(e)
-		  }}>
 	      <motion.div
 		  ref={cardRef}
 		  layout={animationMode === 'off' ? false : true}
-		    layoutId={animationMode === 'off' ? undefined : layoutId}
+		  layoutId={(onSelect || animationMode === 'off') ? undefined : layoutId}
 		  className={cn ('w-full h-full overflow-hidden rounded-xl shadow',
 				 'transform-gpu will-change-transform',
 				 (post.childPosts ?? []).length > 0 && 'ring-4 ring-green-500',
@@ -87,13 +80,34 @@ const PostList: FC<Props> = ({ posts, onClick }) => {
 			loading={
 			    thumbnailMode === 'light'
 			    ? 'lazy'
-			      : i < 12
+			    : (i < 12 ? 'eager' : 'lazy')
-				? 'eager'
-				: 'lazy'
 			}
 			decoding="async"
 			className="object-cover w-full h-full"/>)}
-		</motion.div>
+	      </motion.div>)
+
+	  return onSelect
+	  ? (
+	      <Button
+		  key={post.id}
+		  type="button"
+		  variant="ghost"
+		  className="w-40 h-40 p-0"
+		  aria-label={post.title || post.url}
+		  onClick={() => onSelect (post)}>
+		{card}
+	      </Button>)
+	  : (
+	      <PrefetchLink
+		  to={`/posts/${ post.id }`}
+		  key={post.id}
+		  className="w-40 h-40"
+		  state={{ sharedId }}
+		  onClick={e => {
+		    setForLocationKey (location.key, sharedId)
+		    onClick?.(e)
+		  }}>
+		{card}
 	      </PrefetchLink>)
 	})}
       </div>)

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

@@ -1,4 +1,5 @@
 {
+  "_untranslated": ["edit.import"],
   "list": {
     "tagline": "{{brand}}",
     "empty": "ミンタㇻ　タ　ネン　カ　イサㇺ",
@@ -31,6 +32,7 @@
     "showExternal": "ソイタㇰ　ソㇱ　アヌカレ"
   },
   "edit": {
+    "import": "インポート",
     "validationFailed": "アシㇼ　カㇻ　カ　エアイカㇷ゚……",
     "conflictTitle": "モㇱマ　クㇽ　アシㇼ　カㇻ　ワ　アン！",
     "conflictDescription": "モㇱマ　イカㇻ　クㇽ　エエトコ　アシㇼ　カㇻ　ワ　アン。",

frontend/src/locales/ja/posts.json

@@ -22,6 +22,7 @@
     "question": "表示しますか?", "showExternal": "外部ページを表示"
   },
   "edit": {
+    "import": "インポート",
     "validationFailed": "更新はできなかったよ……",
     "conflictTitle": "競合が発生しました．",
     "conflictDescription": "ほかの耕作員が先に更新してゐます．",