AI: address review on PR #462

Reviewed-on: #452
Co-authored-by: miteruzo <miteruzo@naver.com>

backend/app/controllers/posts_controller.rb

@@ -37,7 +37,7 @@ class PostsController < ApplicationController
 
     offset = (page - 1) * limit
 
-    needs_history_join = order[0] == 'updated_at' || updated_between.any?(&:present?)
+    history_join_required = order[0] == 'updated_at' || updated_between.any?(&:present?)
 
     q =
         filtered_posts(locale)
@@ -57,8 +57,8 @@ class PostsController < ApplicationController
     q = q.where('posts.created_at >= ?', created_between[0]) if created_between[0]
     q = q.where('posts.created_at <= ?', created_between[1]) if created_between[1]
     count_scope = q
-    if needs_history_join
+    if history_join_required
-      history_times = HistoryAccess.visible(PostVersion.all)
+      history_times = PostVersion.all
           .select('post_id, MAX(created_at) AS latest_at').group(:post_id)
       q = q.joins("LEFT JOIN (#{ history_times.to_sql }) history_times " +
                   'ON history_times.post_id = posts.id')
@@ -72,7 +72,7 @@ class PostsController < ApplicationController
       q = q.where("#{ updated_at_all_sql } <= ?", updated_between[1])
     end
     count_scope = q if updated_between.any?(&:present?)
-    if needs_history_join
+    if history_join_required
       q = q.select('posts.*', "#{ updated_at_all_sql } AS updated_at")
     end
 
@@ -92,10 +92,10 @@ class PostsController < ApplicationController
              .offset(offset)
              .to_a
     latest_version_times =
-        if needs_history_join
+        if history_join_required
           { }
         else
-          HistoryAccess.visible(PostVersion.where(post_id: posts.map(&:id)))
+          PostVersion.where(post_id: posts.map(&:id))
               .group(:post_id).maximum(:created_at)
         end
 

backend/app/controllers/tag_descriptions_controller.rb

@@ -49,7 +49,6 @@ class TagDescriptionsController < ApplicationController
   private
 
   def representation description
-    HistoryAccess.require_current!(description, TagDescriptionVersion)
     description.as_json(only: [
         :tag_id,
         :language_code,

backend/app/controllers/tag_groups_controller.rb

@@ -1,7 +1,7 @@
 class TagGroupsController < ApplicationController
   def index
     locale = resolve_locale!
-    groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).includes(:created_by_user, :updated_by_user).order(:id)
+    groups = TagGroup.includes(:created_by_user, :updated_by_user).order(:id)
     render json: TagGroupRepr.many(locale, groups.to_a)
   end
 

backend/app/controllers/wiki_pages_controller.rb

@@ -8,12 +8,11 @@ class WikiPagesController < ApplicationController
 
     title = params[:title].to_s.strip
     descriptions =
-        HistoryAccess.current(TagDescription.all, TagDescriptionVersion)
+        TagDescription.where(language_code: locale.language_code)
-        .where(language_code: locale.language_code)
         .includes(tag: :tag_names)
 
     descriptions = descriptions.order(updated_at: :desc, id: :asc)
-    tag_groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).order(updated_at: :desc, id: :asc)
+    tag_groups = TagGroup.order(updated_at: :desc, id: :asc)
     if title.present?
       pattern = "%#{ ApplicationRecord.sanitize_sql_like(title) }%"
       descriptions =
@@ -41,13 +40,13 @@ class WikiPagesController < ApplicationController
     return head :not_found unless language.is_a?(String)
     return head :not_found unless Language.exists?(code: language)
 
-    names = HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
+    names = TagDescription.joins(tag: :tag_names)
         .where(language_code: locale.language_code, tag_names: { language_code: language })
         .pluck('tag_descriptions.tag_id', 'tag_descriptions.id', 'tag_names.name')
     candidates = names.map do |tag_id, description_id, name|
       WikiPageRepr.autolink_tag(locale, tag_id:, description_id:, name:, language:)
     end
