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/DraggableDroppableTagRow.test.tsx

@@ -1,25 +1,9 @@
-import { screen } from '@testing-library/react'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import DraggableDroppableTagRow from '@/components/DraggableDroppableTagRow'
 import { buildTag } from '@/test/factories'
 import { renderWithProviders } from '@/test/render'
 
-import type { CSSProperties, ReactNode } from 'react'
-
-vi.mock ('framer-motion', async importOriginal => {
-  const original = await importOriginal<typeof import ('framer-motion')> ()
-  return {
-      ...original,
-      motion: {
-	  ...original.motion,
-	  div: ({ children, style, layoutId }: {
-	      children?: ReactNode
-	      style?: CSSProperties
-	      layoutId?: string }) => (
-	      <div style={style} data-layout-id={layoutId}>{children}</div>) } }
-})
-
 const dndKit = vi.hoisted (() => ({
   useDraggable: vi.fn (),
   useDroppable: vi.fn (),
@@ -113,32 +97,4 @@ describe ('DraggableDroppableTagRow', () => {
 	}),
     )
   })
-
-  it.each ([false, true]) (
-      'separates same-id internal and external animation identities (sp=%s)',
-      sp => {
-	const internal = buildTag ({ id: 7, name: 'internal_collision' })
-	const external = buildTag ({
-	    id: 7, name: 'nico:external_collision', category: 'nico' })
-
-	renderWithProviders (
-	    <>
-	      {[internal, external].map (item => (
-		  <DraggableDroppableTagRow
-		      key={item.category}
-		      tag={item}
-		      nestLevel={0}
-		      pathKey={`cat-${ item.category }-7`}
-		      suppressClickRef={{ current: false }}
-		      sp={sp}/>))}
-	    </>)
-
-	const prefix = sp ? 'tag-sp-' : 'tag-'
-	for (const item of [internal, external])
-	{
-	  expect (screen.getByRole ('link', { name: item.name })
-	      .closest ('[data-layout-id]')).toHaveAttribute (
-		  'data-layout-id', `${ prefix }${ item.category }-7`)
-	}
-      })
 })

frontend/src/components/DraggableDroppableTagRow.tsx

@@ -137,7 +137,7 @@ const DraggableDroppableTagRow: FC<Props> = ({
 		transition={{ layout: layoutTransition }}
 		layoutId={animationMode === 'off'
 		    ? undefined
-		    : `tag-${ sp ? 'sp-' : '' }${ tag.category }-${ tag.id }`}>
+		    : `tag-${ sp ? 'sp-' : '' }${ tag.id }`}>
 	      <TagLink tag={tag} nestLevel={nestLevel}/>
 	    </motion.div>)}
       </div>)

frontend/src/components/TagSidebar.test.tsx

@@ -1,47 +0,0 @@
-import { screen } from '@testing-library/react'
-import { describe, expect, it, vi } from 'vitest'
-
-import TagSidebar from '@/components/TagSidebar'
-import { buildPost, buildTag } from '@/test/factories'
-import { renderWithProviders } from '@/test/render'
-
-import type { ReactNode } from 'react'
-
-vi.mock ('@/components/TagSearch', () => ({ default: () => null }))
-vi.mock ('@/components/layout/SidebarComponent', () => ({
-    default: ({ children }: { children: ReactNode }) => <>{children}</> }))
-
-vi.mock ('framer-motion', async importOriginal => {
-  const original = await importOriginal<typeof import ('framer-motion')> ()
-  return {
-      ...original,
-      motion: {
-	  ...original.motion,
-	  div: ({ children, layoutId }: {
-	      children?: ReactNode
-	      layoutId?: string }) => (
-	      <div data-layout-id={layoutId}>{children}</div>) } }
-})
-
-describe ('TagSidebar', () => {
-  it ('keeps same-id internal and external tags with distinct identities', () => {
-    const errors = vi.spyOn (console, 'error').mockImplementation (() => {})
-    const internal = buildTag ({ id: 7, name: 'internal_collision' })
-    const external = buildTag ({
-	id: 7, name: 'nico:external_collision', category: 'nico' })
-
-    renderWithProviders (
-	<TagSidebar posts={[buildPost ({ tags: [internal, external] })]}/>)
-
-    for (const item of [internal, external])
-    {
-      const link = screen.getByRole ('link', { name: item.name })
-      expect (link).toBeInTheDocument ()
-      expect (link.closest ('[data-layout-id]')).toHaveAttribute (
-	  'data-layout-id', `tag-${ item.category }-7`)
-    }
-
-    expect (errors.mock.calls.filter (args =>
-	args.some (value => String (value).includes ('same key')))).toEqual ([])
-  })
-})

frontend/src/components/TagSidebar.tsx

@@ -84,8 +84,7 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
 	<ul>
 	  {CATEGORIES.flatMap (cat => cat in tags ? (
 	      tags[cat].map (tag => (
-		  <li key={`${ cat }-${ tag.id }`}
+		  <li key={tag.id} className="mb-1 min-w-0 max-w-full overflow-hidden">
-		      className="mb-1 min-w-0 max-w-full overflow-hidden">
 		    {animationsOff
 		     ? (
 			 <div className="flex min-w-0 max-w-full items-baseline overflow-hidden">
@@ -95,7 +94,7 @@ const TagSidebar: FC<Props> = ({ posts, onClick }) => {
 			 <motion.div
 			     className="flex min-w-0 max-w-full items-baseline overflow-hidden"
 			     transition={{ layout: layoutTransition }}
-			     layoutId={`tag-${ cat }-${ tag.id }`}>
+			     layoutId={`tag-${ tag.id }`}>
 			   <TagLink tag={tag} onClick={onClick}/>
 			 </motion.div>)}
 		  </li>))) : [])}