AI: address review on PR #463

backend/app/controllers/tags_controller.rb

@@ -218,16 +218,63 @@ class TagsController < ApplicationController
     locale = resolve_locale!
 
     q = params[:q].to_s.strip.sub(/\Anot:/i, '')
-    literal = ActiveRecord::Base.sanitize_sql_like(q)
+    prefix = "#{ ActiveRecord::Base.sanitize_sql_like(q) }%"
-    nico = bool?(:nico, default: true)
-    present = bool?(:present, default: true)
 
-    rows = autocomplete_rows(locale:, pattern: "#{ literal }%", nico:, present:)
+    with_nico = bool?(:nico, default: true)
-    if rows.length < 20 && q.present?
+    present_only = bool?(:present, default: true)
-      suffix_rows = autocomplete_rows(locale:, pattern: "%#{ literal }", nico:, present:)
+
-      rows = (rows + suffix_rows).uniq { [_1['category'], _1['id']] }.first(20)
+    alias_rows =
+        TagName
+        .where(language_code: locale.language_code, primary_flg: false)
+        .where('name LIKE ?', prefix)
+        .pluck(:tag_id, :name)
+
+    matched_alias_by_tag_id = { }
+    tag_ids = []
+    alias_rows.each do |tag_id, alias_name|
+      tag_ids << tag_id
+      matched_alias_by_tag_id[tag_id] ||= alias_name
     end
 
+    base =
+        Tag
+        .joins(:tag_names)
+        .preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
+                 parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
+        .where(tag_names: { language_code: locale.language_code, primary_flg: true },
+               deprecated_at: nil)
+    base = base.where('tags.post_count > 0') if present_only
+
+    canonical_hit = base.where('tag_names.name LIKE ?', prefix)
+
+    internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
+
+    internal_rows =
+        internal_tags
+        .order(Arel.sql('tags.post_count DESC, tag_names.name'))
+        .limit(20)
+        .map { |tag|
+          TagRepr.base(tag, language_code: locale.language_code)
+                 .merge(matched_alias: matched_alias_by_tag_id[tag.id])
+        }
+
+    return render json: internal_rows unless with_nico
+
+    external_base = ExternalTag.all
+    external_base = external_base.where('post_count > 0') if present_only
+
+    external_rows =
+        external_base
+        .where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", prefix, prefix)
+        .order(post_count: :desc, name: :asc)
+        .limit(20)
+        .map { external_tag_json(_1) }
+
+    rows =
+    (internal_rows + external_rows)
+        .sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
+        .first(20)
+
     render json: rows
   end
 
@@ -498,59 +545,6 @@ class TagsController < ApplicationController
 
   private
 
-  def autocomplete_rows locale:, pattern:, nico:, present:
-    alias_rows =
-        TagName
-        .where(language_code: locale.language_code, primary_flg: false)
-        .where('name LIKE ?', pattern)
-        .pluck(:tag_id, :name)
-
-    matched_alias_by_tag_id = { }
-    tag_ids = []
-    alias_rows.each do |tag_id, alias_name|
-      tag_ids << tag_id
-      matched_alias_by_tag_id[tag_id] ||= alias_name
-    end
-
-    base =
-        Tag
-        .joins(:tag_names)
-        .preload(:tag_names, :materials, :deerjikists, :tag_descriptions,
-                 parents: [:tag_names, :materials, :deerjikists, :tag_descriptions])
-        .where(tag_names: { language_code: locale.language_code, primary_flg: true },
-               deprecated_at: nil)
-    base = base.where('tags.post_count > 0') if present
-
-    canonical_hit = base.where('tag_names.name LIKE ?', pattern)
-
-    internal_tags = canonical_hit.or(base.where(id: tag_ids.uniq))
-
-    internal_rows =
-        internal_tags
-        .order(Arel.sql('tags.post_count DESC, tag_names.name'))
-        .limit(20)
-        .map { |tag|
-          TagRepr.base(tag, language_code: locale.language_code)
-                 .merge(matched_alias: matched_alias_by_tag_id[tag.id])
-        }
-
-    return internal_rows unless nico
-
-    external_base = ExternalTag.all
-    external_base = external_base.where('post_count > 0') if present
-
-    external_rows =
-        external_base
-        .where("CONCAT(platform, ':', name) LIKE ? OR name LIKE ?", pattern, pattern)
-        .order(post_count: :desc, name: :asc)
-        .limit(20)
-        .map { external_tag_json(_1) }
-
-    (internal_rows + external_rows)
-        .sort_by { |row| [-row['post_count'], row['name'] || row[:name]] }
-        .first(20)
-  end
-
   def material_filter_param default:
     value = params[:material_filter].to_s.presence
     return default unless ['present', 'missing', 'any'].include?(value)

