#386

backend/app/controllers/materials_controller.rb

@@ -89,15 +89,13 @@ class MaterialsController < ApplicationController
 
     begin
       Material.transaction do
-        tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
-        tag = tag_name.tag
-        tag = Tag.create!(tag_name:, category: :material) unless tag
-
+        tag = resolve_material_tag!(tag_name_raw)
         material = Material.new(tag:, url:,
                                 created_by_user: current_user,
                                 updated_by_user: current_user)
         material.file.attach(uploaded_blob) if uploaded_blob
         material.save!
+        TagVersioning.record_tag_snapshot!(tag, created_by_user: current_user)
         upsert_export_paths!(material)
         MaterialVersionRecorder.record!(material:, event_type: :create,
                                         created_by_user: current_user)
@@ -139,10 +137,7 @@ class MaterialsController < ApplicationController
     begin
       Material.transaction do
         MaterialVersionRecorder.ensure_snapshot!(material, created_by_user: current_user)
-        tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
-        tag = tag_name.tag
-        tag = Tag.create!(tag_name:, category: :material) unless tag
-
+        tag = resolve_material_tag!(tag_name_raw)
         material.assign_attributes(tag:, url:, updated_by_user: current_user)
         if uploaded_blob
           material.file.attach(uploaded_blob)
@@ -150,6 +145,7 @@ class MaterialsController < ApplicationController
           material.file.detach
         end
         material.save!
+        TagVersioning.record_tag_snapshot!(tag, created_by_user: current_user)
         upsert_export_paths!(material)
         MaterialVersionRecorder.record!(material:, event_type: :update,
                                         created_by_user: current_user)
@@ -240,6 +236,12 @@ class MaterialsController < ApplicationController
     nil
   end
 
+  def resolve_material_tag! tag_name_raw
+    tag_name = TagName.find_undiscard_or_create_by!(name: tag_name_raw)
+    tag = tag_name.tag
+    tag || Tag.create!(tag_name:, category: :material)
+  end
+
   def material_index_needs_tag_name? filters
     filters[:q].present? || filters[:sort] == 'tag_name'
   end

backend/spec/requests/materials_spec.rb

@@ -287,6 +287,25 @@ RSpec.describe 'Materials API', type: :request do
         expect(json.dig('export_paths', 'legacy_drive')).to eq('伊地知ニジカ/created.png')
       end
 
