Merge branch 'main' into feature/389

まだ画面チェックしてゐないのでマージ禁止

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

AGENTS.md

@@ -271,7 +271,12 @@ const value =
 - In TypeScript and TSX, convert every leading run of 8 spaces to a tab
   character.
 - A leading tab is exactly equivalent to 8 leading spaces.
-- Never place a closing parenthesis at the beginning of a line.
+- In TypeScript and TSX function declarations, including `const` arrow
+  function declarations, when the parameter list spans multiple lines, always
+  put the closing parenthesis at the beginning of its own line before the return
+  type or `=>`.
+- In TypeScript and TSX, never place a closing parenthesis at the beginning of
+  a line except for a multi-line function declaration parameter list.
 - Never place a closing square bracket at the beginning of a line.
 - For object literals and other associative-array-style braces, do not place
   the closing brace at the beginning of a line. Function, lambda, callback, and

backend/app/controllers/posts_controller.rb

@@ -140,10 +140,11 @@ class PostsController < ApplicationController
     original_created_from = params[:original_created_from]
     original_created_before = params[:original_created_before]
     parent_post_ids = parse_parent_post_ids
+    resized_thumbnail = thumbnail.present? ? Post.resized_thumbnail_attachment(thumbnail) : nil
 
     post = Post.new(title:, url:, thumbnail_base: nil, uploaded_user: current_user,
                     original_created_from:, original_created_before:)
-    post.thumbnail.attach(thumbnail) if thumbnail.present?
+    post.thumbnail.attach(resized_thumbnail) if resized_thumbnail
 
     ApplicationRecord.transaction do
       post.save!
@@ -156,8 +157,6 @@ class PostsController < ApplicationController
 
       sync_parent_posts!(post, parent_post_ids)
 
-      post.resized_thumbnail!
-
       PostVersionRecorder.record!(post:, event_type: :create, created_by_user: current_user)
     end
 
@@ -167,6 +166,8 @@ class PostsController < ApplicationController
     render_validation_error fields: { tags: 'ニコニコ・タグは直接指定できません．' }
   rescue Tag::DeprecatedTagNormalisationError
     render_unprocessable_entity '廃止済みタグは付与できません．', field: :tags
+  rescue MiniMagick::Error
+    render_validation_error fields: { thumbnail: ['サムネイル画像の変換に失敗しました．'] }
   rescue ArgumentError => e
     render_validation_error fields: { parent_post_ids: [e.message] }
   rescue ActiveRecord::RecordInvalid => e

backend/app/controllers/tags_controller.rb

@@ -245,10 +245,7 @@ class TagsController < ApplicationController
     return render_unprocessable_entity('カテゴリは必須です．', field: :category) if category.blank?
     return render_unprocessable_entity '廃止状態は必須です．', field: :deprecated unless params.key?(:deprecated)
 
-    if (name != tag.name &&
-        tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico]))
-      return render_unprocessable_entity 'システム・タグの名称は変更できません．', field: :name
-    end
+    return unless validate_tag_rename(tag, name)
 
     alias_names = params[:aliases].to_s.split.uniq
     parent_names = params[:parent_tags].to_s.split.uniq
@@ -274,7 +271,7 @@ class TagsController < ApplicationController
       else
         tag.update!(category:, deprecated_at: deprecated ? Time.current : nil)
       end
-      tag.tag_name.update!(name:)
+      rename_tag_name!(tag, name) if name_changed
 
       alias_names << old_name if name_changed
       alias_names.delete(name)
@@ -310,6 +307,8 @@ class TagsController < ApplicationController
       return render_unprocessable_entity 'ニコタグは廃止できません．', field: :deprecated
     end
 
+    return unless validate_tag_rename(tag, name)
+
     if tag.nico? || (category.present? && category == 'nico')
       return render_unprocessable_entity 'ニコタグは変更できません．', field: :category
     end
@@ -321,7 +320,7 @@ class TagsController < ApplicationController
       name_changed = name.present? && name != old_name
       wiki_page = tag.tag_name.wiki_page if name_changed
 
-      tag.tag_name.update!(name:) if name.present?
+      rename_tag_name!(tag, name) if name_changed
       tag.update!(category:) if category.present?
       if deprecated_given && tag.deprecated? != deprecated
         tag.update!(deprecated_at: deprecated ? Time.current : nil)
@@ -535,6 +534,67 @@ class TagsController < ApplicationController
         created_by_user:)
   end
 
+  def validate_tag_rename tag, name
+    return true if name.blank? || name == tag.name
+
+    if tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico])
+      render_unprocessable_entity 'システム・タグの名称は変更できません．', field: :name
+      return false
+    end
+
+    target_tag_name = TagName.with_discarded.find_by(name:)
+    return true if target_tag_name.nil?
+    return true if target_tag_name.canonical_id?
+
+    render_unprocessable_entity 'その名前は既に使はれてゐます．', field: :name
+    false
+  end
+
+  def rename_tag_name! tag, name
+    return if name == tag.name
+
+    current_tag_name = tag.tag_name
+    target_tag_name = TagName.with_discarded.find_by(name:)
+
+    if target_tag_name.nil?
+      current_tag_name.update!(name:)
+      return
+    end
+
+    promote_tag_alias!(
+        tag,
+        current_tag_name:,
+        promoted_tag_name: target_tag_name)
+  end
+
+  def promote_tag_alias! tag, current_tag_name:, promoted_tag_name:
+    old_owner_tag = promoted_tag_name.canonical&.tag
+
+    if old_owner_tag && old_owner_tag != tag
+      TagVersioning.ensure_snapshot!(old_owner_tag, created_by_user: current_user)
+    end
+
+    promoted_tag_name.undiscard! if promoted_tag_name.discarded?
+    promoted_tag_name.update!(canonical: nil)
+
+    TagName.with_discarded
+           .where(canonical_id: current_tag_name.id)
+           .where.not(id: promoted_tag_name.id)
+           .find_each do |alias_tag_name|
+      alias_tag_name.update!(canonical: promoted_tag_name)
+    end
+
+    current_tag_name.wiki_page&.update!(tag_name: promoted_tag_name)
+    tag.update!(tag_name: promoted_tag_name)
+    current_tag_name.association(:wiki_page).reset
+    current_tag_name.association(:tag).reset
+    current_tag_name.reload.update!(canonical: promoted_tag_name)
+
+    return unless old_owner_tag && old_owner_tag != tag
+
+    record_tag_version!(old_owner_tag.reload, event_type: :update, created_by_user: current_user)
+  end
+
   def update_aliases! tag, alias_names
     alias_names = alias_names.uniq
 

backend/app/models/post.rb

@@ -1,5 +1,19 @@
 class Post < ApplicationRecord
   require 'mini_magick'
+  require 'stringio'
+
+  def self.resized_thumbnail_attachment(upload)
+    upload.rewind
+    image = MiniMagick::Image.read(upload.read)
+    image.resize '180x180'
+    image.format 'jpg'
+
+    { io: StringIO.new(image.to_blob),
+      filename: 'resized_thumbnail.jpg',
+      content_type: 'image/jpeg' }
+  ensure
+    upload.rewind
+  end
 
   belongs_to :uploaded_user, class_name: 'User', optional: true
 
@@ -87,12 +101,7 @@ class Post < ApplicationRecord
   def resized_thumbnail!
     return unless thumbnail.attached?
 
-    image = MiniMagick::Image.read(thumbnail.download)
-    image.resize '180x180'
-    thumbnail.purge
-    thumbnail.attach(io:            File.open(image.path),
-                     filename:      'resized_thumbnail.jpg',
-                     content_type:  'image/jpeg')
+    thumbnail.attach(self.class.resized_thumbnail_attachment(StringIO.new(thumbnail.download)))
   end
 
   private

backend/app/models/tag_implication.rb

@@ -6,6 +6,7 @@ class TagImplication < ApplicationRecord
   validates :parent_tag_id, presence: true
 
   validate :parent_tag_mustnt_be_itself
+  validate :parent_tag_mustnt_create_cycle
 
   private
 
@@ -14,4 +15,27 @@ class TagImplication < ApplicationRecord
       errors.add :parent_tag_id, '親タグは子タグと同一であってはなりません．'
     end
   end
+
+  def parent_tag_mustnt_create_cycle
+    return if tag_id.blank? || parent_tag_id.blank?
+    return if errors[:parent_tag_id].present?
+
+    seen = { }
+    stack = [parent_tag_id]
+
+    until stack.empty?
+      current_id = stack.pop
+      next if seen[current_id]
+
+      seen[current_id] = true
+
+      if current_id == tag_id
+        errors.add :parent_tag_id, '親タグに子孫タグを指定すると循環します．'
+        errors.add :base, 'タグの親子関係が循環します．'
+        return
+      end
+
+      stack.concat(TagImplication.where(tag_id: current_id).pluck(:parent_tag_id))
+    end
+  end
 end

backend/app/services/google_drive/api_client.rb

@@ -26,13 +26,19 @@ module GoogleDrive
 
     def list_material_files_under_folder folder_id
       files = []
+      each_material_file_under_folder(folder_id) { |entry| files << entry }
+      files
+    end
+
+    def each_material_file_under_folder folder_id
+      return enum_for(__method__, folder_id) unless block_given?
+
       walk_folder(folder_id, nil) do |entry, relative_path|
         next if entry['mimeType'] == FOLDER_MIME_TYPE
         next if native_file?(entry['mimeType'])
 
-        files << build_file_entry(entry, relative_path)
+        yield build_file_entry(entry, relative_path)
       end
-      files
     end
 
     def fetch_material_file file_id
@@ -44,9 +50,10 @@ module GoogleDrive
 
     def download_to_tempfile file_id, filename:
       tempfile = Tempfile.new(['material-sync', File.extname(filename.to_s)])
+      tempfile.binmode
       request_binary("/files/#{ file_id }",
                      { alt: 'media', supportsAllDrives: true }) do |chunk|
-        tempfile.write(chunk)
+        tempfile.write(chunk.b)
       end
       tempfile.rewind
       tempfile
@@ -139,7 +146,7 @@ module GoogleDrive
         end
 
         response.read_body do |chunk|
-          yield chunk
+          yield chunk.b
         end
       end
     end

backend/app/services/material_sync_runner.rb

@@ -21,10 +21,14 @@ class MaterialSyncRunner
     result = Result.new(imported: 0, updated: 0, unchanged: 0,
                         suppressed: 0, failed: 0, errors: [])
 
-    candidates.each do |candidate|
-      next if candidate.blank?
+    if @source.source_kind == 'google_drive_path'
+      sync_google_drive_path!(result)
+    else
+      candidates.each do |candidate|
+        next if candidate.blank?
 
-      sync_candidate!(candidate, result)
+        sync_candidate!(candidate, result)
+      end
     end
 
     @source.update!(last_synced_at: Time.current)
@@ -43,8 +47,6 @@ class MaterialSyncRunner
     case @source.source_kind
     when 'uri'
       [uri_candidate]
-    when 'google_drive_path'
-      google_drive_path_candidates
     when 'google_drive_file'
       [google_drive_file_candidate]
     when 'legacy_drive_path'
@@ -104,12 +106,25 @@ class MaterialSyncRunner
   def google_drive_path_candidates
     folder_id = google_drive_folder_id
     Enumerator.new do |entries|
