AI: address review on PR #465

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

frontend/src/components/PostEditForm.test.tsx

@@ -1,11 +1,13 @@
-import { fireEvent, screen, waitFor } from '@testing-library/react'
+import { act, fireEvent, screen, waitFor } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
+import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import { textContentOf } from '@/test/text'
 import PostEditForm from '@/components/PostEditForm'
 import { buildPost, buildTag } from '@/test/factories'
 import { renderWithProviders as render } from '@/test/render'
 
+import type { DialogueAPI } from '@/lib/dialogues/useDialogue'
+
 const postsApi = vi.hoisted (() => ({
   updatePost: vi.fn (),
 }))
@@ -18,18 +20,27 @@ const toastApi = vi.hoisted (() => ({
   toast: vi.fn (),
 }))
 
+const dialogue = vi.hoisted (() => ({
+    confirm: vi.fn<DialogueAPI['confirm']> (),
+    choice: vi.fn () }))
+
 vi.mock ('@/lib/posts', () => postsApi)
 vi.mock ('@/lib/api', () => api)
 vi.mock ('@/components/ui/use-toast', () => toastApi)
 vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({
-  ...await importOriginal<typeof import ('@/lib/dialogues/useDialogue')> (),
+    ...await importOriginal<typeof import ('@/lib/dialogues/useDialogue')> (),
-  default: () => ({
+    default: () => dialogue }))
-    choice: vi.fn (),
-  }),
-}))
 
 describe ('PostEditForm', () => {
+  beforeEach (() => {
+    vi.resetAllMocks ()
+  })
+
   it ('submits edited post fields with the current base version', async () => {
+    const confirm = vi.fn<(value: boolean) => void> ()
+    dialogue.confirm.mockReturnValueOnce (new Promise<boolean> (resolve => {
+      confirm.mockImplementation (resolve)
+    }))
     const onSave = vi.fn ()
     const post = buildPost ({
       id:        8,
@@ -55,6 +66,16 @@ describe ('PostEditForm', () => {
     fireEvent.change (parentIds, { target: { value: '3 4' } })
     fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
 
+    expect (postsApi.updatePost).not.toHaveBeenCalled ()
+    expect (dialogue.confirm).toHaveBeenCalledTimes (1)
+    const difference = textContentOf (
+	dialogue.confirm.mock.calls[0][0].description)
+    expect (difference).toContain ('oldnew')
+    expect (difference).toContain ('23 4')
+    expect (difference).not.toContain ('general-tag')
+
+    await act (async () => { confirm (true) })
+
     await waitFor (() => {
       expect (postsApi.updatePost).toHaveBeenCalledWith (
           expect.objectContaining ({
@@ -71,6 +92,28 @@ describe ('PostEditForm', () => {
     expect (textContentOf (toastApi.toast.mock.calls[0][0].description)).toBe ('更新しました．')
   })
 
+  it ('keeps edited fields without submitting when confirmation is cancelled', async () => {
+    const onSave = vi.fn ()
+    dialogue.confirm.mockResolvedValueOnce (false)
+    render (<PostEditForm post={buildPost ()} onSave={onSave}/>)
+
+    const [title, parentIds] = screen.getAllByRole ('textbox')
+    fireEvent.change (title, { target: { value: 'new' } })
+    fireEvent.change (parentIds, { target: { value: '3 4' } })
+    const button = screen.getByRole ('button', { name: '更新' })
+    fireEvent.submit (button.closest ('form')!)
+
+    await waitFor (() => {
+      expect (button).toBeEnabled ()
+    })
+    expect (dialogue.confirm).toHaveBeenCalledTimes (1)
+    expect (postsApi.updatePost).not.toHaveBeenCalled ()
+    expect (onSave).not.toHaveBeenCalled ()
+    expect (toastApi.toast).not.toHaveBeenCalled ()
+    expect (title).toHaveValue ('new')
+    expect (parentIds).toHaveValue ('3 4')
+  })
+
   it ('preserves duration while the video tag is temporarily removed', () => {
     const post = buildPost ({
       videoMs: 180_500,
@@ -100,6 +143,7 @@ describe ('PostEditForm', () => {
       'shows deduplicated original-created endpoint errors on the shared datetime field',
       async () => {
     const post = buildPost ()
+    dialogue.confirm.mockResolvedValueOnce (true)
     api.isApiError.mockReturnValue (true)
     postsApi.updatePost.mockRejectedValueOnce ({
       response: {

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 } from 'react'
+import type { FC, FormEvent, ReactNode } from 'react'
 
 import type { Post, TagWithSections } from '@/types'
 
@@ -23,6 +23,8 @@ 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 ?? []))]
 
@@ -150,12 +152,63 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
   const handleSubmit = async (e: FormEvent) => {
     e.preventDefault ()
 
+    if (disabled) return
+
     setDisabled (true)
     try
     {
-      await update ({ id: post.id, title, tags, parentPostIds,
+      const current: PostEditData = {
-		      duration: videoFlg ? duration : null,
+	  title, tags, parentPostIds,
-		      originalCreatedFrom, originalCreatedBefore },
+	  duration: videoFlg ? duration : null,
+	  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

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