#444

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/TagSearch.test.tsx

@@ -1,120 +0,0 @@
-import { fireEvent, screen } from '@testing-library/react'
-import userEvent from '@testing-library/user-event'
-import { useLocation } from 'react-router-dom'
-import { beforeEach, describe, expect, it, vi } from 'vitest'
-
-import TagSearch from '@/components/TagSearch'
-import * as api from '@/lib/api'
-import { buildTag } from '@/test/factories'
-import { renderWithProviders } from '@/test/render'
-
-
-const LocationOutput = () => {
-  const location = useLocation ()
-  return <output data-testid="location">{location.pathname}{location.search}</output>
-}
-
-
-const renderSearch = () => renderWithProviders (
-    <>
-      <TagSearch/>
-      <LocationOutput/>
-    </>, { route: '/ja/posts?page=3' })
-
-
-describe ('TagSearch', () => {
-  beforeEach (() => {
-    vi.spyOn (api, 'apiGet').mockResolvedValue ([])
-  })
-
-  it ('searches through native submission without an Enter key event', () => {
-    renderSearch ()
-    const input = screen.getByRole<HTMLInputElement> ('textbox')
-    fireEvent.change (input, { target: { value: '虹夏 not:TEST type:or' } })
-
-    expect (input.form).toBeInstanceOf (HTMLFormElement)
-    fireEvent.submit (input.form!)
-
-    const query = new URLSearchParams ({ tags: '虹夏 not:test', match: 'any' })
-    expect (screen.getByTestId ('location')).toHaveTextContent (
-	`/ja/posts?${ query }`)
-    expect (input).toHaveValue ('虹夏 not:test type:or')
-  })
-
-  it ('requests a search action from the software keyboard', () => {
-    renderSearch ()
-
-    expect (screen.getByRole ('textbox')).toHaveAttribute ('enterkeyhint', 'search')
-  })
-
-  it ('searches through the form when Enter is pressed', async () => {
-    const user = userEvent.setup ()
-    renderSearch ()
-
-    await user.type (screen.getByRole ('textbox'), '虹夏{Enter}')
-
-    const query = new URLSearchParams ({ tags: '虹夏', match: 'all' })
-    expect (screen.getByTestId ('location')).toHaveTextContent (
-	`/ja/posts?${ query }`)
-  })
-
-  it.each ([
-      { label: 'composition flag', composing: true, keyCode: 13 },
-      { label: 'legacy IME code', composing: false, keyCode: 229 }]) (
-      'cancels confirmation Enter with $label', ({ composing, keyCode }) => {
-    renderSearch ()
-    const input = screen.getByRole ('textbox')
-    fireEvent.change (input, { target: { value: '虹夏' } })
-    const uncancelled = fireEvent.keyDown (input, {
-	key: 'Enter', isComposing: composing, keyCode })
-
-    expect (uncancelled).toBe (false)
-    expect (screen.getByTestId ('location')).toHaveTextContent ('/ja/posts?page=3')
-    expect (input).toHaveValue ('虹夏')
-  })
-
-  it ('cancels Enter throughout composition even without keyboard IME flags', () => {
-    renderSearch ()
-    const input = screen.getByRole ('textbox')
-    fireEvent.compositionStart (input)
-    fireEvent.change (input, { target: { value: '虹夏' } })
-    const uncancelled = fireEvent.keyDown (input, {
-	key: 'Enter', isComposing: false, keyCode: 13 })
-
-    expect (uncancelled).toBe (false)
-    expect (screen.getByTestId ('location')).toHaveTextContent ('/ja/posts?page=3')
-    expect (input).toHaveValue ('虹夏')
-  })
-
-  it ('blocks direct submission during composition and allows it after confirmation', () => {
-    renderSearch ()
-    const input = screen.getByRole<HTMLInputElement> ('textbox')
-    fireEvent.compositionStart (input)
-    fireEvent.change (input, { target: { value: '虹夏' } })
-    fireEvent.submit (input.form!)
-
-    expect (screen.getByTestId ('location')).toHaveTextContent ('/ja/posts?page=3')
-    expect (input).toHaveValue ('虹夏')
-
-    fireEvent.compositionEnd (input)
-    fireEvent.submit (input.form!)
-
-    const query = new URLSearchParams ({ tags: '虹夏', match: 'all' })
-    expect (screen.getByTestId ('location')).toHaveTextContent (
-	`/ja/posts?${ query }`)
-  })
-
-  it ('selects the active suggestion without submitting the form', async () => {
-    vi.mocked (api.apiGet).mockResolvedValue ([buildTag ({ name: '虹夏' })])
-    const user = userEvent.setup ()
-    renderSearch ()
-
-    await user.type (screen.getByRole ('textbox'), '虹')
-    await screen.findByText ('虹夏')
-    await user.keyboard ('{ArrowDown}{Enter}')
-
-    expect (screen.getByRole ('textbox')).toHaveValue ('虹夏 ')
-    expect (screen.getByTestId ('location')).toHaveTextContent ('/ja/posts?page=3')
-    expect (screen.queryByText ('虹夏')).not.toBeInTheDocument ()
-  })
-})

