#306

backend/app/controllers/tags_controller.rb

@@ -245,7 +245,10 @@ class TagsController < ApplicationController
     return render_unprocessable_entity('カテゴリは必須です．', field: :category) if category.blank?
     return render_unprocessable_entity '廃止状態は必須です．', field: :deprecated unless params.key?(:deprecated)
 
-    return unless validate_tag_rename(tag, name)
+    if (name != tag.name &&
+        tag.in?([Tag.tagme, Tag.bot, Tag.no_deerjikist, Tag.video, Tag.niconico]))
+      return render_unprocessable_entity 'システム・タグの名称は変更できません．', field: :name
+    end
 
     alias_names = params[:aliases].to_s.split.uniq
     parent_names = params[:parent_tags].to_s.split.uniq
@@ -271,7 +274,7 @@ class TagsController < ApplicationController
       else
         tag.update!(category:, deprecated_at: deprecated ? Time.current : nil)
       end
-      rename_tag_name!(tag, name) if name_changed
+      tag.tag_name.update!(name:)
 
       alias_names << old_name if name_changed
       alias_names.delete(name)
@@ -307,8 +310,6 @@ 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
@@ -320,7 +321,7 @@ class TagsController < ApplicationController
       name_changed = name.present? && name != old_name
       wiki_page = tag.tag_name.wiki_page if name_changed
 
-      rename_tag_name!(tag, name) if name_changed
+      tag.tag_name.update!(name:) if name.present?
       tag.update!(category:) if category.present?
       if deprecated_given && tag.deprecated? != deprecated
         tag.update!(deprecated_at: deprecated ? Time.current : nil)
@@ -534,67 +535,6 @@ 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/spec/requests/tags_spec.rb

@@ -581,58 +581,6 @@ 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
 
@@ -1081,42 +1029,6 @@ 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'),
@@ -1241,48 +1153,6 @@ 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'),
@@ -1321,48 +1191,6 @@ RSpec.describe 'Tags API', type: :request do
         expect(old_owner_versions.second.aliases.split).not_to include('put_stolen_alias')
       end
 
-      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
         pending '#332 で対応予定'
 

frontend/src/components/TopNav.tsx

@@ -58,7 +58,6 @@ export const menuOutline = (
       { name: '素材', to: '/materials', visible: true, subMenu: [
 	  { name: '一覧', to: '/materials' },
 	  { name: '追加', to: '/materials/new' },
-	  { name: '抑止', to: '/materials/suppressions' },
 	  { name: '全体履歴', to: '/materials/changes' },
 	  { name: 'ヘルプ', to: '/wiki/ヘルプ:素材管理' },
 	  { component: <Separator/>, visible: materialFlg },

frontend/src/pages/materials/MaterialDetailPage.tsx

@@ -127,12 +127,17 @@ const MaterialDetailPage: FC = () => {
 		      <audio src={material.file} controls/>)))}
 
 	      <TabGroup>
-		{material.tag && (
 		<Tab name="Wiki">
+		  {material.tag
+		   ? (
 		      <WikiBody
 			  title={material.tag.name}
-			  body={material.wikiPageBody ?? undefined}/>
+			  body={material.wikiPageBody ?? undefined}/>)
-		    </Tab>)}
+		   : (
+		      <p className="text-stone-700 dark:text-stone-300">
+			タグ未設定の素材です．
+		      </p>)}
+		</Tab>
 
 		<Tab name="編輯">
 		  <div className="max-w-wl space-y-4 pt-2">

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

@@ -34,6 +34,10 @@ describe ('MaterialListPage', () => {
       )
     })
     expect (await screen.findByText ('素材はありません。')).toBeInTheDocument ()
