AI: address review on PR #464

backend/app/controllers/tag_versions_controller.rb

@@ -69,8 +69,11 @@ class TagVersionsController < ApplicationController
 
       parent_tags =
           build_version_values(cur_parent_tag_ids, prev_parent_tag_ids, key: :tag_id)
-          .map do |h|
+          .filter_map do |h|
-            { tag: parent_json.fetch(h[:tag_id]),
+            parent = parent_json[h[:tag_id]]
+            next unless parent
+
+            { tag: parent,
               type: h[:type] }
           end
 

backend/spec/requests/tag_versions_spec.rb

@@ -215,6 +215,36 @@ RSpec.describe 'TagVersions API', type: :request do
       expect(first.fetch('created_at')).to eq(t_v1.iso8601)
     end
 
+    [:parent_shared, :parent_new, :parent_old].each do |parent_key|
+      it "omits deleted #{ parent_key } from parent diffs" do
+        deleted_parent = public_send(parent_key)
+        deleted_parent.tag_names.destroy_all
+        deleted_parent.destroy!
+
+        get '/tags/versions', params: { id: tag.id }
+
+        expect(response).to have_http_status(:ok)
+        expect(json.fetch('count')).to eq(2)
+
+        versions = json.fetch('versions')
+        expect(versions.map { _1.fetch('version_no') }).to eq([2, 1])
+
+        expected_parents = [
+            [parent_shared.id, 'context'],
+            [parent_new.id, 'added'],
+            [parent_old.id, 'removed']].reject { _1.first == deleted_parent.id }
+        expect(versions.first.fetch('parent_tags').map { |entry|
+          [entry.fetch('tag').fetch('id'), entry.fetch('type')]
+        }).to eq(expected_parents)
+
+        expected_first_parents = [parent_shared.id, parent_old.id]
+            .reject { _1 == deleted_parent.id }.map { [_1, 'added'] }
+        expect(versions.second.fetch('parent_tags').map { |entry|
+          [entry.fetch('tag').fetch('id'), entry.fetch('type')]
+        }).to eq(expected_first_parents)
+      end
+    end
+
     it 'returns empty when the specified tag has no versions' do
       fresh_tag = create(:tag, primary_name: 'no_versions_tag', category: :general)
 

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/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"