コミットを比較

..
4 コミット
作成者 SHA1 メッセージ 日付
みてるぞ ef5a3f725e Merge remote-tracking branch 'origin/main' into feature/414 2026-11-17 04:07:45 +09:00
みてるぞ 971b2632b0 #414 2026-11-03 15:17:10 +09:00
みてるぞ ad04c03e14 #414 2026-11-03 13:37:09 +09:00
みてるぞ 2197a9192b #414 2026-11-03 12:22:15 +09:00
74個のファイルの変更、1201行の追加、1003行の削除
+9
ファイルの表示
@@ -0,0 +1,9 @@
class Event < ApplicationRecord
has_many :post_versions
has_many :tag_versions
has_many :material_versions
has_many :tag_description_versions
has_many :tag_group_versions
belongs_to :created_by_user, class_name: 'User', optional: true
end
+1 -3
ファイルの表示
@@ -11,7 +11,5 @@ class MaterialVersion < ApplicationRecord
belongs_to :parent, class_name: 'Material', optional: true
belongs_to :updated_by_user, class_name: 'User', optional: true
def export_paths_hash
export_paths_json || {}
end
def export_paths_hash = export_paths_json || { }
end
+2
ファイルの表示
@@ -19,6 +19,8 @@ module VersionRecord
belongs_to :created_by_user, class_name: 'User', optional: true
belongs_to :event
enum :event_type, event_type_map, prefix: true, validate: true
validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 }
+8 -5
ファイルの表示
@@ -1,20 +1,23 @@
class MaterialVersionRecorder < VersionRecorder
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
def self.record! material:, event_type:, created_by_user:, file_snapshot: nil
new(material:, event_type:, created_by_user:, file_snapshot:).record!
def self.record! material:, event_type:, event:, created_by_user:, file_snapshot: nil
new(material:, event_type:, event:, created_by_user:, file_snapshot:).record!
end
def initialize material:, event_type:, created_by_user:, file_snapshot: nil
def initialize material:, event_type:, event:, created_by_user:, file_snapshot: nil
@file_snapshot = file_snapshot
super(record: material, event_type:, created_by_user:)
super(record: material, event_type:, event:, created_by_user:)
end
def self.ensure_snapshot! material, created_by_user:
return if material.material_versions.exists?
record!(material:, event_type: :create,
event = Event.create!(event_type: 'materials.create',
created_by_user:,
created_at: material.created_at)
record!(material:, event_type: :create, event:,
created_by_user: material.created_by_user || created_by_user)
end
+8 -5
ファイルの表示
@@ -1,16 +1,19 @@
class PostVersionRecorder < VersionRecorder
def self.record! post:, event_type:, created_by_user:
new(post:, event_type:, created_by_user:).record!
def self.record! post:, event_type:, event:, created_by_user:
new(post:, event_type:, event:, created_by_user:).record!
end
def initialize post:, event_type:, created_by_user:
super(record: post, event_type:, created_by_user:)
def initialize post:, event_type:, event:, created_by_user:
super(record: post, event_type:, event:, created_by_user:)
end
def self.ensure_snapshot! post, created_by_user:
return if post.post_versions.exists?
record!(post:, event_type: :create, created_by_user:)
event = Event.create!(event_type: 'posts.create',
created_by_user:,
created_at: post.created_at)
record!(post:, event_type: :create, event:, created_by_user:)
end
private
+4 -4
ファイルの表示
@@ -1,13 +1,13 @@
class TagVersionRecorder < VersionRecorder
def self.record! tag:, event_type:, created_by_user:, **_options
def self.record! tag:, event_type:, event:, created_by_user:, **_options
Tag.transaction do
SharedResourceIdAllocator.lock_space!(Tag, 'tags')
new(tag:, event_type:, created_by_user:).record!
new(tag:, event_type:, event:, created_by_user:).record!
end
end
def initialize tag:, event_type:, created_by_user:
super(record: tag, event_type:, created_by_user:)
def initialize tag:, event_type:, event:, created_by_user:
super(record: tag, event_type:, event:, created_by_user:)
end
private
+5 -3
ファイルの表示
@@ -1,9 +1,10 @@
class VersionRecorder
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
def initialize record:, event_type:, created_by_user:
def initialize record:, event_type:, event:, created_by_user:
@record = record
@event_type = event_type.to_s
@event = event
@created_by_user = created_by_user
validate_event_type!
@@ -42,8 +43,9 @@ class VersionRecorder
def base_attributes latest
{ version_no: (latest&.version_no || 0) + 1,
event_type: @event_type,
created_at: Time.current,
created_by_user: @created_by_user }
event: @event,
created_by_user: @created_by_user,
created_at: Time.current }
end
def update_record_version_no! version_no
+19
ファイルの表示
@@ -0,0 +1,19 @@
class CreateEvents < ActiveRecord::Migration[8.0]
def change
create_table :events do |t|
t.string :event_type, null: false, index: true
t.text :reason
t.references :reverted_from_event, foreign_key: { to_table: :events }
t.json :metadata
t.binary :ip_address, limit: 16, index: true
t.references :created_by_user, index: true, foreign_key: false
t.datetime :created_at, null: false, index: true
end
add_reference :post_versions, :event, foreign_key: true, after: :original_created_before
add_reference :tag_versions, :event, foreign_key: true, after: :deprecated_at
add_reference :material_versions, :event, foreign_key: true
add_reference :tag_description_versions, :event, foreign_key: true, after: :source_version_no
add_reference :tag_group_versions, :event, foreign_key: true, after: :placements
end
end
+207
ファイルの表示
@@ -0,0 +1,207 @@
class BackfillEventsFromExistingVersions < ActiveRecord::Migration[8.0]
class MigrationEvent < ActiveRecord::Base
self.table_name = 'events'
end
class MigrationPostVersion < ActiveRecord::Base
self.table_name = 'post_versions'
end
class MigrationTagVersion < ActiveRecord::Base
self.table_name = 'tag_versions'
end
class MigrationMaterialVersion < ActiveRecord::Base
self.table_name = 'material_versions'
end
class MigrationTagDescriptionVersion < ActiveRecord::Base
self.table_name = 'tag_description_versions'
end
class MigrationTagGroupVersion < ActiveRecord::Base
self.table_name = 'tag_group_versions'
end
class MigrationLocale < ActiveRecord::Base
self.table_name = 'locales'
end
def up
# create → posts.create
# update → posts.update
raise if MigrationPostVersion.where.not(event_type: ['create', 'update']).exists?
# create → materials.create
# update → materials.update
if MigrationMaterialVersion.where.not(event_type: ['create', 'update']).exists?
raise
end
# create → posts.create / posts.update / materials.create / materials.update / unknown
# update → tags.update / locales.create
# discard → unknown
if MigrationTagVersion.where.not(event_type: ['create', 'update', 'discard']).exists?
raise
end
# create → tag_descriptions.create
# update → tag_descriptions.update
if MigrationTagDescriptionVersion.where.not(event_type: ['create', 'update']).exists?
raise
end
# create → tag_groups.create
# update → tag_groups.update
if MigrationTagGroupVersion.where.not(event_type: ['create', 'update']).exists?
raise
end
# post_versions の Backfill
MigrationPostVersion.find_each do |pv|
ev = MigrationEvent.create!(event_type: "posts.#{ pv.event_type }",
reason: nil,
reverted_from_event_id: nil,
metadata: nil,
ip_address: nil,
created_by_user_id: pv.created_by_user_id,
created_at: pv.created_at)
pv.update_columns(event_id: ev.id)
end
# material_versions の Backfill
MigrationMaterialVersion.find_each do |m|
ev = MigrationEvent.create!(event_type: "materials.#{ m.event_type }",
reason: nil,
reverted_from_event_id: nil,
metadata: nil,
ip_address: nil,
created_by_user_id: m.created_by_user_id,
created_at: m.created_at)
m.update_columns(event_id: ev.id)
end
# ロカール追加に伴ふ該当語言のタグ名称追加異動のみ分離
ids_cause_of_locale_creation = []
MigrationLocale.where('created_at > ?', MigrationLocale.minimum(:created_at)).find_each do |l|
ev = MigrationEvent.create!(event_type: 'locales.create',
reason: nil,
reverted_from_event_id: nil,
metadata: nil,
ip_address: nil,
created_by_user_id: nil,
created_at: l.created_at)
MigrationTagVersion
.where('created_at > ?', l.created_at)
.where(event_type: 'update', event_id: nil)
.find_each do |t|
next unless t.names.key?(l.language_code)
prev = MigrationTagVersion.find_by(tag_id: t.tag_id, version_no: t.version_no - 1)
next if prev.nil? || prev.names.key?(l.language_code)
t.update_columns(event_id: ev.id)
ids_cause_of_locale_creation << t.id
end
ev.destroy! unless MigrationTagVersion.where(event_id: ev.id).exists?
end
# tag_versions の Backfill
MigrationTagVersion.where.not(id: ids_cause_of_locale_creation).find_each do |t|
ev =
case t.event_type
when 'create'
post =
MigrationPostVersion
.where('JSON_CONTAINS(tags_json, ?) <> 0', { tag_id: t.tag_id }.to_json)
.find_by(created_at: MigrationPostVersion
.where('JSON_CONTAINS(tags_json, ?) <> 0',
{ tag_id: t.tag_id }.to_json)
.minimum(:created_at))
material =
MigrationMaterialVersion
.where(tag_id: t.tag_id)
.find_by(created_at: MigrationMaterialVersion
.where(tag_id: t.tag_id)
.minimum(:created_at))
if post
if material
if post.created_at < material.created_at
MigrationEvent.find(post.event_id)
else
MigrationEvent.find(material.event_id)
end
else
MigrationEvent.find(post.event_id)
end
else
if material
MigrationEvent.find(material.event_id)
else
MigrationEvent.create!(event_type: 'unknown',
reason: nil,
reverted_from_event_id: nil,
metadata: nil,
ip_address: nil,
created_by_user_id: t.created_by_user_id,
created_at: t.created_at)
end
end
when 'update'
MigrationEvent.create!(event_type: 'tags.update',
reason: nil,
reverted_from_event_id: nil,
metadata: nil,
ip_address: nil,
created_by_user_id: t.created_by_user_id,
created_at: t.created_at)
when 'discard'
MigrationEvent.create!(event_type: 'unknown',
reason: nil,
reverted_from_event_id: nil,
metadata: nil,
ip_address: nil,
created_by_user_id: t.created_by_user_id,
created_at: t.created_at)
end
t.update_columns(event_id: ev.id)
end
# tag_description_versions の Backfill
MigrationTagDescriptionVersion.find_each do |td|
ev = MigrationEvent.create!(event_type: "tag_descriptions.#{ td.event_type }",
reason: nil,
reverted_from_event_id: nil,
metadata: nil,
ip_address: nil,
created_by_user_id: td.created_by_user_id,
created_at: td.created_at)
td.update_columns(event_id: ev.id)
end
# tag_group_versions の Backfill
MigrationTagGroupVersion.find_each do |tg|
ev = MigrationEvent.create!(event_type: "tag_groups.#{ tg.event_type }",
reason: nil,
reverted_from_event_id: nil,
metadata: nil,
ip_address: nil,
created_by_user_id: tg.created_by_user_id,
created_at: tg.created_at)
tg.update_columns(event_id: ev.id)
end
change_column_null :post_versions, :event_id, false
change_column_null :tag_versions, :event_id, false
change_column_null :material_versions, :event_id, false
change_column_null :tag_description_versions, :event_id, false
change_column_null :tag_group_versions, :event_id, false
end
def down
raise ActiveRecord::IrreversibleMigration, '戻せません.'
end
end
生成ファイル
+31
ファイルの表示
@@ -48,6 +48,21 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.index ["tag_id"], name: "index_deerjikists_on_tag_id"
end
create_table "events", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.string "event_type", null: false
t.text "reason"
t.bigint "reverted_from_event_id"
t.json "metadata"
t.binary "ip_address", limit: 16
t.bigint "created_by_user_id"
t.datetime "created_at", null: false
t.index ["created_at"], name: "index_events_on_created_at"
t.index ["created_by_user_id"], name: "index_events_on_created_by_user_id"
t.index ["event_type"], name: "index_events_on_event_type"
t.index ["ip_address"], name: "index_events_on_ip_address"
t.index ["reverted_from_event_id"], name: "index_events_on_reverted_from_event_id"
end
create_table "external_tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.string "platform", limit: 16, null: false
t.string "name", null: false
@@ -250,8 +265,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.string "source_path"
t.string "source_file_id"
t.string "normalized_source_key"
t.bigint "event_id", null: false
t.index ["created_by_user_id"], name: "index_material_versions_on_created_by_user_id"
t.index ["discarded_at"], name: "index_material_versions_on_discarded_at"
t.index ["event_id"], name: "index_material_versions_on_event_id"
t.index ["file_blob_id"], name: "index_material_versions_on_file_blob_id"
t.index ["material_id", "version_no"], name: "index_material_versions_on_material_id_and_version_no", unique: true
t.index ["material_id"], name: "index_material_versions_on_material_id"
@@ -379,10 +396,12 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.text "parent_post_ids", null: false
t.datetime "original_created_from"
t.datetime "original_created_before"
t.bigint "event_id", null: false
t.datetime "created_at", null: false
t.bigint "created_by_user_id"
t.integer "video_ms"
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id"
t.index ["event_id"], name: "index_post_versions_on_event_id"
t.index ["post_id", "version_no"], name: "index_post_versions_on_post_id_and_version_no", unique: true
t.index ["post_id"], name: "index_post_versions_on_post_id"
t.index ["video_ms", "post_id"], name: "idx_post_versions_video_ms_post_id"
@@ -447,9 +466,11 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.text "body", null: false
t.string "source_language_code", limit: 16
t.integer "source_version_no"
t.bigint "event_id", null: false
t.bigint "created_by_user_id"
t.datetime "created_at", null: false
t.index ["created_by_user_id"], name: "index_tag_description_versions_on_created_by_user_id"
t.index ["event_id"], name: "index_tag_description_versions_on_event_id"
t.index ["tag_id", "language_code", "version_no"], name: "idx_on_tag_id_language_code_version_no_ced77e57e6", unique: true
t.index ["tag_id", "source_language_code", "source_version_no"], name: "fk_rails_4f13094dbc"
t.index ["tag_id"], name: "index_tag_description_versions_on_tag_id"
@@ -532,9 +553,11 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.text "description"
t.json "members", null: false
t.json "placements", null: false
t.bigint "event_id", null: false
t.bigint "created_by_user_id"
t.datetime "created_at", null: false
t.index ["created_by_user_id"], name: "index_tag_group_versions_on_created_by_user_id"
t.index ["event_id"], name: "index_tag_group_versions_on_event_id"
t.index ["tag_group_id", "version_no"], name: "index_tag_group_versions_on_tag_group_id_and_version_no", unique: true
t.index ["tag_group_id"], name: "index_tag_group_versions_on_tag_group_id"
t.check_constraint "`version_no` > 0", name: "chk_tag_group_versions_version_no_positive"
@@ -610,11 +633,13 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.text "aliases", null: false
t.text "parent_tag_ids", null: false
t.datetime "deprecated_at"
t.bigint "event_id", null: false
t.datetime "created_at", null: false
t.bigint "created_by_user_id"
t.json "names", null: false
t.index ["created_at"], name: "index_tag_versions_on_created_at"
t.index ["created_by_user_id", "created_at"], name: "index_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
t.index ["event_id"], name: "index_tag_versions_on_event_id"
t.index ["tag_id", "created_at"], name: "index_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
t.index ["tag_id", "version_no"], name: "index_tag_versions_on_tag_id_and_version_no", unique: true
t.check_constraint "`version_no` > 0", name: "tag_versions_version_no_positive"
@@ -770,6 +795,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
add_foreign_key "active_storage_attachments", "active_storage_blobs", column: "blob_id"
add_foreign_key "active_storage_variant_records", "active_storage_blobs", column: "blob_id"
add_foreign_key "events", "events", column: "reverted_from_event_id"
add_foreign_key "gekanator_ai_runs", "gekanator_question_suggestions"
add_foreign_key "gekanator_games", "posts", column: "correct_post_id"
add_foreign_key "gekanator_games", "posts", column: "guessed_post_id"
@@ -791,6 +817,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
add_foreign_key "material_sync_sources", "users", column: "created_by_user_id"
add_foreign_key "material_sync_sources", "users", column: "updated_by_user_id"
add_foreign_key "material_sync_suppressions", "users", column: "created_by_user_id"
add_foreign_key "material_versions", "events"
add_foreign_key "material_versions", "materials"
add_foreign_key "material_versions", "materials", column: "parent_id"
add_foreign_key "material_versions", "users", column: "created_by_user_id"
@@ -812,10 +839,12 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
add_foreign_key "post_tags", "posts"
add_foreign_key "post_tags", "tags"
add_foreign_key "post_tags", "users", column: "created_user_id"
add_foreign_key "post_versions", "events"
add_foreign_key "post_versions", "posts"
add_foreign_key "post_versions", "users", column: "created_by_user_id"
add_foreign_key "posts", "users", column: "uploaded_user_id"
add_foreign_key "settings", "users"
add_foreign_key "tag_description_versions", "events"
add_foreign_key "tag_description_versions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"]
add_foreign_key "tag_descriptions", "languages", column: "language_code", primary_key: "code"
add_foreign_key "tag_descriptions", "tag_description_versions", column: ["tag_id", "source_language_code", "source_version_no"], primary_key: ["tag_id", "language_code", "version_no"]
@@ -834,6 +863,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
add_foreign_key "tag_group_tags", "tag_groups"
add_foreign_key "tag_group_tags", "tags"
add_foreign_key "tag_group_tags", "users", column: "created_by_user_id"
add_foreign_key "tag_group_versions", "events"
add_foreign_key "tag_groups", "users", column: "created_by_user_id"
add_foreign_key "tag_groups", "users", column: "updated_by_user_id"
add_foreign_key "tag_implications", "tags"
@@ -843,6 +873,7 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
add_foreign_key "tag_names", "tags"
add_foreign_key "tag_similarities", "tags"
add_foreign_key "tag_similarities", "tags", column: "target_tag_id"
add_foreign_key "tag_versions", "events"
add_foreign_key "tag_versions", "users", column: "created_by_user_id"
add_foreign_key "theatre_comments", "theatres"
add_foreign_key "theatre_comments", "users"
+1
ファイルの表示
@@ -102,6 +102,7 @@ RSpec.describe 'Tag group persistence constraints' do
6.times { nodes = [{ 'tag_id' => tag.id, 'children' => nodes }] }
reject_statement do
insert_group_row('tag_group_versions', {
event_id: create_event!(event_type: 'unknown').id,
tag_group_id: group_id, version_no: 2, event_type: 'update', name: '制約確認',
members: [{ 'tag_id' => tag.id, 'version_no' => tag.version_no }].to_json,
placements: nodes.to_json, created_at: Time.current })
+1
ファイルの表示
@@ -10,6 +10,7 @@ RSpec.describe 'TagVersion names database constraint' do
def insert_snapshot!(snapshot)
TagVersion.insert_all!([{ tag_id: tag.id, version_no: 1, event_type: 'create',
event_id: create_event!(event_type: 'unknown').id,
name: 'snapshot_name', category: 'general',
aliases: '', parent_tag_ids: '', names: snapshot,
created_at: Time.current }])
+21 -7
ファイルの表示
@@ -9,7 +9,9 @@ RSpec.describe HistoryAccess do
locale
rows = ['ja', 'ain'].flat_map do |language|
['create', 'discard', 'restore'].each_with_index.map do |event, index|
TagDescriptionVersion.create!(tag_id: tag.id, language_code: language,
TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: tag.id, language_code: language,
version_no: index + 1, event_type: language == 'ain' ? 'update' : event,
body: "#{ language } #{ index }", created_at: Time.utc(2024))
end
@@ -28,7 +30,9 @@ RSpec.describe HistoryAccess do
public_metadata = described_class.set(user: nil) { described_class.authority }
admin = create(:user, :admin)
admin_metadata = described_class.set(user: admin) { described_class.authority }
TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private',
TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'discard', name: 'private',
category: 'general',
names: { ja: { name: 'private', script_code: 'Jpan',
auto_generated: false, aliases: [] } },
@@ -52,7 +56,9 @@ RSpec.describe HistoryAccess do
blob = ActiveStorage::Blob.create_before_direct_upload!(filename: 'private.png',
byte_size: 1, checksum: Base64.strict_encode64('checksum'), content_type: 'image/png')
ActiveStorage::Attachment.create!(name: 'thumbnail', record: post, blob:)
PostVersion.create!(post:, version_no: 1, event_type: 'discard', url: post.url,
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'discard', url: post.url,
title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
variant = ActiveStorage::VariantRecord.create!(blob:, variation_digest: 'spec-variation')
derived = ActiveStorage::Blob.create_before_direct_upload!(filename: 'derived.png',
@@ -78,7 +84,9 @@ RSpec.describe 'Counts artifact policy and external references' do
it 'does not expose a private linked tag ID through an external history snapshot' do
tag = create(:tag, primary_name: 'private-linked-name')
TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024),
names: { ja: { name: 'private-linked-name', script_code: 'Jpan',
auto_generated: false, aliases: [] } })
@@ -87,7 +95,9 @@ RSpec.describe 'Counts artifact policy and external references' do
linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024))
post = create(:post)
snapshot = PostVersion.create!(post:, version_no: 1, event_type: 'create',
snapshot = PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'create',
title: 'external reference', url: post.url, tags: '',
tags_json: [{ external_tag_id: external.id }], parent_post_ids: '',
created_at: Time.utc(2024, 2))
@@ -112,13 +122,17 @@ RSpec.describe 'Counts artifact policy and external references' do
child = create(:tag, primary_name: 'referencing child')
[[parent, 'discard', '', 'private parent'],
[child, 'create', parent.id.to_s, 'referencing child']].each do |tag, event, parents, name|
TagVersion.create!(tag:, version_no: 1, event_type: event, name:,
TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: event, name:,
category: 'general', aliases: '', parent_tag_ids: parents, created_at: Time.utc(2023),
names: { ja: { name:, script_code: 'Jpan',
auto_generated: false, aliases: [] } })
end
post = create(:post)
row = PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'snapshot',
row = PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'create', title: 'snapshot',
url: post.url, tags: '', parent_post_ids: '',
tags_json: [{ tag_id: child.id, version_no: 1, name: 'referencing child', sections: [] }],
created_at: Time.utc(2024))
+24 -1
ファイルの表示
@@ -23,9 +23,22 @@ RSpec.describe 'Locale activation', type: :model do
.and_raise('backfill failed')
end
it 'groups all tag histories from locale creation into one event' do
previous_ids = TagVersion.pluck(:id)
expect { build_locale.save! }.to change { event_rows.length }.by(1)
event = event_rows.last
expect(event).to include('event_type' => 'locales.create', 'created_by_user_id' => nil)
versions = TagVersion.where.not(id: previous_ids)
expect(versions.pluck(:tag_id)).to include(first.id, second.id)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it 'rolls back a newly created locale and the preceding generated names' do
locale = build_locale
fail_second_generation!
events = event_rows
expect { locale.save! }.to raise_error('backfill failed')
@@ -33,6 +46,7 @@ RSpec.describe 'Locale activation', type: :model do
expect(generated_names).to be_empty
expect(first.reload.name('ja')).to eq('activation_first')
expect(second.reload.name('ja')).to eq('activation_second')
expect(event_rows).to eq(events)
end
it 'does not backfill while the locale is inactive' do
@@ -45,7 +59,14 @@ RSpec.describe 'Locale activation', type: :model do
locale = build_locale(deprecated_at: Time.current)
locale.save!
locale.update!(deprecated_at: nil)
previous_ids = TagVersion.pluck(:id)
expect { locale.update!(deprecated_at: nil) }.to change { event_rows.length }.by(1)
event = event_rows.last
expect(event).to include('event_type' => 'locales.restore', 'created_by_user_id' => nil)
versions = TagVersion.where.not(id: previous_ids)
expect(versions.pluck(:tag_id)).to include(first.id, second.id)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
expect(generated_names.pluck(:tag_id)).to contain_exactly(first.id, second.id)
expect(generated_names).to all(have_attributes(
@@ -57,11 +78,13 @@ RSpec.describe 'Locale activation', type: :model do
locale.save!
previous_deprecated_at = locale.reload.deprecated_at
fail_second_generation!
events = event_rows
expect { locale.update!(deprecated_at: nil) }.to raise_error('backfill failed')
expect(locale.reload.deprecated_at).to eq(previous_deprecated_at)
expect(generated_names).to be_empty
expect(event_rows).to eq(events)
end
it 'preserves a human primary through deactivation and repeated activation' do
+14 -14
ファイルの表示
@@ -12,20 +12,20 @@ RSpec.describe PostVersion, type: :model do
let!(:post_version) do
PostVersion.create!(
post: post_record,
version_no: 1,
event_type: 'create',
title: post_record.title,
url: post_record.url,
thumbnail_base: post_record.thumbnail_base,
tags: post_record.snapshot_tag_names.join(' '),
tags_json: post_record.snapshot_tags_json,
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
original_created_from: post_record.original_created_from,
original_created_before: post_record.original_created_before,
created_at: Time.current,
created_by_user: nil
)
event_id: create_event!(event_type: 'unknown').id,
post: post_record,
version_no: 1,
event_type: 'create',
title: post_record.title,
url: post_record.url,
thumbnail_base: post_record.thumbnail_base,
tags: post_record.snapshot_tag_names.join(' '),
tags_json: post_record.snapshot_tags_json,
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
original_created_from: post_record.original_created_from,
original_created_before: post_record.original_created_before,
created_at: Time.current,
created_by_user: nil)
end
it 'is read only after create' do
+27
ファイルの表示
@@ -34,6 +34,31 @@ RSpec.describe TagNameSanitisationRule, type: :model do
described_class.create!(priority: 10, source_pattern: 'foo_', replacement: 'foo')
end
it 'groups renames, merges and affected post histories into one event' do
target = create(:tag, primary_name: 'foobar')
source = create(:tag, primary_name: 'temporary_source')
renamed = create(:tag, primary_name: 'temporary_rename')
source.tag_name('ja').update_columns(name: 'foo_bar')
renamed.tag_name('ja').update_columns(name: 'foo_baz')
post = create(:post)
PostTag.create!(post:, tag: source)
previous_tag_ids = TagVersion.pluck(:id)
previous_post_ids = PostVersion.pluck(:id)
expect { described_class.apply! }.to change { event_rows.length }.by(1)
event = event_rows.last
expect(event).to include(
'event_type' => 'tag_name_sanitisation_rules.apply', 'created_by_user_id' => nil)
tag_versions = TagVersion.where.not(id: previous_tag_ids)
expect(tag_versions.pluck(:tag_id).uniq).to contain_exactly(target.id, source.id, renamed.id)
expect(tag_versions.pluck(:event_type)).to include('discard', 'update')
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
post_versions = PostVersion.where.not(id: previous_post_ids)
expect(post_versions.pluck(:post_id).uniq).to eq([post.id])
expect(post_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
[:primary, :alias].each do |source_kind|
it "keeps the primary identity when a #{ source_kind } collides within its Tag" do
tag = create(:tag, primary_name: source_kind == :primary ? 'temporary' : 'foobar')
@@ -83,6 +108,7 @@ RSpec.describe TagNameSanitisationRule, type: :model do
PostTag.create!(post:, tag: source)
models = [Tag, TagName, TagVersion, TagDescription, TagDescriptionVersion, PostTag]
snapshots = models.map { |model| model.order(*Array(model.primary_key)).map(&:attributes) }
events = event_rows
expect { described_class.apply! }.to raise_error(ActiveRecord::RecordInvalid)
@@ -90,6 +116,7 @@ RSpec.describe TagNameSanitisationRule, type: :model do
model.order(*Array(model.primary_key)).map(&:attributes)
end
expect(after_state).to eq(snapshots)
expect(event_rows).to eq(events)
expect(post.reload.tags).to contain_exactly(source)
expect(target.reload.name('ja')).to eq('foobar')
end
+14 -14
ファイルの表示
@@ -665,20 +665,20 @@ RSpec.describe Tag, type: :model do
def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
PostVersion.create!(
post: post,
version_no: version_no,
event_type: event_type,
title: post.title,
url: post.url,
thumbnail_base: post.thumbnail_base,
tags: snapshot_tags(post),
tags_json: post.snapshot_tags_json,
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
original_created_from: post.original_created_from,
original_created_before: post.original_created_before,
created_at: Time.current,
created_by_user: created_by_user
)
event_id: create_event!(event_type: 'unknown').id,
post: post,
version_no: version_no,
event_type: event_type,
title: post.title,
url: post.url,
thumbnail_base: post.thumbnail_base,
tags: snapshot_tags(post),
tags_json: post.snapshot_tags_json,
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
original_created_from: post.original_created_from,
original_created_before: post.original_created_before,
created_at: Time.current,
created_by_user: created_by_user)
end
context 'when post versions are enabled' do
+24 -22
ファイルの表示
@@ -6,17 +6,18 @@ RSpec.describe VersionRecord, type: :model do
it 'makes TagVersion read only after create' do
version = TagVersion.create!(
tag: tag,
version_no: 1,
event_type: 'create',
name: primary_tag_name_for(tag, 'ja').name,
category: tag.category,
aliases: '',
names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
script_code: 'Jpan', auto_generated: false, aliases: [] } },
parent_tag_ids: '',
created_at: Time.current,
created_by_user: nil)
event_id: create_event!(event_type: 'unknown').id,
tag: tag,
version_no: 1,
event_type: 'create',
name: primary_tag_name_for(tag, 'ja').name,
category: tag.category,
aliases: '',
names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
script_code: 'Jpan', auto_generated: false, aliases: [] } },
parent_tag_ids: '',
created_at: Time.current,
created_by_user: nil)
expect {
version.update!(name: 'changed')
@@ -25,17 +26,18 @@ RSpec.describe VersionRecord, type: :model do
it 'prevents TagVersion destroy' do
version = TagVersion.create!(
tag: tag,
version_no: 1,
event_type: 'create',
name: primary_tag_name_for(tag, 'ja').name,
category: tag.category,
aliases: '',
names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
script_code: 'Jpan', auto_generated: false, aliases: [] } },
parent_tag_ids: '',
created_at: Time.current,
created_by_user: nil)
event_id: create_event!(event_type: 'unknown').id,
tag: tag,
version_no: 1,
event_type: 'create',
name: primary_tag_name_for(tag, 'ja').name,
category: tag.category,
aliases: '',
names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
script_code: 'Jpan', auto_generated: false, aliases: [] } },
parent_tag_ids: '',
created_at: Time.current,
created_by_user: nil)
expect {
version.destroy!
+1
ファイルの表示
@@ -44,6 +44,7 @@ RSpec.configure do |config|
end
config.include TestRecords
config.include EventRecords
config.include RakeTaskHelper
# FactoryBot の create / create_list を使へるやぅにする
+3 -1
ファイルの表示
@@ -84,7 +84,9 @@ RSpec.describe 'Counts native GET acknowledgement', type: :request do
expect(response).to have_http_status(:not_found)
job, file, attempt = ready_job('json')
record = create(:post)
PostVersion.create!(post: record, version_no: 1, event_type: 'discard', title: 'private',
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: 1, event_type: 'discard', title: 'private',
url: record.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
get "/counts/export/files/#{ file }", params: { job:, attempt: }
expect(response).to have_http_status(:not_found)
+3 -1
ファイルの表示
@@ -8,7 +8,9 @@ RSpec.describe 'History boundaries shared with Counts', type: :request do
before do
['create', 'discard'].each_with_index do |event, index|
TagDescriptionVersion.create!(tag_id: tag.id, language_code: 'ja',
TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: tag.id, language_code: 'ja',
version_no: index + 1, event_type: event, body: 'private body',
created_at: Time.utc(2024))
end
+6 -2
ファイルの表示
@@ -10,12 +10,16 @@ RSpec.describe 'Legacy Counts API', type: :request do
category: 'general', sections: [] }
[1, 2, 3].each do |number|
time = Time.utc(2024, number == 3 ? 2 : 1, number, 0, 0)
PostVersion.create!(post:, version_no: number,
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: number,
event_type: number == 1 ? 'create' : 'update',
tags: '', url: post.url, title: "Snapshot #{ number }", parent_post_ids: '',
tags_json: number == 1 ? [snapshot] : [],
created_by_user: number == 3 ? nil : actor, created_at: time)
TagVersion.create!(tag:, version_no: number,
TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: number,
event_type: number == 1 ? 'create' : 'update',
name: 'counts tag', category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name: 'counts tag', script_code: 'Jpan',
+27 -9
ファイルの表示
@@ -14,7 +14,9 @@ RSpec.describe 'Counts table API', type: :request do
end
before do
TagVersion.create!(tag:, version_no: 1, event_type: 'create', name: 'alpha',
TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'create', name: 'alpha',
category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2023))
@@ -24,7 +26,9 @@ RSpec.describe 'Counts table API', type: :request do
{ tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] },
{ external_tag_id: external.id }]
[1, 2, 3].each do |number|
PostVersion.create!(post: record, version_no: number,
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: number,
event_type: number == 1 ? 'create' : 'update', url: record.url,
title: "snapshot #{ number }", tags: '', parent_post_ids: '',
tags_json: snapshots.first(number == 1 ? 2 : (number == 2 ? 1 : 0)),
@@ -243,7 +247,9 @@ RSpec.describe 'Counts table API', type: :request do
end
it 'checks the current latest flag beyond the execution timestamp' do
PostVersion.create!(post: record, version_no: 4, event_type: 'update',
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: 4, event_type: 'update',
url: record.url, title: 'after execution', tags: '', tags_json: [],
parent_post_ids: '', created_at: Time.utc(2025, 2, 1))
result = query
@@ -297,12 +303,16 @@ RSpec.describe 'Counts table API', type: :request do
tag.tag_names.find_by!(language_code: 'ja', primary_flg: true)
.update!(name: 'renamed-alpha')
create(:tag_name, :alias, tag:, name: 'alpha-alias')
TagVersion.create!(tag:, version_no: 2, event_type: 'update', name: 'renamed-alpha',
TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 2, event_type: 'update', name: 'renamed-alpha',
category: 'general', aliases: 'alpha-alias', parent_tag_ids: '',
names: { ja: { name: 'renamed-alpha', script_code: 'Jpan', auto_generated: false,
aliases: [{ name: 'alpha-alias', script_code: 'Jpan' }] } },
created_at: Time.utc(2024, 2, 1))
PostVersion.create!(post: record, version_no: 4, event_type: 'update',
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: 4, event_type: 'update',
url: record.url, title: 'after rename', tags: '', parent_post_ids: '',
tags_json: [{ tag_id: tag.id, version_no: 2, name: 'renamed-alpha',
category: 'general', sections: [] }],
@@ -365,7 +375,9 @@ RSpec.describe 'Counts table API', type: :request do
it 'reports column overflow separately from malformed input' do
101.times do |index|
PostVersion.create!(post: record, version_no: index + 4,
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: index + 4,
event_type: 'update', url: record.url, title: "column #{ index }",
tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3))
end
@@ -409,7 +421,9 @@ RSpec.describe 'Counts table API', type: :request do
sign_in_as(create(:user, role)) if role
# Equal timestamps deliberately require version ordering, not a date comparison.
['discard', 'restore', 'discard', 'restore'].each_with_index do |event, index|
PostVersion.create!(post: record, version_no: index + 4, event_type: event,
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: index + 4, event_type: event,
url: record.url, title: event == 'restore' ? 'restored' : 'private snapshot',
tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3))
end
@@ -437,7 +451,9 @@ RSpec.describe 'Counts table API', type: :request do
end
it 'does not resolve private condition names even when the result set is empty' do
TagVersion.create!(tag:, version_no: 2, event_type: 'discard', name: 'secret tag',
TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 2, event_type: 'discard', name: 'secret tag',
category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name: 'secret tag', script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2024, 2))
@@ -453,7 +469,9 @@ RSpec.describe 'Counts table API', type: :request do
end
end
it 'includes private history in the public timeline without an exclusion count' do
PostVersion.create!(post: record, version_no: 4, event_type: 'discard', url: record.url,
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: 4, event_type: 'discard', url: record.url,
title: 'hidden title', tags: '', tags_json: [], parent_post_ids: '',
created_at: Time.utc(2024, 3))
result = query(mode: 'summary', rows: 'created_at:month', cols: 'event_type')
+40 -1
ファイルの表示
@@ -314,6 +314,7 @@ RSpec.describe 'Materials API', type: :request do
.and change(Tag, :count).by(1)
.and change(TagName, :count).by(1)
.and change(MaterialVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created)
@@ -325,6 +326,12 @@ RSpec.describe 'Materials API', type: :request do
expect(material.file.attached?).to be(true)
expect(material.version_no).to eq(1)
expect(material.material_versions.first.event_type).to eq('create')
event = event_rows.last
expect(event).to include(
'event_type' => 'materials.create',
'created_by_user_id' => member_user.id)
expect(material.material_versions.first.event_id).to eq(event.fetch('id'))
expect(material.tag.tag_versions.pluck(:event_id)).to eq([event.fetch('id')])
expect(material.material_export_items.first.export_path).to eq('伊地知ニジカ/created.png')
expect(material.material_versions.first.export_paths_json).to eq(
'legacy_drive' => '伊地知ニジカ/created.png'
@@ -509,6 +516,7 @@ RSpec.describe 'Materials API', type: :request do
export_paths: { legacy_drive: '伊地知ニジカ/updated.jpg' }
}
end.to change(MaterialVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok)
@@ -517,6 +525,12 @@ RSpec.describe 'Materials API', type: :request do
expect(material.tag.category).to eq('material')
expect(material.url).to eq('https://example.com/updated-source')
expect(material.updated_by_user).to eq(member_user)
event = event_rows.last
expect(event).to include(
'event_type' => 'materials.update',
'created_by_user_id' => member_user.id)
expect(material.material_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
expect(material.tag.tag_versions.pluck(:event_id)).to eq([event.fetch('id')])
expect(material.file.attached?).to be(true)
expect(material.file.blob.id).not_to eq(old_blob_id)
expect(ActiveStorage::Blob.where(id: old_blob_id).exists?).to be(true)
@@ -632,6 +646,7 @@ RSpec.describe 'Materials API', type: :request do
MaterialVersionRecorder.record!(material:, event_type: :create,
created_by_user: member_user)
TagVersioning.ensure_snapshot!(tag, created_by_user: member_user)
events = event_rows
expect do
put "/materials/#{ material.id }", params: {
@@ -643,6 +658,7 @@ RSpec.describe 'Materials API', type: :request do
expect(response).to have_http_status(:ok)
expect(material.reload.version_no).to eq(1)
expect(event_rows).to eq(events)
end
it 'records update version when only export_path changes' do
@@ -807,6 +823,12 @@ RSpec.describe 'Materials API', type: :request do
it 'creates source suppression as member' do
sign_in_as(member_user)
materials = ['a', 'b'].map do |name|
Material.create!(
source_kind: 'google_drive_file', source_file_id: "blocked-#{ name }",
source_path: "伊地知ニジカ/危険素材/#{ name }.png",
url: "https://example.com/blocked-#{ name }", created_by_user: member_user)
end
expect do
post '/materials/suppressions', params: {
@@ -815,6 +837,7 @@ RSpec.describe 'Materials API', type: :request do
reason: 'copyright_high_risk'
}
end.to change(MaterialSyncSuppression, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created)
expect(json).to include(
@@ -822,6 +845,14 @@ RSpec.describe 'Materials API', type: :request do
'drive_path' => '伊地知ニジカ/危険素材',
'normalized_source_key' => 'google_drive_path_prefix:伊地知ニジカ/危険素材'
)
event = event_rows.last
expect(event).to include(
'event_type' => 'materials.block', 'created_by_user_id' => member_user.id)
expect(materials.map { _1.reload.discarded? }).to eq([true, true])
versions = MaterialVersion.where(material_id: materials.map(&:id))
expect(versions.where(event_type: 'discard').pluck(:material_id))
.to match_array(materials.map(&:id))
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
end
@@ -860,11 +891,19 @@ RSpec.describe 'Materials API', type: :request do
end
it 'discards the material and returns 204' do
delete "/materials/#{ material.id }"
expect { delete "/materials/#{ material.id }" }
.to change { event_rows.length }.by(1)
expect(response).to have_http_status(:no_content)
expect(Material.find_by(id: material.id)).to be_nil
expect(Material.with_discarded.find(material.id)).to be_discarded
event = event_rows.last
expect(event).to include(
'event_type' => 'materials.destroy',
'created_by_user_id' => member_user.id)
versions = MaterialVersion.where(material_id: material.id)
expect(versions.order(:version_no).last.event_type).to eq('discard')
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
end
end
+5
ファイルの表示
@@ -172,6 +172,7 @@ RSpec.describe 'NicoTags', type: :request do
}
}.to change(TagVersion, :count).by(2)
.and change(NicoTagVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok)
@@ -181,6 +182,10 @@ RSpec.describe 'NicoTags', type: :request do
linked_versions = TagVersion.where(tag: [linked_a, linked_b]).order(:tag_id)
expect(linked_versions.map(&:event_type)).to eq(['create', 'create'])
expect(linked_versions.map(&:created_by_user_id)).to all(eq(admin.id))
event = event_rows.last
expect(event).to include(
'event_type' => 'tags.update', 'created_by_user_id' => admin.id)
expect(linked_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
versions = nico_tag.reload.nico_tag_versions.order(:version_no)
expect(versions.map(&:event_type)).to eq(['create', 'update'])
+39 -16
ファイルの表示
@@ -50,6 +50,8 @@ RSpec.describe 'Posts API', type: :request do
post:,
version_no: 1,
event_type: 'create',
event_id: create_event!(
event_type: 'posts.create', created_by_user: post.uploaded_user).id,
title: post.title,
url: post.url,
thumbnail_base: post.thumbnail_base,
@@ -1068,7 +1070,7 @@ RSpec.describe 'Posts API', type: :request do
it 'dry-runs without persisting posts or new tags' do
sign_in_as(member)
counts = [Post.count, Tag.count, TagName.count]
counts = [Post.count, Tag.count, TagName.count, event_rows.length]
post '/posts?dry=1', params: post_write_params(
title: 'dry-run post',
@@ -1084,7 +1086,7 @@ RSpec.describe 'Posts API', type: :request do
[{ 'name' => 'new_dry_run_tag',
'category' => 'character',
'section_literals' => [] }])
expect([Post.count, Tag.count, TagName.count]).to eq(counts)
expect([Post.count, Tag.count, TagName.count, event_rows.length]).to eq(counts)
end
it 'dry-runs an existing URL without validating its upload' do
@@ -2259,20 +2261,20 @@ RSpec.describe 'Posts API', type: :request do
def create_post_version! post, version_no:, event_type:, created_by_user:, created_at:
PostVersion.create!(
post:,
version_no:,
event_type:,
title: post.title,
url: post.url,
thumbnail_base: post.thumbnail_base,
tags: snapshot_tags(post),
tags_json: post.snapshot_tags_json,
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
original_created_from: post.original_created_from,
original_created_before: post.original_created_before,
created_at:,
created_by_user:
)
event_id: create_event!(event_type: 'unknown').id,
post:,
version_no:,
event_type:,
title: post.title,
url: post.url,
thumbnail_base: post.thumbnail_base,
tags: snapshot_tags(post),
tags_json: post.snapshot_tags_json,
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
original_created_from: post.original_created_from,
original_created_before: post.original_created_before,
created_at:,
created_by_user:)
end
let!(:v1) do
@@ -2600,6 +2602,7 @@ RSpec.describe 'Posts API', type: :request do
tags: 'spec_tag',
thumbnail: dummy_upload)
end.to change(PostVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created)
@@ -2611,6 +2614,13 @@ RSpec.describe 'Posts API', type: :request do
expect(version.url).to eq('https://example.com/versioned-post')
expect(version.created_by_user_id).to eq(member.id)
expect(version.tags).to eq(snapshot_tags(created_post))
event = event_rows.last
expect(event).to include(
'event_type' => 'posts.create', 'created_by_user_id' => member.id)
expect(version.event_id).to eq(event.fetch('id'))
tag_versions = TagVersion.where(tag_id: created_post.tags.select(:id))
expect(tag_versions).not_to be_empty
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it 'creates next version on PUT /posts/:id when snapshot changes' do
@@ -2626,6 +2636,7 @@ RSpec.describe 'Posts API', type: :request do
title: 'updated title',
tags: 'spec_tag_2')
end.to change(PostVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok)
@@ -2635,6 +2646,12 @@ RSpec.describe 'Posts API', type: :request do
expect(version.title).to eq('updated title')
expect(version.created_by_user_id).to eq(member.id)
expect(version.tags).to eq(snapshot_tags(post_record.reload))
event = event_rows.last
expect(event).to include(
'event_type' => 'posts.update', 'created_by_user_id' => member.id)
expect(version.event_id).to eq(event.fetch('id'))
tag_version = TagVersion.find_by!(tag_id: tag_name2.reload.tag_id, version_no: 1)
expect(tag_version.event_id).to eq(event.fetch('id'))
end
it 'does not create a new version on PUT /posts/:id when snapshot is unchanged' do
@@ -2643,6 +2660,7 @@ RSpec.describe 'Posts API', type: :request do
PostTag.create!(post: post_record, tag: Tag.no_deerjikist)
base_version = create_post_version_for!(post_record.reload)
events = event_rows
expect {
put "/posts/#{post_record.id}", params: post_write_params(
base_version_no: base_version.version_no,
@@ -2656,10 +2674,12 @@ RSpec.describe 'Posts API', type: :request do
expect(version.version_no).to eq(1)
expect(version.event_type).to eq('create')
expect(version.tags).to eq(snapshot_tags(post_record))
expect(event_rows).to eq(events)
end
it 'does not create a version when POST /posts is invalid' do
sign_in_as(member)
events = event_rows
expect do
post '/posts', params: post_write_params(
@@ -2670,11 +2690,13 @@ RSpec.describe 'Posts API', type: :request do
end.not_to change(PostVersion, :count)
expect(response).to have_http_status(:unprocessable_entity)
expect(event_rows).to eq(events)
end
it 'does not create a version when PUT /posts/:id is invalid' do
sign_in_as(member)
base_version = create_post_version_for!(post_record)
events = event_rows
expect do
put "/posts/#{post_record.id}", params: post_write_params(
@@ -2686,6 +2708,7 @@ RSpec.describe 'Posts API', type: :request do
end.not_to change(PostVersion, :count)
expect(response).to have_http_status(:unprocessable_entity)
expect(event_rows).to eq(events)
end
it 'rejects second-bearing original created timestamps on POST /posts' do
+3 -1
ファイルの表示
@@ -119,7 +119,9 @@ RSpec.describe 'Sitemap entries API', type: :request do
# Legacy empty bodies can exist even though the write service rejects them.
empty = TagDescription.create!(tag: empty_tag, language_code: 'ain',
body: '', version_no: 1)
TagDescriptionVersion.create!(tag_id: empty_tag.id, language_code: 'ain',
TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: empty_tag.id, language_code: 'ain',
body: '', version_no: 1, event_type: 'create',
created_by_user_id: user.id, created_at: Time.current)
+10
ファイルの表示
@@ -53,8 +53,13 @@ RSpec.describe "TagChildren", type: :request do
expect { do_request }
.to change { parent.reload.children.ids.include?(child.id) }
.from(false).to(true)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:no_content)
event = event_rows.last
expect(event).to include(
'event_type' => 'tags.update', 'created_by_user_id' => admin.id)
expect(child.tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it 'returns 422 and does not create relation when the new link makes a cycle' do
@@ -132,6 +137,7 @@ RSpec.describe "TagChildren", type: :request do
expect {
do_request
}.to change(TagVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:no_content)
@@ -140,6 +146,10 @@ RSpec.describe "TagChildren", type: :request do
expect(versions.first.parent_tag_ids.split).to include(parent.id.to_s)
expect(versions.second.parent_tag_ids).to eq('')
expect(versions.second.created_by_user_id).to eq(admin.id)
event = event_rows.last
expect(event).to include(
'event_type' => 'tags.update', 'created_by_user_id' => admin.id)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
end
+2
ファイルの表示
@@ -8,6 +8,7 @@ RSpec.describe 'Tag description Wiki compatibility', type: :request do
let!(:versions) do
['A', 'A', 'new-version'].each_with_index.map do |body, index|
TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: tag.id, language_code: 'ja', version_no: index + 1,
event_type: index.zero? ? 'create' : 'update', body:,
created_by_user_id: user.id, created_at: Time.current)
@@ -73,6 +74,7 @@ RSpec.describe 'Tag description Wiki compatibility', type: :request do
let!(:other_tag) { create(:tag, primary_name: 'other_description_contract') }
let!(:other_version) do
TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: other_tag.id, language_code: 'ja', version_no: 1,
event_type: 'create', body: 'other tag history',
created_by_user_id: user.id, created_at: Time.current)
+13 -1
ファイルの表示
@@ -13,7 +13,7 @@ RSpec.describe 'Tag description native API', type: :request do
def stored_state
[TagDescription, TagDescriptionVersion, TagName, TagVersion].map do |model|
model.order(:id).map(&:attributes)
end
end + [event_rows]
end
def fail_save model
@@ -91,6 +91,8 @@ RSpec.describe 'Tag description native API', type: :request do
let!(:version) do
TagDescriptionVersion.create!(
tag_id: tag.id, language_code: 'ja', body: 'native version', version_no: 1,
event_id: create_event!(
event_type: 'tag_descriptions.create', created_by_user: author).id,
event_type: 'create', created_by_user_id: author.id, created_at: Time.current)
end
let(:name_endpoint) { "/tags/name/#{ tag_name.name }/description" }
@@ -185,6 +187,7 @@ RSpec.describe 'Tag description native API', type: :request do
expect { native_write(body: 'created natively') }
.to change(TagDescription, :count).by(1)
.and change(TagDescriptionVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created)
description = TagDescription.find_by!(tag_id: tag.id, language_code: 'ja')
expect_current(description)
@@ -192,6 +195,10 @@ RSpec.describe 'Tag description native API', type: :request do
expect(version).to have_attributes(
body: 'created natively', version_no: 1, event_type: 'create',
created_by_user_id: editor.id)
event = event_rows.last
expect(event).to include(
'event_type' => 'tag_descriptions.create', 'created_by_user_id' => editor.id)
expect(version.event_id).to eq(event.fetch('id'))
get "/wiki/#{ description.id }"
expect(response).to have_http_status(:ok)
expect(json).to include('body' => description.body, 'revision_id' => version.id)
@@ -223,6 +230,7 @@ RSpec.describe 'Tag description native API', type: :request do
expect(description.version_no).to eq(1)
expect { native_write(body: 'after') }
.to change(TagDescriptionVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok)
expect(description.reload).to have_attributes(
body: 'after', version_no: 2,
@@ -234,6 +242,10 @@ RSpec.describe 'Tag description native API', type: :request do
expect(version).to have_attributes(
tag_id: tag.id, language_code: 'ja', version_no: 2, event_type: 'update',
body: 'after', created_by_user_id: editor.id)
event = event_rows.last
expect(event).to include(
'event_type' => 'tag_descriptions.update', 'created_by_user_id' => editor.id)
expect(version.event_id).to eq(event.fetch('id'))
expect(revision.body).to eq(version.body)
expect(description_versions(page).order(:version_no).last.body).to eq(version.body)
get "/wiki/#{ description.id }"
+5 -1
ファイルの表示
@@ -121,10 +121,14 @@ RSpec.describe 'Tag group native API', type: :request do
[:create, :update].each do |operation|
it "#{ operation }s structured data and keeps unplaced membership" do
previous = group_version(group_id, 1)
native_write(operation)
expect { native_write(operation) }.to change { event_rows.length }.by(1)
expect(response).to have_http_status(operation == :create ? :created : :ok)
id = operation == :create ? json.fetch('id') : group_id
number = operation == :create ? 1 : 2
event = event_rows.last
event_type = operation == :create ? 'tag_groups.create' : 'tag_groups.update'
expect(event).to include('event_type' => event_type, 'created_by_user_id' => user.id)
expect(group_version(id, number).fetch('event_id')).to eq(event.fetch('id'))
expect_group_snapshot(
id, number:, members: snapshot_members, placements:, description: '全体の説明')
expect(group_version(group_id, 1)).to eq(previous)
+1
ファイルの表示
@@ -30,6 +30,7 @@ RSpec.describe 'TagVersions API', type: :request do
)
version =
TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag: tag,
version_no: version_no,
event_type: event_type,
+10
ファイルの表示
@@ -705,6 +705,7 @@ RSpec.describe 'Tags API', type: :request do
expect {
patch "/tags/#{tag.id}", params: { name: 'new_tag_name', category: 'meme' }
}.to change(TagVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok)
@@ -719,6 +720,10 @@ RSpec.describe 'Tags API', type: :request do
expect(version_primary_name(versions.second, 'ja')).to eq('new_tag_name')
expect(versions.second.category).to eq('meme')
expect(versions.second.created_by_user_id).to eq(member_user.id)
event = event_rows.last
expect(event).to include(
'event_type' => 'tags.update', 'created_by_user_id' => member_user.id)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it 'updates deprecated state and records it in tag versions' do
@@ -1275,6 +1280,7 @@ RSpec.describe 'Tags API', type: :request do
deprecated: '0',
}
}.to change(TagVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok)
@@ -1290,6 +1296,10 @@ RSpec.describe 'Tags API', type: :request do
expect(versions.second.category).to eq('meta')
expect(version_alias_names(versions.second, 'ja')).to include('spec_tag')
expect(versions.second.created_by_user_id).to eq(member_user.id)
event = event_rows.last
expect(event).to include(
'event_type' => 'tags.update', 'created_by_user_id' => member_user.id)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it '同じ tag の旧 alias へ戻しても rename できる' do
+3 -1
ファイルの表示
@@ -192,7 +192,9 @@ RSpec.describe 'Counts export contracts' do
expect(CountsExportDownload.find(token, 'owner')).not_to be_nil
expect(CountsExportDownload.find(token, 'other')).to be_nil
post = create(:post)
PostVersion.create!(post:, version_no: 1, event_type: 'discard', url: post.url,
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'discard', url: post.url,
title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
expect(CountsExportDownload.find(token, 'owner')).to be_nil
end
+21 -7
ファイルの表示
@@ -13,7 +13,9 @@ RSpec.describe 'Counts masked pivot contracts' do
let!(:tags) do
['A', 'B', 'C'].map do |name|
tag = create(:tag, primary_name: name)
TagVersion.create!(tag:, version_no: 1, event_type: 'create', name:,
TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'create', name:,
category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name:, script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2023))
@@ -25,12 +27,16 @@ RSpec.describe 'Counts masked pivot contracts' do
[[0, 1], [0], [1, 2]].each_with_index do |indexes, index|
post = create(:post)
snapshot = indexes.map { { tag_id: tags[_1].id, version_no: 1, sections: [] } }
PostVersion.create!(post:, version_no: 1, event_type: 'create',
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'create',
title: "hidden-title-#{ index }", url: post.url, tags: '', tags_json: snapshot,
parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 1))
next if index == 2
PostVersion.create!(post:, version_no: 2, event_type: 'discard',
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 2, event_type: 'discard',
title: "private-discard-#{ index }", url: post.url, tags: '', tags_json: [],
parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 2))
end
@@ -100,12 +106,16 @@ RSpec.describe 'Counts masked pivot contracts' do
it 'uses changed-record membership for totals and hides changes to private predecessors' do
post = PostVersion.order(:id).last.post
PostVersion.create!(post:, version_no: 2, event_type: 'update', title: 'changed-public-title',
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 2, event_type: 'update', title: 'changed-public-title',
url: post.url, tags: '',
tags_json: [{ tag_id: tags.last.id, version_no: 1, sections: [] }],
parent_post_ids: '', created_at: Time.utc(2024, 3))
restored = PostVersion.order(:id).first.post
PostVersion.create!(post: restored, version_no: 3, event_type: 'restore',
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post: restored, version_no: 3, event_type: 'restore',
title: 'restored-public-title', url: restored.url, tags: '',
tags_json: [{ tag_id: tags.first.id, version_no: 1, sections: [] }], parent_post_ids: '',
created_at: Time.utc(2024, 4))
@@ -135,7 +145,9 @@ RSpec.describe 'Counts masked pivot contracts' do
it 'keeps NULL as a public data value rather than treating it as a rollup' do
post = create(:post)
PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'public bot',
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'create', title: 'public bot',
url: post.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 5))
page = result(nil, 'rows' => 'user', 'cols' => 'event_type')
expect(page[:cells].select { _1[:values].first.nil? }.sum { _1[:count] }).to eq(1)
@@ -146,7 +158,9 @@ RSpec.describe 'Counts masked pivot contracts' do
it 'sorts public version numbers numerically including formerly hidden records' do
post = PostVersion.order(:id).last.post
[2, 10].each do |number|
PostVersion.create!(post:, version_no: number, event_type: 'update',
PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: number, event_type: 'update',
title: 'public numeric sort', url: post.url, tags: '', tags_json: [],
parent_post_ids: '', created_at: Time.utc(2024, 5))
end
+2
ファイルの表示
@@ -56,6 +56,7 @@ RSpec.describe MaterialSyncImporter do
profile: 'legacy_drive',
export_path: '素材/a.png',
created_by_user: user)
events = event_rows
result =
described_class.import!(
@@ -73,6 +74,7 @@ RSpec.describe MaterialSyncImporter do
expect(result.action).to eq(:unchanged)
expect(material.reload.tag).to eq(tag)
expect(material.url).to eq('https://example.com/human')
expect(event_rows).to eq(events)
end
it 'suppresses a Google Drive candidate by relative path prefix' do
+41
ファイルの表示
@@ -14,6 +14,47 @@ RSpec.describe MaterialSyncRunner do
let(:drive_client) { instance_double(GoogleDrive::ApiClient) }
describe '#sync!' do
it 'groups created and updated materials across sync sources into one event' do
existing = Material.create!(
source_kind: 'google_drive_file', source_file_id: 'existing-file',
source_path: 'old.png', url: 'https://example.com/existing',
created_by_user: user, updated_by_user: user)
source
MaterialSyncSource.create!(
name: 'Second Drive source', source_kind: 'google_drive_path',
source_file_id: 'folder-456', profile: 'legacy_drive',
created_by_user: user, updated_by_user: user)
allow(GoogleDrive::ApiClient).to receive(:new).and_return(drive_client)
allow(drive_client).to receive(:each_material_file_under_folder) do |folder_id, &block|
id = folder_id == 'folder-123' ? 'existing-file' : 'new-file'
block.call(id:, name: "#{ id }.png", mime_type: 'image/png',
relative_path: "素材/#{ id }.png", sha256_checksum: nil,
web_view_link: "https://drive.google.com/file/d/#{ id }/view")
end
allow(drive_client).to receive(:download_to_tempfile) do |id, **|
Tempfile.new(['sync-event', '.png']).tap do |file|
file.binmode
file.write(id)
file.rewind
end
end
allow(MaterialThumbnailGenerator).to receive(:generate!)
previous_ids = MaterialVersion.pluck(:id)
result = nil
expect { result = described_class.sync_enabled! }
.to change { event_rows.length }.by(1)
expect(result).to have_attributes(imported: 1, updated: 1, failed: 0)
event = event_rows.last
expect(event.fetch('event_type')).to eq('materials.sync')
created = Material.find_by!(source_file_id: 'new-file')
versions = MaterialVersion.where.not(id: previous_ids)
expect(versions.pluck(:material_id).uniq).to contain_exactly(existing.id, created.id)
expect(versions.pluck(:event_type)).to include('create', 'update')
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it 'imports google drive path candidates as they are yielded' do
first_entry = { id: 'file-1',
name: 'a.png',
+83
ファイルの表示
@@ -88,3 +88,86 @@ RSpec.describe PostBulkCreator do
expect(creator).to have_received(:create!).with(locale).once
end
end
RSpec.describe 'PostBulkCreator event grouping', type: :model do
self.use_transactional_tests = false
before do
expect(Rails.env.test?).to be(true)
expect(ApplicationRecord.connection.open_transactions).to eq(0)
@prefix = "bulk_event_#{ SecureRandom.hex(8) }"
@actor = create(:user, :member)
allow(PostCreatePreflight).to receive(:new) do |attributes:, **|
specs = [{ name: attributes.fetch(:title), category: :general }]
instance_double(PostCreatePreflight, run: attributes.merge(
existing_post_id: nil, snapshot_tag_specs: specs, post_tag_specs: specs,
normalised_parent_post_ids: [], tag_sections: { }, video_ms: nil))
end
end
after do
if @actor
posts = Post.where(uploaded_user: @actor)
PostTagSection.where(post_id: posts.select(:id)).delete_all
PostTag.where(post_id: posts.select(:id)).delete_all
PostVersion.where(post_id: posts.select(:id)).delete_all
posts.delete_all
tag_ids = TagName.where(name: ["#{ @prefix }_1", "#{ @prefix }_2"]).pluck(:tag_id)
TagVersion.where(tag_id: tag_ids).delete_all
TagName.where(tag_id: tag_ids).delete_all
Tag.where(id: tag_ids).delete_all
EventRecords::EventRow.where(created_by_user_id: @actor.id).delete_all
@actor.delete
end
end
it 'shares one creation event between real workers and their tag histories' do
posts = [1, 2].map do |number|
{ title: "#{ @prefix }_#{ number }",
url: "https://example.com/#{ @prefix }/#{ number }" }
end
result = nil
expect {
result = PostBulkCreator.new(actor: @actor, posts:, thumbnails: { })
.run(Locale.nipponese)
}.to change { event_rows.length }.by(1)
expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['created', 'created'])
event = event_rows.last
expect(event).to include(
'event_type' => 'posts.create', 'created_by_user_id' => @actor.id)
versions = PostVersion.where(created_by_user_id: @actor.id)
expect(versions.count).to eq(2)
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
tag_versions = TagVersion.where(created_by_user_id: @actor.id)
expect(tag_versions.count).to eq(2)
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it 'does not leave an event when every row fails validation' do
preflight = instance_double(PostCreatePreflight)
allow(PostCreatePreflight).to receive(:new).and_return(preflight)
allow(preflight).to receive(:run).and_raise(
PostCreatePreflight::ValidationFailed.new(fields: { url: ['invalid'] }))
events = event_rows
result = PostBulkCreator.new(
actor: @actor, posts: [{ title: 'invalid' }], thumbnails: { }).run(Locale.nipponese)
expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['failed'])
expect(event_rows).to eq(events)
end
it 'does not leave an event when every row is skipped' do
preflight = instance_double(PostCreatePreflight, run: { existing_post_id: 123 })
allow(PostCreatePreflight).to receive(:new).and_return(preflight)
events = event_rows
result = PostBulkCreator.new(
actor: @actor, posts: [{ title: 'existing' }], thumbnails: { }).run(Locale.nipponese)
expect(result.fetch(:results).map { _1.fetch(:status) }).to eq(['skipped'])
expect(event_rows).to eq(events)
end
end
+10
ファイルの表示
@@ -16,6 +16,7 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
@tag = create(:tag, primary_name: "#{ @prefix }_owner")
@group = TagGroup.create!(name: "#{ @prefix }_owner", version_no: 1)
@tag_ids = Queue.new
@event_ids = Queue.new
@threads = []
@release = Queue.new
end
@@ -42,6 +43,9 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
ids << @tag.id if @tag
TagName.where(tag_id: ids).delete_all
Tag.where(id: ids).delete_all
event_ids = []
event_ids << @event_ids.pop until @event_ids.empty? if @event_ids
EventRecords::EventRow.where(id: event_ids).delete_all
end
end
@@ -72,11 +76,17 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
when :description
TagDescription.create!(tag: @tag, language_code: 'ja', body: '', version_no: 1)
when :description_version
event = create_event!(event_type: 'unknown')
@event_ids << event.id
TagDescriptionVersion.create!(
event_id: event.id,
tag_id: @tag.id, language_code: 'ja', body: 'body', version_no: 1,
event_type: 'create', created_at: Time.current)
when :group_version
event = create_event!(event_type: 'unknown')
@event_ids << event.id
TagGroupVersion.create!(
event_id: event.id,
tag_group: @group, name: @group.name, version_no: 1, event_type: 'create',
members: [], placements: [], created_at: Time.current)
when :group
+3
ファイルの表示
@@ -15,10 +15,12 @@ RSpec.describe SharedResourceIdAllocator do
TagGroup.new(id:, name: "group #{ number }", version_no: number)
when 'tag_description_versions'
TagDescriptionVersion.new(
event_id: create_event!(event_type: 'unknown').id,
id:, tag_id: tag.id, language_code: 'ja', body: 'body', version_no: number,
event_type: 'create', created_at: Time.current)
when 'tag_group_versions'
TagGroupVersion.new(
event_id: create_event!(event_type: 'unknown').id,
id:, tag_group_id: group.id, name: group.name, version_no: number,
event_type: 'create', members: [], placements: [], created_at: Time.current)
end
@@ -82,6 +84,7 @@ RSpec.describe SharedResourceIdAllocator do
it 'reserves a Tag ID referenced only by remaining description history' do
high = [Tag.maximum(:id).to_i, ExternalTag.maximum(:id).to_i].max + 1000
TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: high, language_code: 'ja', version_no: 1, body: 'history',
event_type: 'create', created_at: Time.current)
expect(create(:tag).id).to be > high
+35
ファイルの表示
@@ -42,6 +42,41 @@ RSpec.describe Youtube::Sync do
end
describe '#sync!' do
it 'groups created and updated post histories into one sync event' do
allow(PostVersionRecorder).to receive(:record!).and_call_original
allow(PostVersionRecorder).to receive(:ensure_snapshot!).and_call_original
existing = create(:post, url: 'https://youtu.be/video-1', title: 'old title')
allow(sync).to receive(:query_terms).and_return([])
allow(sync).to receive(:playlist_ids).and_return(['PL123'])
allow(client).to receive(:playlist_items).with(playlist_id: 'PL123', page_token: nil)
.and_return('items' => [
{ 'contentDetails' => { 'videoId' => 'video-1' } },
{ 'contentDetails' => { 'videoId' => 'video-2' } }])
allow(client).to receive(:videos).with(['video-1', 'video-2'])
.and_return('items' => [
youtube_video_item(id: 'video-1', title: 'updated', channel_id: 'UC_NONE'),
youtube_video_item(id: 'video-2', title: 'created', channel_id: 'UC_NONE')])
previous_post_ids = PostVersion.pluck(:id)
previous_tag_ids = TagVersion.pluck(:id)
expect { sync.sync! }.to change { event_rows.length }.by(1)
event = event_rows.last
expect(event).to include('event_type' => 'posts.sync', 'created_by_user_id' => nil)
versions = PostVersion.where.not(id: previous_post_ids)
created = Post.find_by!(url: 'https://www.youtube.com/watch?v=video-2')
expect(versions.pluck(:post_id).uniq).to contain_exactly(existing.id, created.id)
expect(versions.pluck(:event_type)).to include('create', 'update')
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
tag_versions = TagVersion.where.not(id: previous_tag_ids)
expect(tag_versions).not_to be_empty
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
events = event_rows
expect { sync.sync! }.not_to change(PostVersion, :count)
expect(event_rows).to eq(events)
end
it 'returns without fetching video details when no video ids are discovered' do
allow(sync).to receive(:query_terms).and_return([])
allow(sync).to receive(:playlist_ids).and_return([])
+15
ファイルの表示
@@ -0,0 +1,15 @@
module EventRecords
# Read the database contract without requiring an application Event model.
class EventRow < ActiveRecord::Base
self.table_name = 'events'
end
def event_rows
EventRow.order(:id).map(&:attributes)
end
def create_event! event_type:, created_by_user: nil
EventRow.create!(event_type:, created_by_user_id: created_by_user&.id,
created_at: Time.current)
end
end
+4 -1
ファイルの表示
@@ -3,11 +3,13 @@ require 'cgi'
# SQL fixtures use the migration contract without inventing application models.
# Include explicitly; these helpers must not affect unrelated examples.
module TagGroupRecords
include EventRecords
GROUP_TABLES = [
'tag_groups', 'tag_group_tags', 'tag_group_groups',
'tag_group_placements', 'tag_group_versions'].freeze
WRITE_TABLES = GROUP_TABLES + [
'tag_names', 'tag_description_versions',
'events', 'tag_names', 'tag_description_versions',
'tag_descriptions']
def group_connection = ApplicationRecord.connection
@@ -114,6 +116,7 @@ module TagGroupRecords
group_id = insert_group_row('tag_groups', attributes)
insert_group_row('tag_group_versions', {
tag_group_id: group_id, version_no: 1, event_type: 'create',
event_id: create_event!(event_type: 'tag_groups.create', created_by_user: user).id,
name:, description:, members: members.to_json, placements: placements.to_json,
created_by_user_id: user.id, created_at: now })
members.each do |member|
+43 -14
ファイルの表示
@@ -174,20 +174,20 @@ RSpec.describe 'nico:sync' do
def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
PostVersion.create!(
post: post,
version_no: version_no,
event_type: event_type,
title: post.title,
url: post.url,
thumbnail_base: post.thumbnail_base,
tags: snapshot_tags(post),
tags_json: post.snapshot_tags_json,
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
original_created_from: post.original_created_from,
original_created_before: post.original_created_before,
created_at: Time.current,
created_by_user: created_by_user
)
event_id: create_event!(event_type: 'unknown').id,
post: post,
version_no: version_no,
event_type: event_type,
title: post.title,
url: post.url,
thumbnail_base: post.thumbnail_base,
tags: snapshot_tags(post),
tags_json: post.snapshot_tags_json,
parent_post_ids: post.snapshot_parent_post_ids.join(' '),
original_created_from: post.original_created_from,
original_created_before: post.original_created_before,
created_at: Time.current,
created_by_user: created_by_user)
end
it '新規 post 作成時に version 1 を作る' do
@@ -209,6 +209,7 @@ RSpec.describe 'nico:sync' do
expect {
run_rake_task('nico:sync')
}.to change(PostVersion, :count).by(1)
.and change { event_rows.length }.by(1)
post = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm9')
version = post.post_versions.order(:version_no).last
@@ -217,6 +218,32 @@ RSpec.describe 'nico:sync' do
expect(version.event_type).to eq('create')
expect(version.created_by_user).to be_nil
expect(version.tags).to eq(snapshot_tags(post.reload))
event = event_rows.last
expect(event).to include('event_type' => 'posts.sync', 'created_by_user_id' => nil)
expect(version.event_id).to eq(event.fetch('id'))
end
it 'groups created and updated post histories into one sync event' do
existing = create(:post, title: 'old', url: 'https://www.nicovideo.jp/watch/sm9')
stub_python([
{ 'code' => 'sm9', 'title' => 'updated', 'tags' => [] },
{ 'code' => 'sm10', 'title' => 'created', 'tags' => [] }])
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
previous_post_ids = PostVersion.pluck(:id)
previous_tag_ids = TagVersion.pluck(:id)
expect { run_rake_task('nico:sync') }.to change { event_rows.length }.by(1)
event = event_rows.last
expect(event).to include('event_type' => 'posts.sync', 'created_by_user_id' => nil)
created = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm10')
versions = PostVersion.where.not(id: previous_post_ids)
expect(versions.pluck(:post_id).uniq).to contain_exactly(existing.id, created.id)
expect(versions.pluck(:event_type)).to include('create', 'update')
expect(versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
tag_versions = TagVersion.where.not(id: previous_tag_ids)
expect(tag_versions).not_to be_empty
expect(tag_versions.pluck(:event_id).uniq).to eq([event.fetch('id')])
end
it '既存 post の内容または tags が変わったとき update version を作る' do
@@ -282,6 +309,7 @@ RSpec.describe 'nico:sync' do
}])
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
events = event_rows
expect {
run_rake_task('nico:sync')
@@ -291,6 +319,7 @@ RSpec.describe 'nico:sync' do
expect(version.version_no).to eq(1)
expect(version.event_type).to eq('create')
expect(version.tags).to eq(snapshot_tags(post.reload))
expect(event_rows).to eq(events)
end
it '新規 nico tag に nico tag version を作る' do
+1 -2
ファイルの表示
@@ -379,8 +379,7 @@ const RoutedApp = ({ locales }: { locales: AvailableLocale[] }) => {
<PageHead>
{robots != null && <meta name="robots" content={robots}/>}
</PageHead>
<UnsavedChangesGuardProvider
draftScope={user == null ? '' : `${user.id}:${user.role}`}>
<UnsavedChangesGuardProvider>
<KeyboardShortcutsProvider>
<MotionConfig
reducedMotion={
+1 -22
ファイルの表示
@@ -1,5 +1,5 @@
import { fireEvent, screen, waitFor } from '@testing-library/react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { describe, expect, it, vi } from 'vitest'
import { textContentOf } from '@/test/text'
import PostEditForm from '@/components/PostEditForm'
@@ -29,27 +29,6 @@ vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({
}))
describe ('PostEditForm', () => {
beforeEach (() => vi.clearAllMocks ())
it ('submits restored edits against their original version', async () => {
const post = buildPost ({ id: 8, versionNo: 4 })
sessionStorage.setItem ('session-draft:1:anonymous:post:8:ja', JSON.stringify ({
baseVersionNo: 3, title: 'restored title', tags: 'テストタグ', duration: '',
parentPostIds: '', originalCreatedFrom: null, originalCreatedBefore: null }))
postsApi.updatePost.mockResolvedValueOnce ({ ...post, versionNo: 5 })
render (<PostEditForm post={post} onSave={vi.fn ()}/>)
expect (screen.getByDisplayValue ('restored title')).toBeInTheDocument ()
fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
await waitFor (() => {
expect (postsApi.updatePost).toHaveBeenCalledWith (
expect.objectContaining ({ title: 'restored title' }),
{ baseVersionNo: 3 }, 'ja')
})
expect (sessionStorage.getItem ('session-draft:1:anonymous:post:8:ja')).toBeNull ()
})
it ('submits edited post fields with the current base version', async () => {
const onSave = vi.fn ()
const post = buildPost ({
+24 -21
ファイルの表示
@@ -1,6 +1,5 @@
import { useMemo, useState } from 'react'
import { useEffect, useMemo, useState } from 'react'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
import FieldError from '@/components/common/FieldError'
@@ -57,17 +56,17 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
const locale = useLocale ()
const { label } = useUITranslation ('posts')
const [disabled, setDisabled] = useState (false)
const [duration, setDuration] = useState<string> (videoMsToDurationValue (post.videoMs))
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<PostFormField> ()
const { draft, setField, clearDraft } = useSessionDraft (`post:${post.id}:${locale}`, {
baseVersionNo: post.versionNo,
duration: videoMsToDurationValue (post.videoMs),
originalCreatedBefore: post.originalCreatedBefore,
originalCreatedFrom: post.originalCreatedFrom,
parentPostIds: (post.parentPosts ?? []).map (entry => entry.id).join (' '),
tags: tagsToStr (post.tags), title: post.title })
const { baseVersionNo, duration, originalCreatedBefore, originalCreatedFrom,
parentPostIds, tags, title } = draft
const [originalCreatedBefore, setOriginalCreatedBefore] =
useState<string | null> (post.originalCreatedBefore)
const [originalCreatedFrom, setOriginalCreatedFrom] =
useState<string | null> (post.originalCreatedFrom)
const [parentPostIds, setParentPostIds] =
useState ((post.parentPosts ?? []).map (p => p.id).join (' '))
const [tags, setTags] = useState<string> (() => tagsToStr (post.tags))
const [title, setTitle] = useState (post.title)
const videoFlg =
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
@@ -84,7 +83,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
try
{
const data = await updatePost (postData, options, locale)
clearDraft ({ ...draft, baseVersionNo: data.versionNo })
onSave ({ ...post,
versionNo: data.versionNo,
title: data.title,
@@ -134,7 +132,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore },
{ baseVersionNo, merge: true })
{ baseVersionNo: post.versionNo, merge: true })
return
}
@@ -143,7 +141,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore },
{ baseVersionNo, force: true })
{ baseVersionNo: post.versionNo, force: true })
return
}
}
@@ -158,7 +156,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore },
{ baseVersionNo })
{ baseVersionNo: post.versionNo })
}
finally
{
@@ -166,6 +164,11 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
}
}
useEffect (() => {
setTags (tagsToStr (post.tags))
setDuration (videoMsToDurationValue (post.videoMs))
}, [post])
return (
<form onSubmit={handleSubmit} className="max-w-xl pt-2 space-y-4">
<FieldError messages={baseErrors}/>
@@ -174,28 +177,28 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
label={label ('shared:labels.title')}
value={title ?? ''}
disabled={disabled}
onChange={value => setField ('title', value)}/>
onChange={setTitle}/>
<PostTextField
label={label ('shared:labels.parentPosts')}
value={parentPostIds}
disabled={disabled}
errors={fieldErrors.parentPostIds}
onChange={value => setField ('parentPostIds', value)}/>
onChange={setParentPostIds}/>
<PostTagsField
disabled={disabled}
tags={tags}
setTags={value => setField ('tags', value)}
setTags={setTags}
errors={fieldErrors.tags}/>
{/* オリジナルの作成日時 */}
<PostOriginalCreatedTimeField
disabled={disabled}
originalCreatedFrom={originalCreatedFrom}
setOriginalCreatedFrom={value => setField ('originalCreatedFrom', value)}
setOriginalCreatedFrom={setOriginalCreatedFrom}
originalCreatedBefore={originalCreatedBefore}
setOriginalCreatedBefore={value => setField ('originalCreatedBefore', value)}
setOriginalCreatedBefore={setOriginalCreatedBefore}
errors={groupedMessages (
fieldErrors.originalCreatedAt,
fieldErrors.originalCreatedFrom,
@@ -206,7 +209,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
value={duration}
disabled={disabled}
errors={fieldErrors.videoMs}
onChange={value => setField ('duration', value)}/>)}
onChange={setDuration}/>)}
{/* 送信 */}
<Button type="submit" disabled={disabled}>
+2 -18
ファイルの表示
@@ -1,25 +1,9 @@
import { fireEvent, render, screen, waitFor } from '@testing-library/react'
import { describe, expect, it, vi } from 'vitest'
import { fireEvent, render, screen } from '@testing-library/react'
import { describe, expect, it } from 'vitest'
import TabGroup, { Tab } from '@/components/common/TabGroup'
describe ('TabGroup', () => {
it ('waits for approval and retains the current tab after cancellation', async () => {
const onBeforeChange = vi.fn ().mockResolvedValueOnce (false).mockResolvedValueOnce (true)
render (
<TabGroup onBeforeChange={onBeforeChange}>
<Tab name="A">Alpha</Tab>
<Tab name="B">Beta</Tab>
</TabGroup>)
fireEvent.click (screen.getByText ('B'))
await waitFor (() => expect (onBeforeChange).toHaveBeenCalledTimes (1))
expect (screen.getByText ('Alpha')).toBeInTheDocument ()
fireEvent.click (screen.getByText ('B'))
await waitFor (() => expect (screen.getByText ('Beta')).toBeInTheDocument ())
})
it ('uses the init tab and switches tabs when clicked', () => {
render (
<TabGroup>
+3 -5
ファイルの表示
@@ -10,12 +10,12 @@ type TabProps = { name: React.ReactNode
type Props = {
children: React.ReactNode
rightAddon?: React.ReactNode
onBeforeChange?: () => boolean | Promise<boolean> }
}
export const Tab = ({ children }: TabProps) => <>{children}</>
const TabGroup: FC<Props> = ({ children, rightAddon, onBeforeChange }) => {
const TabGroup: FC<Props> = ({ children, rightAddon }) => {
const tabs = React.Children.toArray (children) as React.ReactElement<TabProps>[]
const [current, setCurrent] = useState<number> (() => {
@@ -36,9 +36,7 @@ const TabGroup: FC<Props> = ({ children, rightAddon, onBeforeChange }) => {
'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
i === current && 'font-bold',
)}
onClick={async () => {
if (i === current) return
if (onBeforeChange != null && !(await onBeforeChange ())) return
onClick={() => {
setCurrent (i)
}}>
{tab.props.name}
+1 -14
ファイルの表示
@@ -1,4 +1,4 @@
import { act, fireEvent, screen, waitFor } from '@testing-library/react'
import { act, screen, waitFor } from '@testing-library/react'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import PostImportRowForm from '@/components/posts/import/PostImportRowForm'
@@ -22,19 +22,6 @@ describe ('PostImportRowForm', () => {
api.apiGet.mockResolvedValue (new Blob (['img'], { type: 'image/png' }))
})
it ('restores pending row edits when the editor remounts', () => {
const row = buildPostImportRow ({ attributes: { title: 'original' } })
const controls: DialogueFormControls = {
close: vi.fn (), confirm: vi.fn (), setActions: vi.fn () }
const first = render (
<PostImportRowForm row={row} controls={controls} onSave={vi.fn ()}/>)
fireEvent.change (screen.getByDisplayValue ('original'), { target: { value: 'row draft' } })
first.unmount ()
render (<PostImportRowForm row={row} controls={controls} onSave={vi.fn ()}/>)
expect (screen.getByDisplayValue ('row draft')).toBeInTheDocument ()
})
it ('resets only the draft, then saves with resetRequested', async () => {
const row = buildPostImportRow ()
row.attributes.title = 'manual title'
+9 -20
ファイルの表示
@@ -8,11 +8,10 @@ import PostTextField from '@/components/posts/PostTextField'
import PostImportThumbnailPreview from '@/components/posts/import/PostImportThumbnailPreview'
import { hasThumbnailBaseValue, hasVideoTag } from '@/lib/postImportRows'
import { renderPostImportMessage } from '@/components/posts/import/postImportRowStatus'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
import type { FC, ReactNode, SetStateAction } from 'react'
import type { FC, ReactNode } from 'react'
import type { DialogueFormControls } from '@/lib/dialogues/useDialogue'
import type { PostImportEditableDraft, PostImportRow } from '@/lib/postImportTypes'
@@ -22,7 +21,6 @@ type Draft = PostImportEditableDraft
type Props = {
row: PostImportRow
controls: DialogueFormControls
onDirtyStateChange?: (dirty: boolean, discard: () => void) => void
onSave: (args: { draft: Draft
resetRequested: boolean }) => Promise<{
saved: boolean
@@ -98,7 +96,6 @@ const thumbnailWarnings = (
const PostImportRowForm: FC<Props> = (
{ row,
controls,
onDirtyStateChange,
onSave },
) => {
const locale = useLocale ()
@@ -106,26 +103,21 @@ const PostImportRowForm: FC<Props> = (
const groupedMessages = (...values: (string[] | undefined)[]): ReactNode[] =>
[...new Set (values.flatMap (value => value ?? []))]
.map (value => renderPostImportMessage (value, locale))
const { draft: state, setField, clearDraft, discardDraft, dirty } = useSessionDraft (
`post-import:row:${row.sourceRow}:${row.resetSnapshot.url}`,
{ value: buildDraft (row), resetRequested: false })
const { value: draft, resetRequested } = state
const setDraft = useCallback ((value: SetStateAction<Draft>) =>
setField ('value', value), [setField])
const [draft, setDraft] = useState<Draft> (() => buildDraft (row))
const [messageRow, setMessageRow] = useState<PostImportRow | null> (null)
const [saving, setSaving] = useState (false)
const [resetRequested, setResetRequested] = useState (false)
const [committedThumbnailBase, setCommittedThumbnailBase] = useState (
() => String (row.attributes.thumbnailBase ?? ''))
useEffect (() => {
const nextDraft = buildDraft (row)
setDraft (nextDraft)
setMessageRow (null)
setResetRequested (false)
setCommittedThumbnailBase (String (row.attributes.thumbnailBase ?? ''))
}, [row])
useEffect (() => {
onDirtyStateChange?.(dirty, discardDraft)
}, [dirty, discardDraft, onDirtyStateChange])
const displayRow = messageRow ?? row
const resetDraft = useMemo (
() => buildResetDraft (row),
@@ -165,11 +157,11 @@ const PostImportRowForm: FC<Props> = (
return false
setDraft (resetDraft)
setField ('resetRequested', true)
setResetRequested (true)
setMessageRow (null)
setCommittedThumbnailBase (resetDraft.thumbnailBase)
return false
}, [controls, resetDisabled, resetDraft, label, setDraft, setField])
}, [controls, resetDisabled, resetDraft, label])
const save = useCallback (async (): Promise<boolean> => {
setSaving (true)
@@ -177,10 +169,7 @@ const PostImportRowForm: FC<Props> = (
{
const result = await onSave ({ draft, resetRequested })
if (result.saved)
{
clearDraft ()
return true
}
if (result.row != null)
setMessageRow (result.row)
@@ -190,7 +179,7 @@ const PostImportRowForm: FC<Props> = (
{
setSaving (false)
}
}, [clearDraft, draft, onSave, resetRequested])
}, [draft, onSave, resetRequested])
useEffect (() => {
controls.setActions ([{
+61 -8
ファイルの表示
@@ -1,17 +1,72 @@
import { translateUIMessage } from '@/lib/i18n'
import { readSessionStorage, writeSessionStorage, removeSessionStorage }
from '@/lib/sessionStorage'
import type { StorageErrorHandler } from '@/lib/postImportTypes'
const SOURCE_DRAFT_KEY = 'post-import-source-draft'
const readStorage = (
key: string,
onError?: StorageErrorHandler,
): string | null => {
if (typeof window === 'undefined')
return null
try
{
return sessionStorage.getItem (key)
}
catch
{
onError?.(translateUIMessage ('storage.readFailed', 'imports', 'ja').text)
return null
}
}
const writeStorage = (
key: string,
value: string,
onError?: StorageErrorHandler,
): boolean => {
if (typeof window === 'undefined')
return false
try
{
sessionStorage.setItem (key, value)
return true
}
catch
{
onError?.(translateUIMessage ('storage.writeFailed', 'imports', 'ja').text)
return false
}
}
const removeStorage = (
key: string,
onError?: StorageErrorHandler,
) => {
if (typeof window === 'undefined')
return
try
{
sessionStorage.removeItem (key)
}
catch
{
onError?.(translateUIMessage ('storage.clearFailed', 'imports', 'ja').text)
}
}
export const loadPostImportSourceDraft = (
onError?: StorageErrorHandler,
): { source: string } => {
const raw = readSessionStorage (SOURCE_DRAFT_KEY, () =>
onError?.(translateUIMessage ('storage.readFailed', 'imports', 'ja').text))
const raw = readStorage (SOURCE_DRAFT_KEY, onError)
if (raw == null)
return { source: '' }
@@ -31,13 +86,11 @@ export const savePostImportSourceDraft = (
source: string,
onError?: StorageErrorHandler,
): boolean =>
writeSessionStorage (SOURCE_DRAFT_KEY, JSON.stringify ({ source }), () =>
onError?.(translateUIMessage ('storage.writeFailed', 'imports', 'ja').text))
writeStorage (SOURCE_DRAFT_KEY, JSON.stringify ({ source }), onError)
export const clearPostImportSourceDraft = (
onError?: StorageErrorHandler,
) => {
removeSessionStorage (SOURCE_DRAFT_KEY, () =>
onError?.(translateUIMessage ('storage.clearFailed', 'imports', 'ja').text))
removeStorage (SOURCE_DRAFT_KEY, onError)
}
-58
ファイルの表示
@@ -1,58 +0,0 @@
export const readSessionStorage = (
key: string,
onError?: () => void,
): string | null => {
if (typeof window === 'undefined')
return null
try
{
return sessionStorage.getItem (key)
}
catch
{
onError?.()
return null
}
}
export const writeSessionStorage = (
key: string,
value: string,
onError?: () => void,
): boolean => {
if (typeof window === 'undefined')
return false
try
{
sessionStorage.setItem (key, value)
return true
}
catch
{
onError?.()
return false
}
}
export const removeSessionStorage = (
key: string,
onError?: () => void,
) => {
if (typeof window === 'undefined')
return
try
{
sessionStorage.removeItem (key)
}
catch
{
onError?.()
}
}
-249
ファイルの表示
@@ -1,249 +0,0 @@
import { act, fireEvent, screen, waitFor } from '@testing-library/react'
import { renderToString } from 'react-dom/server'
import { createMemoryRouter, RouterProvider, useLocation, useNavigate } from 'react-router-dom'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import DialogueProvider from '@/components/dialogues/DialogueProvider'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { UnsavedChangesGuardProvider } from '@/lib/useUnsavedChangesGuard'
import { renderWithProviders } from '@/test/render'
const storageKey = 'session-draft:1:anonymous:editor'
const initialDraft = { title: 'original', file: null as File | null }
const Editor = (
{ name = 'editor', initial = initialDraft, active = true }: {
name?: string
initial?: typeof initialDraft
active?: boolean },
) => {
const { draft, setField, clearDraft, allowNextNavigation } =
useSessionDraft (name, initial, active)
const location = useLocation ()
const navigate = useNavigate ()
return (
<>
<output aria-label="location">{location.pathname}</output>
<input aria-label="title" value={draft.title}
onChange={event => setField ('title', event.target.value)}/>
<input aria-label="file" type="file"
onChange={event => setField ('file', event.target.files?.[0] ?? null)}/>
<output aria-label="filename">{draft.file?.name}</output>
<button onClick={() => navigate ('/away')}>leave</button>
<button onClick={() => navigate (-1)}>back</button>
<button onClick={() => {
clearDraft ()
allowNextNavigation ()
navigate ('/saved')
}}>save</button>
</>)
}
describe ('session drafts and navigation', () => {
beforeEach (() => sessionStorage.clear ())
it ('does not store pristine input or warn before it changes', () => {
renderWithProviders (<Editor/>, { route: '/editor' })
expect (sessionStorage.getItem (storageKey)).toBeNull ()
fireEvent.click (screen.getByText ('leave'))
expect (screen.getByLabelText ('location')).toHaveTextContent ('/away')
expect (screen.queryByRole ('dialog')).not.toBeInTheDocument ()
})
it ('stores changed input immediately and restores it after remounting', () => {
const first = renderWithProviders (<Editor/>)
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
expect (JSON.parse (sessionStorage.getItem (storageKey)!)).toEqual ({
title: 'draft', file: null })
first.unmount ()
renderWithProviders (<Editor/>)
expect (screen.getByLabelText ('title')).toHaveValue ('draft')
})
it ('preserves input and storage when navigation is cancelled', async () => {
renderWithProviders (<Editor/>, { route: '/editor' })
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
fireEvent.click (screen.getByText ('leave'))
fireEvent.click (await screen.findByRole ('button', { name: '取消' }))
await waitFor (() => expect (screen.queryByRole ('dialog')).not.toBeInTheDocument ())
expect (screen.getByLabelText ('location')).toHaveTextContent ('/editor')
expect (screen.getByLabelText ('title')).toHaveValue ('draft')
expect (sessionStorage.getItem (storageKey)).toContain ('draft')
})
it ('discards both live input and its stored copy after confirmation', async () => {
renderWithProviders (<Editor/>, { route: '/editor' })
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
fireEvent.click (screen.getByText ('leave'))
fireEvent.click (await screen.findByRole ('button', { name: '変更を破棄して移動' }))
await waitFor (() => {
expect (screen.getByLabelText ('location')).toHaveTextContent ('/away')
})
expect (sessionStorage.getItem (storageKey)).toBeNull ()
expect (screen.getByLabelText ('title')).toHaveValue ('original')
})
it ('warns for history navigation too', async () => {
renderWithProviders (<Editor/>, { route: '/editor' })
fireEvent.click (screen.getByText ('leave'))
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
fireEvent.click (screen.getByText ('back'))
expect (await screen.findByRole ('dialog')).toBeInTheDocument ()
expect (screen.getByLabelText ('location')).toHaveTextContent ('/away')
})
it ('clears successful submissions without prompting on their next navigation', () => {
renderWithProviders (<Editor/>, { route: '/editor' })
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'saved' } })
fireEvent.click (screen.getByText ('save'))
expect (screen.getByLabelText ('location')).toHaveTextContent ('/saved')
expect (sessionStorage.getItem (storageKey)).toBeNull ()
expect (screen.queryByRole ('dialog')).not.toBeInTheDocument ()
})
it ('retains drafts until a browser departure actually occurs', () => {
renderWithProviders (<Editor/>)
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
const event = new Event ('beforeunload', { cancelable: true })
window.dispatchEvent (event)
expect (event.defaultPrevented).toBe (true)
expect (sessionStorage.getItem (storageKey)).toContain ('draft')
fireEvent (window, new Event ('pagehide'))
expect (sessionStorage.getItem (storageKey)).toBeNull ()
expect (screen.getByLabelText ('title')).toHaveValue ('original')
})
it ('keeps dirty input across background data refreshes', () => {
const view = renderWithProviders (<Editor/>)
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'my draft' } })
view.rerender (<Editor initial={{ title: 'new server value', file: null }}/>)
expect (screen.getByLabelText ('title')).toHaveValue ('my draft')
})
it ('preserves newly added list rows with an empty nullable selection', () => {
const ListEditor = () => {
const { draft, setDraft } = useSessionDraft ('list', [
{ platform: 'youtube' as string | null, code: 'original' }])
return (
<>
<output aria-label="rows">{JSON.stringify (draft)}</output>
<button onClick={() => setDraft ([...draft, { platform: null, code: '' }])}>
add row
</button>
</>)
}
const first = renderWithProviders (<ListEditor/>)
fireEvent.click (screen.getByText ('add row'))
first.unmount ()
renderWithProviders (<ListEditor/>)
expect (JSON.parse (screen.getByLabelText ('rows').textContent!)).toEqual ([
{ platform: 'youtube', code: 'original' }, { platform: null, code: '' }])
})
it ('does not restore a different resource or an inactive editor', () => {
sessionStorage.setItem (storageKey, JSON.stringify ({ title: 'private draft', file: null }))
const view = renderWithProviders (<Editor name="other"/>)
expect (screen.getByLabelText ('title')).toHaveValue ('original')
view.rerender (<Editor active={false}/>)
expect (screen.getByLabelText ('title')).toHaveValue ('original')
expect (sessionStorage.getItem (storageKey)).toContain ('private draft')
})
it ('keeps drafts separate across accounts and roles', () => {
const first = renderWithProviders (<Editor/>, { draftScope: '1:admin' })
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'admin draft' } })
first.unmount ()
const second = renderWithProviders (<Editor/>, { draftScope: '1:member' })
expect (screen.getByLabelText ('title')).toHaveValue ('original')
second.unmount ()
renderWithProviders (<Editor/>, { draftScope: '2:admin' })
expect (screen.getByLabelText ('title')).toHaveValue ('original')
})
it ('removes the draft after all changes are reverted', () => {
renderWithProviders (<Editor/>)
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'original' } })
expect (sessionStorage.getItem (storageKey)).toBeNull ()
const event = new Event ('beforeunload', { cancelable: true })
window.dispatchEvent (event)
expect (event.defaultPrevented).toBe (false)
})
it.each (['{', 'null', '{"title":12,"file":null}']) (
'ignores corrupt or incompatible storage: %s', raw => {
sessionStorage.setItem (storageKey, raw)
renderWithProviders (<Editor/>)
expect (screen.getByLabelText ('title')).toHaveValue ('original')
expect (sessionStorage.getItem (storageKey)).toBeNull ()
})
it ('continues guarding input when browser storage is unavailable', async () => {
vi.spyOn (Storage.prototype, 'getItem').mockImplementation (() => {
throw new DOMException ('disabled')
})
vi.spyOn (Storage.prototype, 'setItem').mockImplementation (() => {
throw new DOMException ('quota')
})
renderWithProviders (<Editor/>)
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
fireEvent.click (screen.getByText ('leave'))
expect (await screen.findByRole ('dialog')).toBeInTheDocument ()
})
it ('restores selected file contents as well as text', async () => {
const first = renderWithProviders (<Editor/>)
const file = new File (['image data'], 'draft.png', { type: 'image/png' })
fireEvent.change (screen.getByLabelText ('file'), { target: { files: [file] } })
await waitFor (() => {
expect (sessionStorage.getItem (storageKey)).toContain ('draft.png')
})
first.unmount ()
renderWithProviders (<Editor/>)
expect (screen.getByLabelText ('filename')).toHaveTextContent ('draft.png')
expect (JSON.parse (sessionStorage.getItem (storageKey)!).file.data)
.toBe ('data:image/png;base64,aW1hZ2UgZGF0YQ==')
})
it ('does not recreate discarded drafts when a pending file read finishes', async () => {
const pending = { reader: null as FileReader | null }
vi.spyOn (FileReader.prototype, 'readAsDataURL').mockImplementation (function (this: FileReader) {
pending.reader = this
})
renderWithProviders (<Editor/>)
fireEvent.change (screen.getByLabelText ('file'), {
target: { files: [new File (['data'], 'pending.png')] } })
expect (pending.reader).not.toBeNull ()
fireEvent (window, new Event ('pagehide'))
const reader = pending.reader!
Object.defineProperty (reader, 'result', { value: 'data:;base64,ZGF0YQ==' })
await act (async () => {
reader.dispatchEvent (new ProgressEvent ('load'))
})
expect (sessionStorage.getItem (storageKey)).toBeNull ()
})
it ('keeps browser drafts out of the server render and initial hydration markup', () => {
sessionStorage.setItem (storageKey, JSON.stringify ({ title: 'browser draft', file: null }))
const router = createMemoryRouter ([{ path: '*', element: (
<DialogueProvider>
<UnsavedChangesGuardProvider>
<Editor/>
</UnsavedChangesGuardProvider>
</DialogueProvider>) }])
const html = renderToString (<RouterProvider router={router}/>)
expect (html).toContain ('original')
expect (html).not.toContain ('browser draft')
expect (sessionStorage.getItem (storageKey)).toContain ('browser draft')
})
})
-180
ファイルの表示
@@ -1,180 +0,0 @@
import { useCallback, useEffect, useRef, useState } from 'react'
import { readSessionStorage, removeSessionStorage, writeSessionStorage }
from '@/lib/sessionStorage'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import type { SetStateAction } from 'react'
const fileIds = new WeakMap<File, number> ()
let fileSequence = 0
const serialiseIdentity = (value: unknown): string =>
JSON.stringify (value, (_key, item) => {
if (typeof File === 'undefined' || !(item instanceof File)) return item
if (!fileIds.has (item)) fileIds.set (item, ++fileSequence)
return { fileId: fileIds.get (item) }
})
const serialiseDraft = (value: unknown): string | Promise<string> => {
const files: File[] = []
const raw = JSON.stringify (value, (_key, item) => {
if (typeof File === 'undefined' || !(item instanceof File)) return item
return { sessionDraftFileId: files.push (item) - 1 }
})
if (files.length === 0) return raw
return Promise.all (files.map (file => new Promise ((resolve, reject) => {
const reader = new FileReader ()
reader.onerror = () => reject (reader.error)
reader.onload = () => resolve ({
sessionDraftFileFlg: true, name: file.name, type: file.type,
lastModified: file.lastModified, data: reader.result })
reader.readAsDataURL (file)
}))).then (values => JSON.stringify (JSON.parse (raw, (_key, item) =>
item?.sessionDraftFileId == null ? item : values[item.sessionDraftFileId])))
}
const parseDraft = (raw: string): unknown =>
JSON.parse (raw, (_key, value) => {
if (value?.sessionDraftFileFlg !== true) return value
if (typeof value.name !== 'string' || typeof value.type !== 'string'
|| typeof value.lastModified !== 'number' || typeof value.data !== 'string')
throw new Error ('Invalid draft file')
const data = atob (value.data.slice (value.data.indexOf (',') + 1))
const bytes = Uint8Array.from (data, character => character.charCodeAt (0))
return new File ([bytes], value.name, {
type: value.type, lastModified: value.lastModified })
})
const validDraft = (value: unknown, initial: unknown, nullable = false): boolean => {
if (nullable && value == null && typeof initial !== 'object') return true
if (initial == null)
return value == null || typeof value === 'string' || typeof value === 'number'
|| (typeof File !== 'undefined' && value instanceof File)
if (Array.isArray (initial))
return Array.isArray (value)
&& (initial.length === 0 || value.every (item => validDraft (item, initial[0], true)))
if (typeof initial !== 'object') return typeof value === typeof initial
if (value == null || typeof value !== 'object' || Array.isArray (value)) return false
return Object.entries (initial).every (([key, item]) =>
validDraft ((value as Record<string, unknown>)[key], item, nullable))
}
type DraftEntry<T> = {
key: string
initial: string
baseline: T
value: T }
// Server data supplies the baseline; background refetches never replace dirty input.
export const useSessionDraft = <T,> (
name: string,
initial: T,
active = true,
difference?: (value: T, baseline: T) => boolean,
) => {
const { draftScope, allowNextNavigation, confirmNavigation } = useUnsavedChangesGuard ()
const key = `session-draft:1:${draftScope}:${name}`
const available = active && draftScope !== ''
const identity = serialiseIdentity (initial)
const [entry, setEntry] = useState<DraftEntry<T> | null> (null)
const revision = useRef (0)
const current = useRef ({ key, initial, identity, entry })
current.current = { key, initial, identity, entry }
const ready = available && entry?.key === key
const pristine = entry == null
|| serialiseIdentity (entry.value) === serialiseIdentity (entry.baseline)
const draft = ready && !(pristine && entry.initial !== identity) ? entry.value : initial
const dirty = ready && (difference?.(draft, entry.baseline) ?? !pristine)
useEffect (() => {
if (!available) return
const { initial } = current.current
setEntry (previous => {
if (previous?.key === key)
{
if (previous.initial === identity) return previous
const clean = serialiseIdentity (previous.value) === serialiseIdentity (previous.baseline)
return { key, initial: identity, baseline: initial,
value: clean ? initial : previous.value }
}
const raw = readSessionStorage (key)
try
{
const value: unknown = raw == null ? initial : parseDraft (raw)
if (validDraft (value, initial))
return { key, initial: identity, baseline: initial, value: value as T }
}
catch
{
// Corrupt or obsolete browser data must not break the editor.
}
removeSessionStorage (key)
return { key, initial: identity, baseline: initial, value: initial }
})
}, [available, key, identity])
useEffect (() => {
if (!ready) return
const sequence = ++revision.current
if (pristine)
{
removeSessionStorage (key)
return
}
const write = (value: string) => {
if (!writeSessionStorage (key, value)) removeSessionStorage (key)
}
const contents = serialiseDraft (draft)
if (typeof contents === 'string')
write (contents)
else
void contents.then (value => {
if (revision.current === sequence) write (value)
}).catch (() => {
// File failures leave the live input and navigation guard intact.
})
}, [pristine, draft, key, ready])
const setDraft = useCallback ((value: SetStateAction<T>) => {
const source = current.current
setEntry (previous => {
const present = previous?.key === source.key ? previous.value : source.initial
const next =
typeof value === 'function'
? (value as (current: T) => T) (present)
: value
return { key: source.key, initial: source.identity,
baseline: previous?.key === source.key ? previous.baseline : source.initial,
value: next }
})
}, [])
const setField = useCallback (<Key extends keyof T,> (
field: Key,
value: SetStateAction<T[Key]>,
) => setDraft (previous => ({ ...previous,
[field]:
typeof value === 'function'
? (value as (current: T[Key]) => T[Key]) (previous[field])
: value })), [setDraft])
const clearDraft = useCallback ((value?: T) => {
const source = current.current
++revision.current
removeSessionStorage (source.key)
const present = source.entry?.key === source.key ? source.entry.value : source.initial
const next = value ?? present
setEntry ({ key: source.key, initial: source.identity, baseline: next, value: next })
}, [])
const discardDraft = useCallback (() => {
const source = current.current
clearDraft (source.entry?.key === source.key ? source.entry.baseline : source.initial)
}, [clearDraft])
useUnsavedChangesGuard ({ dirty, onDiscard: discardDraft })
return { draft, setDraft, setField, clearDraft, discardDraft, dirty,
ready, allowNextNavigation, confirmNavigation }
}
+2 -17
ファイルの表示
@@ -6,14 +6,11 @@ import { describe, expect, it, vi } from 'vitest'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { renderWithProviders } from '@/test/render'
const GuardHarness = ({ onDiscard }: { onDiscard?: () => void }) => {
const GuardHarness = () => {
const [dirty, setDirty] = useState (true)
const location = useLocation ()
const navigate = useNavigate ()
const discard = () => {
onDiscard?.()
setDirty (false)
}
const discard = vi.fn (() => setDirty (false))
const { allowNextNavigation } = useUnsavedChangesGuard ({
dirty,
onDiscard: discard })
@@ -34,18 +31,6 @@ const GuardHarness = ({ onDiscard }: { onDiscard?: () => void }) => {
}
describe ('useUnsavedChangesGuard', () => {
it ('uses the current discard callback while dirty state stays unchanged', async () => {
const original = vi.fn ()
const current = vi.fn ()
const view = renderWithProviders (<GuardHarness onDiscard={original}/>)
view.rerender (<GuardHarness onDiscard={current}/>)
fireEvent.click (screen.getByRole ('button', { name: 'move' }))
fireEvent.click (await screen.findByRole ('button', { name: '変更を破棄して移動' }))
await waitFor (() => expect (current).toHaveBeenCalledTimes (1))
expect (original).not.toHaveBeenCalled ()
})
it ('blocks route changes and resets a cancelled transition', async () => {
renderWithProviders (<GuardHarness/>, { route: '/current' })
+28 -39
ファイルの表示
@@ -23,20 +23,17 @@ type UseUnsavedChangesGuardOptions = {
onDiscard?: () => void | Promise<void> }
type UnsavedChangesGuardContextValue = {
draftScope: string
hasUnsavedChanges: boolean
registerUnsavedChangesSource: (
source: UnsavedChangesSource,
) => () => void
allowNextNavigation: () => void
confirmNavigation: () => Promise<boolean> }
allowNextNavigation: () => void }
const UnsavedChangesGuardContext =
createContext<UnsavedChangesGuardContextValue | null> (null)
export const UnsavedChangesGuardProvider: FC<PropsWithChildren<{
draftScope?: string }>> = ({ children, draftScope = 'anonymous' }) => {
export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children }) => {
const dialogue = useDialogue ()
const { label } = useUITranslation ('settings')
const sourcesRef = useRef (new Map<symbol, UnsavedChangesSource> ())
@@ -120,12 +117,6 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren<{
}
}, [dialogue, hasUnsavedChanges, label])
const confirmNavigation = useCallback (async (): Promise<boolean> => {
if (!(await confirmDiscardChanges ())) return false
await Promise.all (dirtySources.map (source => source.discard ()))
return true
}, [confirmDiscardChanges, dirtySources])
useEffect (() => {
if (blocker.state !== 'blocked' || handlingBlockedTransitionRef.current)
return
@@ -134,24 +125,33 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren<{
void (async () => {
try
{
const confirmed = await confirmNavigation ()
if (!confirmed) {
const confirmed = await confirmDiscardChanges ()
if (!(confirmed))
{
blocker.reset ()
return
}
let discardResults: Array<void | Promise<void>>
try
{
discardResults = dirtySources.map (source => source.discard ())
}
catch
{
blocker.reset ()
return
}
}
blocker.proceed ()
}
catch
{
blocker.reset ()
blocker.proceed ()
await Promise.allSettled (discardResults)
}
finally
{
handlingBlockedTransitionRef.current = false
}
}) ()
}, [blocker, confirmNavigation])
}, [blocker, confirmDiscardChanges, dirtySources])
useEffect (() => {
if (!(hasUnsavedChanges))
@@ -162,30 +162,21 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren<{
event.returnValue = ''
}
const handlePageHide = () => {
for (const source of sourcesRef.current.values ())
if (source.dirty) void source.discard ()
}
window.addEventListener ('beforeunload', handleBeforeUnload)
window.addEventListener ('pagehide', handlePageHide)
return () => {
window.removeEventListener ('beforeunload', handleBeforeUnload)
window.removeEventListener ('pagehide', handlePageHide)
}
}, [hasUnsavedChanges])
const value = useMemo<UnsavedChangesGuardContextValue> (() => ({
draftScope,
hasUnsavedChanges,
registerUnsavedChangesSource,
allowNextNavigation,
confirmNavigation }), [
}), [
allowNextNavigation,
confirmNavigation,
draftScope,
hasUnsavedChanges,
registerUnsavedChangesSource])
registerUnsavedChangesSource,
])
return (
<UnsavedChangesGuardContext.Provider value={value}>
@@ -203,17 +194,15 @@ export const useUnsavedChangesGuard = (
throw new Error ('UnsavedChangesGuardProvider が必要です.')
const { registerUnsavedChangesSource } = context
const source = useRef (options)
source.current = options
const active = options != null
useEffect (() => {
if (!active) return
if (options == null)
return
return registerUnsavedChangesSource ({
dirty: source.current?.dirty ?? false,
discard: () => source.current?.onDiscard?.() })
}, [active, options?.dirty, registerUnsavedChangesSource])
dirty: options.dirty,
discard: options.onDiscard ?? (() => undefined) })
}, [options?.dirty, options?.onDiscard, registerUnsavedChangesSource])
return context
}
-9
ファイルの表示
@@ -2,7 +2,6 @@ import { animate, motion, useMotionTemplate, useMotionValue } from 'framer-motio
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { useLocale } from '@/lib/useLocale'
import PrefetchLink from '@/components/PrefetchLink'
import MainArea from '@/components/layout/MainArea'
@@ -4191,14 +4190,6 @@ const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
setHistory ([])
}
useUnsavedChangesGuard ({
dirty: !restorePromptVisible && (
(!saved && answers.length > 0)
|| questionSuggestion.trim () !== ''
|| questionSuggestionSelectedId != null
|| (extraQuestionState !== 'saved' && Object.keys (extraQuestionAnswers).length > 0)),
onDiscard: reset })
const continueStoredGame = () => {
setRestorePromptVisible (false)
setPhase (storedGame?.phase ?? 'question')
+4 -5
ファイルの表示
@@ -2,7 +2,6 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'
import { useEffect, useMemo, useState } from 'react'
import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
import TagLink from '@/components/TagLink'
@@ -39,9 +38,8 @@ const DeerjikistDetailPage: FC = () => {
const tag = qData?.tag
const deerjikists = useMemo (() => qData?.deerjikists ?? [], [qData])
const { draft: data, setDraft: setData, clearDraft } = useSessionDraft<
(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> (
`deerjikists:${tagId}:${locale}`, deerjikists, tag != null)
const [data, setData] =
useState<(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> (deerjikists)
const [disabled, setDisabled] = useState (tag == null)
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<DeerjikistFormField> ()
@@ -56,7 +54,7 @@ const DeerjikistDetailPage: FC = () => {
{
setDisabled (true)
clearDraft (await apiPut<Deerjikist[]> (`/tags/${ id }/deerjikists`, data, { locale }))
setData (await apiPut<Deerjikist[]> (`/tags/${ id }/deerjikists`, data, { locale }))
qc.invalidateQueries ({ queryKey: tagsKeys.root })
toast ({ description: label ('messages.updated') })
@@ -80,6 +78,7 @@ const DeerjikistDetailPage: FC = () => {
return
}
setData (deerjikists)
setDisabled (false)
}, [tag, deerjikists])
+27 -25
ファイルの表示
@@ -2,7 +2,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useEffect, useState } from 'react'
import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import TagLink from '@/components/TagLink'
import WikiBody from '@/components/WikiBody'
@@ -41,23 +40,12 @@ const MaterialDetailPage: FC = () => {
queryFn: () => fetchMaterial (id ?? '', locale),
enabled: id != null })
const { draft, setField, clearDraft, confirmNavigation } =
useSessionDraft (`material:${id}:${locale}`, {
tag: material?.tag?.name ?? '', url: material?.url ?? '',
exportPath: material?.exportPaths.legacyDrive ?? '', file: null as File | null },
material != null)
const { tag, url, exportPath, file } = draft
const [filePreview, setFilePreview] = useState ('')
useEffect (() => {
const preview =
file == null
? (material?.contentType != null ? material.file ?? '' : '')
: URL.createObjectURL (file)
setFilePreview (preview)
return () => {
if (file != null) URL.revokeObjectURL (preview)
}
}, [file, material?.contentType, material?.file])
const [exportPath, setExportPath] = useState (material?.exportPaths.legacyDrive ?? '')
const [file, setFile] = useState<File | null> (null)
const [filePreview, setFilePreview] = useState (
material?.contentType != null ? material.file ?? '' : '')
const [tag, setTag] = useState (material?.tag?.name ?? '')
const [url, setURL] = useState (material?.url ?? '')
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<MaterialFormField> ()
@@ -65,6 +53,20 @@ const MaterialDetailPage: FC = () => {
? material.tag?.name ?? message ('unnamed', { id: material.id }).text
: ''
useEffect (() => {
if (!(material))
return
setTag (material.tag?.name ?? '')
setURL (material.url ?? '')
setExportPath (material.exportPaths.legacyDrive ?? '')
if (material.file && material.contentType)
{
setFilePreview (material.file)
setFile (null)
}
}, [material])
const invalidateMaterialQueries = async () => {
await qc.invalidateQueries ({ queryKey: materialsKeys.root })
}
@@ -83,8 +85,6 @@ const MaterialDetailPage: FC = () => {
return await updateMaterial (id ?? '', formData, locale)
},
onSuccess: async data => {
clearDraft ({ tag: data.tag?.name ?? '', url: data.url ?? '',
exportPath: data.exportPaths.legacyDrive ?? '', file: null })
qc.setQueryData (materialsKeys.show (id ?? '', locale), data)
await invalidateMaterialQueries ()
toast ({ title: label ('updated') })
@@ -133,7 +133,7 @@ const MaterialDetailPage: FC = () => {
|| (/audio\/.*/.test (material.contentType) && (
<audio src={material.file} controls/>)))}
<TabGroup onBeforeChange={confirmNavigation}>
<TabGroup>
{material.tag && (
<Tab name={label ('navigation:wiki')}>
<WikiBody
@@ -152,7 +152,7 @@ const MaterialDetailPage: FC = () => {
describedBy={describedBy}
invalid={invalid}
value={tag}
setValue={value => setField ('tag', value)}/>)}
setValue={setTag}/>)}
</FormField>
<FormField label={label ('file')} messages={fieldErrors.file}>
@@ -165,7 +165,9 @@ const MaterialDetailPage: FC = () => {
aria-invalid={invalid}
onChange={e => {
const nextFile = e.target.files?.[0]
setField ('file', nextFile ?? null)
setFile (nextFile ?? null)
setFilePreview (
nextFile ? URL.createObjectURL (nextFile) : '')
}}/>
{(file && filePreview) && (
(/image\/.*/.test (file.type) && (
@@ -196,7 +198,7 @@ const MaterialDetailPage: FC = () => {
<input
type="url"
value={url}
onChange={e => setField ('url', e.target.value)}
onChange={e => setURL (e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>)}
@@ -207,7 +209,7 @@ const MaterialDetailPage: FC = () => {
<input
type="text"
value={exportPath}
onChange={e => setField ('exportPath', e.target.value)}
onChange={e => setExportPath (e.target.value)}
placeholder={message ('exportPlaceholder').text}
lang={message ('exportPlaceholder').language}
aria-describedby={describedBy}
+10 -19
ファイルの表示
@@ -1,8 +1,7 @@
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { useEffect, useState } from 'react'
import { useState } from 'react'
import { useLocation } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import FieldError from '@/components/common/FieldError'
import Form from '@/components/common/Form'
@@ -38,18 +37,11 @@ const MaterialNewPage: FC = () => {
const navigate = useLocaleNavigate ()
const { draft, setField, clearDraft, allowNextNavigation } =
useSessionDraft (`material:new:${locale}`, {
tag: tagQuery, url: '', exportPath: '', file: null as File | null })
const { tag, url, exportPath, file } = draft
const [file, setFile] = useState<File | null> (null)
const [filePreview, setFilePreview] = useState ('')
useEffect (() => {
const preview = file == null ? '' : URL.createObjectURL (file)
setFilePreview (preview)
return () => {
if (file != null) URL.revokeObjectURL (preview)
}
}, [file])
const [tag, setTag] = useState (tagQuery)
const [url, setURL] = useState ('')
const [exportPath, setExportPath] = useState ('')
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<MaterialFormField> ()
@@ -67,10 +59,8 @@ const MaterialNewPage: FC = () => {
return await createMaterial (formData, locale)
},
onSuccess: async () => {
clearDraft ()
await qc.invalidateQueries ({ queryKey: materialsKeys.root })
toast ({ title: label ('sent') })
allowNextNavigation ()
navigate (safeReturnTo || '/materials')
},
onError: error => {
@@ -98,7 +88,7 @@ const MaterialNewPage: FC = () => {
describedBy={describedBy}
invalid={invalid}
value={tag}
setValue={value => setField ('tag', value)}/>)}
setValue={setTag}/>)}
</FormField>
{/* ファイル */}
@@ -112,7 +102,8 @@ const MaterialNewPage: FC = () => {
aria-invalid={invalid}
onChange={e => {
const f = e.target.files?.[0]
setField ('file', f ?? null)
setFile (f ?? null)
setFilePreview (f ? URL.createObjectURL (f) : '')
}}/>
{(file && filePreview) && (
(/image\/.*/.test (file.type) && (
@@ -144,7 +135,7 @@ const MaterialNewPage: FC = () => {
<input
type="url"
value={url}
onChange={e => setField ('url', e.target.value)}
onChange={e => setURL (e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>)}
@@ -157,7 +148,7 @@ const MaterialNewPage: FC = () => {
<input
type="text"
value={exportPath}
onChange={e => setField ('exportPath', e.target.value)}
onChange={e => setExportPath (e.target.value)}
placeholder={message ('exportPlaceholder').text}
lang={message ('exportPlaceholder').language}
aria-describedby={describedBy}
+15 -12
ファイルの表示
@@ -1,6 +1,6 @@
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useState } from 'react'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import FormField from '@/components/common/FormField'
import PageTitle from '@/components/common/PageTitle'
@@ -41,11 +41,12 @@ const MaterialSyncSuppressionsPage: FC = () => {
const locale = useLocale ()
const { message, label } = useUITranslation ('materials')
const qc = useQueryClient ()
const { draft, setField, clearDraft } = useSessionDraft (`material-suppressions:${locale}`, {
sourceKind: 'uri' as MaterialSyncSuppressionSourceKind,
sourceUri: '', drivePath: '', driveFileId: '',
reason: REASONS[0] as MaterialSyncSuppressionReason })
const { sourceKind, sourceUri, drivePath, driveFileId, reason } = draft
const [sourceKind, setSourceKind] =
useState<MaterialSyncSuppressionSourceKind> ('uri')
const [sourceUri, setSourceUri] = useState ('')
const [drivePath, setDrivePath] = useState ('')
const [driveFileId, setDriveFileId] = useState ('')
const [reason, setReason] = useState<MaterialSyncSuppressionReason> (REASONS[0])
const { data, isError, isLoading } = useQuery ({
queryKey: materialsKeys.suppressions (locale),
@@ -62,7 +63,9 @@ const MaterialSyncSuppressionsPage: FC = () => {
onSuccess: async () => {
await qc.invalidateQueries ({ queryKey: materialsKeys.suppressions (locale) })
await qc.invalidateQueries ({ queryKey: materialsKeys.root })
clearDraft ({ ...draft, sourceUri: '', drivePath: '', driveFileId: '' })
setSourceUri ('')
setDrivePath ('')
setDriveFileId ('')
toast ({ title: label ('suppressions.registered') })
},
onError: () => {
@@ -93,7 +96,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
{({ invalid }) => (
<select
value={sourceKind}
onChange={e => setField ('sourceKind',
onChange={e => setSourceKind (
e.target.value as MaterialSyncSuppressionSourceKind)}
className={inputClass (invalid)}>
{Object.entries (SOURCE_KIND_LABELS).map (([value, key]) => (
@@ -108,7 +111,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
<input
type="text"
value={sourceUri}
onChange={e => setField ('sourceUri', e.target.value)}
onChange={e => setSourceUri (e.target.value)}
className={inputClass (invalid)}/>)}
</FormField>
@@ -117,7 +120,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
<input
type="text"
value={drivePath}
onChange={e => setField ('drivePath', e.target.value)}
onChange={e => setDrivePath (e.target.value)}
className={inputClass (invalid)}/>)}
</FormField>
@@ -126,7 +129,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
<input
type="text"
value={driveFileId}
onChange={e => setField ('driveFileId', e.target.value)}
onChange={e => setDriveFileId (e.target.value)}
className={inputClass (invalid)}/>)}
</FormField>
@@ -134,7 +137,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
{({ invalid }) => (
<select
value={reason}
onChange={e => setField ('reason', e.target.value as MaterialSyncSuppressionReason)}
onChange={e => setReason (e.target.value as MaterialSyncSuppressionReason)}
className={inputClass (invalid)}>
{REASONS.map (value => (
<option key={value} value={value}
+1 -4
ファイルの表示
@@ -2,8 +2,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { motion } from 'framer-motion'
import { useEffect, useRef } from 'react'
import { useParams } from 'react-router-dom'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { useLocale } from '@/lib/useLocale'
import PostEditForm from '@/components/PostEditForm'
import PostEmbed from '@/components/PostEmbed'
@@ -35,7 +33,6 @@ const PostDetailPage: FC<Props> = ({ user }) => {
const locale = useLocale ()
const { message, label } = useUITranslation ('posts')
const editable = canEditContent (user)
const { confirmNavigation } = useUnsavedChangesGuard ()
const behaviourSettings = useClientBehaviourSettings ()
const thumbnailMode = behaviourSettings.thumbnailMode ?? 'normal'
const animationMode = behaviourSettings.animation ?? 'normal'
@@ -166,7 +163,7 @@ const PostDetailPage: FC<Props> = ({ user }) => {
className={cn ('text-white', viewedClass)}>
{label (post.viewed ? 'detail.viewed' : 'detail.unviewed')}
</Button>
<TabGroup onBeforeChange={confirmNavigation}>
<TabGroup>
<Tab name={label ('shared:labels.relations')}>
{post.related.length > 0
? <PostList posts={post.related}/>
+40 -32
ファイルの表示
@@ -42,14 +42,13 @@ import {
} from '@/lib/postImportRows'
import { clearPostImportSourceDraft } from '@/lib/postImportStorage'
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { cn } from '@/lib/utils'
import { canEditContent } from '@/lib/users'
import Forbidden from '@/pages/Forbidden'
import type { FC } from 'react'
import type { DialogueFormControls } from '@/lib/dialogues/useDialogue'
import type {
PostImportDisplayTag,
PostImportEditableDraft,
@@ -579,6 +578,26 @@ const ExistingSkippedRows: FC<ExistingSkippedRowsProps> = ({ id, rows }) => {
}
const editableRowDirty = (row: PostImportRow): boolean =>
row.skipReason === 'manual'
|| row.url !== row.resetSnapshot.url
|| String (row.attributes.title ?? '')
!== String (row.resetSnapshot.attributes.title ?? '')
|| String (row.attributes.thumbnailBase ?? '')
!== String (row.resetSnapshot.attributes.thumbnailBase ?? '')
|| String (row.attributes.originalCreatedFrom ?? '')
!== String (row.resetSnapshot.attributes.originalCreatedFrom ?? '')
|| String (row.attributes.originalCreatedBefore ?? '')
!== String (row.resetSnapshot.attributes.originalCreatedBefore ?? '')
|| String (row.attributes.duration ?? '')
!== String (row.resetSnapshot.attributes.duration ?? '')
|| String (row.attributes.tags ?? '')
!== String (row.resetSnapshot.attributes.tags ?? '')
|| String (row.attributes.parentPostIds ?? '')
!== String (row.resetSnapshot.attributes.parentPostIds ?? '')
|| row.thumbnailFile != null
const PostImportReviewPage: FC<Props> = ({ user }) => {
const locale = useLocale ()
const { message, label } = useUITranslation ('imports')
@@ -595,13 +614,8 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
? { duration: .08, ease: 'linear' as const }
: { duration: .2, ease: 'easeOut' as const }
const { draft: rows, setDraft: setRows, clearDraft, allowNextNavigation, ready } =
useSessionDraft (`post-import:review:${location.search}`,
buildInitialRows (parsePostNewReviewUrls (location.search)), editable,
value => value.some (row => row.importStatus !== 'created'
&& row.skipReason !== 'existing'))
const { clearDraft: clearSourceDraft } =
useSessionDraft ('post-import:source', '', editable)
const [rows, setRows] = useState<PostImportRow[] | null> (
() => buildInitialRows (parsePostNewReviewUrls (location.search)))
const [metadataLoading, setMetadataLoading] = useState (false)
const [submitting, setSubmitting] = useState (false)
const [busyRowIds, setBusyRowIds] = useState<Set<number>> (new Set ())
@@ -609,13 +623,22 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
const [showExistingRows, setShowExistingRows] = useState (false)
const rowsRef = useRef<PostImportRow[]> ([])
const metadataSequenceRef = useRef (0)
rowsRef.current = rows
const discardChanges = useCallback (() => undefined, [])
const dirty = useMemo (
() => rows?.some (row => editableRowDirty (row)) ?? false,
[rows],
)
const { allowNextNavigation } = useUnsavedChangesGuard ({
dirty,
onDiscard: discardChanges,
})
const commitRows = useCallback ((nextRows: PostImportRow[]) => {
rowsRef.current = nextRows
setRows (nextRows)
return nextRows
}, [setRows])
}, [])
const updateRows = useCallback ((
updater: (currentRows: PostImportRow[]) => PostImportRow[],
@@ -631,18 +654,17 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
[])
const finishImport = useCallback (() => {
clearDraft ()
clearSourceDraft ('')
allowNextNavigation ()
clearPostImportSourceDraft (message =>
toast ({ title: label ('review.clearFailed'),
description: renderPostImportMessage (message, locale) }))
allowNextNavigation ()
navigate ('/posts')
}, [allowNextNavigation, clearDraft, clearSourceDraft, navigate, label, locale])
}, [allowNextNavigation, navigate, label, locale])
useEffect (() => {
if (!ready) return
const initialRows = rowsRef.current
const urls = parsePostNewReviewUrls (location.search)
const initialRows = buildInitialRows (urls)
commitRows (initialRows)
let active = true
const sequence = ++metadataSequenceRef.current
@@ -756,7 +778,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
active = false
controllers.forEach (controller => controller.abort ())
}
}, [currentRowBySource, location.search, updateRows, locale, ready])
}, [commitRows, currentRowBySource, location.search, updateRows, locale])
useEffect (() => {
if (editingRow == null || resultRepairMode (rowsRef.current) !== 'failed')
@@ -902,9 +924,6 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
}
const openEditingDialogue = async (row: PostImportRow) => {
const draftState = { dirty: false, discard: () => { },
confirm: null as null | DialogueFormControls['confirm'] }
const saveRowDraft = (
{ draft, resetRequested }: {
draft: PostImportEditableDraft
@@ -915,23 +934,12 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
await dialogue.form ({
title: label ('review.editPost'),
cancelText: label ('shared:actions.cancel'),
onCancel: async () => !draftState.dirty
|| (await draftState.confirm?.({
title: label ('settings:unsaved.leavePage'),
confirmText: label ('settings:unsaved.discardAndMove'),
cancelText: label ('shared:actions.cancel'), variant: 'danger' })) === true,
size: 'large',
body: controls => (
<PostImportRowForm
row={row}
controls={controls}
onDirtyStateChange={(dirty, discard) => {
draftState.dirty = dirty
draftState.discard = discard
draftState.confirm = controls.confirm
}}
onSave={saveRowDraft}/>) })
draftState.discard ()
}
const editRow = async (row: PostImportRow) => {
+39 -5
ファイルの表示
@@ -1,7 +1,6 @@
import { useState } from 'react'
import { useEffect, useRef, useState } from 'react'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
import { renderPostImportMessage } from '@/components/posts/import/postImportRowStatus'
@@ -23,6 +22,10 @@ import {
extractImportSourceUrls,
validateImportSource,
} from '@/lib/postImportSourceValidation'
import {
loadPostImportSourceDraft,
savePostImportSourceDraft,
} from '@/lib/postImportStorage'
import { canEditContent } from '@/lib/users'
import Forbidden from '@/pages/Forbidden'
@@ -42,11 +45,12 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
const { message: uiMessage, label } = useUITranslation ('imports')
const editable = canEditContent (user)
const navigate = useLocaleNavigate ()
const { draft: source, setDraft: setSource, allowNextNavigation } =
useSessionDraft ('post-import:source', '', editable)
const [source, setSource] = useState ('')
const [loading, setLoading] = useState (false)
const [sourceIssues, setSourceIssues] = useState<ReturnType<typeof validateImportSource>> ([])
const [sourceError, setSourceError] = useState<string | null> (null)
const saveTimer = useRef<number | null> (null)
const editedRef = useRef (false)
const lineCount = countImportSourceLines (source)
const sourceUrls = extractImportSourceUrls (source)
@@ -58,6 +62,36 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
.filter (value => value != null)
.join (' ')
useEffect (() => {
const draft = loadPostImportSourceDraft (message =>
toast ({ title: label ('source.restoreFailed'),
description: renderPostImportMessage (message, locale) }))
if (!(editedRef.current))
{
setSource (current =>
current === ''
? draft.source
: current)
}
}, [label, locale])
useEffect (() => {
if (saveTimer.current != null)
window.clearTimeout (saveTimer.current)
saveTimer.current = window.setTimeout (() => {
savePostImportSourceDraft (source, message =>
toast ({ title: label ('source.saveFailed'),
description: renderPostImportMessage (message, locale) }))
}, 300)
return () => {
if (saveTimer.current != null)
window.clearTimeout (saveTimer.current)
}
}, [source, label, locale])
const preview = async () => {
if (lineCount === 0)
{
@@ -81,7 +115,6 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
setSourceError (null)
try
{
allowNextNavigation ()
navigate (buildPostNewReviewPath (sourceUrls))
}
finally
@@ -114,6 +147,7 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
description: renderPostImportMessage (message, locale) }))
}}
onChange={ev => {
editedRef.current = true
setSource (ev.target.value)
setSourceError (null)
setSourceIssues ([])
+21 -19
ファイルの表示
@@ -3,7 +3,6 @@ import { Check, LoaderCircle, Pencil, X } from 'lucide-react'
import { Fragment, useEffect, useMemo, useState } from 'react'
import { useLocation } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import TagLink from '@/components/TagLink'
import SortHeader from '@/components/SortHeader'
@@ -28,7 +27,7 @@ import { useUITranslation } from '@/lib/useUITranslation'
import { translateUIMessage } from '@/lib/i18n'
import { canEditContent } from '@/lib/users'
import type { FC, FormEvent, SetStateAction } from 'react'
import type { FC, FormEvent } from 'react'
import type { FetchNicoTagsOrder, FetchNicoTagsOrderField, NicoTag, Tag, User } from '@/types'
@@ -62,10 +61,12 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
const qLinkStatus = (query.get ('link_status') || 'all') as LinkStatus
const order = (query.get ('order') || 'updated_at:desc') as FetchNicoTagsOrder
const [editingId, setEditingId] = useState<number | null> (null)
const [errorsByTagId, setErrorsByTagId] = useState<Record<number, string[]>> ({ })
const [linkStatus, setLinkStatus] = useState<LinkStatus> ('all')
const [linkedTag, setLinkedTag] = useState ('')
const [name, setName] = useState ('')
const [rawTags, setRawTags] = useState<Record<number, string>> ({ })
const [savingId, setSavingId] = useState<number | null> (null)
const keys = {
@@ -78,19 +79,6 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
const editable = canEditContent (user)
const totalPages = Math.ceil (count / limit)
const { draft, setField, clearDraft } = useSessionDraft (
`nico-links:${locale}:${location.search}`,
{ editingId: null as number | null, rawTags: { } as Record<number, string> },
editable && data != null, value => {
const tag = nicoTags.find (tag => tag.id === value.editingId)
return tag != null
&& value.rawTags[tag.id] !== tag.linkedTags.map (entry => entry.name).join (' ')
})
const { editingId, rawTags } = draft
const setEditingId = (value: number | null) => setField ('editingId', value)
const setRawTags = (value: SetStateAction<Record<number, string>>) =>
setField ('rawTags', value)
const handleSearch = (e: FormEvent) => {
e.preventDefault ()
@@ -123,14 +111,18 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
variant: 'danger'})))
return
clearDraft ({ editingId: null, rawTags: { } })
setEditingId (tag.id)
setRawTags ({ [tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ') })
setRawTags (rawTags => ({
...rawTags,
[tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')}))
setErrorsByTagId (errors => ({ ...errors, [tag.id]: [] }))
}
const cancelEdit = (tag: NicoTag) => {
clearDraft ({ editingId: null, rawTags: { } })
setEditingId (null)
setRawTags (rawTags => ({
...rawTags,
[tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')}))
setErrorsByTagId (errors => ({ ...errors, [tag.id]: [] }))
}
@@ -144,7 +136,7 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
await apiPut<Tag[]> (`/tags/nico/${ id }`, formData,
{ locale, headers: { 'Content-Type': 'multipart/form-data' } })
setErrorsByTagId (errors => ({ ...errors, [id]: [] }))
clearDraft ({ editingId: null, rawTags: { } })
setEditingId (null)
await queryClient.invalidateQueries ({ queryKey: tagsKeys.nicoRoot })
toast ({ description: label ('nico.updated') })
}
@@ -169,11 +161,21 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
setName (qName)
setLinkedTag (qLinkedTag)
setLinkStatus (qLinkStatus)
setEditingId (null)
document.querySelector ('table')?.scrollIntoView ({
behavior: clientScrollBehaviour (animationMode) })
}, [animationMode, location.search, qLinkedTag, qLinkStatus, qName])
useEffect (() => {
if (!(data))
return
setRawTags (Object.fromEntries (data.tags.map (tag => [
tag.id,
tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')])))
}, [data])
useEffect (() => {
if (isError)
{
+21 -16
ファイルの表示
@@ -2,7 +2,6 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'
import { useEffect, useState } from 'react'
import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import TagLink from '@/components/TagLink'
import FieldError from '@/components/common/FieldError'
@@ -43,12 +42,12 @@ const TagDetailPage: FC = () => {
queryKey: tagKey,
queryFn: () => fetchTag (tagId, locale) })
const { draft, setField, clearDraft } = useSessionDraft (`tag:${tagId}:${locale}`, {
name: tag?.name ?? '', category: (tag?.category ?? 'general') as Category,
aliases: tag?.aliases.join (' ') ?? '',
parentTags: tag?.parents.map (entry => entry.name).join (' ') ?? '',
deprecated: tag?.deprecatedAt != null }, tag != null && tag.category !== 'nico')
const { name, category, aliases, parentTags, deprecated } = draft
const [name, setName] = useState (tag?.name ?? '')
const [category, setCategory] = useState<Category> (tag?.category ?? 'general')
const [aliases, setAliases] = useState (tag?.aliases.join (' ') ?? '')
const [parentTags, setParentTags] = useState (tag?.parents.map (entry => entry.name).join (' ')
?? '')
const [deprecated, setDeprecated] = useState (tag?.deprecatedAt != null)
const [disabled, setDisabled] = useState (tag == null || tag.category === 'nico')
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<TagFormField> ()
@@ -70,10 +69,11 @@ const TagDetailPage: FC = () => {
{
const data = await apiPut<Tag> (`/tags/${ id }`, formData, { locale })
clearDraft ({ name: data.name, category: data.category as Category,
aliases: data.aliases.join (' '),
parentTags: data.parents.map (entry => entry.name).join (' '),
deprecated: data.deprecatedAt != null })
setName (data.name)
setCategory (data.category as Category)
setAliases (data.aliases.join (' '))
setParentTags (data.parents.map (t => t.name).join (' '))
setDeprecated (Boolean (data.deprecatedAt))
qc.invalidateQueries ({ queryKey: postsKeys.root })
qc.invalidateQueries ({ queryKey: tagsKeys.root })
@@ -94,6 +94,11 @@ const TagDetailPage: FC = () => {
return
}
setName (tag.name)
setCategory (tag.category as Category)
setAliases (tag.aliases.join (' '))
setParentTags (tag.parents.map (t => t.name).join (' '))
setDeprecated (Boolean (tag.deprecatedAt))
setDisabled (tag.category === 'nico')
}, [tag])
@@ -124,7 +129,7 @@ const TagDetailPage: FC = () => {
type="text"
disabled={disabled}
value={name}
onChange={e => setField ('name', e.target.value)}
onChange={e => setName (e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>
@@ -137,7 +142,7 @@ const TagDetailPage: FC = () => {
<select
disabled={disabled}
value={category ?? ''}
onChange={e => setField ('category', e.target.value as Category)}
onChange={e => setCategory(e.target.value as Category)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}>
@@ -159,7 +164,7 @@ const TagDetailPage: FC = () => {
type="text"
disabled={disabled}
value={aliases}
onChange={e => setField ('aliases', e.target.value)}
onChange={e => setAliases (e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>
@@ -175,7 +180,7 @@ const TagDetailPage: FC = () => {
type="text"
disabled={disabled}
value={parentTags}
onChange={e => setField ('parentTags', e.target.value)}
onChange={e => setParentTags (e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>
@@ -188,7 +193,7 @@ const TagDetailPage: FC = () => {
type="checkbox"
disabled={disabled}
checked={deprecated}
onChange={e => setField ('deprecated', e.target.checked)}
onChange={e => setDeprecated (e.target.checked)}
aria-describedby={describedBy}
aria-invalid={invalid}/>)}
</FormField>
+2 -4
ファイルの表示
@@ -3,7 +3,6 @@ import { useQuery } from '@tanstack/react-query'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import ErrorScreen from '@/components/ErrorScreen'
import PostEditForm from '@/components/PostEditForm'
@@ -239,8 +238,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
const [rightSidebarWidth, setRightSidebarWidth] = useState (256)
const [sidebarContainerWidth, setSidebarContainerWidth] = useState (0)
const [comments, setComments] = useState<TheatreComment[]> ([])
const { draft: content, setDraft: setContent, clearDraft } =
useSessionDraft (`theatre:${id}:comment:${locale}`, '')
const [content, setContent] = useState ('')
const [editingPost, setEditingPost] = useState<Post | null> (null)
const [loading, setLoading] = useState (false)
const { data: initialTheatre, error: theatreError } = useQuery ({
@@ -622,7 +620,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
setSending (true)
clearValidationErrors ()
await apiPost (`/theatres/${ id }/comments`, { content }, { locale })
clearDraft ('')
setContent ('')
commentsRef.current?.scrollTo ({
top: 0,
behavior: clientScrollBehaviour (animationMode) })
+16 -12
ファイルの表示
@@ -38,7 +38,6 @@ import {
upsertUserThemeSlot,
USER_THEME_SLOT_SELECTIONS,
} from '@/lib/settings'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { useKeyboardShortcutSettings, useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
import { cn, inputClass } from '@/lib/utils'
@@ -673,13 +672,11 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
const location = useLocation ()
const navigate = useLocaleNavigate ()
const dialogue = useDialogue ()
const { registerUnsavedChangesSource, allowNextNavigation } = useUnsavedChangesGuard ()
const { registerUnsavedChangesSource } = useUnsavedChangesGuard ()
const [inheritVsbl, setInheritVsbl] = useState (false)
const [loading, setLoading] = useState (initialSettings == null)
const { draft: name, setDraft: setName, clearDraft: clearNameDraft,
discardDraft: discardNameDraft } =
useSessionDraft ('settings:account', user?.name ?? '', user != null)
const [name, setName] = useState (user?.name ?? '')
const [settingsError, setSettingsError] = useState<string | null> (null)
const [savedThemeMode, setSavedThemeMode] =
useState<ClientThemeMode> (initialSettings?.theme ?? 'system')
@@ -696,9 +693,9 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
const [savedThemeSlots, setSavedThemeSlots] =
useState<UserThemeSlotMap> (() => ensureCompleteThemeSlots (
normaliseUserThemeSlots (initialThemeSlots ?? [])))
const { draft: draftThemeSlots, setDraft: setDraftThemeSlots,
clearDraft: clearThemeDraft } =
useSessionDraft ('settings:theme-slots', savedThemeSlots, user != null && !loading)
const [draftThemeSlots, setDraftThemeSlots] =
useState<UserThemeSlotMap> (() => ensureCompleteThemeSlots (
normaliseUserThemeSlots (initialThemeSlots ?? [])))
const [dirtyStates, setDirtyStates] =
useState<Partial<Record<SettingsTab, SettingsTabDirtyState>>> ({ })
const [userCodeVsbl, setUserCodeVsbl] = useState (false)
@@ -822,7 +819,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
}
const discardAccountChanges = () => {
discardNameDraft ()
setName (savedName)
clearUserValidationErrors ()
}
@@ -901,7 +898,6 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
return
await discardCurrentTabChanges ()
allowNextNavigation ()
applyActiveTab (nextTab)
}
@@ -1061,7 +1057,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
`/users/${ user.id }`, formData,
{ headers: { 'Content-Type': 'multipart/form-data' } })
setUser (currentUser => ({ ...currentUser, ...data }))
clearNameDraft (data.name ?? '')
setName (data.name ?? '')
toast ({ title: label ('account.nameSaved') })
}
catch (submitError)
@@ -1095,7 +1091,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
const completeThemeSlots = ensureCompleteThemeSlots (nextSavedThemeSlots)
setSavedThemeSlots (completeThemeSlots)
clearThemeDraft (completeThemeSlots)
setDraftThemeSlots (completeThemeSlots)
setCachedUserThemeSlots (completeThemeSlots)
applyClientAppearance (completeThemeSlots)
toast ({ title: label ('theme.saved') })
@@ -1111,6 +1107,13 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
discardThemeChanges ()
}
useEffect (() => {
if (!user)
return
setName (user.name ?? '')
}, [user])
useEffect (() => {
if (!(user))
return
@@ -1143,6 +1146,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
setSavedActiveDarkThemeSlotNo (activeDarkThemeSlotNo)
setDraftActiveDarkThemeSlotNo (activeDarkThemeSlotNo)
setSavedThemeSlots (completeThemeSlots)
setDraftThemeSlots (completeThemeSlots)
setCachedUserThemeSlots (completeThemeSlots)
applyThemeAppearanceState ({ themeMode,
activeLightThemeSlotNo,
+1 -30
ファイルの表示
@@ -1,6 +1,6 @@
import { fireEvent, screen, waitFor } from '@testing-library/react'
import { Route, Routes } from 'react-router-dom'
import { beforeEach, describe, expect, it, vi } from 'vitest'
import { describe, expect, it, vi } from 'vitest'
import { textContentOf } from '@/test/text'
import WikiEditPage from '@/pages/wiki/WikiEditPage'
@@ -10,7 +10,6 @@ import { renderWithProviders } from '@/test/render'
const api = vi.hoisted (() => ({
apiGet: vi.fn (),
apiPut: vi.fn (),
isApiError: vi.fn (() => false),
}))
const toastApi = vi.hoisted (() => ({
@@ -40,34 +39,6 @@ const renderPage = (user = buildUser ({ role: 'member' })) =>
)
describe ('WikiEditPage', () => {
beforeEach (() => vi.clearAllMocks ())
it ('restores a draft after the server baseline arrives', async () => {
sessionStorage.setItem ('session-draft:1:anonymous:wiki:ja:9', JSON.stringify ({
title: '入力中の表題', body: '入力中の本文' }))
api.apiGet.mockResolvedValueOnce (buildWikiPage ({ title: '既存', body: '本文' }))
renderPage ()
expect (await screen.findByDisplayValue ('入力中の表題')).toBeInTheDocument ()
expect (screen.getByLabelText ('本文エディタ')).toHaveValue ('入力中の本文')
})
it ('keeps the draft after a rejected submission', async () => {
api.apiGet.mockResolvedValueOnce (buildWikiPage ({ title: '既存', body: '本文' }))
api.apiPut.mockRejectedValueOnce (new Error ('unavailable'))
renderPage ()
fireEvent.change (await screen.findByDisplayValue ('既存'), {
target: { value: '未送信の表題' } })
fireEvent.click (screen.getByRole ('button', { name: '編輯' }))
await waitFor (() => expect (api.apiPut).toHaveBeenCalled ())
expect (screen.getByDisplayValue ('未送信の表題')).toBeInTheDocument ()
expect (sessionStorage.getItem ('session-draft:1:anonymous:wiki:ja:9'))
.toContain ('未送信の表題')
})
it ('blocks guests', () => {
renderPage (buildUser ({ role: 'guest' }))
+15 -10
ファイルの表示
@@ -1,9 +1,9 @@
import { useQuery, useQueryClient } from '@tanstack/react-query'
import MarkdownIt from 'markdown-it'
import { useEffect, useState } from 'react'
import MdEditor from 'react-markdown-editor-lite'
import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
import FieldError from '@/components/common/FieldError'
@@ -52,11 +52,10 @@ const WikiEditPage: FC<Props> = ({ user }) => {
queryKey: wikiKeys.show (id ?? '', { }, locale),
queryFn: () => apiGet<WikiPage> (`/wiki/${ encodeURIComponent (id ?? '') }`, { locale }),
enabled: editable })
const { draft, setField, clearDraft, allowNextNavigation } =
useSessionDraft (`wiki:${source}`, { title: wiki?.title ?? '', body: wiki?.body ?? '' },
editable && wiki != null)
const { title, body } = draft
const pending = loading
const [body, setBody] = useState (wiki?.body ?? '')
const [loadedSource, setLoadedSource] = useState (wiki == null ? '' : source)
const pending = loading || loadedSource !== source
const [title, setTitle] = useState (wiki?.title ?? '')
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<WikiFormField> ()
@@ -78,8 +77,6 @@ const WikiEditPage: FC<Props> = ({ user }) => {
prev == null ? prev : { ...prev, title, body })
qc.invalidateQueries ({ queryKey: wikiKeys.root })
toast ({ title: label ('shared:messages.postSuccess') })
clearDraft ()
allowNextNavigation ()
navigate (`/wiki/${ encodeURIComponent (title) }`)
}
catch (e)
@@ -90,6 +87,14 @@ const WikiEditPage: FC<Props> = ({ user }) => {
}
}
useEffect (() => {
if (!(editable) || wiki == null)
return
setTitle (wiki.title)
setBody (wiki.body)
setLoadedSource (source)
}, [editable, source, wiki])
if (!(editable))
return <Forbidden/>
@@ -109,7 +114,7 @@ const WikiEditPage: FC<Props> = ({ user }) => {
{({ describedBy, invalid }) => (
<input type="text"
value={title}
onChange={e => setField ('title', e.target.value)}
onChange={e => setTitle (e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>)}
@@ -122,7 +127,7 @@ const WikiEditPage: FC<Props> = ({ user }) => {
style={{ height: '500px' }}
config={{ view: FIXED_WIKI_EDITOR_VIEW }}
renderHTML={text => mdParser.render (text)}
onChange={({ text }) => setField ('body', text)}/>)}
onChange={({ text }) => setBody (text)}/>)}
</FormField>
{/* 送信 */}
+5 -8
ファイルの表示
@@ -1,10 +1,10 @@
import { useQueryClient } from '@tanstack/react-query'
import MarkdownIt from 'markdown-it'
import { useState } from 'react'
import MdEditor from 'react-markdown-editor-lite'
import { useLocation } from 'react-router-dom'
import 'react-markdown-editor-lite/lib/index.css'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
import FieldError from '@/components/common/FieldError'
@@ -47,9 +47,8 @@ const WikiNewPage: FC<Props> = ({ user }) => {
const query = new URLSearchParams (location.search)
const titleQuery = query.get ('title') ?? ''
const { draft, setField, clearDraft, allowNextNavigation } =
useSessionDraft (`wiki:new:${locale}`, { title: titleQuery, body: '' }, editable)
const { title, body } = draft
const [title, setTitle] = useState (titleQuery)
const [body, setBody] = useState ('')
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<WikiFormField> ()
@@ -70,8 +69,6 @@ const WikiNewPage: FC<Props> = ({ user }) => {
qc.invalidateQueries ({ queryKey: wikiKeys.root }),
qc.invalidateQueries ({ queryKey: tagsKeys.root })])
toast ({ title: label ('shared:messages.postSuccess') })
clearDraft ()
allowNextNavigation ()
navigate (`/wiki/${ encodeURIComponent (data.title) }`)
}
catch (e)
@@ -98,7 +95,7 @@ const WikiNewPage: FC<Props> = ({ user }) => {
{({ describedBy, invalid }) => (
<input type="text"
value={title}
onChange={e => setField ('title', e.target.value)}
onChange={e => setTitle (e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>)}
@@ -111,7 +108,7 @@ const WikiNewPage: FC<Props> = ({ user }) => {
style={{ height: '500px' }}
config={{ view: FIXED_WIKI_EDITOR_VIEW }}
renderHTML={text => mdParser.render (text)}
onChange={({ text }) => setField ('body', text)}/>)}
onChange={({ text }) => setBody (text)}/>)}
</FormField>
{/* 送信 */}
+4 -5
ファイルの表示
@@ -12,18 +12,17 @@ import type { ReactElement, ReactNode } from 'react'
type Options = {
route?: string
queryClient?: QueryClient
draftScope?: string }
queryClient?: QueryClient }
const TestContentContext = createContext<ReactNode> (null)
const TestRoute = ({ draftScope }: { draftScope?: string }) => {
const TestRoute = () => {
const children = useContext (TestContentContext)
return (
<DialogueProvider>
<UnsavedChangesGuardProvider draftScope={draftScope}>
<UnsavedChangesGuardProvider>
<KeyboardShortcutsProvider>
{children}
</KeyboardShortcutsProvider>
@@ -41,7 +40,7 @@ export const renderWithProviders = (
const Wrapper = ({ children }: { children: ReactNode }) => {
const [router] = useState (() => createMemoryRouter ([{
path: '*',
element: <TestRoute draftScope={options.draftScope}/> }], {
element: <TestRoute/> }], {
initialEntries: [options.route ?? '/'] }))
return (
-1
ファイルの表示
@@ -9,7 +9,6 @@ beforeEach (() => {
afterEach (() => {
cleanup ()
localStorage.clear ()
sessionStorage.clear ()
vi.restoreAllMocks ()
})