AI: address review on PR #461

backend/app/services/post_tag_search.rb

@@ -3,8 +3,8 @@ class PostTagSearch
   def self.literals(locale, raw)
     tokens = raw.split.reject { _1.downcase == 'type:or' }
     names = tokens.map { _1.sub(/\Anot:/i, '') }
-    registered = TagName.where(language_code: locale.language_code, name: names)
+    registered = matching_names(TagName.where(language_code: locale.language_code),
-        .pluck(:name, :tag_id).to_h
+        names, 'tag_names.name', :tag_id).to_h
     primary = TagName.where(language_code: locale.language_code,
         tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h
     tokens.zip(names).map do |token, name|
@@ -19,12 +19,25 @@ class PostTagSearch
 
   def self.references_for(locale, literals)
     names = literals.map { _1[:name] }.uniq
-    internal = TagName.where(language_code: locale.language_code, name: names)
+    internal = matching_names(TagName.where(language_code: locale.language_code),
-        .pluck(:name, :tag_id).group_by(&:first)
+        names, 'tag_names.name', :tag_id).group_by(&:first)
-    external = names.empty? ? {} : ExternalTag.where(
+    external = matching_names(ExternalTag.all, names,
-        "CONCAT(platform, ':', name) IN (?)", names)
+        "CONCAT(external_tags.platform, ':', external_tags.name)", :id).group_by(&:first)
-        .pluck(Arel.sql("CONCAT(platform, ':', name)"), :id).group_by(&:first)
     names.to_h { |name| [name, [internal.fetch(name, []).map(&:last).uniq,
                               external.fetch(name, []).map(&:last).uniq]] }
   end
+
+  def self.matching_names(scope, names, expression, identifier)
+    return [] if names.empty?
+
+    queries = names.uniq.map do |name|
+      scope.klass.sanitize_sql_array(['SELECT ? AS name', name])
+    end
+    # Return the input spelling so Ruby does not recheck database equivalence.
+    scope.joins(<<~SQL).pluck(Arel.sql('search_names.name'), identifier)
+      INNER JOIN (#{ queries.join(' UNION ALL ') }) AS search_names
+        ON #{ expression } = search_names.name COLLATE utf8mb4_0900_ai_ci
+    SQL
+  end
+  private_class_method :matching_names
 end

frontend/src/components/PostEditForm.tsx

@@ -15,7 +15,7 @@ import { msToTime } from '@/lib/utils'
 import { useValidationErrors } from '@/lib/useValidationErrors'
 import { useUITranslation } from '@/lib/useUITranslation'
 
-import type { FC, FormEvent, ReactNode } from 'react'
+import type { FC, FormEvent } from 'react'
 
 import type { Post, TagWithSections } from '@/types'
 
@@ -23,8 +23,6 @@ type PostFormField =
     'parentPostIds' | 'tags' | 'videoMs'
     | 'originalCreatedAt' | 'originalCreatedFrom' | 'originalCreatedBefore'
 
-type PostEditData = Omit<Parameters<typeof updatePost>[0], 'id'>
-
 const groupedMessages = (...values: (string[] | undefined)[]): string[] =>
     [...new Set (values.flatMap (value => value ?? []))]
 
@@ -152,63 +150,12 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
   const handleSubmit = async (e: FormEvent) => {
     e.preventDefault ()
 
-    if (disabled) return
-
     setDisabled (true)
     try
     {
-      const current: PostEditData = {
+      await update ({ id: post.id, title, tags, parentPostIds,
-	  title, tags, parentPostIds,
+		      duration: videoFlg ? duration : null,
-	  duration: videoFlg ? duration : null,
+		      originalCreatedFrom, originalCreatedBefore },
-	  originalCreatedFrom, originalCreatedBefore }
-      const fields: {
-	  [Key in keyof PostEditData]-?: {
-	      name: ReactNode
-	      prev: PostEditData[Key] } } = {
-	  title: { name: label ('shared:labels.title'), prev: post.title },
-	  parentPostIds: {
-	      name: label ('shared:labels.parentPosts'),
-	      prev: (post.parentPosts ?? []).map (parent => parent.id).join (' ') },
-	  tags: { name: label ('tags:title'), prev: tagsToStr (post.tags) },
-	  duration: {
-	      name: label ('shared:labels.duration'),
-	      prev: videoMsToDurationValue (post.videoMs) },
-	  originalCreatedFrom: {
-	      name: <>{label ('shared:labels.originalCreatedAt')}{' '}
-			{label ('shared:labels.since')}</>,
-	      prev: post.originalCreatedFrom },
-	  originalCreatedBefore: {
-	      name: <>{label ('shared:labels.originalCreatedAt')}{' '}
-			{label ('shared:labels.before')}</>,
-	      prev: post.originalCreatedBefore } }
-      const differences = (Object.keys (fields) as (keyof PostEditData)[])
-	  .map (key => ({ key, name: fields[key].name,
-	      prev: fields[key].prev ?? '', current: current[key] ?? '' }))
-	  .filter (row => row.prev !== row.current)
-
-      if (!(await dialogue.confirm ({
-	  title: label ('shared:actions.diff'),
-	  confirmText: label ('shared:actions.update'),
-	  description: (
-	      <dl className="max-h-[60dvh] overflow-y-auto space-y-3 text-left">
-		{differences.map (row => (
-		    <div key={row.key}>
-		      <dt className="font-semibold">{row.name}</dt>
-		      <dd className="whitespace-pre-wrap break-words">
-			{row.prev && (
-			    <del className="block text-red-600 dark:text-red-400">
-			      {row.prev}
-			    </del>)}
-			{row.current && (
-			    <ins className="block text-green-700 dark:text-green-400">
-			      {row.current}
-			    </ins>)}
-		      </dd>
-		    </div>))}
-	      </dl>) })))
-	return
-
-      await update ({ id: post.id, ...current },
 		    { baseVersionNo: post.versionNo })
     }
     finally