backend/spec/requests/tags_spec.rb

@@ -482,7 +482,6 @@ RSpec.describe 'Tags API', type: :request do
         create(:tag, category: :general, primary_name: name, post_count: 1)
         create(:external_tag, name:, post_count: 1)
       end
-      create(:external_tag, name: 'suffix_combined', post_count: 100)
 
       get '/tags/autocomplete', params: { q: 'combined' }
 
@@ -491,39 +490,6 @@ RSpec.describe 'Tags API', type: :request do
       expect(json.map { |row| row.fetch('name') }).to eq(expected.first(20))
     end
 
-    it 'appends primary, alias, and external suffix matches without duplicate resources' do
-      prefix = create(:tag, primary_name: 'tail', post_count: 1)
-      create(:tag_name, :alias, name: 'tail_alias', tag: prefix)
-      create(:tag_name, :alias, name: 'alias_tail', tag: prefix)
-      create(:tag, primary_name: 'primary_tail', post_count: 4)
-      alias_target = create(:tag, primary_name: 'alias_target', post_count: 3)
-      create(:tag_name, :alias, name: 'suffix_tail', tag: alias_target)
-      external = create(:external_tag, id: prefix.id, name: 'external_tail', post_count: 5)
-      create(:tag, primary_name: 'middle_tail_only', post_count: 100)
-      create(:external_tag, name: 'middle_tail_only', post_count: 100)
-
-      get '/tags/autocomplete', params: { q: 'tail' }
-
-      expect(response).to have_http_status(:ok)
-      expect(json.map { |row| row.fetch('name') }).to eq(
-          ['tail', 'nico:external_tail', 'primary_tail', 'alias_target'])
-      expect(json.first.fetch('matched_alias')).to eq('tail_alias')
-      expect(json.last.fetch('matched_alias')).to eq('suffix_tail')
-      expect(json[1]).to include('id' => external.id, 'category' => 'nico')
-    end
-
-    it 'fills only the remaining places with suffix matches' do
-      names = 19.times.map { |number| "capacity_#{ number.to_s.rjust(2, '0') }" }
-      names.each { create(:tag, primary_name: _1, post_count: 1) }
-      create(:tag, primary_name: 'first_capacity', post_count: 3)
-      create(:external_tag, name: 'second_capacity', post_count: 2)
-
-      get '/tags/autocomplete', params: { q: 'capacity' }
-
-      expect(response).to have_http_status(:ok)
-      expect(json.map { |row| row.fetch('name') }).to eq(names + ['first_capacity'])
-    end
-
     it 'excludes external tags but preserves internal alias matches when nico is false' do
       internal = create(:tag, category: :general, primary_name: 'switch_internal', post_count: 1)
       alias_target = create(:tag, category: :general, primary_name: 'alias_target', post_count: 1)
@@ -552,20 +518,12 @@ RSpec.describe 'Tags API', type: :request do
         create(:external_tag, name: literal, post_count: 1)
         create(:tag, category: :general, primary_name: 'literalXmatch', post_count: 2)
         create(:external_tag, name: 'literalXmatch', post_count: 2)
-        suffix = "suffix_literal#{ wildcard }"
-        create(:tag, primary_name: suffix, post_count: 1)
-        suffix_alias = create(:tag, primary_name: 'suffix_alias_target', post_count: 1)
-        create(:tag_name, :alias, name: "alias_#{ suffix }", tag: suffix_alias)
-        create(:external_tag, name: suffix, post_count: 1)
-        create(:tag, primary_name: 'suffix_literalX', post_count: 2)
-        create(:external_tag, name: 'suffix_literalX', post_count: 2)
 
         get '/tags/autocomplete', params: { q: "literal#{ wildcard }" }
 
         expect(json.map { |row| row.fetch('name') })
             .to contain_exactly(
-                literal, primary_tag_name_for(alias_target, 'ja').name, "nico:#{ literal }",
+                literal, primary_tag_name_for(alias_target, 'ja').name, "nico:#{ literal }")
-                suffix, 'suffix_alias_target', "nico:#{ suffix }")
       end
     end
 

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>))) : [])}