AI: address review on PR #463

backend/app/controllers/wiki_pages_controller.rb

@@ -6,11 +6,6 @@ class WikiPagesController < ApplicationController
   def index
     locale = resolve_locale!
 
-    resource_type = params[:resource_type]
-    unless resource_type.nil? || ['tag_description', 'tag_group'].include?(resource_type)
-      return head :bad_request
-    end
-
     title = params[:title].to_s.strip
     descriptions =
         HistoryAccess.current(TagDescription.all, TagDescriptionVersion)
@@ -19,8 +14,6 @@ class WikiPagesController < ApplicationController
 
     descriptions = descriptions.order(updated_at: :desc, id: :asc)
     tag_groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).order(updated_at: :desc, id: :asc)
-    descriptions = descriptions.none if resource_type == 'tag_group'
-    tag_groups = tag_groups.none if resource_type == 'tag_description'
     if title.present?
       pattern = "%#{ ApplicationRecord.sanitize_sql_like(title) }%"
       descriptions =

frontend/src/App.tsx

@@ -166,13 +166,7 @@ export const pageRoutes = (
 	    robots: 'noindex', authentication: 'user' } },
 	{ path: ':id', element: <MaterialDetailPage/>,
 	  handle: { preload: MaterialDetailPage.preload, sitemap: ['materials'] } }] },