+      it 'creates a create tag_version for a newly created material tag' do
+        expect do
+          post '/materials', params: {
+            tag: 'material_create_versioned_tag',
+            file: dummy_upload(filename: 'created.png')
+          }
+        end.to change(TagVersion, :count).by(1)
+
+        expect(response).to have_http_status(:created)
+
+        tag = Tag.joins(:tag_name).find_by!(tag_names: { name: 'material_create_versioned_tag' })
+        version = tag.tag_versions.order(:version_no).last
+
+        expect(version.event_type).to eq('create')
+        expect(version.name).to eq('material_create_versioned_tag')
+        expect(version.category).to eq('material')
+        expect(version.created_by_user).to eq(member_user)
+      end
+
       it 'snapshots attached file metadata and sha256' do
         post '/materials', params: {
           tag: 'material_create_file_version',
@@ -466,6 +485,73 @@ RSpec.describe 'Materials API', type: :request do
         expect(json.dig('tag', 'name')).to eq('material_update_new')
       end
 
+      it 'creates a create tag_version when update creates a new tag' do
+        expect do
+          put "/materials/#{ material.id }", params: {
+            tag: 'material_update_versioned_tag',
+            file: dummy_upload(filename: 'updated.png')
+          }
+        end.to change(Tag, :count).by(1)
+          .and change(TagName, :count).by(1)
+          .and change(TagVersion, :count).by(1)
+
+        expect(response).to have_http_status(:ok)
+
+        tag = Tag.joins(:tag_name).find_by!(tag_names: { name: 'material_update_versioned_tag' })
+        version = tag.tag_versions.order(:version_no).last
+
+        expect(version.event_type).to eq('create')
+        expect(version.name).to eq('material_update_versioned_tag')
+        expect(version.category).to eq('material')
+        expect(version.created_by_user).to eq(member_user)
+      end
+
+      it 'backfills a create tag_version for an existing material tag without history' do
+        existing_tag =
+            Tag.create!(tag_name: TagName.create!(name: 'material_update_existing_no_history'),
+                        category: :material)
+
+        expect(existing_tag.tag_versions).to be_empty
+
+        expect do
+          put "/materials/#{ material.id }", params: {
+            tag: 'material_update_existing_no_history',
+            file: dummy_upload(filename: 'updated.png')
+          }
+        end.to change(TagVersion, :count).by(1)
+
+        expect(response).to have_http_status(:ok)
+
+        version = existing_tag.reload.tag_versions.order(:version_no).last
+        expect(version.event_type).to eq('create')
+        expect(version.name).to eq('material_update_existing_no_history')
+        expect(version.category).to eq('material')
+        expect(version.created_by_user).to eq(member_user)
+      end
+
+      it 'backfills a create tag_version for an existing character tag without history' do
+        existing_tag =
+            Tag.create!(tag_name: TagName.create!(name: 'material_update_character_no_history'),
+                        category: :character)
+
+        expect(existing_tag.tag_versions).to be_empty
+
+        expect do
+          put "/materials/#{ material.id }", params: {
+            tag: 'material_update_character_no_history',
+            file: dummy_upload(filename: 'updated.png')
+          }
+        end.to change(TagVersion, :count).by(1)
+
+        expect(response).to have_http_status(:ok)
+
+        version = existing_tag.reload.tag_versions.order(:version_no).last
+        expect(version.event_type).to eq('create')
+        expect(version.name).to eq('material_update_character_no_history')
+        expect(version.category).to eq('character')
+        expect(version.created_by_user).to eq(member_user)
+      end
+
       it 'detaches the existing file without purging blob when url replaces file' do
         old_blob_id = material.file.blob.id
 
@@ -494,6 +580,7 @@ RSpec.describe 'Materials API', type: :request do
       it 'does not increase version for the same snapshot update' do
         MaterialVersionRecorder.record!(material:, event_type: :create,
                                         created_by_user: member_user)
+        TagVersioning.ensure_snapshot!(tag, created_by_user: member_user)
 
         expect do
           put "/materials/#{ material.id }", params: {
@@ -501,6 +588,8 @@ RSpec.describe 'Materials API', type: :request do
           }
         end.not_to change(MaterialVersion, :count)
 
+        expect(tag.reload.tag_versions.count).to eq(1)
+
         expect(response).to have_http_status(:ok)
         expect(material.reload.version_no).to eq(1)
       end

frontend/src/App.tsx

@@ -6,7 +6,6 @@ import { BrowserRouter,
 	 Routes,
 	 useLocation } from 'react-router-dom'
 
-import DevModeWatermark from '@/components/DevModeWatermark'
 import RouteBlockerOverlay from '@/components/RouteBlockerOverlay'
 import TopNav from '@/components/TopNav'
 import DialogueProvider from '@/components/dialogues/DialogueProvider'
@@ -146,7 +145,6 @@ const App: FC = () => {
   return (
       <>
 	<RouteBlockerOverlay/>
-	{import.meta.env.DEV && <DevModeWatermark/>}
 
 	<BrowserRouter>
 	  <DialogueProvider>
@@ -154,7 +152,7 @@ const App: FC = () => {
 	      <motion.div
 		  layout="position"
 		  transition={{ layout: { duration: .2, ease: 'easeOut' } }}
-		  className="relative flex flex-col h-dvh w-full overflow-y-hidden">
+		  className="flex flex-col h-dvh w-full overflow-y-hidden">
 		<TopNav user={user}/>
 		<RouteTransitionWrapper user={user} setUser={setUser}/>
 	      </motion.div>

frontend/src/components/DevModeWatermark.tsx

@@ -1,46 +0,0 @@
-import nikumaru from '@/assets/fonts/nikumaru.otf'
-
-import type { FC } from 'react'
-
-
-const ROW_COUNT = 8
-const COLUMN_COUNT = 12
-
-
-const DevModeWatermark: FC = () => {
-  return (
-      <div
-	  aria-hidden="true"
-	  className="pointer-events-none select-none fixed inset-0 overflow-hidden z-0">
-	<style>{`
-	  @font-face {
-	    font-family: 'Nikumaru';
-	    src: url(${nikumaru}) format('opentype');
-	  }
-	`}</style>
-	<div className="absolute -inset-32 flex flex-col justify-center gap-12 py-48">
-	  {Array.from ({ length: ROW_COUNT }, (_, rowIndex) => (
-	      <div
-		  key={rowIndex}
-		  className={
-		      'flex min-h-32 items-center gap-12 '
-		      + (rowIndex % 2 === 0 ? 'translate-x-0' : 'translate-x-32')
-		  }>
-		{Array.from ({ length: COLUMN_COUNT }, (_, columnIndex) => (
-		    <span
-			key={columnIndex}
-			className={
-			    'whitespace-nowrap text-3xl font-bold '
-			    + 'tracking-[0.3em] text-neutral-950/5 '
-			    + 'dark:text-white/10'
-			}
-			style={{ fontFamily: 'Nikumaru' }}>
-		      開発モード
-		    </span>))}
-	      </div>))}
-	</div>
-      </div>)
-}
-
-
-export default DevModeWatermark

frontend/src/pages/theatres/TheatreDetailPage.test.tsx

@@ -1,10 +1,9 @@
-import { act, fireEvent, screen, waitFor, within } from '@testing-library/react'
+import { act, fireEvent, screen, waitFor } from '@testing-library/react'
 import { Route, Routes } from 'react-router-dom'
 import { beforeEach, describe, expect, it, vi } from 'vitest'
 
 import TheatreDetailPage from '@/pages/theatres/TheatreDetailPage'
 import { buildPost,
-	 buildTag,
 	 buildTheatre,
 	 buildTheatreComment,
 	 buildTheatreInfo,
@@ -97,9 +96,6 @@ const renderPage = (user = buildUser ({ id: 1, role: 'member' })) =>
       { route: '/theatres/7' },
   )
 
-const tagSection = (): HTMLElement =>
-  screen.getAllByRole ('heading', { name: 'タグ' })[0].closest ('section')!
-
 const mockDefaultApi = () => {
   api.apiGet.mockImplementation ((path: string) => {
     switch (path)
@@ -249,53 +245,6 @@ describe ('TheatreDetailPage', () => {
     expect (postEmbed.seek).not.toHaveBeenCalledWith (0)
   })
 
-  it ('shows child tags from the post tag tree in both vertical and horizontal layouts', async () => {
-    const childTag = buildTag ({ id: 12, name: '子タグ', category: 'general' })
-    const parentTag = buildTag ({
-      id:       11,
-      name:     '親タグ',
-      category: 'general',
-      children: [childTag],
-    })
-    const duplicateParentTag = buildTag ({
-      id:       13,
-      name:     '別親タグ',
-      category: 'general',
-      children: [childTag],
-    })
-
-    postsApi.fetchPost.mockResolvedValueOnce (buildPost ({
-      ...currentPost,
-      tags: [parentTag, duplicateParentTag],
-    }))
-
-    renderPage ()
-
-    await screen.findByText ('Embed:上映中の投稿')
-
-    expect (within (tagSection ()).getByRole ('link', { name: '親タグ' }))
-      .toBeInTheDocument ()
-    expect (within (tagSection ()).getByRole ('link', { name: '別親タグ' }))
-      .toBeInTheDocument ()
-    expect (within (tagSection ()).getAllByRole ('link', { name: '子タグ' })[0])
-      .toBeInTheDocument ()
-    expect (within (tagSection ()).getAllByText ('↳').length).toBeGreaterThan (0)
-
-    fireEvent.click (screen.getByRole ('button', { name: '2 列 A 型' }))
-    fireEvent.click (screen.getAllByRole ('button', { name: '横並び' })[0])
-
-    await waitFor (() => {
-      expect (within (tagSection ()).getByRole ('link', { name: '親タグ' }))
-	.toBeInTheDocument ()
-      expect (within (tagSection ()).getByRole ('link', { name: '別親タグ' }))
-	.toBeInTheDocument ()
-      expect (within (tagSection ()).getByRole ('link', { name: '子タグ' }))
-	.toBeInTheDocument ()
-      expect (within (tagSection ()).getAllByRole ('link', { name: '子タグ' }))
-	.toHaveLength (1)
-    })
-  })
-
   it ('does not advance host post while video length is unknown', async () => {
     api.apiPut.mockImplementation ((path: string) => {
       switch (path)

frontend/src/pages/theatres/TheatreDetailPage.tsx

@@ -102,28 +102,6 @@ const compareTagName = (a: Tag, b: Tag): number =>
     a.name === b.name ? 0 : (a.name < b.name ? -1 : 1)
 
 
-const flattenTags = (tags: Tag[]): Tag[] => {
-  const flattened: Tag[] = []
-  const seen = new Set<number> ()
-
-  const visit = (tag: Tag) => {
-    if (seen.has (tag.id))
-      return
-
-    seen.add (tag.id)
-    flattened.push (tag)
-
-    for (const child of tag.children ?? [])
-      visit (child)
-  }
-
-  for (const tag of tags)
-    visit (tag)
-
-  return flattened
-}
-
-
 const tagsByCategory = (tags: Tag[]): Partial<Record<Category, Tag[]>> => {
   const grouped: Partial<Record<Category, Tag[]>> = { }
 
@@ -140,39 +118,15 @@ const tagsByCategory = (tags: Tag[]): Partial<Record<Category, Tag[]>> => {
 }
 
 
-const renderReadonlyTagTree = (
-    tag:       Tag,
-    nestLevel: number,
-    path:      string,
-    ancestors: Set<number> = new Set<number> (),
-): ReactNode[] => {
-  const key = `${ path }-${ tag.id }`
-  const nextAncestors = new Set (ancestors)
-  nextAncestors.add (tag.id)
-
-  return [
-      (
-	  <li key={key} className="text-left leading-tight">
-	    <TagLink tag={tag} nestLevel={nestLevel} withCount={false}/>
-	  </li>),
-      ...((tag.children ?? [])
-	  .filter (child => !(nextAncestors.has (child.id)))
-	  .sort (compareTagName)
-	  .flatMap (child =>
-	      renderReadonlyTagTree (child, nestLevel + 1, key, nextAncestors)))]
-}
-
-
 const TagList: FC<{ tags: Tag[]; compact?: boolean; flow?: TagFlow }> = (
     { tags, compact, flow = 'vertical' }) => {
-  const horizontalGrouped = tagsByCategory (flattenTags (tags))
-  const verticalGrouped = tagsByCategory (tags)
+  const grouped = tagsByCategory (tags)
 
   if (flow === 'horizontal')
     {
       return (
 	  <ul className={cn ('flex flex-wrap gap-x-3 gap-y-1', compact && 'text-sm')}>
-	    {CATEGORIES.flatMap (cat => horizontalGrouped[cat] ?? []).map (tag => (
+	    {CATEGORIES.flatMap (cat => grouped[cat] ?? []).map (tag => (
 		<li key={tag.id} className="text-left leading-tight">
 		  <TagLink tag={tag} withCount={false}/>
 		</li>))}
@@ -182,7 +136,7 @@ const TagList: FC<{ tags: Tag[]; compact?: boolean; flow?: TagFlow }> = (
   return (
       <div className="space-y-3">
 	{CATEGORIES.map (cat => {
-	  const rows = verticalGrouped[cat] ?? []
+	  const rows = grouped[cat] ?? []
 	  if (rows.length === 0)
 	    return null
 
@@ -192,8 +146,10 @@ const TagList: FC<{ tags: Tag[]; compact?: boolean; flow?: TagFlow }> = (
 		  {CATEGORY_NAMES[cat]}
 		</div>
 		<ul className={cn ('space-y-1', compact && 'text-sm')}>
-		  {rows.flatMap (tag =>
-		      renderReadonlyTagTree (tag, 0, `cat-${ cat }`))}
+		  {rows.map (tag => (
+		      <li key={tag.id} className="text-left leading-tight">
+			<TagLink tag={tag} withCount={false}/>
+		      </li>))}
 		</ul>
 	      </div>)
 	})}