AI: address review on PR #463

frontend/src/components/DraggableDroppableTagRow.test.tsx

@@ -1,9 +1,25 @@
+import { screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import DraggableDroppableTagRow from '@/components/DraggableDroppableTagRow'
 import { buildTag } from '@/test/factories'
 import { renderWithProviders } from '@/test/render'
 
+import type { CSSProperties, ReactNode } from 'react'
+
+vi.mock ('framer-motion', async importOriginal => {
+  const original = await importOriginal<typeof import ('framer-motion')> ()
+  return {
+      ...original,
+      motion: {
+	  ...original.motion,
+	  div: ({ children, style, layoutId }: {
+	      children?: ReactNode
+	      style?: CSSProperties
+	      layoutId?: string }) => (
+	      <div style={style} data-layout-id={layoutId}>{children}</div>) } }
+})
+
 const dndKit = vi.hoisted (() => ({
   useDraggable: vi.fn (),
   useDroppable: vi.fn (),
@@ -97,4 +113,32 @@ describe ('DraggableDroppableTagRow', () => {
 	}),
     )
   })
+
+  it.each ([false, true]) (
+      'separates same-id internal and external animation identities (sp=%s)',
+      sp => {
+	const internal = buildTag ({ id: 7, name: 'internal_collision' })
+	const external = buildTag ({
+	    id: 7, name: 'nico:external_collision', category: 'nico' })
+
+	renderWithProviders (
+	    <>
+	      {[internal, external].map (item => (
+		  <DraggableDroppableTagRow
+		      key={item.category}
+		      tag={item}
+		      nestLevel={0}
+		      pathKey={`cat-${ item.category }-7`}
+		      suppressClickRef={{ current: false }}
+		      sp={sp}/>))}
+	    </>)
+
+	const prefix = sp ? 'tag-sp-' : 'tag-'
+	for (const item of [internal, external])
+	{
+	  expect (screen.getByRole ('link', { name: item.name })
+	      .closest ('[data-layout-id]')).toHaveAttribute (
+		  'data-layout-id', `${ prefix }${ item.category }-7`)
+	}
+      })
 })

frontend/src/components/DraggableDroppableTagRow.tsx

