AI: address review on PR #460

frontend/server.ssr.test.mjs

@@ -2,6 +2,7 @@ import assert from 'node:assert/strict'
 import { createServer } from 'node:http'
 import { spawn } from 'node:child_process'
 import { after, before, test } from 'node:test'
+import { JSDOM } from 'jsdom'
 import { createServer as createViteServer } from 'vite'
 
 import { render } from './dist/server/entry-server.js'
@@ -402,6 +403,26 @@ test ('every canonical screen route returns page HTML without JavaScript', async
   }
 })
 
+test ('SSR HTML head includes reciprocal hreflang links with query parameters', async () => {
+  for (const locale of ['ja', 'ain-Kana']) {
+    const response = await fetch (`${httpOrigin}/${locale}/posts?page=2&limit=50`)
+    assert.equal (response.status, 200)
+    const dom = new JSDOM (await response.text ())
+    try
+    {
+      const links = [...dom.window.document.head.querySelectorAll ('link[rel="alternate"]')]
+      assert.deepEqual (links.map (link => ({
+        locale: link.getAttribute ('hreflang'), href: link.getAttribute ('href') })), [
+        { locale: 'ja', href: `${origin}/ja/posts?page=2&limit=50` },
+        { locale: 'ain-Kana', href: `${origin}/ain-Kana/posts?page=2&limit=50` }])
+    }
+    finally
+    {
+      dom.window.close ()
+    }
+  }
+})
+
 test ('YouTube posts return HTTP 200 with the embed rendered by SSR', async t => {
   for (const locale of ['ja', 'ain-Kana']) {
     await t.test (locale, async () => {

frontend/src/components/PostFormTagsArea.tsx

@@ -36,13 +36,10 @@ const replaceToken = (value: string, start: number, end: number, text: string) =
 type Props = Omit<ComponentPropsWithoutRef<'textarea'>, 'value' | 'onChange' | 'onBlur'> & {
     tags:     string
     setTags:  (tags: string) => void
-    label?:   ReactNode
     errors?:  ReactNode[] }
 
 
-const PostFormTagsArea: FC<Props> = (
+const PostFormTagsArea: FC<Props> = ({ tags, setTags, errors, ...rest }) => {
-    { tags, setTags, label: fieldLabel, errors, ...rest },
-) => {
   const { label } = useUITranslation ('navigation')
   const locale = useLocale ()
   const ref = useRef<HTMLTextAreaElement> (null)
@@ -120,10 +117,7 @@ const PostFormTagsArea: FC<Props> = (
   }, [locale])
 
   return (
-      <FormField
+      <FormField className="relative w-full" label={label ('tags')} messages={errors}>
-	  className="relative w-full"
-	  label={fieldLabel ?? label ('tags')}
-	  messages={errors}>
 	{({ describedBy, invalid }) => (
 	    <>
 	      <TextArea

frontend/src/entry-server.tsx

@@ -1,6 +1,6 @@
 import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
 import { PassThrough } from 'node:stream'
-import { renderToPipeableStream } from 'react-dom/server'
+import { renderToPipeableStream, renderToStaticMarkup } from 'react-dom/server'
 import { HelmetProvider } from 'react-helmet-async'
 import { I18nextProvider } from 'react-i18next'
 import { createStaticHandler, createStaticRouter,
@@ -9,7 +9,7 @@ import { createStaticHandler, createStaticRouter,
 import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
 import { apiGet, isApiError } from '@/lib/api'
 import { createUII18n } from '@/lib/i18n'
-import { fetchLocales, isLocaleCode, legacyLocalePath } from '@/lib/locales'
+import { fetchLocales, isLocaleCode, legacyLocalePath, switchLocalePath } from '@/lib/locales'
 import { localesKeys, sessionKeys } from '@/lib/queryKeys'
 import { withRenderContext } from '@/lib/renderContext.server'
 
@@ -171,8 +171,26 @@ export const render = async (
 	}))
       }
       const helmet = helmetContext.helmet!
+      const alternates = status === 200 && known != null
+	  ? await Promise.all (locales.locales.map (entry => entry.code)
+	      .filter (isLocaleCode)
+	      .filter (code => known.route.handle?.locale == null
+		  || known.route.handle.locale === code)
+	      .map (async targetLocale => {
+		const location = { pathname: url.pathname, search: url.search, hash: '' }
+		const path = targetLocale === locale
+		    ? url.pathname + url.search
+		    : (known.route.handle?.switchLocale != null
+		       ? await known.route.handle.switchLocale ({
+			   location, params: known.params, locale, targetLocale })
+		       : switchLocalePath (location, targetLocale))
+		return <link key={targetLocale} rel="alternate" hrefLang={targetLocale}
+		    href={new URL (path, origin).href}/>
+	      }))
+	  : []
       const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
 	  .map (entry => entry.toString ()).join ('')
+	  + renderToStaticMarkup (<>{alternates}</>)
       const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
 	  query.state.status !== 'pending'
 	  && query.meta?.clientOnly !== true

frontend/src/pages/tags/NicoTagListPage.test.tsx

@@ -162,13 +162,12 @@ describe ('NicoTagListPage', () => {
     })
   })
 
-  it ('saves links after completing the tag at the cursor', async () => {
+  it ('updates links from a tag card', async () => {
     api.apiGet
       .mockResolvedValueOnce ({
         tags:  [buildNicoTag ({ id: 7, name: 'nico:source' })],
         count: 1,
       })
-      .mockResolvedValueOnce ([buildTag ({ id: 8, name: '連携先', postCount: 3 })])
       .mockResolvedValueOnce ({
         tags: [
           buildNicoTag ({
@@ -184,24 +183,8 @@ describe ('NicoTagListPage', () => {
     renderPage ()
 
     fireEvent.click (await screen.findByRole ('button', { name: '編集' }))
-    const textarea = screen.getByLabelText ('連携する広場タグ')
+    fireEvent.change (screen.getByLabelText ('連携する広場タグ'), {
-    fireEvent.change (textarea, { target: { value: '既存 連携\n後続' } })
+      target: { value: '連携先' },
-    fireEvent.focus (textarea)
-    fireEvent.select (textarea, {
-	target: { selectionStart: 4, selectionEnd: 4 } })
-
-    await waitFor (() => {
-      expect (api.apiGet).toHaveBeenCalledWith (
-	  '/tags/autocomplete',
-	  { locale: 'ja', params: { q: '連携', nico: '0' },
-	    signal: expect.any (AbortSignal) })
-    })
-    fireEvent.mouseDown (await screen.findByText ('連携先'))
-
-    expect (textarea).toHaveValue ('既存 連携先 \n後続')
-    await waitFor (() => {
-      expect ((textarea as HTMLTextAreaElement).selectionStart).toBe (7)
-      expect ((textarea as HTMLTextAreaElement).selectionEnd).toBe (7)
     })
     fireEvent.click (screen.getByRole ('button', { name: '保存' }))
 
@@ -212,8 +195,6 @@ describe ('NicoTagListPage', () => {
           { locale: 'ja', headers: { 'Content-Type': 'multipart/form-data' } },
       )
     })
-    const payload = api.apiPut.mock.calls[0][1] as FormData
-    expect (payload.get ('tags')).toBe ('既存 連携先 \n後続')
     expect (await screen.findByText ('1 件')).toBeInTheDocument ()
   })
 

frontend/src/pages/tags/NicoTagListPage.tsx

@@ -6,10 +6,11 @@ import { useLocation } from 'react-router-dom'
 import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
 import TagLink from '@/components/TagLink'
 import SortHeader from '@/components/SortHeader'
-import PostFormTagsArea from '@/components/PostFormTagsArea'
+import FieldError from '@/components/common/FieldError'
 import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
 import Pagination from '@/components/common/Pagination'
+import TextArea from '@/components/common/TextArea'
 import useDialogue from '@/lib/dialogues/useDialogue'
 import MainArea from '@/components/layout/MainArea'
 import { toast } from '@/components/ui/use-toast'
@@ -356,18 +357,21 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
 					       dark:bg-rose-950/30">
 				  <td colSpan={editable ? 5 : 4} className="p-3">
 				    <div className="space-y-2">
-				      <PostFormTagsArea
+				      <label htmlFor={`nico-links-${ tag.id }`}
+					     className="block text-sm font-semibold">
+					{label ('nico.tagsToLink')}
+				      </label>
+				      <TextArea
 					  id={`nico-links-${ tag.id }`}
-					  label={label ('nico.tagsToLink')}
+					  value={rawTags[tag.id] ?? ''}
-					  aria-label={message ('nico.tagsToLink').text}
+					  invalid={(errorsByTagId[tag.id] ?? []).length > 0}
-					  tags={rawTags[tag.id] ?? ''}
-					  errors={errors}
 					  className="min-h-24 resize-y"
 					  placeholder={message ('nico.tagsPlaceholder').text}
 					  lang={message ('nico.tagsPlaceholder').language}
-					  setTags={value => setRawTags (rawTags => ({
+					  onChange={e => setRawTags (rawTags => ({
 					      ...rawTags,
-					      [tag.id]: value}))}/>
+					      [tag.id]: e.target.value}))}/>
+				      <FieldError messages={errors}/>
 				      <div className="flex justify-end gap-2">
 					<button
 					    type="button"