-    candidates.concat(HistoryAccess.current(TagGroup.all, TagGroupVersion).order(:id).pluck(:id, :name).map do |id, name|
+    candidates.concat(TagGroup.order(:id).pluck(:id, :name).map do |id, name|
       WikiPageRepr.autolink_group(locale, id:, name:, language:)
     end)
     render json: candidates
@@ -411,7 +410,7 @@ class WikiPagesController < ApplicationController
   end
 
   def tag_description_by_title locale, title
-    HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
+    TagDescription.joins(tag: :tag_names)
         .find_by(language_code: locale.language_code,
                  tag_names: { language_code: locale.language_code, name: title })
   end

backend/app/models/history_access.rb

@@ -147,29 +147,6 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
     scope.where(Arel.sql(sql(scope.klass, row)))
   end
 
-  def self.current(scope, version_model)
-    return scope if admin?
-
-    table = scope.klass.table_name
-    keys = KEYS.fetch(version_model.table_name)
-    matches = keys.map do |key|
-      column = scope.klass.column_names.include?(key) ? key : 'id'
-      "current_snapshot.#{ key } = #{ table }.#{ column }"
-    end.join(' AND ')
-    boundary = "#{ matches } AND current_snapshot.version_no >= #{ table }.version_no " +
-        "AND current_snapshot.event_type = 'discard'"
-    scope = scope.where(Arel.sql("NOT EXISTS (SELECT 1 FROM #{ version_model.table_name } " +
-        "current_snapshot WHERE #{ boundary })"))
-    condition = "#{ matches } AND current_snapshot.version_no = #{ table }.version_no"
-    scope.where(Arel.sql("NOT EXISTS (SELECT 1 FROM #{ version_model.table_name } " +
-        "current_snapshot WHERE #{ condition } AND NOT (#{ sql(version_model, 'current_snapshot') }))"))
-  end
-
-  def self.require_current!(record, version_model)
-    return if admin?
-    raise Forbidden unless current(record.class.where(id: record.id), version_model).exists?
-  end
-
   def self.blob_visible?(blob, seen = [])
     return true if admin?
     return false if seen.include?(blob.id)

backend/app/representations/tag_group_repr.rb

@@ -44,7 +44,6 @@ module TagGroupRepr
   end
 
   def one locale, group
-    HistoryAccess.require_current!(group, TagGroupVersion)
     many(locale, [group]).first
   end
 

backend/app/representations/wiki_page_repr.rb

@@ -5,7 +5,6 @@ module WikiPageRepr
   module_function
 
   def tag_description locale, description
-    HistoryAccess.require_current!(description, TagDescriptionVersion)
     tag = description.tag
 
     { 'id' => description.id,

frontend/src/components/TagSearch.test.tsx

@@ -0,0 +1,120 @@
+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, useState } from 'react'
+import { useEffect, useRef, 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, KeyboardEvent } from 'react'
+import type { ChangeEvent, FC, FormEvent, KeyboardEvent } from 'react'
 
 import type { Tag } from '@/types'
 
@@ -20,6 +20,7 @@ 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 ('')
@@ -74,7 +75,34 @@ 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':
@@ -90,13 +118,12 @@ const TagSearch: FC = () => {
       break
 
     case 'Enter':
-      if (activeIndex < 0)
-	break
-      ev.preventDefault ()
       {
-	const selected = suggestions[activeIndex]
+	const selected = suggestionsVsbl ? suggestions[activeIndex] : null
-	if (selected)
+	if (selected == null)
-	  handleTagSelect (selected)
+	  break
+	ev.preventDefault ()
+	handleTagSelect (selected)
       }
       break
 
@@ -105,20 +132,6 @@ 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) => {
@@ -144,8 +157,9 @@ const TagSearch: FC = () => {
   }, [location.search])
 
   return (
-      <div className="relative w-full">
+      <form onSubmit={handleSubmit} className="relative w-full">
 	<input type="text"
+	       enterKeyHint="search"
 	       data-shortcut-focus-search="true"
 	       placeholder={message ('labels.tagSearch').text}
 	       value={search}
@@ -153,12 +167,18 @@ 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}/>
-      </div>)
+      </form>)
 }
 
 export default TagSearch