-      drive_client.list_material_files_under_folder(folder_id).each do |entry|
+      drive_client.each_material_file_under_folder(folder_id).each do |entry|
         entries << build_google_drive_candidate(entry)
       end
     end
   end
 
+  def sync_google_drive_path! result
+    folder_id = google_drive_folder_id
+    scanned_count = 0
+
+    drive_client.each_material_file_under_folder(folder_id) do |entry|
+      scanned_count += 1
+      sync_candidate!(build_google_drive_candidate(entry), result)
+      log_google_drive_progress(folder_id, scanned_count, result) if progress_log_scan_count?(scanned_count)
+    end
+
+    log_google_drive_progress(folder_id, scanned_count, result, summary: true)
+  end
+
   def google_drive_file_candidate
     entry = drive_client.fetch_material_file(google_drive_file_id)
     return nil unless entry
@@ -213,6 +228,22 @@ class MaterialSyncRunner
                                         failed: result.failed))
   end
 
+  def progress_log_scan_count? scanned_count
+    scanned_count == 1 || (scanned_count % 50).zero?
+  end
+
+  def log_google_drive_progress folder_id, scanned_count, result, summary: false
+    Rails.logger.info(
+        material_sync_log(folder_id:,
+                          scanned_count:,
+                          imported: result.imported,
+                          updated: result.updated,
+                          unchanged: result.unchanged,
+                          suppressed: result.suppressed,
+                          failed: result.failed,
+                          progress: summary ? 'summary' : 'scan'))
+  end
+
   def material_sync_log fields
     { material_sync_source_id: @source.id,
       material_sync_source_name: @source.name }.merge(fields).to_json

backend/spec/models/tag_implication_spec.rb

@@ -0,0 +1,36 @@
+require 'rails_helper'
+
+RSpec.describe TagImplication, type: :model do
+  it 'rejects a parent tag that would create a cycle' do
+    child = create(:tag, name: 'tag_implication_cycle_child')
+    parent = create(:tag, name: 'tag_implication_cycle_parent')
+
+    described_class.create!(tag: child, parent_tag: parent)
+
+    implication = described_class.new(tag: parent, parent_tag: child)
+
+    expect(implication).not_to be_valid
+    expect(implication.errors[:parent_tag_id]).to include(
+      '親タグに子孫タグを指定すると循環します．'
+    )
+    expect(implication.errors[:base]).to be_present
+  end
+
+  it 'terminates even when existing data already contains a cycle' do
+    child = create(:tag, name: 'tag_implication_existing_cycle_child')
+    parent = create(:tag, name: 'tag_implication_existing_cycle_parent')
+    ancestor = create(:tag, name: 'tag_implication_existing_cycle_ancestor')
+
+    described_class.create!(tag: parent, parent_tag: ancestor)
+    described_class.insert_all!(
+      [
+        { tag_id: ancestor.id, parent_tag_id: parent.id,
+          created_at: Time.current, updated_at: Time.current }
+      ]
+    )
+
+    implication = described_class.new(tag: child, parent_tag: parent)
+
+    expect(implication).to be_valid
+  end
+end

backend/spec/models/tag_spec.rb

@@ -54,7 +54,17 @@ RSpec.describe Tag, type: :model do
       first = create(:tag, name: 'expand_cycle_first')
       second = create(:tag, name: 'expand_cycle_second')
       TagImplication.create!(tag: first, parent_tag: second)
-      TagImplication.create!(tag: second, parent_tag: first)
+      now = Time.current
+      TagImplication.insert_all!(
+        [
+          {
+            tag_id: second.id,
+            parent_tag_id: first.id,
+            created_at: now,
+            updated_at: now
+          }
+        ]
+      )
 
       expect(described_class.expand_parent_tags([first])).to contain_exactly(first, second)
     end

backend/spec/requests/posts_spec.rb

@@ -1,4 +1,5 @@
 require 'rails_helper'
+require 'base64'
 require 'set'
 
 include ActiveSupport::Testing::TimeHelpers
@@ -8,6 +9,11 @@ RSpec.describe 'Posts API', type: :request do
   # resized_thumbnail! が MiniMagick 依存でコケやすいので request spec ではスタブしとくのが無難。
   before do
     allow_any_instance_of(Post).to receive(:resized_thumbnail!).and_return(true)
+    allow(Post).to receive(:resized_thumbnail_attachment).and_return(
+      io: StringIO.new('dummy'),
+      filename: 'resized_thumbnail.jpg',
+      content_type: 'image/jpeg'
+    )
   end
 
   def create_nico_tag!(name)
@@ -19,6 +25,18 @@ RSpec.describe 'Posts API', type: :request do
     Rack::Test::UploadedFile.new(StringIO.new('dummy'), 'image/jpeg', original_filename: 'dummy.jpg')
   end
 
+  def real_thumbnail_upload
+    gif =
+        Base64.decode64(
+            'R0lGODdhAQABAIABAP///wAAACwAAAAAAQABAAACAkQBADs=')
+
+    Rack::Test::UploadedFile.new(
+      StringIO.new(gif),
+      'image/gif',
+      original_filename: 'thumbnail.gif'
+    )
+  end
+
   def post_write_params params = { }
     { parent_post_ids: '' }.merge(params)
   end
@@ -696,6 +714,66 @@ RSpec.describe 'Posts API', type: :request do
       expect(json['tags'][0]).to have_key('name')
     end
 
+    it '201 when posting manually with a thumbnail' do
+      sign_in_as(member)
+      allow(Post).to receive(:resized_thumbnail_attachment).and_call_original
+
+      post '/posts', params: post_write_params(
+        title: 'thumbnail post',
+        url: 'https://example.com/thumbnail-post',
+        tags: 'spec_tag',
+        thumbnail: real_thumbnail_upload
+      )
+
+      expect(response).to have_http_status(:created)
+      post_record = Post.find(json.fetch('id'))
+      expect(post_record.thumbnail).to be_attached
+      expect(post_record.thumbnail.blob.content_type).to eq('image/jpeg')
+      expect { post_record.thumbnail.download }.not_to raise_error
+    end
+
+    it 'resizes the thumbnail before the create transaction begins' do
+      sign_in_as(member)
+
+      open_transactions = []
+      baseline_open_transactions = Post.connection.open_transactions
+      allow(Post).to receive(:resized_thumbnail_attachment) do |_upload|
+        open_transactions << Post.connection.open_transactions
+        { io: StringIO.new('dummy'),
+          filename: 'resized_thumbnail.jpg',
+          content_type: 'image/jpeg' }
+      end
+
+      post '/posts', params: post_write_params(
+        title: 'transaction post',
+        url: 'https://example.com/transaction-post',
+        tags: 'spec_tag',
+        thumbnail: dummy_upload
+      )
+
+      expect(response).to have_http_status(:created)
+      expect(open_transactions).to eq([baseline_open_transactions])
+    end
+
+    it 'returns 422 and does not create a post when thumbnail resize fails' do
+      sign_in_as(member)
+      allow(Post).to receive(:resized_thumbnail_attachment).and_raise(MiniMagick::Error)
+
+      expect {
+        post '/posts', params: post_write_params(
+          title: 'broken thumbnail post',
+          url: 'https://example.com/broken-thumbnail-post',
+          tags: 'spec_tag',
+          thumbnail: dummy_upload
+        )
+      }.not_to change(Post, :count)
+
+      expect(response).to have_http_status(:unprocessable_entity)
+      expect(json.fetch('errors')).to include(
+        'thumbnail' => ['サムネイル画像の変換に失敗しました．']
+      )
+    end
+
     it '201 and creates post + tags when member and tags have aliases' do
       sign_in_as(member)
 

backend/spec/requests/tag_children_spec.rb

@@ -56,6 +56,17 @@ RSpec.describe "TagChildren", type: :request do
 
         expect(response).to have_http_status(:no_content)
       end
+
+      it 'returns 422 and does not create relation when the new link makes a cycle' do
+        TagImplication.create!(tag: parent, parent_tag: child)
+
+        expect {
+          do_request
+        }.not_to change(TagImplication, :count)
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(TagImplication.where(tag: child, parent_tag: parent)).not_to exist
+      end
     end
 
     context "when Tag.find raises (invalid ids)" do

backend/spec/requests/tags_spec.rb

@@ -581,6 +581,58 @@ RSpec.describe 'Tags API', type: :request do
         expect(response).to have_http_status(:ok)
         expect(wiki_page.reload.wiki_versions.count).to eq(before_wiki_version_count)
       end
+
+      it 'full update で旧名 alias が残った tag を PATCH で旧名へ戻せる' do
+        put "/tags/#{ tag.id }", params: {
+          name: 'patch_roundtrip_target',
+          category: 'general',
+          aliases: 'unko',
+          parent_tags: '',
+          deprecated: '0',
+        }
+
+        expect(response).to have_http_status(:ok)
+        expect(TagName.find_by!(name: 'spec_tag').canonical).to eq(tag.reload.tag_name)
+
+        patch "/tags/#{ tag.id }", params: { name: 'spec_tag' }
+
+        expect(response).to have_http_status(:ok)
+
+        tag.reload
+
+        expect(tag.name).to eq('spec_tag')
+        expect(tag.tag_name.canonical_id).to be_nil
+        expect(TagName.find_by!(name: 'patch_roundtrip_target').canonical).to eq(tag.tag_name)
+      end
+
+      it '別 tag の正規名には変更できない' do
+        wiki_page =
+            Wiki::Commit.create_content!(
+                tag_name: tag.tag_name,
+                body: 'patch collision wiki',
+                created_by_user: member_user,
+                message: 'init')
+
+        patch "/tags/#{ tag.id }", params: { name: 'unknown' }
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(json.fetch('errors')).to include(
+          'name' => ['その名前は既に使はれてゐます．']
+        )
+
+        expect(tag.reload.name).to eq('spec_tag')
+        expect(tag.tag_name.aliases.map(&:name)).to contain_exactly('unko')
+        expect(wiki_page.reload.tag_name).to eq(tag.tag_name)
+      end
+
+      it 'system tag の name は変更できない' do
+        system_tag = Tag.bot
+
+        patch "/tags/#{ system_tag.id }", params: { name: 'patch_system_tag_renamed' }
+
+        expect(response).to have_http_status(:unprocessable_entity)
+        expect(system_tag.reload.name).to eq('bot操作')
+      end
     end
   end
 
@@ -745,7 +797,17 @@ RSpec.describe 'Tags API', type: :request do
       )
       TagImplication.create!(tag: first, parent_tag: root_material)
       TagImplication.create!(tag: second, parent_tag: first)
-      TagImplication.create!(tag: first, parent_tag: second)
+      now = Time.current
+      TagImplication.insert_all!(
+        [
+          {
+            tag_id: first.id,
+            parent_tag_id: second.id,
+            created_at: now,
+            updated_at: now
+          }
+        ]
+      )
 
       get '/tags/with-depth', params: { parent: root_material.id }
 
@@ -1029,6 +1091,42 @@ RSpec.describe 'Tags API', type: :request do
         expect(versions.second.created_by_user_id).to eq(member_user.id)
       end
 