@@ -137,7 +137,7 @@ const DraggableDroppableTagRow: FC<Props> = ({
 		transition={{ layout: layoutTransition }}
 		layoutId={animationMode === 'off'
 		    ? undefined
-		    : `tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
+		    : `tag-${ sp ? 'sp-' : '' }${ tag.category }-${ tag.id }`}>
 	      <TagLink tag={tag} nestLevel={nestLevel}/>
 	    </motion.div>)}
       </div>)

frontend/src/components/PostEditForm.tsx

@@ -1,8 +1,6 @@
-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'
@@ -12,15 +10,14 @@ 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 { fetchPosts, updatePost } from '@/lib/posts'
+import { 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 } from 'react'
 
-import type { FetchPostsParams, Post, TagWithSections } from '@/types'
+import type { Post, TagWithSections } from '@/types'
 
 type PostFormField =
     'parentPostIds' | 'tags' | 'videoMs'
@@ -71,33 +68,6 @@ 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])
@@ -222,48 +192,6 @@ 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,7 +3,6 @@ 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'
@@ -14,11 +13,10 @@ 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, onSelect }) => {
+const PostList: FC<Props> = ({ posts, onClick }) => {
   const { label } = useUITranslation ('shared')
   const location = useLocation ()
   const behaviourSettings = useClientBehaviourSettings ()
@@ -41,63 +39,7 @@ const PostList: FC<Props> = ({ posts, onClick, onSelect }) => {
 	  const sharedId = `page-${ post.id }`
 	  const layoutId = sharedId
 
-	  const card = (
+	  return (
-	      <motion.div
-		  ref={cardRef}
-		  layout={animationMode === 'off' ? false : true}
-		  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',
-				 (post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
-		  whileHover={{ scale: 1.02 }}
-		  onLayoutAnimationStart={() => {
-		    if (!(cardRef.current))
-		      return
-
-		    cardRef.current.style.position = 'relative'
-		    cardRef.current.style.zIndex = '9999'
-		  }}
-		  onLayoutAnimationComplete={() => {
-		    if (!(cardRef.current))
-		      return
-
-		    cardRef.current.style.zIndex = ''
-		    cardRef.current.style.position = ''
-		  }}
-		  transition={{ layout: cardLayoutTransition }}>
-		{thumbnailMode === 'off'
-		 ? (
-		    <div className="flex h-full w-full items-center justify-center
-				    bg-muted text-center text-xs text-muted-foreground">
-		      {label ('labels.noThumbnail')}
-		    </div>)
-		 : (
-		    <img
-			src={post.thumbnail || post.thumbnailBase || undefined}
-			alt={post.title || post.url}
-			title={post.title || post.url || undefined}
-			loading={
-			    thumbnailMode === 'light'
-			    ? 'lazy'
-			    : (i < 12 ? 'eager' : 'lazy')
-			}
-			decoding="async"
-			className="object-cover w-full h-full"/>)}
-	      </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}
@@ -107,7 +49,51 @@ const PostList: FC<Props> = ({ posts, onClick, onSelect }) => {
 		    setForLocationKey (location.key, sharedId)
 		    onClick?.(e)
 		  }}>
-		{card}
+		<motion.div
+		    ref={cardRef}
+		    layout={animationMode === 'off' ? false : true}
+		    layoutId={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',
+				   (post.parentPosts ?? []).length > 0 && 'ring-4 ring-yellow-500')}
+		    whileHover={{ scale: 1.02 }}
+		    onLayoutAnimationStart={() => {
+		      if (!(cardRef.current))
+			return
+
+		      cardRef.current.style.position = 'relative'
+		      cardRef.current.style.zIndex = '9999'
+		    }}
+		    onLayoutAnimationComplete={() => {
+		      if (!(cardRef.current))
+			return
+
+		      cardRef.current.style.zIndex = ''
+		      cardRef.current.style.position = ''
+		    }}
+		    transition={{ layout: cardLayoutTransition }}>
+		  {thumbnailMode === 'off'
+		   ? (
+		      <div className="flex h-full w-full items-center justify-center
+				      bg-muted text-center text-xs text-muted-foreground">
+			{label ('labels.noThumbnail')}
+		      </div>)
+		   : (
+		      <img
+			  src={post.thumbnail || post.thumbnailBase || undefined}
+			  alt={post.title || post.url}
+			  title={post.title || post.url || undefined}
+			  loading={
+			      thumbnailMode === 'light'
+			      ? 'lazy'
+			      : i < 12
+				? 'eager'
+				: 'lazy'
+			  }
+			  decoding="async"
+			  className="object-cover w-full h-full"/>)}
+		</motion.div>
 	      </PrefetchLink>)
 	})}
       </div>)

frontend/src/components/TagSidebar.test.tsx

@@ -0,0 +1,47 @@
+import { screen } from '@testing-library/react'
+import { describe, expect, it, vi } from 'vitest'
+
+import TagSidebar from '@/components/TagSidebar'
+import { buildPost, buildTag } from '@/test/factories'
+import { renderWithProviders } from '@/test/render'
+
+import type { ReactNode } from 'react'
+
+vi.mock ('@/components/TagSearch', () => ({ default: () => null }))
+vi.mock ('@/components/layout/SidebarComponent', () => ({
+    default: ({ children }: { children: ReactNode }) => <>{children}</> }))
+
+vi.mock ('framer-motion', async importOriginal => {
+  const original = await importOriginal<typeof import ('framer-motion')> ()
+  return {
+      ...original,
+      motion: {
+	  ...original.motion,
+	  div: ({ children, layoutId }: {
+	      children?: ReactNode
+	      layoutId?: string }) => (
+	      <div data-layout-id={layoutId}>{children}</div>) } }
+})
+
+describe ('TagSidebar', () => {
+  it ('keeps same-id internal and external tags with distinct identities', () => {
+    const errors = vi.spyOn (console, 'error').mockImplementation (() => {})
+    const internal = buildTag ({ id: 7, name: 'internal_collision' })
+    const external = buildTag ({
+	id: 7, name: 'nico:external_collision', category: 'nico' })
+
+    renderWithProviders (
+	<TagSidebar posts={[buildPost ({ tags: [internal, external] })]}/>)
+
+    for (const item of [internal, external])
+    {
+      const link = screen.getByRole ('link', { name: item.name })
+      expect (link).toBeInTheDocument ()
+      expect (link.closest ('[data-layout-id]')).toHaveAttribute (
+	  'data-layout-id', `tag-${ item.category }-7`)
+    }
+
+    expect (errors.mock.calls.filter (args =>
+	args.some (value => String (value).includes ('same key')))).toEqual ([])
+  })
+})

frontend/src/components/TagSidebar.tsx

@@ -84,7 +84,8 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
 	<ul>
 	  {CATEGORIES.flatMap (cat => cat in tags ? (
 	      tags[cat].map (tag => (
-		  <li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden">
+		  <li key={`${ cat }-${ tag.id }`}
+		      className="mb-1 min-w-0 max-w-full overflow-hidden">
 		    {animationsOff
 		     ? (
 			 <div className="flex min-w-0 max-w-full items-baseline overflow-hidden">
@@ -94,7 +95,7 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
 			 <motion.div
 			     className="flex min-w-0 max-w-full items-baseline overflow-hidden"
 			     transition={{ layout: layoutTransition }}
-			     layoutId={`tag-${ tag.id }`}>
+			     layoutId={`tag-${ cat }-${ tag.id }`}>
 			   <TagLink tag={tag} onClick={onClick}/>
 			 </motion.div>)}
 		  </li>))) : [])}

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

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

frontend/src/locales/ja/posts.json

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