-    { path: 'wiki', element: <LocaleRedirect to="/tag-descriptions"/>,
-      handle: { redirectTo: '/tag-descriptions' } },
-    { path: 'tag-descriptions',
-      element: <WikiSearchPage key="tag_description" resourceType="tag_description"/>,
-      handle: { preload: WikiSearchPage.preload, sitemap: ['static'] } },
-    { path: 'tag-groups',
-      element: <WikiSearchPage key="tag_group" resourceType="tag_group"/>,
+    { path: 'wiki', element: <WikiSearchPage/>,
       handle: { preload: WikiSearchPage.preload, sitemap: ['static'] } },
     { path: 'wiki/:title', element: <WikiDetailPage/>,
       handle: { preload: WikiDetailPage.preload, switchLocale: switchWikiLocale,

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/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/components/TopNav.tsx

@@ -29,7 +29,7 @@ import { fetchWikiPage } from '@/lib/wiki'
 import type { FC, MouseEvent } from 'react'
 
 import type { AvailableLocale, LocaleCode } from '@/lib/locales'
-import type { Material, Menu, MenuVisibleItem, Tag, User, WikiPage } from '@/types'
+import type { Material, Menu, MenuVisibleItem, Tag, User } from '@/types'
 
 type Props = {
     user: User | null
@@ -39,11 +39,10 @@ type NavDensity = 'auto' | 'comfortable' | 'compact'
 
 
 export const menuOutline = (
-    { tag, material, wikiId, wikiResourceType, user, pathName: fullPathname }: {
+    { tag, material, wikiId, user, pathName: fullPathname }: {
 	tag?: Tag | null
 	material?: Material | null
 	wikiId: number | null
-	wikiResourceType?: WikiPage['resourceType']
 	user: User | null
 	pathName: string },
 ): Menu => {
@@ -100,30 +99,17 @@ export const menuOutline = (
 	    visible: materialFlg && Boolean (material?.tag) },
 	  { ...message ('history'), to: `/materials/changes?material_id=${ material?.id }`,
 	    visible: materialFlg }] },
-      ...([
-	  { key: 'tagDescriptions', path: '/tag-descriptions', type: 'tag_description' },
-	  { key: 'tagGroups', path: '/tag-groups', type: 'tag_group' }] as const)
-	  .map (({ key, path, type }): MenuVisibleItem => {
-	    const current = (wikiResourceType ?? 'tag_description') === type
-	    const detailFlg = wikiPageFlg && current
-	    const creationPath =
-		type === 'tag_group'
-		? `/wiki/new?title=${ encodeURIComponent ('タググループ:') }` : '/wiki/new'
-	    return { ...message (key), to: path,
-		base: (pathName.startsWith ('/wiki') && current) ? '/wiki' : path,
-		subMenu: [
-		    { ...message ('search'), to: path },
-		    { ...message ('create'), to: creationPath, visible: editable },
-		    { ...message ('allHistory'), to: '/wiki/changes' },
-		    { ...message ('help'), to: '/wiki/ヘルプ:Wiki' },
-		    { component: <Separator/>, visible: detailFlg },
-		    { ...message ('postsWithCount', { count: postCount }),
-		      to: `/posts?tags=${ wikiTitle }`, visible: detailFlg },
-		    { ...message ('history'), to: `/wiki/changes?id=${ wikiId }`,
-		      visible: detailFlg },
-		    { ...message ('edit'), to: `/wiki/${ wikiId || wikiTitle }/edit`,
-		      visible: detailFlg && editable }] }
-	  }),
+      { ...message ('wiki'), to: '/wiki', subMenu: [
+	  { ...message ('search'), to: '/wiki' },
+	  { ...message ('create'), to: '/wiki/new', visible: editable },
+	  { ...message ('allHistory'), to: '/wiki/changes' },
+	  { ...message ('help'), to: '/wiki/ヘルプ:Wiki' },
+	  { component: <Separator/>, visible: wikiPageFlg },
+	  { ...message ('postsWithCount', { count: postCount }), to: `/posts?tags=${ wikiTitle }`,
+	    visible: wikiPageFlg },
+	  { ...message ('history'), to: `/wiki/changes?id=${ wikiId }`, visible: wikiPageFlg },
+	  { ...message ('edit'), to: `/wiki/${ wikiId || wikiTitle }/edit`,
+	    visible: wikiPageFlg && editable }] },
       { ...message ('help'), to: '/help/home', base: '/help', subMenu: [
 	  { ...message ('search'), to: '/help' },
 	  { ...message ('allHistory'), to: '/help/changes' },
@@ -243,8 +229,7 @@ const TopNav: FC<Props> = ({ user, locales, resolveLocaleSwitch }) => {
       queryKey: materialsKeys.show (effectiveTitle, locale),
       queryFn: () => fetchMaterial (effectiveTitle, locale) })
 
-  const menu = menuOutline ({ tag, material, wikiId,
-      wikiResourceType: wikiPage?.resourceType, user, pathName: location.pathname })
+  const menu = menuOutline ({ tag, material, wikiId, user, pathName: location.pathname })
   const visibleMenu = menu.filter ((item): item is MenuVisibleItem => item.visible ?? true)
   const menuLabels = visibleMenu.map (item => item.name).join ('\u0000')
   const moreMenu = menu.filter (item =>

frontend/src/lib/prefetchers.ts

@@ -100,11 +100,10 @@ const prefetchHelpDiff: Prefetcher = async (qc, url, locale) => {
 
 const prefetchWikiPagesIndex: Prefetcher = async (qc, url, locale) => {
   const title = url.searchParams.get ('title') ?? ''
-  const resourceType = url.pathname === '/tag-groups' ? 'tag_group' : 'tag_description'
 
   await qc.prefetchQuery ({
-      queryKey: wikiKeys.index ({ title, resourceType }, locale),
-      queryFn: () => fetchWikiPages ({ title, resourceType }, locale) })
+      queryKey: wikiKeys.index ({ title }, locale),
+      queryFn:  () => fetchWikiPages ({ title }, locale) })
 }
 
 
@@ -311,8 +310,7 @@ export const routePrefetchers: { test: (u: URL) => boolean; run: Prefetcher }[]
 		  && Boolean (mPost (u.pathname))),
       run: prefetchPostShow },
     { test: u => u.pathname === '/posts/changes', run: prefetchPostChanges },
-    { test: u => ['/wiki', '/tag-descriptions', '/tag-groups'].includes (u.pathname),
-      run: prefetchWikiPagesIndex },
+    { test: u => u.pathname === '/wiki', run: prefetchWikiPagesIndex },
     { test: u => (!(['/wiki/new', '/wiki/changes'].includes (u.pathname))
 		  && Boolean (mWiki (u.pathname))),
       run: prefetchWikiPageShow },

frontend/src/lib/queryKeys.ts

@@ -5,7 +5,6 @@ import type {
     FetchPostsParams,
     FetchTagsParams,
     MaterialFilter,
-    WikiPage,
     WikiTagReference } from '@/types'
 
 export const localesKeys = {
@@ -131,7 +130,7 @@ export const wikiKeys = {
     autolinkCandidates: (language: string, locale: LocaleCode) =>
 	['wiki', 'autolink', locale, language] as const,
     index:  (
-    p: { title?: string, resourceType?: WikiPage['resourceType'] },
+    p: { title?: string },
     locale: LocaleCode = 'ja',
 ) => ['wiki', locale, 'index', p] as const,
     show:   (

frontend/src/lib/wiki.ts

@@ -24,10 +24,10 @@ export const fetchWikiChanges = (
 
 
 export const fetchWikiPages = async (
-    { title, resourceType }: { title?: string, resourceType?: WikiPage['resourceType'] },
+    { title }:  { title?: string },
     locale: LocaleCode = 'ja',
 ): Promise<WikiPage[]> =>
-    await apiGet ('/wiki', { locale, params: { title, resource_type: resourceType } })
+    await apiGet ('/wiki', { locale, params: { title } })
 
 
 export const fetchWikiPage = async (

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

@@ -14,8 +14,6 @@
   "materials": "チカㇻペ",
   "suppressions": "アエアイカㇷ゚テㇷ゚",
   "wiki": "Wiki",
-  "tagDescriptions": "$t(counts:resources.tag_descriptions)",
-  "tagGroups": "$t(counts:resources.tag_groups)",
   "create": "アシㇼ",
   "edit": "イヌイェㇷ゚",
   "entertainment": "シノッ",

frontend/src/locales/ja/navigation.json

@@ -13,8 +13,6 @@
   "materials": "素材",
   "suppressions": "抑止",
   "wiki": "Wiki",
-  "tagDescriptions": "$t(counts:resources.tag_descriptions)",
-  "tagGroups": "$t(counts:resources.tag_groups)",
   "create": "新規",
   "edit": "編輯",
   "entertainment": "おたのしみ",

frontend/src/pages/materials/MaterialDetailPage.tsx

@@ -135,7 +135,7 @@ const MaterialDetailPage: FC = () => {
 
 	      <TabGroup>
 		{material.tag && (
-		    <Tab name={label ('navigation:tagDescriptions')}>
+		    <Tab name={label ('navigation:wiki')}>
 		      <WikiBody
 			  title={material.tag.name}
 			  language={localeLanguage (locale)}

frontend/src/pages/posts/PostListPage.tsx

@@ -176,7 +176,7 @@ const PostListPage: FC = () => {
 	      {loading && label ('common:loading')}
 	    </Tab>
 	    {tags.length === 1 && (
-		<Tab name={label ('navigation:tagDescriptions')}>
+		<Tab name={label ('navigation:wiki')}>
 		  <WikiBody title={tags[0]} body={wikiPage?.body}
 		      language={wikiPage?.languageCode ?? (wikiPage?.resourceType === 'tag_description'
 			  ? localeLanguage (locale) : 'und')}/>

frontend/src/pages/wiki/WikiDetailPage.tsx

@@ -51,8 +51,7 @@ const WikiDetailPage: FC = () => {
       queryKey: helpKeys.titles ('ja'),
       queryFn: () => getHelpTitleIndex ('ja'),
       staleTime: Infinity })
-  const lookupTitle = title.trim ().normalize ('NFKC').toLowerCase ()
-      .replace (/^(?:ヘルプ|手引):/, '')
+  const lookupTitle = title.trim ().normalize ('NFKC').toLowerCase ().replace (/^ヘルプ:/, '')
   const identifiers = useMemo (() => (
       (titleIndex != null && Object.hasOwn (titleIndex, lookupTitle))
       ? titleIndex[lookupTitle] : []), [titleIndex, lookupTitle])

frontend/src/pages/wiki/WikiSearchPage.tsx

@@ -8,7 +8,7 @@ import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
 import MainArea from '@/components/layout/MainArea'
 import PageHead from '@/components/common/PageHead'
-import { fetchWikiPages } from '@/lib/wiki'
+import { apiGet } from '@/lib/api'
 import { wikiKeys } from '@/lib/queryKeys'
 import { dateString, inputClass } from '@/lib/utils'
 
@@ -17,20 +17,16 @@ import type { FormEvent , FC } from 'react'
 import type { WikiPage } from '@/types'
 
 
-const WikiSearchPage: FC<{ resourceType?: WikiPage['resourceType'] }> = (
-    { resourceType = 'tag_description' },
-) => {
+const WikiSearchPage: FC = () => {
   const { message, label } = useUITranslation ('shared')
   const locale = useLocale ()
-  const heading =
-      resourceType === 'tag_group'
-      ? 'navigation:tagGroups' : 'navigation:tagDescriptions'
   const [title, setTitle] = useState ('')
   const [text, setText] = useState ('')
   const [submittedTitle, setSubmittedTitle] = useState ('')
   const { data: results = [], refetch } = useQuery ({
-      queryKey: wikiKeys.index ({ title: submittedTitle, resourceType }, locale),
-      queryFn: () => fetchWikiPages ({ title: submittedTitle, resourceType }, locale) })
+      queryKey: wikiKeys.index ({ title: submittedTitle }, locale),
+      queryFn: () => apiGet<WikiPage[]> ('/wiki', {
+	  locale, params: { title: submittedTitle } }) })
 
   const handleSearch = (ev: FormEvent) => {
     ev.preventDefault ()
@@ -46,10 +42,10 @@ const WikiSearchPage: FC<{ resourceType?: WikiPage['resourceType'] }> = (
 
   return (
       <MainArea>
-	<PageHead title={message (heading)}/>
+	<PageHead title={message ('navigation:wiki')}/>
 
 	<div className="max-w-xl">
-	  <PageTitle>{label (heading)}</PageTitle>
+	  <PageTitle>{label ('navigation:wiki')}</PageTitle>
 	  <form onSubmit={handleSearch} className="space-y-2">
 	    {/* タイトル */}
 	    <FormField label={label ('labels.title')}>