+      it '同じ tag の旧 alias へ戻しても rename できる' do
+        put "/tags/#{ tag.id }", params: {
+          name: 'put_roundtrip_b',
+          category: 'general',
+          aliases: 'unko',
+          parent_tags: '',
+          deprecated: '0',
+        }
+
+        expect(response).to have_http_status(:ok)
+
+        put "/tags/#{ tag.id }", params: {
+          name: 'spec_tag',
+          category: 'general',
+          aliases: 'unko',
+          parent_tags: '',
+          deprecated: '0',
+        }
+
+        expect(response).to have_http_status(:ok)
+
+        tag.reload
+
+        expect(tag.name).to eq('spec_tag')
+        expect(TagName.find_by!(name: 'put_roundtrip_b').canonical).to eq(tag.tag_name)
+        expect(tag.tag_name.aliases.map(&:name)).to contain_exactly('put_roundtrip_b', 'unko')
+        expect(tag.tag_name.aliases.map(&:name)).not_to include('spec_tag')
+        expect(alias_tn.reload.canonical).to eq(tag.tag_name)
+
+        version = tag.tag_versions.order(:version_no).last
+
+        expect(version.event_type).to eq('update')
+        expect(version.name).to eq('spec_tag')
+        expect(version.aliases.split).to contain_exactly('put_roundtrip_b', 'unko')
+      end
+
       it 'parent tag の snapshot も作成する' do
         old_parent = Tag.create!(
           tag_name: TagName.create!(name: 'put_snapshot_old_parent'),
@@ -1153,6 +1251,48 @@ RSpec.describe 'Tags API', type: :request do
         )
       end
 