frontend/src/components/TagSearch.tsx

@@ -1,6 +1,6 @@
 // TODO: タグ入力系すべてに同様の処理あるため共通化する．
 
-import { useEffect, useRef, useState } from 'react'
+import { useEffect, useState } from 'react'
 import { useLocation } from 'react-router-dom'
 
 import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
@@ -10,7 +10,7 @@ import { inputClass } from '@/lib/utils'
 
 import TagSearchBox from './TagSearchBox'
 
-import type { ChangeEvent, FC, FormEvent, KeyboardEvent } from 'react'
+import type { ChangeEvent, FC, KeyboardEvent } from 'react'
 
 import type { Tag } from '@/types'
 
@@ -20,7 +20,6 @@ const TagSearch: FC = () => {
   const locale = useLocale ()
   const location = useLocation ()
   const navigate = useLocaleNavigate ()
-  const compositionFlgRef = useRef (false)
 
   const [activeIndex, setActiveIndex] = useState (-1)
   const [search, setSearch] = useState ('')
@@ -75,34 +74,7 @@ const TagSearch: FC = () => {
     setSuggestionsVsbl (false)
   }, [locale])
 
-  const handleSubmit = (ev: FormEvent<HTMLFormElement>) => {
-    ev.preventDefault ()
-    if (compositionFlgRef.current)
-      return
-
-    const parts = search.split (' ')
-    const match =
-	parts.map (t => t.toLowerCase ()).includes ('type:or') ? 'any' : 'all'
-    navigate (`/posts?${
-	(new URLSearchParams ({
-	    tags: parts.map (t => t.toLowerCase ())
-		       .filter (t => t !== 'type:or')
-		       .join (' '),
-	    match })).toString () }`)
-    setSuggestionsVsbl (false)
-    setRequest ({ query: '' })
-  }
-
   const handleKeyDown = (ev: KeyboardEvent<HTMLInputElement>) => {
-    if (compositionFlgRef.current
-	|| ev.nativeEvent.isComposing
-	|| ev.nativeEvent.keyCode === 229)
-    {
-      if (ev.key === 'Enter')
-	ev.preventDefault ()
-      return
-    }
-
     switch (ev.key)
     {
     case 'ArrowDown':
@@ -118,11 +90,12 @@ const TagSearch: FC = () => {
       break
 
     case 'Enter':
-      {
+      if (activeIndex < 0)
-	const selected = suggestionsVsbl ? suggestions[activeIndex] : null
-	if (selected == null)
 	break
       ev.preventDefault ()
+      {
+	const selected = suggestions[activeIndex]
+	if (selected)
 	  handleTagSelect (selected)
       }
       break
@@ -132,6 +105,20 @@ const TagSearch: FC = () => {
       setSuggestionsVsbl (false)
       break
     }
+    if (ev.key === 'Enter' && (!(suggestionsVsbl) || activeIndex < 0))
+      {
+	const parts = search.split (' ')
+	const match = parts.map (t => t.toLowerCase ()).includes ('type:or') ? 'any' : 'all'
+	navigate (`/posts?${
+	    (new URLSearchParams ({
+		tags: parts.map (t => t.toLowerCase ())
+			   .filter (t => t !== 'type:or')
+			   .join (' '),
+		match }))
+	    .toString () }`)
+	setSuggestionsVsbl (false)
+	setRequest ({ query: '' })
+      }
   }
 
   const handleTagSelect = (tag: Tag) => {
@@ -157,9 +144,8 @@ const TagSearch: FC = () => {
   }, [location.search])
 
   return (
-      <form onSubmit={handleSubmit} className="relative w-full">
+      <div className="relative w-full">
 	<input type="text"
-	       enterKeyHint="search"
 	       data-shortcut-focus-search="true"
 	       placeholder={message ('labels.tagSearch').text}
 	       value={search}
@@ -167,18 +153,12 @@ const TagSearch: FC = () => {
 	       onFocus={() => setSuggestionsVsbl (true)}
 	       onBlur={() => setSuggestionsVsbl (false)}
 	       onKeyDown={handleKeyDown}
-	       onCompositionStart={() => {
-		 compositionFlgRef.current = true
-	       }}
-	       onCompositionEnd={() => {
-		 compositionFlgRef.current = false
-	       }}
 	       className={inputClass (false,
 				      'px-3 py-2 dark:border-gray-600 dark:bg-gray-800 dark:text-white')}/>
 	<TagSearchBox suggestions={suggestionsVsbl && suggestions.length ? suggestions : [] as Tag[]}
 		      activeIndex={activeIndex}
 		      onSelect={handleTagSelect}/>
-      </form>)
+      </div>)
 }
 
 export default TagSearch