+    expect (screen.getByRole ('link', { name: '新規素材を追加' })).toHaveAttribute (
+        'href',
+        '/materials/new',
+    )
   })
 
   it ('shows materials in the default card view', async () => {

frontend/src/pages/materials/MaterialListPage.tsx

@@ -10,7 +10,7 @@ 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 { SITE_TITLE } from '@/config'
+import { API_BASE_URL, SITE_TITLE } from '@/config'
 import { fetchMaterials, parseMaterialFilter } from '@/lib/materials'
 import { materialsKeys } from '@/lib/queryKeys'
 import { dateString, inputClass } from '@/lib/utils'
@@ -41,16 +41,16 @@ const MEDIA_FILTER_LABELS: Record<MaterialIndexMediaKind, string> = {
     video:      '動画',
     audio:      '音声',
     file_other: 'その他ファイル',
-    url_only:   '外部リンクのみ'}
+    url_only:   'URL のみ'}
 
 const SORT_LABELS: Record<MaterialIndexSort, string> = {
     created_at:     '作成日時',
     updated_at:     '更新日時',
     tag_name:       'タグ名',
     media_kind:     '種類',
-    file_byte_size: '容量',
+    file_byte_size: 'ファイルサイズ',
-    version_no:     '版',
+    version_no:     'バージョン',
-    id:             'Id.'}
+    id:             'ID'}
 
 
 const setIf = (qs: URLSearchParams, key: string, value: string | null) => {
@@ -409,8 +409,21 @@ const MaterialListPage: FC = () => {
 	  <div className="flex flex-wrap items-center justify-between gap-3">
 	    <PageTitle className="my-auto">素材管理</PageTitle>
 	    <div className="flex flex-wrap gap-2">
-	      {/* TODO: 局所出力を可能にする */}
+	      <PrefetchLink
-	      {/* <a
+		  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>
+	      <a
 		  href={`${ API_BASE_URL }/materials/download.zip?profile=legacy_drive`}
 		  target="_blank"
 		  rel="noopener noreferrer"
@@ -418,7 +431,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>
 

frontend/src/pages/materials/MaterialSyncSuppressionsPage.tsx

@@ -2,13 +2,17 @@ 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'
 
@@ -18,11 +22,11 @@ import type { MaterialSyncSuppressionSourceKind } from '@/types'
 
 const SOURCE_KIND_LABELS: Record<MaterialSyncSuppressionSourceKind, string> = {
     uri:               'URI',
-    google_drive_path: 'Google Drive ファイル',
+    google_drive_path: 'Google Drive path',
-    google_drive_path_prefix: 'Google Drive フォルダ',
+    google_drive_path_prefix: 'Google Drive path prefix',
-    google_drive_file: 'Google Drive ファイル Id.',
+    google_drive_file: 'Google Drive file ID',
-    legacy_drive_path: '汎用ファイル',
+    legacy_drive_path: 'Legacy Drive path',
-    legacy_drive_path_prefix: '汎用フォルダ' }
+    legacy_drive_path_prefix: 'Legacy Drive path prefix'}
 
 const REASONS = [
     'copyright_high_risk',
@@ -32,23 +36,7 @@ const REASONS = [
     'malware_or_dangerous_file',
     'duplicate_or_low_quality',
     'source_owner_request',
-    'other'] as const
+    'other']
-
-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 = () => {
@@ -58,7 +46,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
   const [sourceUri, setSourceUri] = useState ('')
   const [drivePath, setDrivePath] = useState ('')
   const [driveFileId, setDriveFileId] = useState ('')
-  const [reason, setReason] = useState<MaterialSyncSuppressionReason> (REASONS[0])
+  const [reason, setReason] = useState (REASONS[0])
 
   const { data, isError, isLoading } = useQuery ({
       queryKey: materialsKeys.suppressions (),
@@ -94,11 +82,18 @@ const MaterialSyncSuppressionsPage: FC = () => {
   return (
       <MainArea>
 	<Helmet>
-	  <title>{`素材同期抑止 | ${ SITE_TITLE }`}</title>
+	  <title>{`同期元抑止 | ${ SITE_TITLE }`}</title>
 	</Helmet>
 
 	<div className="space-y-5">
-	  <PageTitle>同期抑止</PageTitle>
+	  <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>
 
 	  <form
 	      onSubmit={handleSubmit}
@@ -120,7 +115,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 		    </select>)}
 	      </FormField>
 
-	      <FormField label="同期元 URI">
+	      <FormField label="Source URI">
 		{({ invalid }) => (
 		    <input
 			type="text"
@@ -129,7 +124,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 			className={inputClass (invalid)}/>)}
 	      </FormField>
 
-	      <FormField label="Google Drive パス">
+	      <FormField label="Drive path">
 		{({ invalid }) => (
 		    <input
 			type="text"
@@ -138,7 +133,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 			className={inputClass (invalid)}/>)}
 	      </FormField>
 
-	      <FormField label="Google Drive ファイル Id.">
+	      <FormField label="Drive file ID">
 		{({ invalid }) => (
 		    <input
 			type="text"
@@ -147,15 +142,15 @@ const MaterialSyncSuppressionsPage: FC = () => {
 			className={inputClass (invalid)}/>)}
 	      </FormField>
 
-	      <FormField label="事由">
+	      <FormField label="理由">
 		{({ invalid }) => (
 		    <select
 			value={reason}
-			onChange={e => setReason (e.target.value as MaterialSyncSuppressionReason)}
+			onChange={e => setReason (e.target.value)}
 			className={inputClass (invalid)}>
 		      {REASONS.map (value => (
 			  <option key={value} value={value}>
-			    {REASON_NAMES[value]}
+			    {value}
 			  </option>))}
 		    </select>)}
 	      </FormField>
@@ -190,8 +185,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
 		    {suppression.normalizedSourceKey}
 		  </div>
 		  <div className="mt-2 text-sm text-stone-600 dark:text-stone-400">
-		    事由: {reasonName (suppression.reason)} /
+		    理由: {suppression.reason} / 登録: {dateString (suppression.createdAt)}
-		    登録: {dateString (suppression.createdAt)}
 		  </div>
 		</article>))}
 	  </div>