+      it 'wiki を持つ tag を旧 alias へ戻しても wiki を新 canonical へ移す' do
+        wiki_page =
+            Wiki::Commit.create_content!(
+                tag_name: tag.tag_name,
+                body: 'wiki body before',
+                created_by_user: member_user,
+                message: 'init')
+
+        expect {
+          put "/tags/#{ tag.id }", params: {
+            name: 'put_wiki_roundtrip_b',
+            category: 'general',
+            aliases: 'unko',
+            parent_tags: '',
+            deprecated: '0',
+          }
+
+          put "/tags/#{ tag.id }", params: {
+            name: 'spec_tag',
+            category: 'general',
+            aliases: 'unko',
+            parent_tags: '',
+            deprecated: '0',
+          }
+        }
+            .to change(TagVersion, :count).by(3)
+            .and change(WikiVersion, :count).by(2)
+
+        expect(response).to have_http_status(:ok)
+
+        tag.reload
+
+        expect(wiki_page.reload.tag_name).to eq(tag.tag_name)
+        expect(TagName.find_by!(name: 'put_wiki_roundtrip_b').wiki_page).to be_nil
+        expect(TagName.find_by!(name: 'put_wiki_roundtrip_b').canonical).to eq(tag.tag_name)
+
+        versions = wiki_page.wiki_versions.order(:version_no).last(2)
+
+        expect(versions.map(&:event_type)).to eq(['update', 'update'])
+        expect(versions.map(&:title)).to eq(['put_wiki_roundtrip_b', 'spec_tag'])
+      end
+
       it '別名を他 tag から奪った場合、奪はれた側の tag version も作成する' do
         old_owner = Tag.create!(
           tag_name: TagName.create!(name: 'put_alias_old_owner'),
@@ -1191,9 +1331,49 @@ RSpec.describe 'Tags API', type: :request do
         expect(old_owner_versions.second.aliases.split).not_to include('put_stolen_alias')
       end
 
-      it 'parent_tags に指定すると循環する tag は 422 にする' do
-        pending '#332 で対応予定'
+      it '別 tag の alias 名を rename で奪へる' do
+        old_owner = Tag.create!(
+          tag_name: TagName.create!(name: 'put_alias_collision_owner'),
+          category: :general
+        )
+        stolen_alias = TagName.create!(
+          name: 'put_alias_collision_name',
+          canonical: old_owner.tag_name
+        )
+        wiki_page =
+            Wiki::Commit.create_content!(
+                tag_name: tag.tag_name,
+                body: 'put collision wiki',
+                created_by_user: member_user,
+                message: 'init')
 
+        put "/tags/#{ tag.id }", params: {
+          name: 'put_alias_collision_name',
+          category: 'general',
+          aliases: 'unko',
+          parent_tags: '',
+          deprecated: '0',
+        }
+
+        expect(response).to have_http_status(:ok)
+
+        tag.reload
+        old_owner.reload
+        stolen_alias.reload
+
+        expect(tag.name).to eq('put_alias_collision_name')
+        expect(stolen_alias.canonical_id).to be_nil
+        expect(TagName.find_by!(name: 'spec_tag').canonical).to eq(tag.tag_name)
+        expect(old_owner.tag_name.aliases.map(&:name)).not_to include('put_alias_collision_name')
+
+        old_owner_versions = old_owner.tag_versions.order(:version_no)
+
+        expect(old_owner_versions.last.event_type).to eq('update')
+        expect(old_owner_versions.last.aliases.split).not_to include('put_alias_collision_name')
+        expect(wiki_page.reload.tag_name).to eq(tag.tag_name)
+      end
+
+      it 'parent_tags に指定すると循環する tag は 422 にする' do
         child = Tag.create!(
           tag_name: TagName.create!(name: 'put_cycle_child'),
           category: :general

backend/spec/services/material_sync_runner_spec.rb

@@ -0,0 +1,89 @@
+require 'rails_helper'
+
+RSpec.describe MaterialSyncRunner do
+  let(:user) { create(:user, :member) }
+  let(:source) do
+    MaterialSyncSource.create!(
+        name: 'Drive source',
+        source_kind: 'google_drive_path',
+        source_file_id: 'folder-123',
+        profile: 'legacy_drive',
+        created_by_user: user,
+        updated_by_user: user)
+  end
+  let(:drive_client) { instance_double(GoogleDrive::ApiClient) }
+
+  describe '#sync!' do
+    it 'imports google drive path candidates as they are yielded' do
+      first_entry = { id: 'file-1',
+                      name: 'a.png',
+                      mime_type: 'image/png',
+                      relative_path: '素材/a.png',
+                      sha256_checksum: 'sha-a',
+                      web_view_link: 'https://drive.google.com/file/d/file-1/view',
+                      web_content_link: nil }
+      second_entry = { id: 'file-2',
+                       name: 'b.png',
+                       mime_type: 'image/png',
+                       relative_path: '素材/b.png',
+                       sha256_checksum: 'sha-b',
+                       web_view_link: 'https://drive.google.com/file/d/file-2/view',
+                       web_content_link: nil }
+      yielded = []
+
+      allow(GoogleDrive::ApiClient).to receive(:new).and_return(drive_client)
+      allow(drive_client).to receive(:each_material_file_under_folder) do |folder_id, &block|
+        expect(folder_id).to eq('folder-123')
+        block.call(first_entry)
+        expect(yielded).to eq(['素材/a.png'])
+        block.call(second_entry)
+      end
+      allow(MaterialSyncImporter).to receive(:import!) do |candidate|
+        yielded << candidate.fetch(:source_path)
+        instance_double(MaterialSyncImporter::Result,
+                        action: yielded.last == '素材/a.png' ? :imported : :updated)
+      end
+
+      result = described_class.new(source).sync!
+
+      expect(yielded).to eq(['素材/a.png', '素材/b.png'])
+      expect(result.imported).to eq(1)
+      expect(result.updated).to eq(1)
+      expect(result.unchanged).to eq(0)
+      expect(source.reload.last_synced_at).to be_present
+    end
+
+    it 'logs google drive path progress at first item and summary' do
+      entry = { id: 'file-1',
+                name: 'a.png',
+                mime_type: 'image/png',
+                relative_path: '素材/a.png',
+                sha256_checksum: 'sha-a',
+                web_view_link: 'https://drive.google.com/file/d/file-1/view',
+                web_content_link: nil }
+      logged = []
+
+      allow(GoogleDrive::ApiClient).to receive(:new).and_return(drive_client)
+      allow(drive_client).to receive(:each_material_file_under_folder) do |_folder_id, &block|
+        block.call(entry)
+      end
+      allow(MaterialSyncImporter).to receive(:import!)
+        .and_return(instance_double(MaterialSyncImporter::Result, action: :imported))
+      allow(Rails.logger).to receive(:info) { |message| logged << JSON.parse(message) }
+
+      described_class.new(source).sync!
+
+      progress_logs = logged.select { |row| row['folder_id'] == 'folder-123' }
+      expect(progress_logs.map { |row| row['progress'] }).to eq(['scan', 'summary'])
+      expect(progress_logs.last).to include(
+          'material_sync_source_id' => source.id,
+          'material_sync_source_name' => 'Drive source',
+          'scanned_count' => 1,
+          'imported' => 1,
+          'updated' => 0,
+          'unchanged' => 0,
+          'suppressed' => 0,
+          'failed' => 0)
+    end
+  end
+end

frontend/src/App.tsx

@@ -6,6 +6,7 @@ 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'
@@ -75,7 +76,6 @@ const RouteTransitionWrapper = ({ user, setUser }: {
 	    <Route path="suppressions" element={<MaterialSyncSuppressionsPage/>}/>
 	    <Route path=":id" element ={<MaterialDetailPage/>}/>
 	  </Route>
-	  {/* <Route path="/materials/search" element={<MaterialSearchPage/>}/> */}
 	  <Route path="/wiki" element={<WikiSearchPage/>}/>
 	  <Route path="/wiki/:title" element={<WikiDetailPage/>}/>
 	  <Route path="/wiki/new" element={<WikiNewPage user={user}/>}/>
@@ -146,6 +146,7 @@ const App: FC = () => {
   return (
       <>
 	<RouteBlockerOverlay/>
+	{import.meta.env.DEV && <DevModeWatermark/>}
 
 	<BrowserRouter>
 	  <DialogueProvider>
@@ -153,7 +154,7 @@ const App: FC = () => {
 	      <motion.div
 		  layout="position"
 		  transition={{ layout: { duration: .2, ease: 'easeOut' } }}
-		  className="flex flex-col h-dvh w-full overflow-y-hidden">
+		  className="relative 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

@@ -0,0 +1,46 @@
+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/components/MaterialSidebar.tsx

@@ -1,29 +1,43 @@
-import { Fragment, useEffect, useRef, useState } from 'react'
 import { useQuery } from '@tanstack/react-query'
+import { useEffect, useRef, useState } from 'react'
 import { useLocation, useNavigate } from 'react-router-dom'
 
-import PrefetchLink from '@/components/PrefetchLink'
-import TagLink from '@/components/TagLink'
 import SidebarComponent from '@/components/layout/SidebarComponent'
-import { materialsKeys } from '@/lib/queryKeys'
+import TagLink from '@/components/TagLink'
 import { fetchMaterialTagTree, parseMaterialFilter } from '@/lib/materials'
+import { materialsKeys } from '@/lib/queryKeys'
+import { cn } from '@/lib/utils'
 
-import type { Dispatch, FC, ReactNode, SetStateAction } from 'react'
+import type { CSSProperties, Dispatch, FC, ReactNode, SetStateAction } from 'react'
 
 import type { MaterialFilter, MaterialSidebarTag, Tag } from '@/types'
 
-const FILTERS: MaterialFilter[] = ['present', 'missing', 'any']
+const FILTERS: MaterialFilter[] = ['missing', 'present', 'any']
+const FILTER_LABELS: Record<MaterialFilter, string> = { present: '有', missing: '無', any: '全' }
 
-const FILTER_LABELS: Record<MaterialFilter, string> = {
-    present: '素材あり',
-    missing: '素材なし',
-    any:     'すべて'}
+
+const px = (value: string): number => {
+  const parsed = Number.parseFloat (value)
+  return Number.isFinite (parsed) ? parsed : 0
+}
+
+
+const verticalChrome = (el: HTMLElement): number => {
+  const style = window.getComputedStyle (el)
+
+  return (
+      px (style.paddingTop)
+      + px (style.paddingBottom)
+      + px (style.borderTopWidth)
+      + px (style.borderBottomWidth))
+}
 
 
 const setChildrenById = (
     tags:     MaterialSidebarTag[],
     targetId: number,
-    children: MaterialSidebarTag[]): MaterialSidebarTag[] => (
+    children: MaterialSidebarTag[],
+): MaterialSidebarTag[] => (
     tags.map (tag => {
       if (tag.id === targetId)
 	return { ...tag, children }
@@ -37,24 +51,12 @@ const setChildrenById = (
 
 const materialPath = (
     tagId: number,
-    materialFilter: MaterialFilter): string =>
+    materialFilter: MaterialFilter,
+): string =>
     `/materials?tag_id=${ tagId }&include_descendants=1&group_by=parent_tag`
     + `&material_filter=${ materialFilter }`
 
 
-const clearTagSelectionPath = (
-    locationSearch: string,
-    materialFilter: MaterialFilter): string => {
-    const qs = new URLSearchParams (locationSearch)
-    qs.delete ('tag_id')
-    qs.delete ('include_descendants')
-    qs.delete ('group_by')
-    qs.delete ('page')
-    qs.set ('material_filter', materialFilter)
-    return `/materials?${ qs.toString () }`
-}
-
-
 const sidebarTagToTag = (tag: MaterialSidebarTag): Tag => ({
     id:             tag.id,
     name:           tag.name,
@@ -72,39 +74,42 @@ const sidebarTagToTag = (tag: MaterialSidebarTag): Tag => ({
 
 
 const tagSelectionShellClass = (selected: boolean): string =>
-    selected
-    ? 'rounded-md border border-sky-500 bg-sky-50 px-2 py-1 text-sky-700 '
-      + 'dark:border-sky-400 dark:bg-sky-950 dark:text-sky-100'
-    : 'px-2 py-1'
+    cn (selected
+	? ['rounded-md border border-sky-500 bg-sky-50 px-2 py-1 text-sky-700',
+	   'dark:border-sky-400 dark:bg-sky-950 dark:text-sky-100']
+	: 'px-2 py-1')
 
 
 const updateMaterialFilterQuery = (
     pathname: string,
     locationSearch: string,
     navigate: ReturnType<typeof useNavigate>,
-    materialFilter: MaterialFilter) => {
-    const qs = new URLSearchParams (locationSearch)
-    qs.set ('material_filter', materialFilter)
-    navigate (`${ pathname }${ qs.toString () ? `?${ qs.toString () }` : '' }`)
+    materialFilter: MaterialFilter,
+) => {
+  const qs = new URLSearchParams (locationSearch)
+  qs.set ('material_filter', materialFilter)
+  navigate (`${ pathname }${ qs.toString () ? `?${ qs.toString () }` : '' }`)
 }
 
 
-const MaterialFilterButtons: FC<{
-    materialFilter: MaterialFilter
-    onChange:       (materialFilter: MaterialFilter) => void
-}> = ({ materialFilter, onChange }) => (
-    <div className="flex flex-wrap gap-2">
+const MaterialFilterButtons: FC<{ materialFilter: MaterialFilter
+				  onChange:       (materialFilter: MaterialFilter) => void }> = (
+    { materialFilter, onChange },
+) => (
+    <div className="flex flex-wrap gap-2 justify-end md:justify-start flex-center">
+      <label className="my-auto text-sm font-bold">素材：</label>
       {FILTERS.map (value => (
-      <button
+	  <button
 	      key={value}
 	      type="button"
 	      onClick={() => onChange (value)}
-	      className={`rounded-full border px-3 py-1 text-sm ${
-		  materialFilter === value
-		  ? 'border-sky-500 bg-sky-50 text-sky-700 dark:border-sky-400 '
-		    + 'dark:bg-sky-950 dark:text-sky-100'
-		  : 'border-neutral-300 bg-white text-neutral-700 dark:border-stone-700 '
-		    + 'dark:bg-stone-900 dark:text-stone-200' }`}>
+	      className={cn (
+		  'rounded-full border px-3 py-1 text-sm',
+		  (materialFilter === value
+		   ? ['border-sky-500 bg-sky-50 text-sky-700 dark:border-sky-400',
+		      'dark:bg-sky-950 dark:text-sky-100']
+		   : ['border-neutral-300 bg-white text-neutral-700 dark:border-stone-700',
+		      'dark:bg-stone-900 dark:text-stone-200']))}>
 	    {FILTER_LABELS[value]}
 	  </button>))}
     </div>)
@@ -132,10 +137,10 @@ const MaterialTreeNode: FC<{
   }, [data, onChildren, open, tag.children.length, tag.id])
 
   return (
-      <Fragment>
+      <>
 	<li>
-	  <div className="flex">
-	    <div className="flex-none w-4">
+	  <div className="flex flex-center">
+	    <div className="flex-none w-4 my-auto">
 	      {tag.hasChildren && (
 		  <button
 		      type="button"
@@ -144,8 +149,9 @@ const MaterialTreeNode: FC<{
 		    {open ? <>&minus;</> : '+'}
 		  </button>)}
 	    </div>
-	    <div className="flex-1 truncate">
-	      <div className={tagSelectionShellClass (selectedTagId === tag.id)}>
+	    <div className="min-w-0 flex-1 my-auto">
+	      <div className={cn (tagSelectionShellClass (selectedTagId === tag.id),
+				  'min-w-0 truncate')}>
 		<TagLink
 		    tag={sidebarTagToTag (tag)}
 		    nestLevel={nestLevel}
@@ -160,7 +166,7 @@ const MaterialTreeNode: FC<{
 	{open && tag.children.length > 0 && (
 	    <ul>
 	      {tag.children.map (child => (
-		      <MaterialTreeNode
+		  <MaterialTreeNode
 		      key={child.id}
 		      tag={child}
 		      nestLevel={nestLevel + 1}
@@ -170,21 +176,39 @@ const MaterialTreeNode: FC<{
 		      setOpenTags={setOpenTags}
 		      onChildren={onChildren}/>))}
 	    </ul>)}
-      </Fragment>)
+      </>)
 }
 
 
-const MobileMaterialTreeNode: FC<{
-    depth?:          number
-    materialFilter: MaterialFilter
-    selectedTagId:  number | null
-    onChildren:     (tagId: number, children: MaterialSidebarTag[]) => void
-    openTags:       Record<number, boolean>
-    setOpenTags:    Dispatch<SetStateAction<Record<number, boolean>>>
-    tag:            MaterialSidebarTag
-}> = ({ depth = 0, materialFilter, onChildren, openTags, selectedTagId,
-	 setOpenTags, tag }) => {
+const MobileMaterialTreeNode: FC<{ depth?: number
+				   availableInlineSizePx?: number | null
+				   materialFilter: MaterialFilter
+				   selectedTagId: number | null
+				   onChildren: (tagId: number, children: MaterialSidebarTag[]) =>
+						   void
+				   openTags: Record<number, boolean>
+				   setOpenTags: Dispatch<SetStateAction<Record<number, boolean>>>
+				   tag: MaterialSidebarTag }> = (
+    {
+      depth = 0,
+      availableInlineSizePx = null,
+      materialFilter,
+      onChildren,
+      openTags,
+      selectedTagId,
+      setOpenTags,
+      tag,
+    },
+) => {
   const open = Boolean (openTags[tag.id])
+  const tagColumnRef = useRef<HTMLDivElement | null> (null)
+  const chipRef = useRef<HTMLDivElement | null> (null)
+  const buttonRef = useRef<HTMLButtonElement | null> (null)
+  const expansionSlotRef = useRef<HTMLDivElement | null> (null)
+  const expansionBorderRef = useRef<HTMLDivElement | null> (null)
+  const [tagChipInlineSizePx, setTagChipInlineSizePx] = useState<number | null> (null)
+  const [tagLinkInlineSizePx, setTagLinkInlineSizePx] = useState<number | null> (null)
+  const [childAvailableInlineSizePx, setChildAvailableInlineSizePx] = useState<number | null> (null)
   const { data } = useQuery ({
       queryKey: materialsKeys.tree ({ parentId: tag.id, materialFilter }),
       queryFn:  () => fetchMaterialTagTree ({ parentId: tag.id, materialFilter }),
@@ -195,50 +219,155 @@ const MobileMaterialTreeNode: FC<{
       onChildren (tag.id, data)
   }, [data, onChildren, open, tag.children.length, tag.id])
 
+  useEffect (() => {
+    const tagColumn = tagColumnRef.current
+    const chip = chipRef.current
+    if (!(tagColumn) || !(chip))
+      return
+
+    const updateTagInlineSize = () => {
+      const buttonHeight = buttonRef.current?.offsetHeight ?? 0
+      const gap = tag.hasChildren ? px (window.getComputedStyle (tagColumn).rowGap) : 0
+      const columnHeight =
+	  availableInlineSizePx == null
+	  ? tagColumn.clientHeight
+	  : Math.min (tagColumn.clientHeight, availableInlineSizePx)
+      const nextChipInlineSize = Math.max (24, columnHeight - buttonHeight - gap)
+      const nextLinkInlineSize = Math.max (
+	  16,
+	  nextChipInlineSize - verticalChrome (chip),
+      )
+
+      setTagChipInlineSizePx (prev => prev === nextChipInlineSize ? prev : nextChipInlineSize)
+      setTagLinkInlineSizePx (prev => prev === nextLinkInlineSize ? prev : nextLinkInlineSize)
+    }
+
+    updateTagInlineSize ()
+
+    const resizeObserver = new ResizeObserver (() => {
+      updateTagInlineSize ()
+    })
+
+    resizeObserver.observe (tagColumn)
+    resizeObserver.observe (chip)
+
+    if (buttonRef.current)
+      resizeObserver.observe (buttonRef.current)
+
+    return () => {
+      resizeObserver.disconnect ()
+    }
+  }, [availableInlineSizePx, open, tag.hasChildren, tag.children.length])
+
+  useEffect (() => {
+    const expansionSlot = expansionSlotRef.current
+    const expansionBorder = expansionBorderRef.current
+    if (!(expansionSlot) || !(expansionBorder))
+      return
+
+    const updateChildInlineSize = () => {
+      const base =
+	  availableInlineSizePx == null
+	  ? expansionSlot.clientHeight
+	  : availableInlineSizePx
+      const chrome = verticalChrome (expansionSlot) + verticalChrome (expansionBorder)
+      const nextInlineSize = Math.max (24, base - chrome)
+      setChildAvailableInlineSizePx (prev => prev === nextInlineSize ? prev : nextInlineSize)
+    }
+
+    updateChildInlineSize ()
+
+    const resizeObserver = new ResizeObserver (() => {
+      updateChildInlineSize ()
+    })
+
+    resizeObserver.observe (expansionSlot)
+    resizeObserver.observe (expansionBorder)
+
+    return () => {
+      resizeObserver.disconnect ()
+    }
+  }, [availableInlineSizePx, open, tag.children.length])
+
   return (
-      <div className="flex flex-row-reverse items-start gap-2">
-      <div className="flex flex-col items-center gap-1">
+      <div className="flex h-full min-h-0 max-h-full flex-row-reverse items-start gap-2
+		      overflow-hidden">
+	<div
+	    ref={tagColumnRef}
+	    className="flex h-full min-h-0 max-h-full flex-col items-center gap-1
+		       overflow-hidden">
 	  <div
-	      className={`${ tagSelectionShellClass (selectedTagId === tag.id) } rounded-xl
-			 border px-3 py-2 text-sm shadow-sm`}
-	      style={{ writingMode: 'vertical-rl' }}>
+	      ref={chipRef}
+	      className={cn (
+		  tagSelectionShellClass (selectedTagId === tag.id),
+		  'box-border rounded-xl border px-3 py-2 text-sm shadow-sm',
+		  'min-h-0 overflow-hidden [max-inline-size:var(--tag-chip-inline-size)]',
+		  '[max-height:var(--tag-chip-inline-size)]',
+	      )}
+	      style={{
+		writingMode: 'vertical-rl',
+		'--tag-chip-inline-size': (
+		    tagChipInlineSizePx == null
+		    ? undefined
+		    : `${ tagChipInlineSizePx }px`),
+		'--tag-link-inline-size': (
+		    tagLinkInlineSizePx == null
+		    ? undefined
+		    : `${ tagLinkInlineSizePx }px`),
+	      } as CSSProperties}>
 	    <TagLink
 		tag={sidebarTagToTag (tag)}
 		title={tag.name}
 		withCount={false}
 		withWiki={false}
-		to={materialPath (tag.id, materialFilter)}/>
+		to={materialPath (tag.id, materialFilter)}
+		className="block overflow-hidden text-ellipsis whitespace-nowrap
+			   [max-inline-size:var(--tag-link-inline-size)]
+			   [max-height:var(--tag-link-inline-size)]"/>
 	  </div>
 	  {tag.hasChildren && (
 	      <button
+		  ref={buttonRef}
 		  type="button"
 		  onClick={() => setOpenTags (prev => ({ ...prev, [tag.id]: !prev[tag.id] }))}
-		  className="rounded-full border border-stone-300 bg-white px-2 py-0.5
-			     text-sm text-stone-700 dark:border-stone-700
+		  className="flex-none rounded-full border border-stone-300 bg-white
+			     px-2 py-0.5 text-sm text-stone-700 dark:border-stone-700
 			     dark:bg-stone-900 dark:text-stone-100">
 		{open ? <>&minus;</> : '+'}
 	      </button>)}
 	</div>
 	{open && tag.children.length > 0 && (
 	    <div
-		className="relative flex flex-row-reverse items-start gap-2 rounded-2xl border
-			   border-stone-200 bg-stone-100/70 py-2 pl-2 pr-2 text-stone-900
-			   dark:border-stone-700 dark:bg-stone-900/70 dark:text-stone-100"
-		style={{ marginTop: `${ depth === 0 ? 1.25 : .75 }rem` }}>
-	      <span
-		  aria-hidden="true"
-		  className="absolute -right-3 top-4 h-px w-3 bg-stone-300 dark:bg-stone-600"/>
-	      {tag.children.map (child => (
-		  <div key={child.id} className="relative">
-	    <MobileMaterialTreeNode
-		      tag={child}
-		      depth={depth + 1}
-		      materialFilter={materialFilter}
-		      selectedTagId={selectedTagId}
-		      openTags={openTags}
-		      setOpenTags={setOpenTags}
-		      onChildren={onChildren}/>
-		  </div>))}
+		ref={expansionSlotRef}
+		className={cn (
+		    'h-full min-h-0 max-h-full overflow-hidden box-border',
+		    depth === 0 ? 'pt-5' : 'pt-3')}>
+	      <div
+		  ref={expansionBorderRef}
+		  className="relative max-h-full overflow-hidden rounded-2xl border border-stone-200
+			     bg-stone-100/70 py-2 pl-2 pr-2 text-stone-900
+			     dark:border-stone-700 dark:bg-stone-900/70 dark:text-stone-100">
+		<div className="flex h-full min-h-0 max-h-full flex-row-reverse items-start gap-2
+				overflow-hidden">
+		  <span
+		      aria-hidden="true"
+		      className="absolute -right-3 top-4 h-px w-3 bg-stone-300 dark:bg-stone-600"/>
+		  {tag.children.map (child => (
+		      <div
+			  key={child.id}
+			  className="relative h-full min-h-0 max-h-full overflow-hidden">
+			<MobileMaterialTreeNode
+			    tag={child}
+			    depth={depth + 1}
+			    availableInlineSizePx={childAvailableInlineSizePx}
+			    materialFilter={materialFilter}
+			    selectedTagId={selectedTagId}
+			    openTags={openTags}
+			    setOpenTags={setOpenTags}
+			    onChildren={onChildren}/>
+		      </div>))}
+		</div>
+	      </div>
 	    </div>)}
       </div>)
 }
@@ -248,12 +377,14 @@ const MaterialSidebar: FC = () => {
   const location = useLocation ()
   const navigate = useNavigate ()
   const qs = new URLSearchParams (location.search)
-  const materialFilter = parseMaterialFilter (qs.get ('material_filter'), 'present')
+  const materialFilter = parseMaterialFilter (qs.get ('material_filter'), 'any')
   const selectedTagId = Number (qs.get ('tag_id') ?? 0) || null
 
   const [desktopTags, setDesktopTags] = useState<MaterialSidebarTag[]> ([])
   const [openTags, setOpenTags] = useState<Record<number, boolean>> ({ })
   const mobileRailRef = useRef<HTMLDivElement | null> (null)
+  const [mobileAvailableInlineSizePx, setMobileAvailableInlineSizePx] =
+      useState<number | null> (null)
 
   const { data: rootTags = [], isLoading, isError } = useQuery ({
       queryKey: materialsKeys.tree ({ parentId: null, materialFilter }),
@@ -273,6 +404,29 @@ const MaterialSidebar: FC = () => {
     })
   }, [rootTags, materialFilter])
 
+  useEffect (() => {
+    const el = mobileRailRef.current
+    if (!(el))
+      return
+
+    const updateAvailableInlineSize = () => {
+      const nextInlineSize = Math.max (24, el.clientHeight)
+      setMobileAvailableInlineSizePx (prev => prev === nextInlineSize ? prev : nextInlineSize)
+    }
+
+    updateAvailableInlineSize ()
+
+    const resizeObserver = new ResizeObserver (() => {
+      updateAvailableInlineSize ()
+    })
+
+    resizeObserver.observe (el)
+
+    return () => {
+      resizeObserver.disconnect ()
+    }
+  }, [rootTags, materialFilter])
+
   const visibleRootTags = desktopTags.length > 0 ? desktopTags : rootTags
 
   const setChildren = (tagId: number, children: MaterialSidebarTag[]) => {
@@ -288,8 +442,6 @@ const MaterialSidebar: FC = () => {
     updateMaterialFilterQuery (location.pathname, location.search, navigate, value)
   }
 
-  const clearTagSelection = clearTagSelectionPath (location.search, materialFilter)
-
   const renderDesktopTree = (tags: MaterialSidebarTag[]): ReactNode => (
       tags.map (tag => (
 	  <MaterialTreeNode
@@ -304,24 +456,21 @@ const MaterialSidebar: FC = () => {
   return (
       <>
 	<div className="border-b bg-stone-50 p-3 dark:border-stone-700 dark:bg-stone-950
-			dark:text-stone-100 md:hidden">
-	  <div className="mb-3">
-	    <PrefetchLink
-		to={clearTagSelection}
-		className="text-sm text-sky-700 underline underline-offset-2
-			   dark:text-sky-300">
-	      {selectedTagId != null ? '選択解除' : '全素材'}
-	    </PrefetchLink>
-	  </div>
+			dark:text-stone-100 md:hidden flex h-[25dvh] min-h-0 flex-col
+			overflow-hidden">
 	  <MaterialFilterButtons
 	      materialFilter={materialFilter}
 	      onChange={handleFilterChange}/>
-	  <div ref={mobileRailRef} className="mt-3 overflow-x-auto">
-	    <div className="flex min-w-max flex-row-reverse gap-3 pb-1">
+	  <div
+	      ref={mobileRailRef}
+	      className="mt-3 min-h-0 flex-1 overflow-x-auto overflow-y-hidden">
+	    <div className="flex min-w-max flex-row-reverse items-start gap-3 pb-1 h-full
+			    min-h-0 max-h-full">
 	      {visibleRootTags.map (tag => (
 		  <MobileMaterialTreeNode
 		      key={tag.id}
 		      tag={tag}
+		      availableInlineSizePx={mobileAvailableInlineSizePx}
 		      materialFilter={materialFilter}
 		      selectedTagId={selectedTagId}
 		      openTags={openTags}
@@ -334,12 +483,6 @@ const MaterialSidebar: FC = () => {
 	<div className="hidden md:block">
 	  <SidebarComponent>
 	    <div className="space-y-4">
-	      <PrefetchLink
-		  to={clearTagSelection}
-		  className="text-sm text-sky-700 underline underline-offset-2
-			     dark:text-sky-300">
-		{selectedTagId != null ? '選択解除' : '全素材'}
-	      </PrefetchLink>
 	      <MaterialFilterButtons
 		  materialFilter={materialFilter}
 		  onChange={handleFilterChange}/>

frontend/src/components/TagLink.tsx

@@ -28,11 +28,12 @@ type Props =
 
 
 const TagLink: FC<Props> = ({ tag,
-		   nestLevel = 0,
-		   linkFlg   = true,
-		   withWiki  = true,
-		   withCount = true,
-		   ...props }) => {
+			      nestLevel = 0,
+			      linkFlg   = true,
+			      withWiki  = true,
+			      withCount = true,
+			      className,
+			      ...props }) => {
   const spanClass = cn (
       `text-${ TAG_COLOUR[tag.category] }-${ LIGHT_COLOUR_SHADE }`,
       `dark:text-${ TAG_COLOUR[tag.category] }-${ DARK_COLOUR_SHADE }`)
@@ -105,7 +106,7 @@ const TagLink: FC<Props> = ({ tag,
 	    </span>)}
 	{tag.matchedAlias != null && (
 	    <>
-	      <span className={spanClass} {...props}>
+	      <span className={cn (spanClass, className)} {...props}>
 		{tag.matchedAlias}
 	      </span>
 	      <> → </>
@@ -114,12 +115,12 @@ const TagLink: FC<Props> = ({ tag,
 	 ? (
 	    <PrefetchLink
 		to={`/posts?${ (new URLSearchParams ({ tags: tag.name })).toString () }`}
-		className={linkClass}
+		className={cn (linkClass, className)}
 		{...props}>
 	      {tag.name}
 	    </PrefetchLink>)
 	 : (
-	    <span className={spanClass}
+	    <span className={cn (spanClass, className)}
 		  {...props}>
 	      {tag.name}
 	    </span>)}

frontend/src/components/TopNav.tsx

@@ -7,30 +7,36 @@ import Separator from '@/components/MenuSeparator'
 import PrefetchLink from '@/components/PrefetchLink'
 import TopNavUser from '@/components/TopNavUser'
 import { WikiIdBus } from '@/lib/eventBus/WikiIdBus'
-import { tagsKeys, wikiKeys } from '@/lib/queryKeys'
+import { materialsKeys, tagsKeys, wikiKeys } from '@/lib/queryKeys'
 import { fetchTag, fetchTagByName } from '@/lib/tags'
+import { fetchMaterial } from '@/lib/materials'
 import { cn } from '@/lib/utils'
 import { fetchWikiPage } from '@/lib/wiki'
 
 import type { FC, MouseEvent } from 'react'
 
-import type { Menu, MenuVisibleItem, Tag, User } from '@/types'
+import type { Material, Menu, MenuVisibleItem, Tag, User } from '@/types'
 
 type Props = { user: User | null }
 
 
-export const menuOutline = ({ tag, wikiId, user, pathName }: { 
-    tag?: Tag | null
-    wikiId: number | null
-    user: User | null,
-    pathName: string }): Menu => {
-  const postCount = tag?.postCount ?? 0
+export const menuOutline = (
+    { tag, material, wikiId, user, pathName }: {
+	tag?: Tag | null
+	material?: Material | null
+	wikiId: number | null
+	user: User | null,
+	pathName: string },
+): Menu => {
+  const postCount = tag?.postCount ?? material?.tag?.postCount ?? 0
 
   const wikiPageFlg = Boolean (/^\/wiki\/(?!new|changes)[^/]+/.test (pathName) && wikiId)
   const wikiTitle = pathName.split ('/')[2] ?? ''
 
   const tagFlg = /^\/tags\/\d+/.test (pathName)
 
+  const materialFlg = /^\/materials\/\d+/.test (pathName)
+
   return [
       { name: '広場', to: '/posts', subMenu: [
 	  { name: '一覧', to: '/posts' },
@@ -49,12 +55,18 @@ export const menuOutline = ({ tag, wikiId, user, pathName }: {
 	    visible: tagFlg },
 	  { name: '履歴', to: `/tags/changes?id=${ tag?.id }`,
 	    visible: tagFlg && tag?.category !== 'nico' }] },
-      { name: '素材', to: '/materials', visible: false, subMenu: [
+      { name: '素材', to: '/materials', visible: true, subMenu: [
 	  { name: '一覧', to: '/materials' },
-	  { name: '検索', to: '/materials/search', visible: false }, 
 	  { name: '追加', to: '/materials/new' },
-	  { name: '全体履歴', to: '/materials/changes', visible: false },
-	  { name: 'ヘルプ', to: '/wiki/ヘルプ:素材集' }] },
+	  { name: '抑止', to: '/materials/suppressions' },
+	  { name: '全体履歴', to: '/materials/changes' },
+	  { name: 'ヘルプ', to: '/wiki/ヘルプ:素材管理' },
+	  { component: <Separator/>, visible: materialFlg },
+	  { name: `広場 (${ postCount || 0 })`,
+	    to: `/posts?tags=${ encodeURIComponent (material?.tag?.name ?? '') }`,
+	    visible: materialFlg && Boolean (material?.tag) },
+	  { name: '履歴', to: `/materials/changes?material_id=${ material?.id }`,
+	    visible: materialFlg }] },
       { name: 'Wiki', to: '/wiki/ヘルプ:ホーム', base: '/wiki', subMenu: [
 	  { name: '検索', to: '/wiki' },
 	  { name: '新規', to: '/wiki/new' },
@@ -119,15 +131,23 @@ const TopNav: FC<Props> = ({ user }) => {
       queryFn: () => fetchWikiPage (wikiIdStr, { }) })
 
   const tagFlg = /^\/tags\/\d+/.test (location.pathname)
-  const effectiveTitle = (tagFlg ? location.pathname.split ('/')[2] : wikiPage?.title) ?? ''
+  const materialFlg = /^\/materials\/\d+/.test (location.pathname)
+  const effectiveTitle = (((tagFlg || materialFlg)
+			   ? location.pathname.split ('/')[2]
+			   : wikiPage?.title)
+			  ?? '')
 
   const { data: tag } = useQuery ({
       enabled: Boolean (effectiveTitle),
       queryKey: tagsKeys.show (effectiveTitle),
       queryFn: () => (tagFlg ? fetchTag : fetchTagByName) (effectiveTitle) })
 
+  const { data: material } = useQuery ({
+      enabled: Boolean (effectiveTitle),
+      queryKey: materialsKeys.show (effectiveTitle),
+      queryFn: () => fetchMaterial (effectiveTitle) })
 
-  const menu = menuOutline ({ tag, wikiId, user, pathName: location.pathname })
+  const menu = menuOutline ({ tag, material, wikiId, user, pathName: location.pathname })
   const visibleMenu = menu.filter ((item): item is MenuVisibleItem => item.visible ?? true)
   const moreMenu = menu.filter (item =>
       !(item.visible ?? true)

frontend/src/components/common/PageTitle.tsx

@@ -1,12 +1,14 @@
 import React from 'react'
 
+import { cn } from '@/lib/utils'
+
 import type { FC } from 'react'
 
-type Props = { children: React.ReactNode }
+type Props = { children: React.ReactNode; className?: string }
 
 
-const PageTitle: FC<Props> = ({ children }) => (
-    <h1 className="text-2xl font-bold mb-2">
+const PageTitle: FC<Props> = ({ children, className, ...rest }) => (
+    <h1 className={cn ('text-2xl font-bold mb-2', className)} {...rest}>
       {children}
     </h1>)
 

frontend/src/lib/materials.ts

@@ -1,41 +1,31 @@
-import {
-    apiGet,
-    isApiError,
-    apiPost,
-    apiPut,
-} from '@/lib/api'
+import { apiGet, isApiError, apiPost, apiPut } from '@/lib/api'
 
-import type {
-    Material,
-    MaterialIndexResponse,
-    MaterialVersion,
-    FetchMaterialsParams,
-    MaterialFilter,
-    MaterialSyncSuppression,
-    MaterialSidebarTag,
-    MaterialTagTree,
-} from '@/types'
+import type { Material,
+	      MaterialIndexResponse,
+	      MaterialVersion,
+	      FetchMaterialsParams,
+	      MaterialFilter,
+	      MaterialSyncSuppression,
+	      MaterialSidebarTag,
+	      MaterialTagTree } from '@/types'
 
 export type FetchMaterialTreeParams = {
     parentId?:       number | null
-    materialFilter:  MaterialFilter
-}
+    materialFilter:  MaterialFilter }
 
-export type MaterialSyncSuppressionResponse = {
-    suppressions: MaterialSyncSuppression[]
-}
+export type MaterialSyncSuppressionResponse = { suppressions: MaterialSyncSuppression[] }
 
 export type MaterialChangesResponse = {
     versions: MaterialVersion[]
-    count:    number
-}
+    count:    number }
 
 const MATERIAL_FILTERS: MaterialFilter[] = ['present', 'missing', 'any']
 
 
 export const parseMaterialFilter = (
     value: unknown,
-    fallback: MaterialFilter = 'present'): MaterialFilter =>
+    fallback: MaterialFilter = 'present',
+): MaterialFilter =>
     typeof value === 'string' && MATERIAL_FILTERS.includes (value as MaterialFilter)
     ? value as MaterialFilter
     : fallback
@@ -45,7 +35,8 @@ export const fetchMaterials = async (
     { q, tagState, mediaKind, createdFrom, createdTo,
       updatedFrom, updatedTo, sort, direction, page,
       tagId, includeDescendants, groupBy,
-      limit }: FetchMaterialsParams): Promise<MaterialIndexResponse> =>
+      limit }: FetchMaterialsParams,
+): Promise<MaterialIndexResponse> =>
     await apiGet ('/materials', { params: {
 	...(q && { q }),
 	tag_state:   tagState,

frontend/src/pages/materials/MaterialDetailPage.tsx

@@ -8,7 +8,6 @@ import WikiBody from '@/components/WikiBody'
 import FieldError from '@/components/common/FieldError'
 import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
-import PrefetchLink from '@/components/PrefetchLink'
 import TabGroup, { Tab } from '@/components/common/TabGroup'
 import TagInput from '@/components/common/TagInput'
 import MainArea from '@/components/layout/MainArea'
@@ -119,12 +118,6 @@ const MaterialDetailPage: FC = () => {
 		 : materialTitle}
 	      </PageTitle>
 
-	      <PrefetchLink
-		  to={`/materials/changes?material_id=${ material.id }`}
-		  className="text-sm text-sky-700 underline underline-offset-2 dark:text-sky-300">
-		この素材の履歴
-	      </PrefetchLink>
-
 	      {(material.file && material.contentType) && (
 		  (/image\/.*/.test (material.contentType) && (
 		      <img src={material.file} alt={material.tag?.name || undefined}/>))
@@ -134,17 +127,12 @@ const MaterialDetailPage: FC = () => {
 		      <audio src={material.file} controls/>)))}
 
 	      <TabGroup>
-		<Tab name="Wiki">
-		  {material.tag
-		   ? (
+		{material.tag && (
+		    <Tab name="Wiki">
 		      <WikiBody
 			  title={material.tag.name}
-			  body={material.wikiPageBody ?? undefined}/>)
-		   : (
-		      <p className="text-stone-700 dark:text-stone-300">
-			タグ未設定の素材です．
-		      </p>)}
-		</Tab>
+			  body={material.wikiPageBody ?? undefined}/>
+		    </Tab>)}
 
 		<Tab name="編輯">
 		  <div className="max-w-wl space-y-4 pt-2">

frontend/src/pages/materials/MaterialHistoryPage.tsx

@@ -80,14 +80,7 @@ const MaterialHistoryPage: FC = () => {
 	</Helmet>
 
 	<div className="space-y-5">
-	  <div className="flex flex-wrap items-center justify-between gap-3">
-	    <PageTitle>素材履歴</PageTitle>
-	    <PrefetchLink
-		to="/materials"
-		className="text-sm text-sky-700 underline underline-offset-2 dark:text-sky-300">
-	      素材一覧へ戻る
-	    </PrefetchLink>
-	  </div>
+	  <PageTitle>素材履歴</PageTitle>
 
 	  <form
 	      onSubmit={handleSearch}
@@ -112,20 +105,6 @@ const MaterialHistoryPage: FC = () => {
 			onChange={e => setTagInput (e.target.value)}
 			className={inputClass (invalid)}/>)}
 	      </FormField>
-
-	      <FormField label="イベント">
-		{({ invalid }) => (
-		    <select
-			value={eventTypeInput}
-			onChange={e => setEventTypeInput (e.target.value)}
-			className={inputClass (invalid)}>
-		      <option value="">すべて</option>
-		      <option value="create">create</option>
-		      <option value="update">update</option>
-		      <option value="discard">discard</option>
-		      <option value="restore">restore</option>
-		    </select>)}
-	      </FormField>
 	    </div>
 
 	    <button
@@ -150,7 +129,6 @@ const MaterialHistoryPage: FC = () => {
 		  <table className="w-full min-w-[1200px] table-fixed border-collapse">
 		    <colgroup>
 		      <col className="w-48"/>
-		      <col className="w-32"/>
 		      <col className="w-28"/>
 		      <col className="w-24"/>
 		      <col className="w-64"/>
@@ -163,7 +141,6 @@ const MaterialHistoryPage: FC = () => {
 		    <thead className="border-b-2 border-black dark:border-white">
 		      <tr>
 			<th className="p-2 text-left">日時</th>
-			<th className="p-2 text-left">event_type</th>
 			<th className="p-2 text-left">素材 ID</th>
 			<th className="p-2 text-left">版</th>
 			<th className="p-2 text-left">タグ名</th>
@@ -180,7 +157,6 @@ const MaterialHistoryPage: FC = () => {
 			      key={version.id}
 			      className="even:bg-gray-100 dark:even:bg-gray-700">
 			    <td className="p-2">{dateString (version.createdAt)}</td>
-			    <td className="p-2">{version.eventType}</td>
 			    <td className="p-2">
 			      <PrefetchLink to={`/materials/${ version.materialId }`}>
 				#{version.materialId}

frontend/src/pages/materials/MaterialListPage.test.tsx

@@ -33,15 +33,7 @@ describe ('MaterialListPage', () => {
           } },
       )
     })
-    expect (await screen.findByText ('素材はありません．')).toBeInTheDocument ()
-    expect (screen.getByRole ('link', { name: '新規素材を追加' })).toHaveAttribute (
-        'href',
-        '/materials/new',
-    )
-    expect (screen.getByRole ('link', { name: '履歴' })).toHaveAttribute (
-        'href',
-        '/materials/changes',
-    )
+    expect (await screen.findByText ('素材はありません。')).toBeInTheDocument ()
   })
 
   it ('shows materials in the default card view', async () => {
@@ -159,16 +151,9 @@ describe ('MaterialListPage', () => {
         (_, element) => element?.textContent === '伊地知ニジカ 配下の素材を表示中',
     )).toBeInTheDocument ()
 
-    const addLinks = screen.getAllByRole ('link', { name: 'このタグに素材を追加' })
-    expect (addLinks[0]).toHaveAttribute (
+    expect (screen.getByRole ('link', { name: '泣き' })).toHaveAttribute (
         'href',
-        '/materials/new?tag=%E4%BC%8A%E5%9C%B0%E7%9F%A5%E3%83%8B%E3%82%B8%E3%82%AB'
-        + '&return_to=%2Fmaterials%3Ftag_id%3D20%26include_descendants%3D1%26group_by%3Dparent_tag',
-    )
-    expect (addLinks[1]).toHaveAttribute (
-        'href',
-        '/materials/new?tag=%E6%B3%A3%E3%81%8D'
-        + '&return_to=%2Fmaterials%3Ftag_id%3D20%26include_descendants%3D1%26group_by%3Dparent_tag',
+        '/materials?tag_id=30&include_descendants=1&group_by=parent_tag&material_filter=present',
     )
     expect (screen.getByRole ('link', { name: 'タグ選択を解除' })).toHaveAttribute (
         'href',

frontend/src/pages/materials/MaterialListPage.tsx

@@ -10,24 +10,23 @@ import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
 import Pagination from '@/components/common/Pagination'
 import MainArea from '@/components/layout/MainArea'
-import { API_BASE_URL, SITE_TITLE } from '@/config'
+import { SITE_TITLE } from '@/config'
 import { fetchMaterials, parseMaterialFilter } from '@/lib/materials'
 import { materialsKeys } from '@/lib/queryKeys'
 import { dateString, inputClass } from '@/lib/utils'
 
 import type { FC, FormEvent } from 'react'
 
-import type {
-    FetchMaterialsParams,
-    Material,
-    MaterialFilter,
-    MaterialIndexGroup,
-    MaterialIndexGroupBy,
-    MaterialIndexDirection,
-    MaterialIndexMediaKind,
-    MaterialIndexSort,
-    MaterialIndexTagState,
-    MaterialIndexView } from '@/types'
+import type { FetchMaterialsParams,
+	      Material,
+	      MaterialFilter,
+	      MaterialIndexGroup,
+	      MaterialIndexGroupBy,
+	      MaterialIndexDirection,
+	      MaterialIndexMediaKind,
+	      MaterialIndexSort,
+	      MaterialIndexTagState,
+	      MaterialIndexView } from '@/types'
 
 const MEDIA_KIND_LABELS: Record<Material['mediaKind'], string> = {
     image:      '画像',
@@ -42,20 +41,16 @@ const MEDIA_FILTER_LABELS: Record<MaterialIndexMediaKind, string> = {
     video:      '動画',
     audio:      '音声',
     file_other: 'その他ファイル',
-    url_only:   'URL のみ'}
+    url_only:   '外部リンクのみ'}
 
 const SORT_LABELS: Record<MaterialIndexSort, string> = {
     created_at:     '作成日時',
     updated_at:     '更新日時',
     tag_name:       'タグ名',
     media_kind:     '種類',
-    file_byte_size: 'ファイルサイズ',
-    version_no:     'バージョン',
-    id:             'ID'}
-
-const GROUP_BY_LABELS: Record<MaterialIndexGroupBy, string> = {
-    none:       'オフ',
-    parent_tag: '親タグ'}
+    file_byte_size: '容量',
+    version_no:     '版',
+    id:             'Id.'}
 
 
 const setIf = (qs: URLSearchParams, key: string, value: string | null) => {
@@ -88,21 +83,24 @@ const materialTitle = (material: Material): string =>
 
 const groupedTagPath = (
     tagId: number,
-    materialFilter: MaterialFilter): string =>
+    materialFilter: MaterialFilter,
+): string =>
     `/materials?tag_id=${ tagId }&include_descendants=1&group_by=parent_tag`
     + `&material_filter=${ materialFilter }`
 
 
 const materialNewPath = (
     tagName: string,
-    returnTo: string): string =>
+    returnTo: string,
+): string =>
     `/materials/new?tag=${ encodeURIComponent (tagName) }`
     + `&return_to=${ encodeURIComponent (returnTo) }`
 
 
 const clearedTagSelectionPath = (
     locationSearch: string,
-    materialFilter: MaterialFilter): string => {
+    materialFilter: MaterialFilter,
+): string => {
     const qs = new URLSearchParams (locationSearch)
     qs.delete ('tag_id')
     qs.delete ('include_descendants')
@@ -120,7 +118,7 @@ const MaterialThumb: FC<{ material: Material }> = ({ material }) => (
 		    text-stone-900 shadow-sm dark:border-stone-700 dark:bg-stone-900
 		    dark:text-stone-100`}>
       {material.thumbnail
-       ? <img src={material.thumbnail} alt="" className="h-full w-full object-contain"/>
+       ? <img src={material.thumbnail} alt="" className="block h-full w-full object-cover"/>
        : (
 	  <span
 	      className="px-2 text-2xl leading-tight"
@@ -191,27 +189,22 @@ const MaterialListItem: FC<{ material: Material }> = ({ material }) => (
 const GroupHeading: FC<{
     count:          number
     materialFilter: MaterialFilter
-    returnTo:       string
     title:          string
     tagId:          number
-}> = ({ count, materialFilter, returnTo, title, tagId }) => (
-    <div className="flex flex-wrap items-center gap-2 border-b border-stone-200 pb-2
+}> = ({ count, materialFilter, title, tagId }) => (
+    <div className="flex items-center gap-2 border-b border-stone-200 pb-2
 		    dark:border-stone-700">
       <PrefetchLink
 	  to={groupedTagPath (tagId, materialFilter)}
 	  className="font-medium text-sky-700 underline underline-offset-2
-		     dark:text-sky-300">
+		     dark:text-sky-300 w-full">
 	{title}
       </PrefetchLink>
-      <span className="text-sm text-stone-600 dark:text-stone-300">
-	{count} 件
-      </span>
-      <PrefetchLink
-	  to={materialNewPath (title, returnTo)}
-	  className="text-sm text-sky-700 underline underline-offset-2
-		     dark:text-sky-300">
-	このタグに素材を追加
-      </PrefetchLink>
+      <div className="text-right w-auto">
+	<span className="text-nowrap text-sm text-stone-600 dark:text-stone-300">
+	  {count} 件
+	</span>
+      </div>
     </div>)
 
 
@@ -383,8 +376,7 @@ const MaterialListPage: FC = () => {
 		    tagId={group.tag.id}
 		    title={group.tag.name}
 		    count={group.count}
-		    materialFilter={materialFilter}
-		    returnTo={location.pathname + location.search}/>
+		    materialFilter={materialFilter}/>
 		{renderMaterialCollection (groupMaterials)}
 	      </section>)
 	})}
@@ -410,35 +402,15 @@ const MaterialListPage: FC = () => {
 		  src: url(${ nikumaru }) format('opentype');
 		}`}
 	  </style>
-	  <title>{`素材一覧 | ${ SITE_TITLE }`}</title>
+	  <title>{`素材管理 | ${ SITE_TITLE }`}</title>
 	</Helmet>
 
 	<div className="space-y-5">
 	  <div className="flex flex-wrap items-center justify-between gap-3">
-	    <PageTitle>素材一覧</PageTitle>
+	    <PageTitle className="my-auto">素材管理</PageTitle>
 	    <div className="flex flex-wrap gap-2">
-	      <PrefetchLink
-		  to="/materials/new"
-		  className="rounded-full border border-stone-300 bg-white px-4 py-2 text-sm
-			     text-stone-900 hover:bg-stone-100 dark:border-stone-700
-			     dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
-		新規素材を追加
-	      </PrefetchLink>
-	      <PrefetchLink
-		  to="/materials/suppressions"
-		  className="rounded-full border border-stone-300 bg-white px-4 py-2 text-sm
-			     text-stone-900 hover:bg-stone-100 dark:border-stone-700
-			     dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
-		同期元抑止
-	      </PrefetchLink>
-	      <PrefetchLink
-		  to="/materials/changes"
-		  className="rounded-full border border-stone-300 bg-white px-4 py-2 text-sm
-			     text-stone-900 hover:bg-stone-100 dark:border-stone-700
-			     dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
-		履歴
-	      </PrefetchLink>
-	      <a
+	      {/* TODO: 局所出力を可能にする */}
+	      {/* <a
 		  href={`${ API_BASE_URL }/materials/download.zip?profile=legacy_drive`}
 		  target="_blank"
 		  rel="noopener noreferrer"
@@ -446,7 +418,7 @@ const MaterialListPage: FC = () => {
 			     text-stone-900 hover:bg-stone-100 dark:border-stone-700
 			     dark:bg-stone-900 dark:text-stone-100 dark:hover:bg-stone-800">
 		ZIP をダウンロード
-	      </a>
+	      </a> */}
 	    </div>
 	  </div>
 
@@ -458,12 +430,6 @@ const MaterialListPage: FC = () => {
 		  {tagScope.tag.name}
 		  {tagScope.includeDescendants ? ' 配下の素材を表示中' : ' の素材を表示中'}
 		</span>
-		<PrefetchLink
-		    to={materialNewPath (tagScope.tag.name, location.pathname + location.search)}
-		    className="font-medium underline underline-offset-2
-			       text-sky-700 dark:text-sky-300">
-		  このタグに素材を追加
-		</PrefetchLink>
 		<PrefetchLink
 		    to={clearedTagSelectionPath (location.search, materialFilter)}
 		    className="font-medium underline underline-offset-2
@@ -534,21 +500,6 @@ const MaterialListPage: FC = () => {
 		    </select>)}
 	      </FormField>
 
-	      <FormField label="グルーピング">
-		{({ invalid }) => (
-		    <select
-			value={groupByInput}
-			onChange={e => setGroupByInput (
-			    e.target.value as MaterialIndexGroupBy)}
-			disabled={tagId == null}
-			className={inputClass (invalid)}>
-		      <option value="none">{GROUP_BY_LABELS.none}</option>
-		      <option value="parent_tag" disabled={tagId == null}>
-			{GROUP_BY_LABELS.parent_tag}
-		      </option>
-		    </select>)}
-	      </FormField>
-
 	      <FormField label="作成日時">
 		{() => (
 		    <div className="flex flex-wrap items-center gap-2">
@@ -591,7 +542,7 @@ const MaterialListPage: FC = () => {
 		      : [
 			  'border-stone-300 bg-white text-stone-900 dark:border-stone-700',
 			  'dark:bg-stone-900 dark:text-stone-100'].join (' ') }`}>
-		カード
+		アイコン
 	      </button>
 	      <button
 		  type="button"
@@ -604,7 +555,7 @@ const MaterialListPage: FC = () => {
 		      : [
 			  'border-stone-300 bg-white text-stone-900 dark:border-stone-700',
 			  'dark:bg-stone-900 dark:text-stone-100'].join (' ') }`}>
-		一覧
+		詳細
 	      </button>
 	    </div>
 
@@ -632,7 +583,18 @@ const MaterialListPage: FC = () => {
 	  {isError && (
 	      <p className="text-red-600 dark:text-red-300">素材一覧の取得に失敗しました．</p>)}
 	  {(!isLoading && !isError && materials.length === 0) && (
-	      <p>素材はありません．</p>)}
+	      <p>
+		素材はありません。
+		{(tagScope && ['character', 'material'].includes (tagScope.tag.category)) && (
+		    <>
+		      <PrefetchLink
+			  to={materialNewPath (tagScope.tag.name, location.pathname + location.search)}
+			  className="font-medium underline underline-offset-2
+				     text-sky-700 dark:text-sky-300">
+			追加してください
+		      </PrefetchLink>。
+		    </>)}
+	      </p>)}
 	  {materials.length > 0 && (
 	      groupBy === 'parent_tag' && groups.length > 0
 	      ? renderGroupedMaterials (groups)

frontend/src/pages/materials/MaterialSearchPage.tsx

@@ -1,51 +0,0 @@
-import { useState } from 'react'
-import { Helmet } from 'react-helmet-async'
-
-import FormField from '@/components/common/FormField'
-import PageTitle from '@/components/common/PageTitle'
-import TagInput from '@/components/common/TagInput'
-import MainArea from '@/components/layout/MainArea'
-import { SITE_TITLE } from '@/config'
-
-import type { FC, FormEvent } from 'react'
-
-
-const MaterialSearchPage: FC = () => {
-  const [tagName, setTagName] = useState ('')
-  const [parentTagName, setParentTagName] = useState ('')
-
-  const handleSearch = (e: FormEvent) => {
-    e.preventDefault ()
-  }
-
-  return (
-      <MainArea>
-	<Helmet>
-	  <title>素材集 | {SITE_TITLE}</title>
-	</Helmet>
-
-	<div className="max-w-xl">
-	  <PageTitle>素材集</PageTitle>
-
-	  <form onSubmit={handleSearch} className="space-y-2">
-	    {/* タグ */}
-	    <FormField label="タグ">
-	      {() => (
-		  <TagInput
-		      value={tagName}
-		      setValue={setTagName}/>)}
-	    </FormField>
-
-	    {/* 親タグ */}
-	    <FormField label="親タグ">
-	      {() => (
-		  <TagInput
-		      value={parentTagName}
-		      setValue={setParentTagName}/>)}
-	    </FormField>
-	  </form>
-	</div>
-      </MainArea>)
-}
-
-export default MaterialSearchPage

frontend/src/pages/materials/MaterialSyncSuppressionsPage.tsx

@@ -2,17 +2,13 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
 import { useState } from 'react'
 import { Helmet } from 'react-helmet-async'
 
-import PrefetchLink from '@/components/PrefetchLink'
 import FormField from '@/components/common/FormField'
 import PageTitle from '@/components/common/PageTitle'
 import MainArea from '@/components/layout/MainArea'
 import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
-import {
-    createMaterialSyncSuppression,
-    fetchMaterialSyncSuppressions,
-} from '@/lib/materials'
+import { createMaterialSyncSuppression, fetchMaterialSyncSuppressions } from '@/lib/materials'
 import { materialsKeys } from '@/lib/queryKeys'
 import { dateString, inputClass } from '@/lib/utils'
 
@@ -22,11 +18,11 @@ import type { MaterialSyncSuppressionSourceKind } from '@/types'
 
 const SOURCE_KIND_LABELS: Record<MaterialSyncSuppressionSourceKind, string> = {
     uri:               'URI',
-    google_drive_path: 'Google Drive path',
-    google_drive_path_prefix: 'Google Drive path prefix',
-    google_drive_file: 'Google Drive file ID',
-    legacy_drive_path: 'Legacy Drive path',
-    legacy_drive_path_prefix: 'Legacy Drive path prefix'}
+    google_drive_path: 'Google Drive ファイル',
+    google_drive_path_prefix: 'Google Drive フォルダ',
+    google_drive_file: 'Google Drive ファイル Id.',
+    legacy_drive_path: '汎用ファイル',
+    legacy_drive_path_prefix: '汎用フォルダ' }
 
 const REASONS = [
     'copyright_high_risk',
@@ -36,7 +32,23 @@ const REASONS = [
     'malware_or_dangerous_file',
     'duplicate_or_low_quality',
     'source_owner_request',
-    'other']
+    'other'] as const
+
+type MaterialSyncSuppressionReason = typeof REASONS[number]
+
+const REASON_NAMES: Record<MaterialSyncSuppressionReason, string> = {
+    ['copyright_high_risk']: '著作権への懸念',
+    ['copyright_takedown']: '著作者からの申出',
+    ['adult_or_sensitive']: '成人向け',
+    ['personal_information']: '個人情報',
+    ['malware_or_dangerous_file']: '危険なソフトウェア',
+    ['duplicate_or_low_quality']: '重複',
+    ['source_owner_request']: '同期元管理者からの申出',
+    ['other']: 'その他' } as const
+
+
+const reasonName = (reason: string): string =>
+    REASON_NAMES[reason as MaterialSyncSuppressionReason] ?? reason
 
 
 const MaterialSyncSuppressionsPage: FC = () => {
@@ -46,7 +58,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
   const [sourceUri, setSourceUri] = useState ('')
   const [drivePath, setDrivePath] = useState ('')
   const [driveFileId, setDriveFileId] = useState ('')
-  const [reason, setReason] = useState (REASONS[0])
+  const [reason, setReason] = useState<MaterialSyncSuppressionReason> (REASONS[0])
 
   const { data, isError, isLoading } = useQuery ({
       queryKey: materialsKeys.suppressions (),
@@ -82,18 +94,11 @@ const MaterialSyncSuppressionsPage: FC = () => {
   return (
       <MainArea>
 	<Helmet>
-	  <title>{`同期元抑止 | ${ SITE_TITLE }`}</title>
+	  <title>{`素材同期抑止 | ${ SITE_TITLE }`}</title>
 	</Helmet>
 
 	<div className="space-y-5">
-	  <div className="flex flex-wrap items-center justify-between gap-3">
-	    <PageTitle>同期元抑止</PageTitle>
-	    <PrefetchLink
-		to="/materials"
-		className="text-sm text-sky-700 underline underline-offset-2 dark:text-sky-300">
-	      素材一覧へ戻る
-	    </PrefetchLink>
-	  </div>
+	  <PageTitle>同期抑止</PageTitle>
 
 	  <form
 	      onSubmit={handleSubmit}
@@ -115,7 +120,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 		    </select>)}
 	      </FormField>
 
-	      <FormField label="Source URI">
+	      <FormField label="同期元 URI">
 		{({ invalid }) => (
 		    <input
 			type="text"
@@ -124,7 +129,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 			className={inputClass (invalid)}/>)}
 	      </FormField>
 
-	      <FormField label="Drive path">
+	      <FormField label="Google Drive パス">
 		{({ invalid }) => (
 		    <input
 			type="text"
@@ -133,7 +138,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 			className={inputClass (invalid)}/>)}
 	      </FormField>
 
-	      <FormField label="Drive file ID">
+	      <FormField label="Google Drive ファイル Id.">
 		{({ invalid }) => (
 		    <input
 			type="text"
@@ -142,15 +147,15 @@ const MaterialSyncSuppressionsPage: FC = () => {
 			className={inputClass (invalid)}/>)}
 	      </FormField>
 
-	      <FormField label="理由">
+	      <FormField label="事由">
 		{({ invalid }) => (
 		    <select
 			value={reason}
-			onChange={e => setReason (e.target.value)}
+			onChange={e => setReason (e.target.value as MaterialSyncSuppressionReason)}
 			className={inputClass (invalid)}>
 		      {REASONS.map (value => (
 			  <option key={value} value={value}>
-			    {value}
+			    {REASON_NAMES[value]}
 			  </option>))}
 		    </select>)}
 	      </FormField>
@@ -185,7 +190,8 @@ const MaterialSyncSuppressionsPage: FC = () => {
 		    {suppression.normalizedSourceKey}
 		  </div>
 		  <div className="mt-2 text-sm text-stone-600 dark:text-stone-400">
-		    理由: {suppression.reason} / 登録: {dateString (suppression.createdAt)}
+		    事由: {reasonName (suppression.reason)} /
+		    登録: {dateString (suppression.createdAt)}
 		  </div>
 		</article>))}
 	  </div>

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

@@ -1,9 +1,10 @@
-import { act, fireEvent, screen, waitFor } from '@testing-library/react'
+import { act, fireEvent, screen, waitFor, within } 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,
@@ -96,6 +97,9 @@ 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)
@@ -245,6 +249,53 @@ 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,6 +102,28 @@ 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[]>> = { }
 
@@ -118,15 +140,39 @@ 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 grouped = tagsByCategory (tags)
+  const horizontalGrouped = tagsByCategory (flattenTags (tags))
+  const verticalGrouped = tagsByCategory (tags)
 
   if (flow === 'horizontal')
     {
       return (
 	  <ul className={cn ('flex flex-wrap gap-x-3 gap-y-1', compact && 'text-sm')}>
-	    {CATEGORIES.flatMap (cat => grouped[cat] ?? []).map (tag => (
+	    {CATEGORIES.flatMap (cat => horizontalGrouped[cat] ?? []).map (tag => (
 		<li key={tag.id} className="text-left leading-tight">
 		  <TagLink tag={tag} withCount={false}/>
 		</li>))}
@@ -136,7 +182,7 @@ const TagList: FC<{ tags: Tag[]; compact?: boolean; flow?: TagFlow }> = (
   return (
       <div className="space-y-3">
 	{CATEGORIES.map (cat => {
-	  const rows = grouped[cat] ?? []
+	  const rows = verticalGrouped[cat] ?? []
 	  if (rows.length === 0)
 	    return null
 
@@ -146,10 +192,8 @@ const TagList: FC<{ tags: Tag[]; compact?: boolean; flow?: TagFlow }> = (
 		  {CATEGORY_NAMES[cat]}
 		</div>
 		<ul className={cn ('space-y-1', compact && 'text-sm')}>
-		  {rows.map (tag => (
-		      <li key={tag.id} className="text-left leading-tight">
-			<TagLink tag={tag} withCount={false}/>
-		      </li>))}
+		  {rows.flatMap (tag =>
+		      renderReadonlyTagTree (tag, 0, `cat-${ cat }`))}
 		</ul>
 	      </div>)
 	})}