コミットを比較

..
1 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker e60c38c6b8 AI: address issue #97 2026-11-17 05:39:53 +09:00
74個のファイルの変更、1003行の追加、1201行の削除
-9
ファイルの表示
@@ -1,9 +0,0 @@
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
+3 -1
ファイルの表示
@@ -11,5 +11,7 @@ class MaterialVersion < ApplicationRecord
belongs_to :parent, class_name: 'Material', optional: true belongs_to :parent, class_name: 'Material', optional: true
belongs_to :updated_by_user, class_name: 'User', optional: true belongs_to :updated_by_user, class_name: 'User', optional: true
def export_paths_hash = export_paths_json || { } def export_paths_hash
export_paths_json || {}
end
end end
-2
ファイルの表示
@@ -19,8 +19,6 @@ module VersionRecord
belongs_to :created_by_user, class_name: 'User', optional: true belongs_to :created_by_user, class_name: 'User', optional: true
belongs_to :event
enum :event_type, event_type_map, prefix: true, validate: true enum :event_type, event_type_map, prefix: true, validate: true
validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 } validates :version_no, presence: true, numericality: { only_integer: true, greater_than: 0 }
+5 -8
ファイルの表示
@@ -1,23 +1,20 @@
class MaterialVersionRecorder < VersionRecorder class MaterialVersionRecorder < VersionRecorder
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
def self.record! material:, event_type:, event:, created_by_user:, file_snapshot: nil def self.record! material:, event_type:, created_by_user:, file_snapshot: nil
new(material:, event_type:, event:, created_by_user:, file_snapshot:).record! new(material:, event_type:, created_by_user:, file_snapshot:).record!
end end
def initialize material:, event_type:, event:, created_by_user:, file_snapshot: nil def initialize material:, event_type:, created_by_user:, file_snapshot: nil
@file_snapshot = file_snapshot @file_snapshot = file_snapshot
super(record: material, event_type:, event:, created_by_user:) super(record: material, event_type:, created_by_user:)
end end
def self.ensure_snapshot! material, created_by_user: def self.ensure_snapshot! material, created_by_user:
return if material.material_versions.exists? return if material.material_versions.exists?
event = Event.create!(event_type: 'materials.create', record!(material:, event_type: :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) created_by_user: material.created_by_user || created_by_user)
end end
+5 -8
ファイルの表示
@@ -1,19 +1,16 @@
class PostVersionRecorder < VersionRecorder class PostVersionRecorder < VersionRecorder
def self.record! post:, event_type:, event:, created_by_user: def self.record! post:, event_type:, created_by_user:
new(post:, event_type:, event:, created_by_user:).record! new(post:, event_type:, created_by_user:).record!
end end
def initialize post:, event_type:, event:, created_by_user: def initialize post:, event_type:, created_by_user:
super(record: post, event_type:, event:, created_by_user:) super(record: post, event_type:, created_by_user:)
end end
def self.ensure_snapshot! post, created_by_user: def self.ensure_snapshot! post, created_by_user:
return if post.post_versions.exists? return if post.post_versions.exists?
event = Event.create!(event_type: 'posts.create', record!(post:, event_type: :create, created_by_user:)
created_by_user:,
created_at: post.created_at)
record!(post:, event_type: :create, event:, created_by_user:)
end end
private private
+4 -4
ファイルの表示
@@ -1,13 +1,13 @@
class TagVersionRecorder < VersionRecorder class TagVersionRecorder < VersionRecorder
def self.record! tag:, event_type:, event:, created_by_user:, **_options def self.record! tag:, event_type:, created_by_user:, **_options
Tag.transaction do Tag.transaction do
SharedResourceIdAllocator.lock_space!(Tag, 'tags') SharedResourceIdAllocator.lock_space!(Tag, 'tags')
new(tag:, event_type:, event:, created_by_user:).record! new(tag:, event_type:, created_by_user:).record!
end end
end end
def initialize tag:, event_type:, event:, created_by_user: def initialize tag:, event_type:, created_by_user:
super(record: tag, event_type:, event:, created_by_user:) super(record: tag, event_type:, created_by_user:)
end end
private private
+3 -5
ファイルの表示
@@ -1,10 +1,9 @@
class VersionRecorder class VersionRecorder
EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze EVENT_TYPES = ['create', 'update', 'discard', 'restore'].freeze
def initialize record:, event_type:, event:, created_by_user: def initialize record:, event_type:, created_by_user:
@record = record @record = record
@event_type = event_type.to_s @event_type = event_type.to_s
@event = event
@created_by_user = created_by_user @created_by_user = created_by_user
validate_event_type! validate_event_type!
@@ -43,9 +42,8 @@ class VersionRecorder
def base_attributes latest def base_attributes latest
{ version_no: (latest&.version_no || 0) + 1, { version_no: (latest&.version_no || 0) + 1,
event_type: @event_type, event_type: @event_type,
event: @event, created_at: Time.current,
created_by_user: @created_by_user, created_by_user: @created_by_user }
created_at: Time.current }
end end
def update_record_version_no! version_no def update_record_version_no! version_no
-19
ファイルの表示
@@ -1,19 +0,0 @@
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
ファイルの表示
@@ -1,207 +0,0 @@
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,21 +48,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.index ["tag_id"], name: "index_deerjikists_on_tag_id" t.index ["tag_id"], name: "index_deerjikists_on_tag_id"
end 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| create_table "external_tags", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.string "platform", limit: 16, null: false t.string "platform", limit: 16, null: false
t.string "name", null: false t.string "name", null: false
@@ -265,10 +250,8 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.string "source_path" t.string "source_path"
t.string "source_file_id" t.string "source_file_id"
t.string "normalized_source_key" 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 ["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 ["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 ["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", "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" t.index ["material_id"], name: "index_material_versions_on_material_id"
@@ -396,12 +379,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.text "parent_post_ids", null: false t.text "parent_post_ids", null: false
t.datetime "original_created_from" t.datetime "original_created_from"
t.datetime "original_created_before" t.datetime "original_created_before"
t.bigint "event_id", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.integer "video_ms" t.integer "video_ms"
t.index ["created_by_user_id"], name: "index_post_versions_on_created_by_user_id" 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", "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 ["post_id"], name: "index_post_versions_on_post_id"
t.index ["video_ms", "post_id"], name: "idx_post_versions_video_ms_post_id" t.index ["video_ms", "post_id"], name: "idx_post_versions_video_ms_post_id"
@@ -466,11 +447,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.text "body", null: false t.text "body", null: false
t.string "source_language_code", limit: 16 t.string "source_language_code", limit: 16
t.integer "source_version_no" t.integer "source_version_no"
t.bigint "event_id", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.index ["created_by_user_id"], name: "index_tag_description_versions_on_created_by_user_id" 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", "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", "source_language_code", "source_version_no"], name: "fk_rails_4f13094dbc"
t.index ["tag_id"], name: "index_tag_description_versions_on_tag_id" t.index ["tag_id"], name: "index_tag_description_versions_on_tag_id"
@@ -553,11 +532,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.text "description" t.text "description"
t.json "members", null: false t.json "members", null: false
t.json "placements", null: false t.json "placements", null: false
t.bigint "event_id", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.index ["created_by_user_id"], name: "index_tag_group_versions_on_created_by_user_id" 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", "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.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" t.check_constraint "`version_no` > 0", name: "chk_tag_group_versions_version_no_positive"
@@ -633,13 +610,11 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
t.text "aliases", null: false t.text "aliases", null: false
t.text "parent_tag_ids", null: false t.text "parent_tag_ids", null: false
t.datetime "deprecated_at" t.datetime "deprecated_at"
t.bigint "event_id", null: false
t.datetime "created_at", null: false t.datetime "created_at", null: false
t.bigint "created_by_user_id" t.bigint "created_by_user_id"
t.json "names", null: false t.json "names", null: false
t.index ["created_at"], name: "index_tag_versions_on_created_at" 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 ["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", "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.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" t.check_constraint "`version_no` > 0", name: "tag_versions_version_no_positive"
@@ -795,7 +770,6 @@ 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_attachments", "active_storage_blobs", column: "blob_id"
add_foreign_key "active_storage_variant_records", "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_ai_runs", "gekanator_question_suggestions"
add_foreign_key "gekanator_games", "posts", column: "correct_post_id" add_foreign_key "gekanator_games", "posts", column: "correct_post_id"
add_foreign_key "gekanator_games", "posts", column: "guessed_post_id" add_foreign_key "gekanator_games", "posts", column: "guessed_post_id"
@@ -817,7 +791,6 @@ 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: "created_by_user_id"
add_foreign_key "material_sync_sources", "users", column: "updated_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_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"
add_foreign_key "material_versions", "materials", column: "parent_id" add_foreign_key "material_versions", "materials", column: "parent_id"
add_foreign_key "material_versions", "users", column: "created_by_user_id" add_foreign_key "material_versions", "users", column: "created_by_user_id"
@@ -839,12 +812,10 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
add_foreign_key "post_tags", "posts" add_foreign_key "post_tags", "posts"
add_foreign_key "post_tags", "tags" add_foreign_key "post_tags", "tags"
add_foreign_key "post_tags", "users", column: "created_user_id" 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", "posts"
add_foreign_key "post_versions", "users", column: "created_by_user_id" add_foreign_key "post_versions", "users", column: "created_by_user_id"
add_foreign_key "posts", "users", column: "uploaded_user_id" add_foreign_key "posts", "users", column: "uploaded_user_id"
add_foreign_key "settings", "users" 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_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", "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"] 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"]
@@ -863,7 +834,6 @@ 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", "tag_groups"
add_foreign_key "tag_group_tags", "tags" add_foreign_key "tag_group_tags", "tags"
add_foreign_key "tag_group_tags", "users", column: "created_by_user_id" 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: "created_by_user_id"
add_foreign_key "tag_groups", "users", column: "updated_by_user_id" add_foreign_key "tag_groups", "users", column: "updated_by_user_id"
add_foreign_key "tag_implications", "tags" add_foreign_key "tag_implications", "tags"
@@ -873,7 +843,6 @@ ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
add_foreign_key "tag_names", "tags" add_foreign_key "tag_names", "tags"
add_foreign_key "tag_similarities", "tags" add_foreign_key "tag_similarities", "tags"
add_foreign_key "tag_similarities", "tags", column: "target_tag_id" 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 "tag_versions", "users", column: "created_by_user_id"
add_foreign_key "theatre_comments", "theatres" add_foreign_key "theatre_comments", "theatres"
add_foreign_key "theatre_comments", "users" add_foreign_key "theatre_comments", "users"
-1
ファイルの表示
@@ -102,7 +102,6 @@ RSpec.describe 'Tag group persistence constraints' do
6.times { nodes = [{ 'tag_id' => tag.id, 'children' => nodes }] } 6.times { nodes = [{ 'tag_id' => tag.id, 'children' => nodes }] }
reject_statement do reject_statement do
insert_group_row('tag_group_versions', { 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: '制約確認', tag_group_id: group_id, version_no: 2, event_type: 'update', name: '制約確認',
members: [{ 'tag_id' => tag.id, 'version_no' => tag.version_no }].to_json, members: [{ 'tag_id' => tag.id, 'version_no' => tag.version_no }].to_json,
placements: nodes.to_json, created_at: Time.current }) placements: nodes.to_json, created_at: Time.current })
-1
ファイルの表示
@@ -10,7 +10,6 @@ RSpec.describe 'TagVersion names database constraint' do
def insert_snapshot!(snapshot) def insert_snapshot!(snapshot)
TagVersion.insert_all!([{ tag_id: tag.id, version_no: 1, event_type: 'create', 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', name: 'snapshot_name', category: 'general',
aliases: '', parent_tag_ids: '', names: snapshot, aliases: '', parent_tag_ids: '', names: snapshot,
created_at: Time.current }]) created_at: Time.current }])
+7 -21
ファイルの表示
@@ -9,9 +9,7 @@ RSpec.describe HistoryAccess do
locale locale
rows = ['ja', 'ain'].flat_map do |language| rows = ['ja', 'ain'].flat_map do |language|
['create', 'discard', 'restore'].each_with_index.map do |event, index| ['create', 'discard', 'restore'].each_with_index.map do |event, index|
TagDescriptionVersion.create!( TagDescriptionVersion.create!(tag_id: tag.id, language_code: language,
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, version_no: index + 1, event_type: language == 'ain' ? 'update' : event,
body: "#{ language } #{ index }", created_at: Time.utc(2024)) body: "#{ language } #{ index }", created_at: Time.utc(2024))
end end
@@ -30,9 +28,7 @@ RSpec.describe HistoryAccess do
public_metadata = described_class.set(user: nil) { described_class.authority } public_metadata = described_class.set(user: nil) { described_class.authority }
admin = create(:user, :admin) admin = create(:user, :admin)
admin_metadata = described_class.set(user: admin) { described_class.authority } admin_metadata = described_class.set(user: admin) { described_class.authority }
TagVersion.create!( TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private',
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'discard', name: 'private',
category: 'general', category: 'general',
names: { ja: { name: 'private', script_code: 'Jpan', names: { ja: { name: 'private', script_code: 'Jpan',
auto_generated: false, aliases: [] } }, auto_generated: false, aliases: [] } },
@@ -56,9 +52,7 @@ RSpec.describe HistoryAccess do
blob = ActiveStorage::Blob.create_before_direct_upload!(filename: 'private.png', blob = ActiveStorage::Blob.create_before_direct_upload!(filename: 'private.png',
byte_size: 1, checksum: Base64.strict_encode64('checksum'), content_type: 'image/png') byte_size: 1, checksum: Base64.strict_encode64('checksum'), content_type: 'image/png')
ActiveStorage::Attachment.create!(name: 'thumbnail', record: post, blob:) ActiveStorage::Attachment.create!(name: 'thumbnail', record: post, blob:)
PostVersion.create!( PostVersion.create!(post:, version_no: 1, event_type: 'discard', url: post.url,
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)) title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
variant = ActiveStorage::VariantRecord.create!(blob:, variation_digest: 'spec-variation') variant = ActiveStorage::VariantRecord.create!(blob:, variation_digest: 'spec-variation')
derived = ActiveStorage::Blob.create_before_direct_upload!(filename: 'derived.png', derived = ActiveStorage::Blob.create_before_direct_upload!(filename: 'derived.png',
@@ -84,9 +78,7 @@ RSpec.describe 'Counts artifact policy and external references' do
it 'does not expose a private linked tag ID through an external history snapshot' do it 'does not expose a private linked tag ID through an external history snapshot' do
tag = create(:tag, primary_name: 'private-linked-name') tag = create(:tag, primary_name: 'private-linked-name')
TagVersion.create!( TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
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), category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024),
names: { ja: { name: 'private-linked-name', script_code: 'Jpan', names: { ja: { name: 'private-linked-name', script_code: 'Jpan',
auto_generated: false, aliases: [] } }) auto_generated: false, aliases: [] } })
@@ -95,9 +87,7 @@ RSpec.describe 'Counts artifact policy and external references' do
linked_tag_ids: tag.id.to_s, linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024)) created_at: Time.utc(2024))
post = create(:post) post = create(:post)
snapshot = PostVersion.create!( snapshot = PostVersion.create!(post:, version_no: 1, event_type: 'create',
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'create',
title: 'external reference', url: post.url, tags: '', title: 'external reference', url: post.url, tags: '',
tags_json: [{ external_tag_id: external.id }], parent_post_ids: '', tags_json: [{ external_tag_id: external.id }], parent_post_ids: '',
created_at: Time.utc(2024, 2)) created_at: Time.utc(2024, 2))
@@ -122,17 +112,13 @@ RSpec.describe 'Counts artifact policy and external references' do
child = create(:tag, primary_name: 'referencing child') child = create(:tag, primary_name: 'referencing child')
[[parent, 'discard', '', 'private parent'], [[parent, 'discard', '', 'private parent'],
[child, 'create', parent.id.to_s, 'referencing child']].each do |tag, event, parents, name| [child, 'create', parent.id.to_s, 'referencing child']].each do |tag, event, parents, name|
TagVersion.create!( TagVersion.create!(tag:, version_no: 1, event_type: event, name:,
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), category: 'general', aliases: '', parent_tag_ids: parents, created_at: Time.utc(2023),
names: { ja: { name:, script_code: 'Jpan', names: { ja: { name:, script_code: 'Jpan',
auto_generated: false, aliases: [] } }) auto_generated: false, aliases: [] } })
end end
post = create(:post) post = create(:post)
row = PostVersion.create!( row = PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'snapshot',
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 1, event_type: 'create', title: 'snapshot',
url: post.url, tags: '', parent_post_ids: '', url: post.url, tags: '', parent_post_ids: '',
tags_json: [{ tag_id: child.id, version_no: 1, name: 'referencing child', sections: [] }], tags_json: [{ tag_id: child.id, version_no: 1, name: 'referencing child', sections: [] }],
created_at: Time.utc(2024)) created_at: Time.utc(2024))
+1 -24
ファイルの表示
@@ -23,22 +23,9 @@ RSpec.describe 'Locale activation', type: :model do
.and_raise('backfill failed') .and_raise('backfill failed')
end 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 it 'rolls back a newly created locale and the preceding generated names' do
locale = build_locale locale = build_locale
fail_second_generation! fail_second_generation!
events = event_rows
expect { locale.save! }.to raise_error('backfill failed') expect { locale.save! }.to raise_error('backfill failed')
@@ -46,7 +33,6 @@ RSpec.describe 'Locale activation', type: :model do
expect(generated_names).to be_empty expect(generated_names).to be_empty
expect(first.reload.name('ja')).to eq('activation_first') expect(first.reload.name('ja')).to eq('activation_first')
expect(second.reload.name('ja')).to eq('activation_second') expect(second.reload.name('ja')).to eq('activation_second')
expect(event_rows).to eq(events)
end end
it 'does not backfill while the locale is inactive' do it 'does not backfill while the locale is inactive' do
@@ -59,14 +45,7 @@ RSpec.describe 'Locale activation', type: :model do
locale = build_locale(deprecated_at: Time.current) locale = build_locale(deprecated_at: Time.current)
locale.save! locale.save!
previous_ids = TagVersion.pluck(:id) locale.update!(deprecated_at: nil)
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.pluck(:tag_id)).to contain_exactly(first.id, second.id)
expect(generated_names).to all(have_attributes( expect(generated_names).to all(have_attributes(
@@ -78,13 +57,11 @@ RSpec.describe 'Locale activation', type: :model do
locale.save! locale.save!
previous_deprecated_at = locale.reload.deprecated_at previous_deprecated_at = locale.reload.deprecated_at
fail_second_generation! fail_second_generation!
events = event_rows
expect { locale.update!(deprecated_at: nil) }.to raise_error('backfill failed') expect { locale.update!(deprecated_at: nil) }.to raise_error('backfill failed')
expect(locale.reload.deprecated_at).to eq(previous_deprecated_at) expect(locale.reload.deprecated_at).to eq(previous_deprecated_at)
expect(generated_names).to be_empty expect(generated_names).to be_empty
expect(event_rows).to eq(events)
end end
it 'preserves a human primary through deactivation and repeated activation' do 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 let!(:post_version) do
PostVersion.create!( PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id, post: post_record,
post: post_record, version_no: 1,
version_no: 1, event_type: 'create',
event_type: 'create', title: post_record.title,
title: post_record.title, url: post_record.url,
url: post_record.url, thumbnail_base: post_record.thumbnail_base,
thumbnail_base: post_record.thumbnail_base, tags: post_record.snapshot_tag_names.join(' '),
tags: post_record.snapshot_tag_names.join(' '), tags_json: post_record.snapshot_tags_json,
tags_json: post_record.snapshot_tags_json, parent_post_ids: post_record.snapshot_parent_post_ids.join(' '),
parent_post_ids: post_record.snapshot_parent_post_ids.join(' '), original_created_from: post_record.original_created_from,
original_created_from: post_record.original_created_from, original_created_before: post_record.original_created_before,
original_created_before: post_record.original_created_before, created_at: Time.current,
created_at: Time.current, created_by_user: nil
created_by_user: nil) )
end end
it 'is read only after create' do it 'is read only after create' do
-27
ファイルの表示
@@ -34,31 +34,6 @@ RSpec.describe TagNameSanitisationRule, type: :model do
described_class.create!(priority: 10, source_pattern: 'foo_', replacement: 'foo') described_class.create!(priority: 10, source_pattern: 'foo_', replacement: 'foo')
end 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| [:primary, :alias].each do |source_kind|
it "keeps the primary identity when a #{ source_kind } collides within its Tag" do it "keeps the primary identity when a #{ source_kind } collides within its Tag" do
tag = create(:tag, primary_name: source_kind == :primary ? 'temporary' : 'foobar') tag = create(:tag, primary_name: source_kind == :primary ? 'temporary' : 'foobar')
@@ -108,7 +83,6 @@ RSpec.describe TagNameSanitisationRule, type: :model do
PostTag.create!(post:, tag: source) PostTag.create!(post:, tag: source)
models = [Tag, TagName, TagVersion, TagDescription, TagDescriptionVersion, PostTag] models = [Tag, TagName, TagVersion, TagDescription, TagDescriptionVersion, PostTag]
snapshots = models.map { |model| model.order(*Array(model.primary_key)).map(&:attributes) } snapshots = models.map { |model| model.order(*Array(model.primary_key)).map(&:attributes) }
events = event_rows
expect { described_class.apply! }.to raise_error(ActiveRecord::RecordInvalid) expect { described_class.apply! }.to raise_error(ActiveRecord::RecordInvalid)
@@ -116,7 +90,6 @@ RSpec.describe TagNameSanitisationRule, type: :model do
model.order(*Array(model.primary_key)).map(&:attributes) model.order(*Array(model.primary_key)).map(&:attributes)
end end
expect(after_state).to eq(snapshots) expect(after_state).to eq(snapshots)
expect(event_rows).to eq(events)
expect(post.reload.tags).to contain_exactly(source) expect(post.reload.tags).to contain_exactly(source)
expect(target.reload.name('ja')).to eq('foobar') expect(target.reload.name('ja')).to eq('foobar')
end 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) def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
PostVersion.create!( PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id, post: post,
post: post, version_no: version_no,
version_no: version_no, event_type: event_type,
event_type: event_type, title: post.title,
title: post.title, url: post.url,
url: post.url, thumbnail_base: post.thumbnail_base,
thumbnail_base: post.thumbnail_base, tags: snapshot_tags(post),
tags: snapshot_tags(post), tags_json: post.snapshot_tags_json,
tags_json: post.snapshot_tags_json, parent_post_ids: post.snapshot_parent_post_ids.join(' '),
parent_post_ids: post.snapshot_parent_post_ids.join(' '), original_created_from: post.original_created_from,
original_created_from: post.original_created_from, original_created_before: post.original_created_before,
original_created_before: post.original_created_before, created_at: Time.current,
created_at: Time.current, created_by_user: created_by_user
created_by_user: created_by_user) )
end end
context 'when post versions are enabled' do context 'when post versions are enabled' do
+22 -24
ファイルの表示
@@ -6,18 +6,17 @@ RSpec.describe VersionRecord, type: :model do
it 'makes TagVersion read only after create' do it 'makes TagVersion read only after create' do
version = TagVersion.create!( version = TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id, tag: tag,
tag: tag, version_no: 1,
version_no: 1, event_type: 'create',
event_type: 'create', name: primary_tag_name_for(tag, 'ja').name,
name: primary_tag_name_for(tag, 'ja').name, category: tag.category,
category: tag.category, aliases: '',
aliases: '', names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
names: { ja: { name: primary_tag_name_for(tag, 'ja').name, script_code: 'Jpan', auto_generated: false, aliases: [] } },
script_code: 'Jpan', auto_generated: false, aliases: [] } }, parent_tag_ids: '',
parent_tag_ids: '', created_at: Time.current,
created_at: Time.current, created_by_user: nil)
created_by_user: nil)
expect { expect {
version.update!(name: 'changed') version.update!(name: 'changed')
@@ -26,18 +25,17 @@ RSpec.describe VersionRecord, type: :model do
it 'prevents TagVersion destroy' do it 'prevents TagVersion destroy' do
version = TagVersion.create!( version = TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id, tag: tag,
tag: tag, version_no: 1,
version_no: 1, event_type: 'create',
event_type: 'create', name: primary_tag_name_for(tag, 'ja').name,
name: primary_tag_name_for(tag, 'ja').name, category: tag.category,
category: tag.category, aliases: '',
aliases: '', names: { ja: { name: primary_tag_name_for(tag, 'ja').name,
names: { ja: { name: primary_tag_name_for(tag, 'ja').name, script_code: 'Jpan', auto_generated: false, aliases: [] } },
script_code: 'Jpan', auto_generated: false, aliases: [] } }, parent_tag_ids: '',
parent_tag_ids: '', created_at: Time.current,
created_at: Time.current, created_by_user: nil)
created_by_user: nil)
expect { expect {
version.destroy! version.destroy!
-1
ファイルの表示
@@ -44,7 +44,6 @@ RSpec.configure do |config|
end end
config.include TestRecords config.include TestRecords
config.include EventRecords
config.include RakeTaskHelper config.include RakeTaskHelper
# FactoryBot の create / create_list を使へるやぅにする # FactoryBot の create / create_list を使へるやぅにする
+1 -3
ファイルの表示
@@ -84,9 +84,7 @@ RSpec.describe 'Counts native GET acknowledgement', type: :request do
expect(response).to have_http_status(:not_found) expect(response).to have_http_status(:not_found)
job, file, attempt = ready_job('json') job, file, attempt = ready_job('json')
record = create(:post) record = create(:post)
PostVersion.create!( PostVersion.create!(post: record, version_no: 1, event_type: 'discard', title: 'private',
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)) url: record.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
get "/counts/export/files/#{ file }", params: { job:, attempt: } get "/counts/export/files/#{ file }", params: { job:, attempt: }
expect(response).to have_http_status(:not_found) expect(response).to have_http_status(:not_found)
+1 -3
ファイルの表示
@@ -8,9 +8,7 @@ RSpec.describe 'History boundaries shared with Counts', type: :request do
before do before do
['create', 'discard'].each_with_index do |event, index| ['create', 'discard'].each_with_index do |event, index|
TagDescriptionVersion.create!( TagDescriptionVersion.create!(tag_id: tag.id, language_code: 'ja',
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', version_no: index + 1, event_type: event, body: 'private body',
created_at: Time.utc(2024)) created_at: Time.utc(2024))
end end
+2 -6
ファイルの表示
@@ -10,16 +10,12 @@ RSpec.describe 'Legacy Counts API', type: :request do
category: 'general', sections: [] } category: 'general', sections: [] }
[1, 2, 3].each do |number| [1, 2, 3].each do |number|
time = Time.utc(2024, number == 3 ? 2 : 1, number, 0, 0) time = Time.utc(2024, number == 3 ? 2 : 1, number, 0, 0)
PostVersion.create!( PostVersion.create!(post:, version_no: number,
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: number,
event_type: number == 1 ? 'create' : 'update', event_type: number == 1 ? 'create' : 'update',
tags: '', url: post.url, title: "Snapshot #{ number }", parent_post_ids: '', tags: '', url: post.url, title: "Snapshot #{ number }", parent_post_ids: '',
tags_json: number == 1 ? [snapshot] : [], tags_json: number == 1 ? [snapshot] : [],
created_by_user: number == 3 ? nil : actor, created_at: time) created_by_user: number == 3 ? nil : actor, created_at: time)
TagVersion.create!( TagVersion.create!(tag:, version_no: number,
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: number,
event_type: number == 1 ? 'create' : 'update', event_type: number == 1 ? 'create' : 'update',
name: 'counts tag', category: 'general', aliases: '', parent_tag_ids: '', name: 'counts tag', category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name: 'counts tag', script_code: 'Jpan', names: { ja: { name: 'counts tag', script_code: 'Jpan',
+9 -27
ファイルの表示
@@ -14,9 +14,7 @@ RSpec.describe 'Counts table API', type: :request do
end end
before do before do
TagVersion.create!( TagVersion.create!(tag:, version_no: 1, event_type: 'create', name: 'alpha',
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'create', name: 'alpha',
category: 'general', aliases: '', parent_tag_ids: '', category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } }, names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2023)) created_at: Time.utc(2023))
@@ -26,9 +24,7 @@ RSpec.describe 'Counts table API', type: :request do
{ tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] }, { tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] },
{ external_tag_id: external.id }] { external_tag_id: external.id }]
[1, 2, 3].each do |number| [1, 2, 3].each do |number|
PostVersion.create!( PostVersion.create!(post: record, version_no: number,
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: number,
event_type: number == 1 ? 'create' : 'update', url: record.url, event_type: number == 1 ? 'create' : 'update', url: record.url,
title: "snapshot #{ number }", tags: '', parent_post_ids: '', title: "snapshot #{ number }", tags: '', parent_post_ids: '',
tags_json: snapshots.first(number == 1 ? 2 : (number == 2 ? 1 : 0)), tags_json: snapshots.first(number == 1 ? 2 : (number == 2 ? 1 : 0)),
@@ -247,9 +243,7 @@ RSpec.describe 'Counts table API', type: :request do
end end
it 'checks the current latest flag beyond the execution timestamp' do it 'checks the current latest flag beyond the execution timestamp' do
PostVersion.create!( PostVersion.create!(post: record, version_no: 4, event_type: 'update',
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: [], url: record.url, title: 'after execution', tags: '', tags_json: [],
parent_post_ids: '', created_at: Time.utc(2025, 2, 1)) parent_post_ids: '', created_at: Time.utc(2025, 2, 1))
result = query result = query
@@ -303,16 +297,12 @@ RSpec.describe 'Counts table API', type: :request do
tag.tag_names.find_by!(language_code: 'ja', primary_flg: true) tag.tag_names.find_by!(language_code: 'ja', primary_flg: true)
.update!(name: 'renamed-alpha') .update!(name: 'renamed-alpha')
create(:tag_name, :alias, tag:, name: 'alpha-alias') create(:tag_name, :alias, tag:, name: 'alpha-alias')
TagVersion.create!( TagVersion.create!(tag:, version_no: 2, event_type: 'update', name: 'renamed-alpha',
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: '', category: 'general', aliases: 'alpha-alias', parent_tag_ids: '',
names: { ja: { name: 'renamed-alpha', script_code: 'Jpan', auto_generated: false, names: { ja: { name: 'renamed-alpha', script_code: 'Jpan', auto_generated: false,
aliases: [{ name: 'alpha-alias', script_code: 'Jpan' }] } }, aliases: [{ name: 'alpha-alias', script_code: 'Jpan' }] } },
created_at: Time.utc(2024, 2, 1)) created_at: Time.utc(2024, 2, 1))
PostVersion.create!( PostVersion.create!(post: record, version_no: 4, event_type: 'update',
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: '', url: record.url, title: 'after rename', tags: '', parent_post_ids: '',
tags_json: [{ tag_id: tag.id, version_no: 2, name: 'renamed-alpha', tags_json: [{ tag_id: tag.id, version_no: 2, name: 'renamed-alpha',
category: 'general', sections: [] }], category: 'general', sections: [] }],
@@ -375,9 +365,7 @@ RSpec.describe 'Counts table API', type: :request do
it 'reports column overflow separately from malformed input' do it 'reports column overflow separately from malformed input' do
101.times do |index| 101.times do |index|
PostVersion.create!( PostVersion.create!(post: record, version_no: index + 4,
event_id: create_event!(event_type: 'unknown').id,
post: record, version_no: index + 4,
event_type: 'update', url: record.url, title: "column #{ index }", event_type: 'update', url: record.url, title: "column #{ index }",
tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3)) tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3))
end end
@@ -421,9 +409,7 @@ RSpec.describe 'Counts table API', type: :request do
sign_in_as(create(:user, role)) if role sign_in_as(create(:user, role)) if role
# Equal timestamps deliberately require version ordering, not a date comparison. # Equal timestamps deliberately require version ordering, not a date comparison.
['discard', 'restore', 'discard', 'restore'].each_with_index do |event, index| ['discard', 'restore', 'discard', 'restore'].each_with_index do |event, index|
PostVersion.create!( PostVersion.create!(post: record, version_no: index + 4, event_type: event,
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', url: record.url, title: event == 'restore' ? 'restored' : 'private snapshot',
tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3)) tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 3))
end end
@@ -451,9 +437,7 @@ RSpec.describe 'Counts table API', type: :request do
end end
it 'does not resolve private condition names even when the result set is empty' do it 'does not resolve private condition names even when the result set is empty' do
TagVersion.create!( TagVersion.create!(tag:, version_no: 2, event_type: 'discard', name: 'secret tag',
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 2, event_type: 'discard', name: 'secret tag',
category: 'general', aliases: '', parent_tag_ids: '', category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name: 'secret tag', script_code: 'Jpan', auto_generated: false, aliases: [] } }, names: { ja: { name: 'secret tag', script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2024, 2)) created_at: Time.utc(2024, 2))
@@ -469,9 +453,7 @@ RSpec.describe 'Counts table API', type: :request do
end end
end end
it 'includes private history in the public timeline without an exclusion count' do it 'includes private history in the public timeline without an exclusion count' do
PostVersion.create!( PostVersion.create!(post: record, version_no: 4, event_type: 'discard', url: record.url,
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: '', title: 'hidden title', tags: '', tags_json: [], parent_post_ids: '',
created_at: Time.utc(2024, 3)) created_at: Time.utc(2024, 3))
result = query(mode: 'summary', rows: 'created_at:month', cols: 'event_type') result = query(mode: 'summary', rows: 'created_at:month', cols: 'event_type')
+1 -40
ファイルの表示
@@ -314,7 +314,6 @@ RSpec.describe 'Materials API', type: :request do
.and change(Tag, :count).by(1) .and change(Tag, :count).by(1)
.and change(TagName, :count).by(1) .and change(TagName, :count).by(1)
.and change(MaterialVersion, :count).by(1) .and change(MaterialVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created) expect(response).to have_http_status(:created)
@@ -326,12 +325,6 @@ RSpec.describe 'Materials API', type: :request do
expect(material.file.attached?).to be(true) expect(material.file.attached?).to be(true)
expect(material.version_no).to eq(1) expect(material.version_no).to eq(1)
expect(material.material_versions.first.event_type).to eq('create') 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_export_items.first.export_path).to eq('伊地知ニジカ/created.png')
expect(material.material_versions.first.export_paths_json).to eq( expect(material.material_versions.first.export_paths_json).to eq(
'legacy_drive' => '伊地知ニジカ/created.png' 'legacy_drive' => '伊地知ニジカ/created.png'
@@ -516,7 +509,6 @@ RSpec.describe 'Materials API', type: :request do
export_paths: { legacy_drive: '伊地知ニジカ/updated.jpg' } export_paths: { legacy_drive: '伊地知ニジカ/updated.jpg' }
} }
end.to change(MaterialVersion, :count).by(2) end.to change(MaterialVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@@ -525,12 +517,6 @@ RSpec.describe 'Materials API', type: :request do
expect(material.tag.category).to eq('material') expect(material.tag.category).to eq('material')
expect(material.url).to eq('https://example.com/updated-source') expect(material.url).to eq('https://example.com/updated-source')
expect(material.updated_by_user).to eq(member_user) 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.attached?).to be(true)
expect(material.file.blob.id).not_to eq(old_blob_id) expect(material.file.blob.id).not_to eq(old_blob_id)
expect(ActiveStorage::Blob.where(id: old_blob_id).exists?).to be(true) expect(ActiveStorage::Blob.where(id: old_blob_id).exists?).to be(true)
@@ -646,7 +632,6 @@ RSpec.describe 'Materials API', type: :request do
MaterialVersionRecorder.record!(material:, event_type: :create, MaterialVersionRecorder.record!(material:, event_type: :create,
created_by_user: member_user) created_by_user: member_user)
TagVersioning.ensure_snapshot!(tag, created_by_user: member_user) TagVersioning.ensure_snapshot!(tag, created_by_user: member_user)
events = event_rows
expect do expect do
put "/materials/#{ material.id }", params: { put "/materials/#{ material.id }", params: {
@@ -658,7 +643,6 @@ RSpec.describe 'Materials API', type: :request do
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(material.reload.version_no).to eq(1) expect(material.reload.version_no).to eq(1)
expect(event_rows).to eq(events)
end end
it 'records update version when only export_path changes' do it 'records update version when only export_path changes' do
@@ -823,12 +807,6 @@ RSpec.describe 'Materials API', type: :request do
it 'creates source suppression as member' do it 'creates source suppression as member' do
sign_in_as(member_user) 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 expect do
post '/materials/suppressions', params: { post '/materials/suppressions', params: {
@@ -837,7 +815,6 @@ RSpec.describe 'Materials API', type: :request do
reason: 'copyright_high_risk' reason: 'copyright_high_risk'
} }
end.to change(MaterialSyncSuppression, :count).by(1) end.to change(MaterialSyncSuppression, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created) expect(response).to have_http_status(:created)
expect(json).to include( expect(json).to include(
@@ -845,14 +822,6 @@ RSpec.describe 'Materials API', type: :request do
'drive_path' => '伊地知ニジカ/危険素材', 'drive_path' => '伊地知ニジカ/危険素材',
'normalized_source_key' => 'google_drive_path_prefix:伊地知ニジカ/危険素材' '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
end end
@@ -891,19 +860,11 @@ RSpec.describe 'Materials API', type: :request do
end end
it 'discards the material and returns 204' do it 'discards the material and returns 204' do
expect { delete "/materials/#{ material.id }" } delete "/materials/#{ material.id }"
.to change { event_rows.length }.by(1)
expect(response).to have_http_status(:no_content) expect(response).to have_http_status(:no_content)
expect(Material.find_by(id: material.id)).to be_nil expect(Material.find_by(id: material.id)).to be_nil
expect(Material.with_discarded.find(material.id)).to be_discarded 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 end
end end
-5
ファイルの表示
@@ -172,7 +172,6 @@ RSpec.describe 'NicoTags', type: :request do
} }
}.to change(TagVersion, :count).by(2) }.to change(TagVersion, :count).by(2)
.and change(NicoTagVersion, :count).by(1) .and change(NicoTagVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@@ -182,10 +181,6 @@ RSpec.describe 'NicoTags', type: :request do
linked_versions = TagVersion.where(tag: [linked_a, linked_b]).order(:tag_id) 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(&:event_type)).to eq(['create', 'create'])
expect(linked_versions.map(&:created_by_user_id)).to all(eq(admin.id)) 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) versions = nico_tag.reload.nico_tag_versions.order(:version_no)
expect(versions.map(&:event_type)).to eq(['create', 'update']) expect(versions.map(&:event_type)).to eq(['create', 'update'])
+16 -39
ファイルの表示
@@ -50,8 +50,6 @@ RSpec.describe 'Posts API', type: :request do
post:, post:,
version_no: 1, version_no: 1,
event_type: 'create', event_type: 'create',
event_id: create_event!(
event_type: 'posts.create', created_by_user: post.uploaded_user).id,
title: post.title, title: post.title,
url: post.url, url: post.url,
thumbnail_base: post.thumbnail_base, thumbnail_base: post.thumbnail_base,
@@ -1070,7 +1068,7 @@ RSpec.describe 'Posts API', type: :request do
it 'dry-runs without persisting posts or new tags' do it 'dry-runs without persisting posts or new tags' do
sign_in_as(member) sign_in_as(member)
counts = [Post.count, Tag.count, TagName.count, event_rows.length] counts = [Post.count, Tag.count, TagName.count]
post '/posts?dry=1', params: post_write_params( post '/posts?dry=1', params: post_write_params(
title: 'dry-run post', title: 'dry-run post',
@@ -1086,7 +1084,7 @@ RSpec.describe 'Posts API', type: :request do
[{ 'name' => 'new_dry_run_tag', [{ 'name' => 'new_dry_run_tag',
'category' => 'character', 'category' => 'character',
'section_literals' => [] }]) 'section_literals' => [] }])
expect([Post.count, Tag.count, TagName.count, event_rows.length]).to eq(counts) expect([Post.count, Tag.count, TagName.count]).to eq(counts)
end end
it 'dry-runs an existing URL without validating its upload' do it 'dry-runs an existing URL without validating its upload' do
@@ -2261,20 +2259,20 @@ RSpec.describe 'Posts API', type: :request do
def create_post_version! post, version_no:, event_type:, created_by_user:, created_at: def create_post_version! post, version_no:, event_type:, created_by_user:, created_at:
PostVersion.create!( PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id, post:,
post:, version_no:,
version_no:, event_type:,
event_type:, title: post.title,
title: post.title, url: post.url,
url: post.url, thumbnail_base: post.thumbnail_base,
thumbnail_base: post.thumbnail_base, tags: snapshot_tags(post),
tags: snapshot_tags(post), tags_json: post.snapshot_tags_json,
tags_json: post.snapshot_tags_json, parent_post_ids: post.snapshot_parent_post_ids.join(' '),
parent_post_ids: post.snapshot_parent_post_ids.join(' '), original_created_from: post.original_created_from,
original_created_from: post.original_created_from, original_created_before: post.original_created_before,
original_created_before: post.original_created_before, created_at:,
created_at:, created_by_user:
created_by_user:) )
end end
let!(:v1) do let!(:v1) do
@@ -2602,7 +2600,6 @@ RSpec.describe 'Posts API', type: :request do
tags: 'spec_tag', tags: 'spec_tag',
thumbnail: dummy_upload) thumbnail: dummy_upload)
end.to change(PostVersion, :count).by(1) end.to change(PostVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created) expect(response).to have_http_status(:created)
@@ -2614,13 +2611,6 @@ RSpec.describe 'Posts API', type: :request do
expect(version.url).to eq('https://example.com/versioned-post') expect(version.url).to eq('https://example.com/versioned-post')
expect(version.created_by_user_id).to eq(member.id) expect(version.created_by_user_id).to eq(member.id)
expect(version.tags).to eq(snapshot_tags(created_post)) 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 end
it 'creates next version on PUT /posts/:id when snapshot changes' do it 'creates next version on PUT /posts/:id when snapshot changes' do
@@ -2636,7 +2626,6 @@ RSpec.describe 'Posts API', type: :request do
title: 'updated title', title: 'updated title',
tags: 'spec_tag_2') tags: 'spec_tag_2')
end.to change(PostVersion, :count).by(1) end.to change(PostVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@@ -2646,12 +2635,6 @@ RSpec.describe 'Posts API', type: :request do
expect(version.title).to eq('updated title') expect(version.title).to eq('updated title')
expect(version.created_by_user_id).to eq(member.id) expect(version.created_by_user_id).to eq(member.id)
expect(version.tags).to eq(snapshot_tags(post_record.reload)) 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 end
it 'does not create a new version on PUT /posts/:id when snapshot is unchanged' do it 'does not create a new version on PUT /posts/:id when snapshot is unchanged' do
@@ -2660,7 +2643,6 @@ RSpec.describe 'Posts API', type: :request do
PostTag.create!(post: post_record, tag: Tag.no_deerjikist) PostTag.create!(post: post_record, tag: Tag.no_deerjikist)
base_version = create_post_version_for!(post_record.reload) base_version = create_post_version_for!(post_record.reload)
events = event_rows
expect { expect {
put "/posts/#{post_record.id}", params: post_write_params( put "/posts/#{post_record.id}", params: post_write_params(
base_version_no: base_version.version_no, base_version_no: base_version.version_no,
@@ -2674,12 +2656,10 @@ RSpec.describe 'Posts API', type: :request do
expect(version.version_no).to eq(1) expect(version.version_no).to eq(1)
expect(version.event_type).to eq('create') expect(version.event_type).to eq('create')
expect(version.tags).to eq(snapshot_tags(post_record)) expect(version.tags).to eq(snapshot_tags(post_record))
expect(event_rows).to eq(events)
end end
it 'does not create a version when POST /posts is invalid' do it 'does not create a version when POST /posts is invalid' do
sign_in_as(member) sign_in_as(member)
events = event_rows
expect do expect do
post '/posts', params: post_write_params( post '/posts', params: post_write_params(
@@ -2690,13 +2670,11 @@ RSpec.describe 'Posts API', type: :request do
end.not_to change(PostVersion, :count) end.not_to change(PostVersion, :count)
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(event_rows).to eq(events)
end end
it 'does not create a version when PUT /posts/:id is invalid' do it 'does not create a version when PUT /posts/:id is invalid' do
sign_in_as(member) sign_in_as(member)
base_version = create_post_version_for!(post_record) base_version = create_post_version_for!(post_record)
events = event_rows
expect do expect do
put "/posts/#{post_record.id}", params: post_write_params( put "/posts/#{post_record.id}", params: post_write_params(
@@ -2708,7 +2686,6 @@ RSpec.describe 'Posts API', type: :request do
end.not_to change(PostVersion, :count) end.not_to change(PostVersion, :count)
expect(response).to have_http_status(:unprocessable_entity) expect(response).to have_http_status(:unprocessable_entity)
expect(event_rows).to eq(events)
end end
it 'rejects second-bearing original created timestamps on POST /posts' do it 'rejects second-bearing original created timestamps on POST /posts' do
+1 -3
ファイルの表示
@@ -119,9 +119,7 @@ RSpec.describe 'Sitemap entries API', type: :request do
# Legacy empty bodies can exist even though the write service rejects them. # Legacy empty bodies can exist even though the write service rejects them.
empty = TagDescription.create!(tag: empty_tag, language_code: 'ain', empty = TagDescription.create!(tag: empty_tag, language_code: 'ain',
body: '', version_no: 1) body: '', version_no: 1)
TagDescriptionVersion.create!( TagDescriptionVersion.create!(tag_id: empty_tag.id, language_code: 'ain',
event_id: create_event!(event_type: 'unknown').id,
tag_id: empty_tag.id, language_code: 'ain',
body: '', version_no: 1, event_type: 'create', body: '', version_no: 1, event_type: 'create',
created_by_user_id: user.id, created_at: Time.current) created_by_user_id: user.id, created_at: Time.current)
-10
ファイルの表示
@@ -53,13 +53,8 @@ RSpec.describe "TagChildren", type: :request do
expect { do_request } expect { do_request }
.to change { parent.reload.children.ids.include?(child.id) } .to change { parent.reload.children.ids.include?(child.id) }
.from(false).to(true) .from(false).to(true)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:no_content) 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 end
it 'returns 422 and does not create relation when the new link makes a cycle' do it 'returns 422 and does not create relation when the new link makes a cycle' do
@@ -137,7 +132,6 @@ RSpec.describe "TagChildren", type: :request do
expect { expect {
do_request do_request
}.to change(TagVersion, :count).by(2) }.to change(TagVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:no_content) expect(response).to have_http_status(:no_content)
@@ -146,10 +140,6 @@ RSpec.describe "TagChildren", type: :request do
expect(versions.first.parent_tag_ids.split).to include(parent.id.to_s) expect(versions.first.parent_tag_ids.split).to include(parent.id.to_s)
expect(versions.second.parent_tag_ids).to eq('') expect(versions.second.parent_tag_ids).to eq('')
expect(versions.second.created_by_user_id).to eq(admin.id) 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
end end
-2
ファイルの表示
@@ -8,7 +8,6 @@ RSpec.describe 'Tag description Wiki compatibility', type: :request do
let!(:versions) do let!(:versions) do
['A', 'A', 'new-version'].each_with_index.map do |body, index| ['A', 'A', 'new-version'].each_with_index.map do |body, index|
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: tag.id, language_code: 'ja', version_no: index + 1, tag_id: tag.id, language_code: 'ja', version_no: index + 1,
event_type: index.zero? ? 'create' : 'update', body:, event_type: index.zero? ? 'create' : 'update', body:,
created_by_user_id: user.id, created_at: Time.current) created_by_user_id: user.id, created_at: Time.current)
@@ -74,7 +73,6 @@ RSpec.describe 'Tag description Wiki compatibility', type: :request do
let!(:other_tag) { create(:tag, primary_name: 'other_description_contract') } let!(:other_tag) { create(:tag, primary_name: 'other_description_contract') }
let!(:other_version) do let!(:other_version) do
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: other_tag.id, language_code: 'ja', version_no: 1, tag_id: other_tag.id, language_code: 'ja', version_no: 1,
event_type: 'create', body: 'other tag history', event_type: 'create', body: 'other tag history',
created_by_user_id: user.id, created_at: Time.current) created_by_user_id: user.id, created_at: Time.current)
+1 -13
ファイルの表示
@@ -13,7 +13,7 @@ RSpec.describe 'Tag description native API', type: :request do
def stored_state def stored_state
[TagDescription, TagDescriptionVersion, TagName, TagVersion].map do |model| [TagDescription, TagDescriptionVersion, TagName, TagVersion].map do |model|
model.order(:id).map(&:attributes) model.order(:id).map(&:attributes)
end + [event_rows] end
end end
def fail_save model def fail_save model
@@ -91,8 +91,6 @@ RSpec.describe 'Tag description native API', type: :request do
let!(:version) do let!(:version) do
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
tag_id: tag.id, language_code: 'ja', body: 'native version', version_no: 1, 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) event_type: 'create', created_by_user_id: author.id, created_at: Time.current)
end end
let(:name_endpoint) { "/tags/name/#{ tag_name.name }/description" } let(:name_endpoint) { "/tags/name/#{ tag_name.name }/description" }
@@ -187,7 +185,6 @@ RSpec.describe 'Tag description native API', type: :request do
expect { native_write(body: 'created natively') } expect { native_write(body: 'created natively') }
.to change(TagDescription, :count).by(1) .to change(TagDescription, :count).by(1)
.and change(TagDescriptionVersion, :count).by(1) .and change(TagDescriptionVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:created) expect(response).to have_http_status(:created)
description = TagDescription.find_by!(tag_id: tag.id, language_code: 'ja') description = TagDescription.find_by!(tag_id: tag.id, language_code: 'ja')
expect_current(description) expect_current(description)
@@ -195,10 +192,6 @@ RSpec.describe 'Tag description native API', type: :request do
expect(version).to have_attributes( expect(version).to have_attributes(
body: 'created natively', version_no: 1, event_type: 'create', body: 'created natively', version_no: 1, event_type: 'create',
created_by_user_id: editor.id) 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 }" get "/wiki/#{ description.id }"
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(json).to include('body' => description.body, 'revision_id' => version.id) expect(json).to include('body' => description.body, 'revision_id' => version.id)
@@ -230,7 +223,6 @@ RSpec.describe 'Tag description native API', type: :request do
expect(description.version_no).to eq(1) expect(description.version_no).to eq(1)
expect { native_write(body: 'after') } expect { native_write(body: 'after') }
.to change(TagDescriptionVersion, :count).by(1) .to change(TagDescriptionVersion, :count).by(1)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
expect(description.reload).to have_attributes( expect(description.reload).to have_attributes(
body: 'after', version_no: 2, body: 'after', version_no: 2,
@@ -242,10 +234,6 @@ RSpec.describe 'Tag description native API', type: :request do
expect(version).to have_attributes( expect(version).to have_attributes(
tag_id: tag.id, language_code: 'ja', version_no: 2, event_type: 'update', tag_id: tag.id, language_code: 'ja', version_no: 2, event_type: 'update',
body: 'after', created_by_user_id: editor.id) 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(revision.body).to eq(version.body)
expect(description_versions(page).order(:version_no).last.body).to eq(version.body) expect(description_versions(page).order(:version_no).last.body).to eq(version.body)
get "/wiki/#{ description.id }" get "/wiki/#{ description.id }"
+1 -5
ファイルの表示
@@ -121,14 +121,10 @@ RSpec.describe 'Tag group native API', type: :request do
[:create, :update].each do |operation| [:create, :update].each do |operation|
it "#{ operation }s structured data and keeps unplaced membership" do it "#{ operation }s structured data and keeps unplaced membership" do
previous = group_version(group_id, 1) previous = group_version(group_id, 1)
expect { native_write(operation) }.to change { event_rows.length }.by(1) native_write(operation)
expect(response).to have_http_status(operation == :create ? :created : :ok) expect(response).to have_http_status(operation == :create ? :created : :ok)
id = operation == :create ? json.fetch('id') : group_id id = operation == :create ? json.fetch('id') : group_id
number = operation == :create ? 1 : 2 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( expect_group_snapshot(
id, number:, members: snapshot_members, placements:, description: '全体の説明') id, number:, members: snapshot_members, placements:, description: '全体の説明')
expect(group_version(group_id, 1)).to eq(previous) expect(group_version(group_id, 1)).to eq(previous)
-1
ファイルの表示
@@ -30,7 +30,6 @@ RSpec.describe 'TagVersions API', type: :request do
) )
version = version =
TagVersion.create!( TagVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag: tag, tag: tag,
version_no: version_no, version_no: version_no,
event_type: event_type, event_type: event_type,
-10
ファイルの表示
@@ -705,7 +705,6 @@ RSpec.describe 'Tags API', type: :request do
expect { expect {
patch "/tags/#{tag.id}", params: { name: 'new_tag_name', category: 'meme' } patch "/tags/#{tag.id}", params: { name: 'new_tag_name', category: 'meme' }
}.to change(TagVersion, :count).by(2) }.to change(TagVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@@ -720,10 +719,6 @@ RSpec.describe 'Tags API', type: :request do
expect(version_primary_name(versions.second, 'ja')).to eq('new_tag_name') expect(version_primary_name(versions.second, 'ja')).to eq('new_tag_name')
expect(versions.second.category).to eq('meme') expect(versions.second.category).to eq('meme')
expect(versions.second.created_by_user_id).to eq(member_user.id) 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 end
it 'updates deprecated state and records it in tag versions' do it 'updates deprecated state and records it in tag versions' do
@@ -1280,7 +1275,6 @@ RSpec.describe 'Tags API', type: :request do
deprecated: '0', deprecated: '0',
} }
}.to change(TagVersion, :count).by(2) }.to change(TagVersion, :count).by(2)
.and change { event_rows.length }.by(1)
expect(response).to have_http_status(:ok) expect(response).to have_http_status(:ok)
@@ -1296,10 +1290,6 @@ RSpec.describe 'Tags API', type: :request do
expect(versions.second.category).to eq('meta') expect(versions.second.category).to eq('meta')
expect(version_alias_names(versions.second, 'ja')).to include('spec_tag') expect(version_alias_names(versions.second, 'ja')).to include('spec_tag')
expect(versions.second.created_by_user_id).to eq(member_user.id) 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 end
it '同じ tag の旧 alias へ戻しても rename できる' do it '同じ tag の旧 alias へ戻しても rename できる' do
+1 -3
ファイルの表示
@@ -192,9 +192,7 @@ RSpec.describe 'Counts export contracts' do
expect(CountsExportDownload.find(token, 'owner')).not_to be_nil expect(CountsExportDownload.find(token, 'owner')).not_to be_nil
expect(CountsExportDownload.find(token, 'other')).to be_nil expect(CountsExportDownload.find(token, 'other')).to be_nil
post = create(:post) post = create(:post)
PostVersion.create!( PostVersion.create!(post:, version_no: 1, event_type: 'discard', url: post.url,
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)) title: 'private', tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024))
expect(CountsExportDownload.find(token, 'owner')).to be_nil expect(CountsExportDownload.find(token, 'owner')).to be_nil
end end
+7 -21
ファイルの表示
@@ -13,9 +13,7 @@ RSpec.describe 'Counts masked pivot contracts' do
let!(:tags) do let!(:tags) do
['A', 'B', 'C'].map do |name| ['A', 'B', 'C'].map do |name|
tag = create(:tag, primary_name: name) tag = create(:tag, primary_name: name)
TagVersion.create!( TagVersion.create!(tag:, version_no: 1, event_type: 'create', name:,
event_id: create_event!(event_type: 'unknown').id,
tag:, version_no: 1, event_type: 'create', name:,
category: 'general', aliases: '', parent_tag_ids: '', category: 'general', aliases: '', parent_tag_ids: '',
names: { ja: { name:, script_code: 'Jpan', auto_generated: false, aliases: [] } }, names: { ja: { name:, script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2023)) created_at: Time.utc(2023))
@@ -27,16 +25,12 @@ RSpec.describe 'Counts masked pivot contracts' do
[[0, 1], [0], [1, 2]].each_with_index do |indexes, index| [[0, 1], [0], [1, 2]].each_with_index do |indexes, index|
post = create(:post) post = create(:post)
snapshot = indexes.map { { tag_id: tags[_1].id, version_no: 1, sections: [] } } snapshot = indexes.map { { tag_id: tags[_1].id, version_no: 1, sections: [] } }
PostVersion.create!( PostVersion.create!(post:, version_no: 1, event_type: '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, title: "hidden-title-#{ index }", url: post.url, tags: '', tags_json: snapshot,
parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 1)) parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 1))
next if index == 2 next if index == 2
PostVersion.create!( PostVersion.create!(post:, version_no: 2, event_type: 'discard',
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: [], title: "private-discard-#{ index }", url: post.url, tags: '', tags_json: [],
parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 2)) parent_post_ids: '', created_by_user: member, created_at: Time.utc(2024, 2))
end end
@@ -106,16 +100,12 @@ RSpec.describe 'Counts masked pivot contracts' do
it 'uses changed-record membership for totals and hides changes to private predecessors' do it 'uses changed-record membership for totals and hides changes to private predecessors' do
post = PostVersion.order(:id).last.post post = PostVersion.order(:id).last.post
PostVersion.create!( PostVersion.create!(post:, version_no: 2, event_type: 'update', title: 'changed-public-title',
event_id: create_event!(event_type: 'unknown').id,
post:, version_no: 2, event_type: 'update', title: 'changed-public-title',
url: post.url, tags: '', url: post.url, tags: '',
tags_json: [{ tag_id: tags.last.id, version_no: 1, sections: [] }], tags_json: [{ tag_id: tags.last.id, version_no: 1, sections: [] }],
parent_post_ids: '', created_at: Time.utc(2024, 3)) parent_post_ids: '', created_at: Time.utc(2024, 3))
restored = PostVersion.order(:id).first.post restored = PostVersion.order(:id).first.post
PostVersion.create!( PostVersion.create!(post: restored, version_no: 3, event_type: 'restore',
event_id: create_event!(event_type: 'unknown').id,
post: restored, version_no: 3, event_type: 'restore',
title: 'restored-public-title', url: restored.url, tags: '', title: 'restored-public-title', url: restored.url, tags: '',
tags_json: [{ tag_id: tags.first.id, version_no: 1, sections: [] }], parent_post_ids: '', tags_json: [{ tag_id: tags.first.id, version_no: 1, sections: [] }], parent_post_ids: '',
created_at: Time.utc(2024, 4)) created_at: Time.utc(2024, 4))
@@ -145,9 +135,7 @@ RSpec.describe 'Counts masked pivot contracts' do
it 'keeps NULL as a public data value rather than treating it as a rollup' do it 'keeps NULL as a public data value rather than treating it as a rollup' do
post = create(:post) post = create(:post)
PostVersion.create!( PostVersion.create!(post:, version_no: 1, event_type: 'create', title: 'public bot',
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)) url: post.url, tags: '', tags_json: [], parent_post_ids: '', created_at: Time.utc(2024, 5))
page = result(nil, 'rows' => 'user', 'cols' => 'event_type') page = result(nil, 'rows' => 'user', 'cols' => 'event_type')
expect(page[:cells].select { _1[:values].first.nil? }.sum { _1[:count] }).to eq(1) expect(page[:cells].select { _1[:values].first.nil? }.sum { _1[:count] }).to eq(1)
@@ -158,9 +146,7 @@ RSpec.describe 'Counts masked pivot contracts' do
it 'sorts public version numbers numerically including formerly hidden records' do it 'sorts public version numbers numerically including formerly hidden records' do
post = PostVersion.order(:id).last.post post = PostVersion.order(:id).last.post
[2, 10].each do |number| [2, 10].each do |number|
PostVersion.create!( PostVersion.create!(post:, version_no: number, event_type: 'update',
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: [], title: 'public numeric sort', url: post.url, tags: '', tags_json: [],
parent_post_ids: '', created_at: Time.utc(2024, 5)) parent_post_ids: '', created_at: Time.utc(2024, 5))
end end
-2
ファイルの表示
@@ -56,7 +56,6 @@ RSpec.describe MaterialSyncImporter do
profile: 'legacy_drive', profile: 'legacy_drive',
export_path: '素材/a.png', export_path: '素材/a.png',
created_by_user: user) created_by_user: user)
events = event_rows
result = result =
described_class.import!( described_class.import!(
@@ -74,7 +73,6 @@ RSpec.describe MaterialSyncImporter do
expect(result.action).to eq(:unchanged) expect(result.action).to eq(:unchanged)
expect(material.reload.tag).to eq(tag) expect(material.reload.tag).to eq(tag)
expect(material.url).to eq('https://example.com/human') expect(material.url).to eq('https://example.com/human')
expect(event_rows).to eq(events)
end end
it 'suppresses a Google Drive candidate by relative path prefix' do it 'suppresses a Google Drive candidate by relative path prefix' do
-41
ファイルの表示
@@ -14,47 +14,6 @@ RSpec.describe MaterialSyncRunner do
let(:drive_client) { instance_double(GoogleDrive::ApiClient) } let(:drive_client) { instance_double(GoogleDrive::ApiClient) }
describe '#sync!' do 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 it 'imports google drive path candidates as they are yielded' do
first_entry = { id: 'file-1', first_entry = { id: 'file-1',
name: 'a.png', name: 'a.png',
-83
ファイルの表示
@@ -88,86 +88,3 @@ RSpec.describe PostBulkCreator do
expect(creator).to have_received(:create!).with(locale).once expect(creator).to have_received(:create!).with(locale).once
end end
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,7 +16,6 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
@tag = create(:tag, primary_name: "#{ @prefix }_owner") @tag = create(:tag, primary_name: "#{ @prefix }_owner")
@group = TagGroup.create!(name: "#{ @prefix }_owner", version_no: 1) @group = TagGroup.create!(name: "#{ @prefix }_owner", version_no: 1)
@tag_ids = Queue.new @tag_ids = Queue.new
@event_ids = Queue.new
@threads = [] @threads = []
@release = Queue.new @release = Queue.new
end end
@@ -43,9 +42,6 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
ids << @tag.id if @tag ids << @tag.id if @tag
TagName.where(tag_id: ids).delete_all TagName.where(tag_id: ids).delete_all
Tag.where(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
end end
@@ -76,17 +72,11 @@ RSpec.describe 'Shared resource IDs across MySQL connections', type: :model do
when :description when :description
TagDescription.create!(tag: @tag, language_code: 'ja', body: '', version_no: 1) TagDescription.create!(tag: @tag, language_code: 'ja', body: '', version_no: 1)
when :description_version when :description_version
event = create_event!(event_type: 'unknown')
@event_ids << event.id
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
event_id: event.id,
tag_id: @tag.id, language_code: 'ja', body: 'body', version_no: 1, tag_id: @tag.id, language_code: 'ja', body: 'body', version_no: 1,
event_type: 'create', created_at: Time.current) event_type: 'create', created_at: Time.current)
when :group_version when :group_version
event = create_event!(event_type: 'unknown')
@event_ids << event.id
TagGroupVersion.create!( TagGroupVersion.create!(
event_id: event.id,
tag_group: @group, name: @group.name, version_no: 1, event_type: 'create', tag_group: @group, name: @group.name, version_no: 1, event_type: 'create',
members: [], placements: [], created_at: Time.current) members: [], placements: [], created_at: Time.current)
when :group when :group
-3
ファイルの表示
@@ -15,12 +15,10 @@ RSpec.describe SharedResourceIdAllocator do
TagGroup.new(id:, name: "group #{ number }", version_no: number) TagGroup.new(id:, name: "group #{ number }", version_no: number)
when 'tag_description_versions' when 'tag_description_versions'
TagDescriptionVersion.new( TagDescriptionVersion.new(
event_id: create_event!(event_type: 'unknown').id,
id:, tag_id: tag.id, language_code: 'ja', body: 'body', version_no: number, id:, tag_id: tag.id, language_code: 'ja', body: 'body', version_no: number,
event_type: 'create', created_at: Time.current) event_type: 'create', created_at: Time.current)
when 'tag_group_versions' when 'tag_group_versions'
TagGroupVersion.new( TagGroupVersion.new(
event_id: create_event!(event_type: 'unknown').id,
id:, tag_group_id: group.id, name: group.name, version_no: number, id:, tag_group_id: group.id, name: group.name, version_no: number,
event_type: 'create', members: [], placements: [], created_at: Time.current) event_type: 'create', members: [], placements: [], created_at: Time.current)
end end
@@ -84,7 +82,6 @@ RSpec.describe SharedResourceIdAllocator do
it 'reserves a Tag ID referenced only by remaining description history' 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 high = [Tag.maximum(:id).to_i, ExternalTag.maximum(:id).to_i].max + 1000
TagDescriptionVersion.create!( TagDescriptionVersion.create!(
event_id: create_event!(event_type: 'unknown').id,
tag_id: high, language_code: 'ja', version_no: 1, body: 'history', tag_id: high, language_code: 'ja', version_no: 1, body: 'history',
event_type: 'create', created_at: Time.current) event_type: 'create', created_at: Time.current)
expect(create(:tag).id).to be > high expect(create(:tag).id).to be > high
-35
ファイルの表示
@@ -42,41 +42,6 @@ RSpec.describe Youtube::Sync do
end end
describe '#sync!' do 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 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(:query_terms).and_return([])
allow(sync).to receive(:playlist_ids).and_return([]) allow(sync).to receive(:playlist_ids).and_return([])
-15
ファイルの表示
@@ -1,15 +0,0 @@
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
+1 -4
ファイルの表示
@@ -3,13 +3,11 @@ require 'cgi'
# SQL fixtures use the migration contract without inventing application models. # SQL fixtures use the migration contract without inventing application models.
# Include explicitly; these helpers must not affect unrelated examples. # Include explicitly; these helpers must not affect unrelated examples.
module TagGroupRecords module TagGroupRecords
include EventRecords
GROUP_TABLES = [ GROUP_TABLES = [
'tag_groups', 'tag_group_tags', 'tag_group_groups', 'tag_groups', 'tag_group_tags', 'tag_group_groups',
'tag_group_placements', 'tag_group_versions'].freeze 'tag_group_placements', 'tag_group_versions'].freeze
WRITE_TABLES = GROUP_TABLES + [ WRITE_TABLES = GROUP_TABLES + [
'events', 'tag_names', 'tag_description_versions', 'tag_names', 'tag_description_versions',
'tag_descriptions'] 'tag_descriptions']
def group_connection = ApplicationRecord.connection def group_connection = ApplicationRecord.connection
@@ -116,7 +114,6 @@ module TagGroupRecords
group_id = insert_group_row('tag_groups', attributes) group_id = insert_group_row('tag_groups', attributes)
insert_group_row('tag_group_versions', { insert_group_row('tag_group_versions', {
tag_group_id: group_id, version_no: 1, event_type: 'create', 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, name:, description:, members: members.to_json, placements: placements.to_json,
created_by_user_id: user.id, created_at: now }) created_by_user_id: user.id, created_at: now })
members.each do |member| members.each do |member|
+14 -43
ファイルの表示
@@ -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) def create_post_version_for!(post, version_no: 1, event_type: 'create', created_by_user: nil)
PostVersion.create!( PostVersion.create!(
event_id: create_event!(event_type: 'unknown').id, post: post,
post: post, version_no: version_no,
version_no: version_no, event_type: event_type,
event_type: event_type, title: post.title,
title: post.title, url: post.url,
url: post.url, thumbnail_base: post.thumbnail_base,
thumbnail_base: post.thumbnail_base, tags: snapshot_tags(post),
tags: snapshot_tags(post), tags_json: post.snapshot_tags_json,
tags_json: post.snapshot_tags_json, parent_post_ids: post.snapshot_parent_post_ids.join(' '),
parent_post_ids: post.snapshot_parent_post_ids.join(' '), original_created_from: post.original_created_from,
original_created_from: post.original_created_from, original_created_before: post.original_created_before,
original_created_before: post.original_created_before, created_at: Time.current,
created_at: Time.current, created_by_user: created_by_user
created_by_user: created_by_user) )
end end
it '新規 post 作成時に version 1 を作る' do it '新規 post 作成時に version 1 を作る' do
@@ -209,7 +209,6 @@ RSpec.describe 'nico:sync' do
expect { expect {
run_rake_task('nico:sync') run_rake_task('nico:sync')
}.to change(PostVersion, :count).by(1) }.to change(PostVersion, :count).by(1)
.and change { event_rows.length }.by(1)
post = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm9') post = Post.find_by!(url: 'https://www.nicovideo.jp/watch/sm9')
version = post.post_versions.order(:version_no).last version = post.post_versions.order(:version_no).last
@@ -218,32 +217,6 @@ RSpec.describe 'nico:sync' do
expect(version.event_type).to eq('create') expect(version.event_type).to eq('create')
expect(version.created_by_user).to be_nil expect(version.created_by_user).to be_nil
expect(version.tags).to eq(snapshot_tags(post.reload)) 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 end
it '既存 post の内容または tags が変わったとき update version を作る' do it '既存 post の内容または tags が変わったとき update version を作る' do
@@ -309,7 +282,6 @@ RSpec.describe 'nico:sync' do
}]) }])
allow(URI).to receive(:open).and_return(StringIO.new('<html></html>')) allow(URI).to receive(:open).and_return(StringIO.new('<html></html>'))
events = event_rows
expect { expect {
run_rake_task('nico:sync') run_rake_task('nico:sync')
@@ -319,7 +291,6 @@ RSpec.describe 'nico:sync' do
expect(version.version_no).to eq(1) expect(version.version_no).to eq(1)
expect(version.event_type).to eq('create') expect(version.event_type).to eq('create')
expect(version.tags).to eq(snapshot_tags(post.reload)) expect(version.tags).to eq(snapshot_tags(post.reload))
expect(event_rows).to eq(events)
end end
it '新規 nico tag に nico tag version を作る' do it '新規 nico tag に nico tag version を作る' do
+2 -1
ファイルの表示
@@ -379,7 +379,8 @@ const RoutedApp = ({ locales }: { locales: AvailableLocale[] }) => {
<PageHead> <PageHead>
{robots != null && <meta name="robots" content={robots}/>} {robots != null && <meta name="robots" content={robots}/>}
</PageHead> </PageHead>
<UnsavedChangesGuardProvider> <UnsavedChangesGuardProvider
draftScope={user == null ? '' : `${user.id}:${user.role}`}>
<KeyboardShortcutsProvider> <KeyboardShortcutsProvider>
<MotionConfig <MotionConfig
reducedMotion={ reducedMotion={
+22 -1
ファイルの表示
@@ -1,5 +1,5 @@
import { fireEvent, screen, waitFor } from '@testing-library/react' import { fireEvent, screen, waitFor } from '@testing-library/react'
import { describe, expect, it, vi } from 'vitest' import { beforeEach, describe, expect, it, vi } from 'vitest'
import { textContentOf } from '@/test/text' import { textContentOf } from '@/test/text'
import PostEditForm from '@/components/PostEditForm' import PostEditForm from '@/components/PostEditForm'
@@ -29,6 +29,27 @@ vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({
})) }))
describe ('PostEditForm', () => { 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 () => { it ('submits edited post fields with the current base version', async () => {
const onSave = vi.fn () const onSave = vi.fn ()
const post = buildPost ({ const post = buildPost ({
+21 -24
ファイルの表示
@@ -1,5 +1,6 @@
import { useEffect, useMemo, useState } from 'react' import { useMemo, useState } from 'react'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale' import { useLocale } from '@/lib/useLocale'
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField' import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
import FieldError from '@/components/common/FieldError' import FieldError from '@/components/common/FieldError'
@@ -56,17 +57,17 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
const locale = useLocale () const locale = useLocale ()
const { label } = useUITranslation ('posts') const { label } = useUITranslation ('posts')
const [disabled, setDisabled] = useState (false) const [disabled, setDisabled] = useState (false)
const [duration, setDuration] = useState<string> (videoMsToDurationValue (post.videoMs))
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } = const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<PostFormField> () useValidationErrors<PostFormField> ()
const [originalCreatedBefore, setOriginalCreatedBefore] = const { draft, setField, clearDraft } = useSessionDraft (`post:${post.id}:${locale}`, {
useState<string | null> (post.originalCreatedBefore) baseVersionNo: post.versionNo,
const [originalCreatedFrom, setOriginalCreatedFrom] = duration: videoMsToDurationValue (post.videoMs),
useState<string | null> (post.originalCreatedFrom) originalCreatedBefore: post.originalCreatedBefore,
const [parentPostIds, setParentPostIds] = originalCreatedFrom: post.originalCreatedFrom,
useState ((post.parentPosts ?? []).map (p => p.id).join (' ')) parentPostIds: (post.parentPosts ?? []).map (entry => entry.id).join (' '),
const [tags, setTags] = useState<string> (() => tagsToStr (post.tags)) tags: tagsToStr (post.tags), title: post.title })
const [title, setTitle] = useState (post.title) const { baseVersionNo, duration, originalCreatedBefore, originalCreatedFrom,
parentPostIds, tags, title } = draft
const videoFlg = const videoFlg =
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'), useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
@@ -83,6 +84,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
try try
{ {
const data = await updatePost (postData, options, locale) const data = await updatePost (postData, options, locale)
clearDraft ({ ...draft, baseVersionNo: data.versionNo })
onSave ({ ...post, onSave ({ ...post,
versionNo: data.versionNo, versionNo: data.versionNo,
title: data.title, title: data.title,
@@ -132,7 +134,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds, await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null, duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore }, originalCreatedFrom, originalCreatedBefore },
{ baseVersionNo: post.versionNo, merge: true }) { baseVersionNo, merge: true })
return return
} }
@@ -141,7 +143,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds, await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null, duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore }, originalCreatedFrom, originalCreatedBefore },
{ baseVersionNo: post.versionNo, force: true }) { baseVersionNo, force: true })
return return
} }
} }
@@ -156,7 +158,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds, await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null, duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore }, originalCreatedFrom, originalCreatedBefore },
{ baseVersionNo: post.versionNo }) { baseVersionNo })
} }
finally finally
{ {
@@ -164,11 +166,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
} }
} }
useEffect (() => {
setTags (tagsToStr (post.tags))
setDuration (videoMsToDurationValue (post.videoMs))
}, [post])
return ( return (
<form onSubmit={handleSubmit} className="max-w-xl pt-2 space-y-4"> <form onSubmit={handleSubmit} className="max-w-xl pt-2 space-y-4">
<FieldError messages={baseErrors}/> <FieldError messages={baseErrors}/>
@@ -177,28 +174,28 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
label={label ('shared:labels.title')} label={label ('shared:labels.title')}
value={title ?? ''} value={title ?? ''}
disabled={disabled} disabled={disabled}
onChange={setTitle}/> onChange={value => setField ('title', value)}/>
<PostTextField <PostTextField
label={label ('shared:labels.parentPosts')} label={label ('shared:labels.parentPosts')}
value={parentPostIds} value={parentPostIds}
disabled={disabled} disabled={disabled}
errors={fieldErrors.parentPostIds} errors={fieldErrors.parentPostIds}
onChange={setParentPostIds}/> onChange={value => setField ('parentPostIds', value)}/>
<PostTagsField <PostTagsField
disabled={disabled} disabled={disabled}
tags={tags} tags={tags}
setTags={setTags} setTags={value => setField ('tags', value)}
errors={fieldErrors.tags}/> errors={fieldErrors.tags}/>
{/* オリジナルの作成日時 */} {/* オリジナルの作成日時 */}
<PostOriginalCreatedTimeField <PostOriginalCreatedTimeField
disabled={disabled} disabled={disabled}
originalCreatedFrom={originalCreatedFrom} originalCreatedFrom={originalCreatedFrom}
setOriginalCreatedFrom={setOriginalCreatedFrom} setOriginalCreatedFrom={value => setField ('originalCreatedFrom', value)}
originalCreatedBefore={originalCreatedBefore} originalCreatedBefore={originalCreatedBefore}
setOriginalCreatedBefore={setOriginalCreatedBefore} setOriginalCreatedBefore={value => setField ('originalCreatedBefore', value)}
errors={groupedMessages ( errors={groupedMessages (
fieldErrors.originalCreatedAt, fieldErrors.originalCreatedAt,
fieldErrors.originalCreatedFrom, fieldErrors.originalCreatedFrom,
@@ -209,7 +206,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
value={duration} value={duration}
disabled={disabled} disabled={disabled}
errors={fieldErrors.videoMs} errors={fieldErrors.videoMs}
onChange={setDuration}/>)} onChange={value => setField ('duration', value)}/>)}
{/* 送信 */} {/* 送信 */}
<Button type="submit" disabled={disabled}> <Button type="submit" disabled={disabled}>
+18 -2
ファイルの表示
@@ -1,9 +1,25 @@
import { fireEvent, render, screen } from '@testing-library/react' import { fireEvent, render, screen, waitFor } from '@testing-library/react'
import { describe, expect, it } from 'vitest' import { describe, expect, it, vi } from 'vitest'
import TabGroup, { Tab } from '@/components/common/TabGroup' import TabGroup, { Tab } from '@/components/common/TabGroup'
describe ('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', () => { it ('uses the init tab and switches tabs when clicked', () => {
render ( render (
<TabGroup> <TabGroup>
+5 -3
ファイルの表示
@@ -10,12 +10,12 @@ type TabProps = { name: React.ReactNode
type Props = { type Props = {
children: React.ReactNode children: React.ReactNode
rightAddon?: React.ReactNode rightAddon?: React.ReactNode
} onBeforeChange?: () => boolean | Promise<boolean> }
export const Tab = ({ children }: TabProps) => <>{children}</> export const Tab = ({ children }: TabProps) => <>{children}</>
const TabGroup: FC<Props> = ({ children, rightAddon }) => { const TabGroup: FC<Props> = ({ children, rightAddon, onBeforeChange }) => {
const tabs = React.Children.toArray (children) as React.ReactElement<TabProps>[] const tabs = React.Children.toArray (children) as React.ReactElement<TabProps>[]
const [current, setCurrent] = useState<number> (() => { const [current, setCurrent] = useState<number> (() => {
@@ -36,7 +36,9 @@ const TabGroup: FC<Props> = ({ children, rightAddon }) => {
'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring', 'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
i === current && 'font-bold', i === current && 'font-bold',
)} )}
onClick={() => { onClick={async () => {
if (i === current) return
if (onBeforeChange != null && !(await onBeforeChange ())) return
setCurrent (i) setCurrent (i)
}}> }}>
{tab.props.name} {tab.props.name}
+14 -1
ファイルの表示
@@ -1,4 +1,4 @@
import { act, screen, waitFor } from '@testing-library/react' import { act, fireEvent, screen, waitFor } from '@testing-library/react'
import { beforeEach, describe, expect, it, vi } from 'vitest' import { beforeEach, describe, expect, it, vi } from 'vitest'
import PostImportRowForm from '@/components/posts/import/PostImportRowForm' import PostImportRowForm from '@/components/posts/import/PostImportRowForm'
@@ -22,6 +22,19 @@ describe ('PostImportRowForm', () => {
api.apiGet.mockResolvedValue (new Blob (['img'], { type: 'image/png' })) 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 () => { it ('resets only the draft, then saves with resetRequested', async () => {
const row = buildPostImportRow () const row = buildPostImportRow ()
row.attributes.title = 'manual title' row.attributes.title = 'manual title'
+20 -9
ファイルの表示
@@ -8,10 +8,11 @@ import PostTextField from '@/components/posts/PostTextField'
import PostImportThumbnailPreview from '@/components/posts/import/PostImportThumbnailPreview' import PostImportThumbnailPreview from '@/components/posts/import/PostImportThumbnailPreview'
import { hasThumbnailBaseValue, hasVideoTag } from '@/lib/postImportRows' import { hasThumbnailBaseValue, hasVideoTag } from '@/lib/postImportRows'
import { renderPostImportMessage } from '@/components/posts/import/postImportRowStatus' import { renderPostImportMessage } from '@/components/posts/import/postImportRowStatus'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale' import { useLocale } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation' import { useUITranslation } from '@/lib/useUITranslation'
import type { FC, ReactNode } from 'react' import type { FC, ReactNode, SetStateAction } from 'react'
import type { DialogueFormControls } from '@/lib/dialogues/useDialogue' import type { DialogueFormControls } from '@/lib/dialogues/useDialogue'
import type { PostImportEditableDraft, PostImportRow } from '@/lib/postImportTypes' import type { PostImportEditableDraft, PostImportRow } from '@/lib/postImportTypes'
@@ -21,6 +22,7 @@ type Draft = PostImportEditableDraft
type Props = { type Props = {
row: PostImportRow row: PostImportRow
controls: DialogueFormControls controls: DialogueFormControls
onDirtyStateChange?: (dirty: boolean, discard: () => void) => void
onSave: (args: { draft: Draft onSave: (args: { draft: Draft
resetRequested: boolean }) => Promise<{ resetRequested: boolean }) => Promise<{
saved: boolean saved: boolean
@@ -96,6 +98,7 @@ const thumbnailWarnings = (
const PostImportRowForm: FC<Props> = ( const PostImportRowForm: FC<Props> = (
{ row, { row,
controls, controls,
onDirtyStateChange,
onSave }, onSave },
) => { ) => {
const locale = useLocale () const locale = useLocale ()
@@ -103,21 +106,26 @@ const PostImportRowForm: FC<Props> = (
const groupedMessages = (...values: (string[] | undefined)[]): ReactNode[] => const groupedMessages = (...values: (string[] | undefined)[]): ReactNode[] =>
[...new Set (values.flatMap (value => value ?? []))] [...new Set (values.flatMap (value => value ?? []))]
.map (value => renderPostImportMessage (value, locale)) .map (value => renderPostImportMessage (value, locale))
const [draft, setDraft] = useState<Draft> (() => buildDraft (row)) 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 [messageRow, setMessageRow] = useState<PostImportRow | null> (null) const [messageRow, setMessageRow] = useState<PostImportRow | null> (null)
const [saving, setSaving] = useState (false) const [saving, setSaving] = useState (false)
const [resetRequested, setResetRequested] = useState (false)
const [committedThumbnailBase, setCommittedThumbnailBase] = useState ( const [committedThumbnailBase, setCommittedThumbnailBase] = useState (
() => String (row.attributes.thumbnailBase ?? '')) () => String (row.attributes.thumbnailBase ?? ''))
useEffect (() => { useEffect (() => {
const nextDraft = buildDraft (row)
setDraft (nextDraft)
setMessageRow (null) setMessageRow (null)
setResetRequested (false)
setCommittedThumbnailBase (String (row.attributes.thumbnailBase ?? '')) setCommittedThumbnailBase (String (row.attributes.thumbnailBase ?? ''))
}, [row]) }, [row])
useEffect (() => {
onDirtyStateChange?.(dirty, discardDraft)
}, [dirty, discardDraft, onDirtyStateChange])
const displayRow = messageRow ?? row const displayRow = messageRow ?? row
const resetDraft = useMemo ( const resetDraft = useMemo (
() => buildResetDraft (row), () => buildResetDraft (row),
@@ -157,11 +165,11 @@ const PostImportRowForm: FC<Props> = (
return false return false
setDraft (resetDraft) setDraft (resetDraft)
setResetRequested (true) setField ('resetRequested', true)
setMessageRow (null) setMessageRow (null)
setCommittedThumbnailBase (resetDraft.thumbnailBase) setCommittedThumbnailBase (resetDraft.thumbnailBase)
return false return false
}, [controls, resetDisabled, resetDraft, label]) }, [controls, resetDisabled, resetDraft, label, setDraft, setField])
const save = useCallback (async (): Promise<boolean> => { const save = useCallback (async (): Promise<boolean> => {
setSaving (true) setSaving (true)
@@ -169,7 +177,10 @@ const PostImportRowForm: FC<Props> = (
{ {
const result = await onSave ({ draft, resetRequested }) const result = await onSave ({ draft, resetRequested })
if (result.saved) if (result.saved)
{
clearDraft ()
return true return true
}
if (result.row != null) if (result.row != null)
setMessageRow (result.row) setMessageRow (result.row)
@@ -179,7 +190,7 @@ const PostImportRowForm: FC<Props> = (
{ {
setSaving (false) setSaving (false)
} }
}, [draft, onSave, resetRequested]) }, [clearDraft, draft, onSave, resetRequested])
useEffect (() => { useEffect (() => {
controls.setActions ([{ controls.setActions ([{
+8 -61
ファイルの表示
@@ -1,72 +1,17 @@
import { translateUIMessage } from '@/lib/i18n' import { translateUIMessage } from '@/lib/i18n'
import { readSessionStorage, writeSessionStorage, removeSessionStorage }
from '@/lib/sessionStorage'
import type { StorageErrorHandler } from '@/lib/postImportTypes' import type { StorageErrorHandler } from '@/lib/postImportTypes'
const SOURCE_DRAFT_KEY = 'post-import-source-draft' 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 = ( export const loadPostImportSourceDraft = (
onError?: StorageErrorHandler, onError?: StorageErrorHandler,
): { source: string } => { ): { source: string } => {
const raw = readStorage (SOURCE_DRAFT_KEY, onError) const raw = readSessionStorage (SOURCE_DRAFT_KEY, () =>
onError?.(translateUIMessage ('storage.readFailed', 'imports', 'ja').text))
if (raw == null) if (raw == null)
return { source: '' } return { source: '' }
@@ -86,11 +31,13 @@ export const savePostImportSourceDraft = (
source: string, source: string,
onError?: StorageErrorHandler, onError?: StorageErrorHandler,
): boolean => ): boolean =>
writeStorage (SOURCE_DRAFT_KEY, JSON.stringify ({ source }), onError) writeSessionStorage (SOURCE_DRAFT_KEY, JSON.stringify ({ source }), () =>
onError?.(translateUIMessage ('storage.writeFailed', 'imports', 'ja').text))
export const clearPostImportSourceDraft = ( export const clearPostImportSourceDraft = (
onError?: StorageErrorHandler, onError?: StorageErrorHandler,
) => { ) => {
removeStorage (SOURCE_DRAFT_KEY, onError) removeSessionStorage (SOURCE_DRAFT_KEY, () =>
onError?.(translateUIMessage ('storage.clearFailed', 'imports', 'ja').text))
} }
+58
ファイルの表示
@@ -0,0 +1,58 @@
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
ファイルの表示
@@ -0,0 +1,249 @@
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
ファイルの表示
@@ -0,0 +1,180 @@
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 }
}
+17 -2
ファイルの表示
@@ -6,11 +6,14 @@ import { describe, expect, it, vi } from 'vitest'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard' import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { renderWithProviders } from '@/test/render' import { renderWithProviders } from '@/test/render'
const GuardHarness = () => { const GuardHarness = ({ onDiscard }: { onDiscard?: () => void }) => {
const [dirty, setDirty] = useState (true) const [dirty, setDirty] = useState (true)
const location = useLocation () const location = useLocation ()
const navigate = useNavigate () const navigate = useNavigate ()
const discard = vi.fn (() => setDirty (false)) const discard = () => {
onDiscard?.()
setDirty (false)
}
const { allowNextNavigation } = useUnsavedChangesGuard ({ const { allowNextNavigation } = useUnsavedChangesGuard ({
dirty, dirty,
onDiscard: discard }) onDiscard: discard })
@@ -31,6 +34,18 @@ const GuardHarness = () => {
} }
describe ('useUnsavedChangesGuard', () => { 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 () => { it ('blocks route changes and resets a cancelled transition', async () => {
renderWithProviders (<GuardHarness/>, { route: '/current' }) renderWithProviders (<GuardHarness/>, { route: '/current' })
+39 -28
ファイルの表示
@@ -23,17 +23,20 @@ type UseUnsavedChangesGuardOptions = {
onDiscard?: () => void | Promise<void> } onDiscard?: () => void | Promise<void> }
type UnsavedChangesGuardContextValue = { type UnsavedChangesGuardContextValue = {
draftScope: string
hasUnsavedChanges: boolean hasUnsavedChanges: boolean
registerUnsavedChangesSource: ( registerUnsavedChangesSource: (
source: UnsavedChangesSource, source: UnsavedChangesSource,
) => () => void ) => () => void
allowNextNavigation: () => void } allowNextNavigation: () => void
confirmNavigation: () => Promise<boolean> }
const UnsavedChangesGuardContext = const UnsavedChangesGuardContext =
createContext<UnsavedChangesGuardContextValue | null> (null) createContext<UnsavedChangesGuardContextValue | null> (null)
export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children }) => { export const UnsavedChangesGuardProvider: FC<PropsWithChildren<{
draftScope?: string }>> = ({ children, draftScope = 'anonymous' }) => {
const dialogue = useDialogue () const dialogue = useDialogue ()
const { label } = useUITranslation ('settings') const { label } = useUITranslation ('settings')
const sourcesRef = useRef (new Map<symbol, UnsavedChangesSource> ()) const sourcesRef = useRef (new Map<symbol, UnsavedChangesSource> ())
@@ -117,6 +120,12 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children })
} }
}, [dialogue, hasUnsavedChanges, label]) }, [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 (() => { useEffect (() => {
if (blocker.state !== 'blocked' || handlingBlockedTransitionRef.current) if (blocker.state !== 'blocked' || handlingBlockedTransitionRef.current)
return return
@@ -125,33 +134,24 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children })
void (async () => { void (async () => {
try try
{ {
const confirmed = await confirmDiscardChanges () const confirmed = await confirmNavigation ()
if (!(confirmed)) if (!confirmed) {
{
blocker.reset ()
return
}
let discardResults: Array<void | Promise<void>>
try
{
discardResults = dirtySources.map (source => source.discard ())
}
catch
{
blocker.reset () blocker.reset ()
return return
} }
blocker.proceed () blocker.proceed ()
await Promise.allSettled (discardResults) }
catch
{
blocker.reset ()
} }
finally finally
{ {
handlingBlockedTransitionRef.current = false handlingBlockedTransitionRef.current = false
} }
}) () }) ()
}, [blocker, confirmDiscardChanges, dirtySources]) }, [blocker, confirmNavigation])
useEffect (() => { useEffect (() => {
if (!(hasUnsavedChanges)) if (!(hasUnsavedChanges))
@@ -162,21 +162,30 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children })
event.returnValue = '' event.returnValue = ''
} }
const handlePageHide = () => {
for (const source of sourcesRef.current.values ())
if (source.dirty) void source.discard ()
}
window.addEventListener ('beforeunload', handleBeforeUnload) window.addEventListener ('beforeunload', handleBeforeUnload)
window.addEventListener ('pagehide', handlePageHide)
return () => { return () => {
window.removeEventListener ('beforeunload', handleBeforeUnload) window.removeEventListener ('beforeunload', handleBeforeUnload)
window.removeEventListener ('pagehide', handlePageHide)
} }
}, [hasUnsavedChanges]) }, [hasUnsavedChanges])
const value = useMemo<UnsavedChangesGuardContextValue> (() => ({ const value = useMemo<UnsavedChangesGuardContextValue> (() => ({
draftScope,
hasUnsavedChanges, hasUnsavedChanges,
registerUnsavedChangesSource, registerUnsavedChangesSource,
allowNextNavigation, allowNextNavigation,
}), [ confirmNavigation }), [
allowNextNavigation, allowNextNavigation,
confirmNavigation,
draftScope,
hasUnsavedChanges, hasUnsavedChanges,
registerUnsavedChangesSource, registerUnsavedChangesSource])
])
return ( return (
<UnsavedChangesGuardContext.Provider value={value}> <UnsavedChangesGuardContext.Provider value={value}>
@@ -194,15 +203,17 @@ export const useUnsavedChangesGuard = (
throw new Error ('UnsavedChangesGuardProvider が必要です.') throw new Error ('UnsavedChangesGuardProvider が必要です.')
const { registerUnsavedChangesSource } = context const { registerUnsavedChangesSource } = context
const source = useRef (options)
source.current = options
const active = options != null
useEffect (() => { useEffect (() => {
if (options == null) if (!active) return
return
return registerUnsavedChangesSource ({ return registerUnsavedChangesSource ({
dirty: options.dirty, dirty: source.current?.dirty ?? false,
discard: options.onDiscard ?? (() => undefined) }) discard: () => source.current?.onDiscard?.() })
}, [options?.dirty, options?.onDiscard, registerUnsavedChangesSource]) }, [active, options?.dirty, registerUnsavedChangesSource])
return context return context
} }
+9
ファイルの表示
@@ -2,6 +2,7 @@ import { animate, motion, useMotionTemplate, useMotionValue } from 'framer-motio
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react' import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { useLocale } from '@/lib/useLocale' import { useLocale } from '@/lib/useLocale'
import PrefetchLink from '@/components/PrefetchLink' import PrefetchLink from '@/components/PrefetchLink'
import MainArea from '@/components/layout/MainArea' import MainArea from '@/components/layout/MainArea'
@@ -4190,6 +4191,14 @@ const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
setHistory ([]) setHistory ([])
} }
useUnsavedChangesGuard ({
dirty: !restorePromptVisible && (
(!saved && answers.length > 0)
|| questionSuggestion.trim () !== ''
|| questionSuggestionSelectedId != null
|| (extraQuestionState !== 'saved' && Object.keys (extraQuestionAnswers).length > 0)),
onDiscard: reset })
const continueStoredGame = () => { const continueStoredGame = () => {
setRestorePromptVisible (false) setRestorePromptVisible (false)
setPhase (storedGame?.phase ?? 'question') setPhase (storedGame?.phase ?? 'question')
+5 -4
ファイルの表示
@@ -2,6 +2,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'
import { useEffect, useMemo, useState } from 'react' import { useEffect, useMemo, useState } from 'react'
import { useParams } from 'react-router-dom' import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale' import { useLocale } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation' import { useUITranslation } from '@/lib/useUITranslation'
import TagLink from '@/components/TagLink' import TagLink from '@/components/TagLink'
@@ -38,8 +39,9 @@ const DeerjikistDetailPage: FC = () => {
const tag = qData?.tag const tag = qData?.tag
const deerjikists = useMemo (() => qData?.deerjikists ?? [], [qData]) const deerjikists = useMemo (() => qData?.deerjikists ?? [], [qData])
const [data, setData] = const { draft: data, setDraft: setData, clearDraft } = useSessionDraft<
useState<(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> (deerjikists) (Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> (
`deerjikists:${tagId}:${locale}`, deerjikists, tag != null)
const [disabled, setDisabled] = useState (tag == null) const [disabled, setDisabled] = useState (tag == null)
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } = const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<DeerjikistFormField> () useValidationErrors<DeerjikistFormField> ()
@@ -54,7 +56,7 @@ const DeerjikistDetailPage: FC = () => {
{ {
setDisabled (true) setDisabled (true)
setData (await apiPut<Deerjikist[]> (`/tags/${ id }/deerjikists`, data, { locale })) clearDraft (await apiPut<Deerjikist[]> (`/tags/${ id }/deerjikists`, data, { locale }))
qc.invalidateQueries ({ queryKey: tagsKeys.root }) qc.invalidateQueries ({ queryKey: tagsKeys.root })
toast ({ description: label ('messages.updated') }) toast ({ description: label ('messages.updated') })
@@ -78,7 +80,6 @@ const DeerjikistDetailPage: FC = () => {
return return
} }
setData (deerjikists)
setDisabled (false) setDisabled (false)
}, [tag, deerjikists]) }, [tag, deerjikists])
+25 -27
ファイルの表示
@@ -2,6 +2,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { useParams } from 'react-router-dom' import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale' import { useLocale } from '@/lib/useLocale'
import TagLink from '@/components/TagLink' import TagLink from '@/components/TagLink'
import WikiBody from '@/components/WikiBody' import WikiBody from '@/components/WikiBody'
@@ -40,12 +41,23 @@ const MaterialDetailPage: FC = () => {
queryFn: () => fetchMaterial (id ?? '', locale), queryFn: () => fetchMaterial (id ?? '', locale),
enabled: id != null }) enabled: id != null })
const [exportPath, setExportPath] = useState (material?.exportPaths.legacyDrive ?? '') const { draft, setField, clearDraft, confirmNavigation } =
const [file, setFile] = useState<File | null> (null) useSessionDraft (`material:${id}:${locale}`, {
const [filePreview, setFilePreview] = useState ( tag: material?.tag?.name ?? '', url: material?.url ?? '',
material?.contentType != null ? material.file ?? '' : '') exportPath: material?.exportPaths.legacyDrive ?? '', file: null as File | null },
const [tag, setTag] = useState (material?.tag?.name ?? '') material != null)
const [url, setURL] = useState (material?.url ?? '') 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 { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } = const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<MaterialFormField> () useValidationErrors<MaterialFormField> ()
@@ -53,20 +65,6 @@ const MaterialDetailPage: FC = () => {
? material.tag?.name ?? message ('unnamed', { id: material.id }).text ? 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 () => { const invalidateMaterialQueries = async () => {
await qc.invalidateQueries ({ queryKey: materialsKeys.root }) await qc.invalidateQueries ({ queryKey: materialsKeys.root })
} }
@@ -85,6 +83,8 @@ const MaterialDetailPage: FC = () => {
return await updateMaterial (id ?? '', formData, locale) return await updateMaterial (id ?? '', formData, locale)
}, },
onSuccess: async data => { onSuccess: async data => {
clearDraft ({ tag: data.tag?.name ?? '', url: data.url ?? '',
exportPath: data.exportPaths.legacyDrive ?? '', file: null })
qc.setQueryData (materialsKeys.show (id ?? '', locale), data) qc.setQueryData (materialsKeys.show (id ?? '', locale), data)
await invalidateMaterialQueries () await invalidateMaterialQueries ()
toast ({ title: label ('updated') }) toast ({ title: label ('updated') })
@@ -133,7 +133,7 @@ const MaterialDetailPage: FC = () => {
|| (/audio\/.*/.test (material.contentType) && ( || (/audio\/.*/.test (material.contentType) && (
<audio src={material.file} controls/>)))} <audio src={material.file} controls/>)))}
<TabGroup> <TabGroup onBeforeChange={confirmNavigation}>
{material.tag && ( {material.tag && (
<Tab name={label ('navigation:wiki')}> <Tab name={label ('navigation:wiki')}>
<WikiBody <WikiBody
@@ -152,7 +152,7 @@ const MaterialDetailPage: FC = () => {
describedBy={describedBy} describedBy={describedBy}
invalid={invalid} invalid={invalid}
value={tag} value={tag}
setValue={setTag}/>)} setValue={value => setField ('tag', value)}/>)}
</FormField> </FormField>
<FormField label={label ('file')} messages={fieldErrors.file}> <FormField label={label ('file')} messages={fieldErrors.file}>
@@ -165,9 +165,7 @@ const MaterialDetailPage: FC = () => {
aria-invalid={invalid} aria-invalid={invalid}
onChange={e => { onChange={e => {
const nextFile = e.target.files?.[0] const nextFile = e.target.files?.[0]
setFile (nextFile ?? null) setField ('file', nextFile ?? null)
setFilePreview (
nextFile ? URL.createObjectURL (nextFile) : '')
}}/> }}/>
{(file && filePreview) && ( {(file && filePreview) && (
(/image\/.*/.test (file.type) && ( (/image\/.*/.test (file.type) && (
@@ -198,7 +196,7 @@ const MaterialDetailPage: FC = () => {
<input <input
type="url" type="url"
value={url} value={url}
onChange={e => setURL (e.target.value)} onChange={e => setField ('url', e.target.value)}
aria-describedby={describedBy} aria-describedby={describedBy}
aria-invalid={invalid} aria-invalid={invalid}
className={inputClass (invalid)}/>)} className={inputClass (invalid)}/>)}
@@ -209,7 +207,7 @@ const MaterialDetailPage: FC = () => {
<input <input
type="text" type="text"
value={exportPath} value={exportPath}
onChange={e => setExportPath (e.target.value)} onChange={e => setField ('exportPath', e.target.value)}
placeholder={message ('exportPlaceholder').text} placeholder={message ('exportPlaceholder').text}
lang={message ('exportPlaceholder').language} lang={message ('exportPlaceholder').language}
aria-describedby={describedBy} aria-describedby={describedBy}
+19 -10
ファイルの表示
@@ -1,7 +1,8 @@
import { useMutation, useQueryClient } from '@tanstack/react-query' import { useMutation, useQueryClient } from '@tanstack/react-query'
import { useState } from 'react' import { useEffect, useState } from 'react'
import { useLocation } from 'react-router-dom' import { useLocation } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale' import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import FieldError from '@/components/common/FieldError' import FieldError from '@/components/common/FieldError'
import Form from '@/components/common/Form' import Form from '@/components/common/Form'
@@ -37,11 +38,18 @@ const MaterialNewPage: FC = () => {
const navigate = useLocaleNavigate () const navigate = useLocaleNavigate ()
const [file, setFile] = useState<File | null> (null) 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 [filePreview, setFilePreview] = useState ('') const [filePreview, setFilePreview] = useState ('')
const [tag, setTag] = useState (tagQuery) useEffect (() => {
const [url, setURL] = useState ('') const preview = file == null ? '' : URL.createObjectURL (file)
const [exportPath, setExportPath] = useState ('') setFilePreview (preview)
return () => {
if (file != null) URL.revokeObjectURL (preview)
}
}, [file])
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } = const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<MaterialFormField> () useValidationErrors<MaterialFormField> ()
@@ -59,8 +67,10 @@ const MaterialNewPage: FC = () => {
return await createMaterial (formData, locale) return await createMaterial (formData, locale)
}, },
onSuccess: async () => { onSuccess: async () => {
clearDraft ()
await qc.invalidateQueries ({ queryKey: materialsKeys.root }) await qc.invalidateQueries ({ queryKey: materialsKeys.root })
toast ({ title: label ('sent') }) toast ({ title: label ('sent') })
allowNextNavigation ()
navigate (safeReturnTo || '/materials') navigate (safeReturnTo || '/materials')
}, },
onError: error => { onError: error => {
@@ -88,7 +98,7 @@ const MaterialNewPage: FC = () => {
describedBy={describedBy} describedBy={describedBy}
invalid={invalid} invalid={invalid}
value={tag} value={tag}
setValue={setTag}/>)} setValue={value => setField ('tag', value)}/>)}
</FormField> </FormField>
{/* ファイル */} {/* ファイル */}
@@ -102,8 +112,7 @@ const MaterialNewPage: FC = () => {
aria-invalid={invalid} aria-invalid={invalid}
onChange={e => { onChange={e => {
const f = e.target.files?.[0] const f = e.target.files?.[0]
setFile (f ?? null) setField ('file', f ?? null)
setFilePreview (f ? URL.createObjectURL (f) : '')
}}/> }}/>
{(file && filePreview) && ( {(file && filePreview) && (
(/image\/.*/.test (file.type) && ( (/image\/.*/.test (file.type) && (
@@ -135,7 +144,7 @@ const MaterialNewPage: FC = () => {
<input <input
type="url" type="url"
value={url} value={url}
onChange={e => setURL (e.target.value)} onChange={e => setField ('url', e.target.value)}
aria-describedby={describedBy} aria-describedby={describedBy}
aria-invalid={invalid} aria-invalid={invalid}
className={inputClass (invalid)}/>)} className={inputClass (invalid)}/>)}
@@ -148,7 +157,7 @@ const MaterialNewPage: FC = () => {
<input <input
type="text" type="text"
value={exportPath} value={exportPath}
onChange={e => setExportPath (e.target.value)} onChange={e => setField ('exportPath', e.target.value)}
placeholder={message ('exportPlaceholder').text} placeholder={message ('exportPlaceholder').text}
lang={message ('exportPlaceholder').language} lang={message ('exportPlaceholder').language}
aria-describedby={describedBy} aria-describedby={describedBy}
+12 -15
ファイルの表示
@@ -1,6 +1,6 @@
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useState } from 'react'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale' import { useLocale } from '@/lib/useLocale'
import FormField from '@/components/common/FormField' import FormField from '@/components/common/FormField'
import PageTitle from '@/components/common/PageTitle' import PageTitle from '@/components/common/PageTitle'
@@ -41,12 +41,11 @@ const MaterialSyncSuppressionsPage: FC = () => {
const locale = useLocale () const locale = useLocale ()
const { message, label } = useUITranslation ('materials') const { message, label } = useUITranslation ('materials')
const qc = useQueryClient () const qc = useQueryClient ()
const [sourceKind, setSourceKind] = const { draft, setField, clearDraft } = useSessionDraft (`material-suppressions:${locale}`, {
useState<MaterialSyncSuppressionSourceKind> ('uri') sourceKind: 'uri' as MaterialSyncSuppressionSourceKind,
const [sourceUri, setSourceUri] = useState ('') sourceUri: '', drivePath: '', driveFileId: '',
const [drivePath, setDrivePath] = useState ('') reason: REASONS[0] as MaterialSyncSuppressionReason })
const [driveFileId, setDriveFileId] = useState ('') const { sourceKind, sourceUri, drivePath, driveFileId, reason } = draft
const [reason, setReason] = useState<MaterialSyncSuppressionReason> (REASONS[0])
const { data, isError, isLoading } = useQuery ({ const { data, isError, isLoading } = useQuery ({
queryKey: materialsKeys.suppressions (locale), queryKey: materialsKeys.suppressions (locale),
@@ -63,9 +62,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
onSuccess: async () => { onSuccess: async () => {
await qc.invalidateQueries ({ queryKey: materialsKeys.suppressions (locale) }) await qc.invalidateQueries ({ queryKey: materialsKeys.suppressions (locale) })
await qc.invalidateQueries ({ queryKey: materialsKeys.root }) await qc.invalidateQueries ({ queryKey: materialsKeys.root })
setSourceUri ('') clearDraft ({ ...draft, sourceUri: '', drivePath: '', driveFileId: '' })
setDrivePath ('')
setDriveFileId ('')
toast ({ title: label ('suppressions.registered') }) toast ({ title: label ('suppressions.registered') })
}, },
onError: () => { onError: () => {
@@ -96,7 +93,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
{({ invalid }) => ( {({ invalid }) => (
<select <select
value={sourceKind} value={sourceKind}
onChange={e => setSourceKind ( onChange={e => setField ('sourceKind',
e.target.value as MaterialSyncSuppressionSourceKind)} e.target.value as MaterialSyncSuppressionSourceKind)}
className={inputClass (invalid)}> className={inputClass (invalid)}>
{Object.entries (SOURCE_KIND_LABELS).map (([value, key]) => ( {Object.entries (SOURCE_KIND_LABELS).map (([value, key]) => (
@@ -111,7 +108,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
<input <input
type="text" type="text"
value={sourceUri} value={sourceUri}
onChange={e => setSourceUri (e.target.value)} onChange={e => setField ('sourceUri', e.target.value)}
className={inputClass (invalid)}/>)} className={inputClass (invalid)}/>)}
</FormField> </FormField>
@@ -120,7 +117,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
<input <input
type="text" type="text"
value={drivePath} value={drivePath}
onChange={e => setDrivePath (e.target.value)} onChange={e => setField ('drivePath', e.target.value)}
className={inputClass (invalid)}/>)} className={inputClass (invalid)}/>)}
</FormField> </FormField>
@@ -129,7 +126,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
<input <input
type="text" type="text"
value={driveFileId} value={driveFileId}
onChange={e => setDriveFileId (e.target.value)} onChange={e => setField ('driveFileId', e.target.value)}
className={inputClass (invalid)}/>)} className={inputClass (invalid)}/>)}
</FormField> </FormField>
@@ -137,7 +134,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
{({ invalid }) => ( {({ invalid }) => (
<select <select
value={reason} value={reason}
onChange={e => setReason (e.target.value as MaterialSyncSuppressionReason)} onChange={e => setField ('reason', e.target.value as MaterialSyncSuppressionReason)}
className={inputClass (invalid)}> className={inputClass (invalid)}>
{REASONS.map (value => ( {REASONS.map (value => (
<option key={value} value={value} <option key={value} value={value}
+4 -1
ファイルの表示
@@ -2,6 +2,8 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { motion } from 'framer-motion' import { motion } from 'framer-motion'
import { useEffect, useRef } from 'react' import { useEffect, useRef } from 'react'
import { useParams } from 'react-router-dom' import { useParams } from 'react-router-dom'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { useLocale } from '@/lib/useLocale' import { useLocale } from '@/lib/useLocale'
import PostEditForm from '@/components/PostEditForm' import PostEditForm from '@/components/PostEditForm'
import PostEmbed from '@/components/PostEmbed' import PostEmbed from '@/components/PostEmbed'
@@ -33,6 +35,7 @@ const PostDetailPage: FC<Props> = ({ user }) => {
const locale = useLocale () const locale = useLocale ()
const { message, label } = useUITranslation ('posts') const { message, label } = useUITranslation ('posts')
const editable = canEditContent (user) const editable = canEditContent (user)
const { confirmNavigation } = useUnsavedChangesGuard ()
const behaviourSettings = useClientBehaviourSettings () const behaviourSettings = useClientBehaviourSettings ()
const thumbnailMode = behaviourSettings.thumbnailMode ?? 'normal' const thumbnailMode = behaviourSettings.thumbnailMode ?? 'normal'
const animationMode = behaviourSettings.animation ?? 'normal' const animationMode = behaviourSettings.animation ?? 'normal'
@@ -163,7 +166,7 @@ const PostDetailPage: FC<Props> = ({ user }) => {
className={cn ('text-white', viewedClass)}> className={cn ('text-white', viewedClass)}>
{label (post.viewed ? 'detail.viewed' : 'detail.unviewed')} {label (post.viewed ? 'detail.viewed' : 'detail.unviewed')}
</Button> </Button>
<TabGroup> <TabGroup onBeforeChange={confirmNavigation}>
<Tab name={label ('shared:labels.relations')}> <Tab name={label ('shared:labels.relations')}>
{post.related.length > 0 {post.related.length > 0
? <PostList posts={post.related}/> ? <PostList posts={post.related}/>
+32 -40
ファイルの表示
@@ -42,13 +42,14 @@ import {
} from '@/lib/postImportRows' } from '@/lib/postImportRows'
import { clearPostImportSourceDraft } from '@/lib/postImportStorage' import { clearPostImportSourceDraft } from '@/lib/postImportStorage'
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings' import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard' import { useSessionDraft } from '@/lib/useSessionDraft'
import { cn } from '@/lib/utils' import { cn } from '@/lib/utils'
import { canEditContent } from '@/lib/users' import { canEditContent } from '@/lib/users'
import Forbidden from '@/pages/Forbidden' import Forbidden from '@/pages/Forbidden'
import type { FC } from 'react' import type { FC } from 'react'
import type { DialogueFormControls } from '@/lib/dialogues/useDialogue'
import type { import type {
PostImportDisplayTag, PostImportDisplayTag,
PostImportEditableDraft, PostImportEditableDraft,
@@ -578,26 +579,6 @@ 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 PostImportReviewPage: FC<Props> = ({ user }) => {
const locale = useLocale () const locale = useLocale ()
const { message, label } = useUITranslation ('imports') const { message, label } = useUITranslation ('imports')
@@ -614,8 +595,13 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
? { duration: .08, ease: 'linear' as const } ? { duration: .08, ease: 'linear' as const }
: { duration: .2, ease: 'easeOut' as const } : { duration: .2, ease: 'easeOut' as const }
const [rows, setRows] = useState<PostImportRow[] | null> ( const { draft: rows, setDraft: setRows, clearDraft, allowNextNavigation, ready } =
() => buildInitialRows (parsePostNewReviewUrls (location.search))) 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 [metadataLoading, setMetadataLoading] = useState (false) const [metadataLoading, setMetadataLoading] = useState (false)
const [submitting, setSubmitting] = useState (false) const [submitting, setSubmitting] = useState (false)
const [busyRowIds, setBusyRowIds] = useState<Set<number>> (new Set ()) const [busyRowIds, setBusyRowIds] = useState<Set<number>> (new Set ())
@@ -623,22 +609,13 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
const [showExistingRows, setShowExistingRows] = useState (false) const [showExistingRows, setShowExistingRows] = useState (false)
const rowsRef = useRef<PostImportRow[]> ([]) const rowsRef = useRef<PostImportRow[]> ([])
const metadataSequenceRef = useRef (0) const metadataSequenceRef = useRef (0)
const discardChanges = useCallback (() => undefined, []) rowsRef.current = rows
const dirty = useMemo (
() => rows?.some (row => editableRowDirty (row)) ?? false,
[rows],
)
const { allowNextNavigation } = useUnsavedChangesGuard ({
dirty,
onDiscard: discardChanges,
})
const commitRows = useCallback ((nextRows: PostImportRow[]) => { const commitRows = useCallback ((nextRows: PostImportRow[]) => {
rowsRef.current = nextRows rowsRef.current = nextRows
setRows (nextRows) setRows (nextRows)
return nextRows return nextRows
}, []) }, [setRows])
const updateRows = useCallback (( const updateRows = useCallback ((
updater: (currentRows: PostImportRow[]) => PostImportRow[], updater: (currentRows: PostImportRow[]) => PostImportRow[],
@@ -654,17 +631,18 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
[]) [])
const finishImport = useCallback (() => { const finishImport = useCallback (() => {
allowNextNavigation () clearDraft ()
clearSourceDraft ('')
clearPostImportSourceDraft (message => clearPostImportSourceDraft (message =>
toast ({ title: label ('review.clearFailed'), toast ({ title: label ('review.clearFailed'),
description: renderPostImportMessage (message, locale) })) description: renderPostImportMessage (message, locale) }))
allowNextNavigation ()
navigate ('/posts') navigate ('/posts')
}, [allowNextNavigation, navigate, label, locale]) }, [allowNextNavigation, clearDraft, clearSourceDraft, navigate, label, locale])
useEffect (() => { useEffect (() => {
const urls = parsePostNewReviewUrls (location.search) if (!ready) return
const initialRows = buildInitialRows (urls) const initialRows = rowsRef.current
commitRows (initialRows)
let active = true let active = true
const sequence = ++metadataSequenceRef.current const sequence = ++metadataSequenceRef.current
@@ -778,7 +756,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
active = false active = false
controllers.forEach (controller => controller.abort ()) controllers.forEach (controller => controller.abort ())
} }
}, [commitRows, currentRowBySource, location.search, updateRows, locale]) }, [currentRowBySource, location.search, updateRows, locale, ready])
useEffect (() => { useEffect (() => {
if (editingRow == null || resultRepairMode (rowsRef.current) !== 'failed') if (editingRow == null || resultRepairMode (rowsRef.current) !== 'failed')
@@ -924,6 +902,9 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
} }
const openEditingDialogue = async (row: PostImportRow) => { const openEditingDialogue = async (row: PostImportRow) => {
const draftState = { dirty: false, discard: () => { },
confirm: null as null | DialogueFormControls['confirm'] }
const saveRowDraft = ( const saveRowDraft = (
{ draft, resetRequested }: { { draft, resetRequested }: {
draft: PostImportEditableDraft draft: PostImportEditableDraft
@@ -934,12 +915,23 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
await dialogue.form ({ await dialogue.form ({
title: label ('review.editPost'), title: label ('review.editPost'),
cancelText: label ('shared:actions.cancel'), 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', size: 'large',
body: controls => ( body: controls => (
<PostImportRowForm <PostImportRowForm
row={row} row={row}
controls={controls} controls={controls}
onDirtyStateChange={(dirty, discard) => {
draftState.dirty = dirty
draftState.discard = discard
draftState.confirm = controls.confirm
}}
onSave={saveRowDraft}/>) }) onSave={saveRowDraft}/>) })
draftState.discard ()
} }
const editRow = async (row: PostImportRow) => { const editRow = async (row: PostImportRow) => {
+5 -39
ファイルの表示
@@ -1,6 +1,7 @@
import { useEffect, useRef, useState } from 'react' import { useState } from 'react'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale' import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation' import { useUITranslation } from '@/lib/useUITranslation'
import { renderPostImportMessage } from '@/components/posts/import/postImportRowStatus' import { renderPostImportMessage } from '@/components/posts/import/postImportRowStatus'
@@ -22,10 +23,6 @@ import {
extractImportSourceUrls, extractImportSourceUrls,
validateImportSource, validateImportSource,
} from '@/lib/postImportSourceValidation' } from '@/lib/postImportSourceValidation'
import {
loadPostImportSourceDraft,
savePostImportSourceDraft,
} from '@/lib/postImportStorage'
import { canEditContent } from '@/lib/users' import { canEditContent } from '@/lib/users'
import Forbidden from '@/pages/Forbidden' import Forbidden from '@/pages/Forbidden'
@@ -45,12 +42,11 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
const { message: uiMessage, label } = useUITranslation ('imports') const { message: uiMessage, label } = useUITranslation ('imports')
const editable = canEditContent (user) const editable = canEditContent (user)
const navigate = useLocaleNavigate () const navigate = useLocaleNavigate ()
const [source, setSource] = useState ('') const { draft: source, setDraft: setSource, allowNextNavigation } =
useSessionDraft ('post-import:source', '', editable)
const [loading, setLoading] = useState (false) const [loading, setLoading] = useState (false)
const [sourceIssues, setSourceIssues] = useState<ReturnType<typeof validateImportSource>> ([]) const [sourceIssues, setSourceIssues] = useState<ReturnType<typeof validateImportSource>> ([])
const [sourceError, setSourceError] = useState<string | null> (null) const [sourceError, setSourceError] = useState<string | null> (null)
const saveTimer = useRef<number | null> (null)
const editedRef = useRef (false)
const lineCount = countImportSourceLines (source) const lineCount = countImportSourceLines (source)
const sourceUrls = extractImportSourceUrls (source) const sourceUrls = extractImportSourceUrls (source)
@@ -62,36 +58,6 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
.filter (value => value != null) .filter (value => value != null)
.join (' ') .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 () => { const preview = async () => {
if (lineCount === 0) if (lineCount === 0)
{ {
@@ -115,6 +81,7 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
setSourceError (null) setSourceError (null)
try try
{ {
allowNextNavigation ()
navigate (buildPostNewReviewPath (sourceUrls)) navigate (buildPostNewReviewPath (sourceUrls))
} }
finally finally
@@ -147,7 +114,6 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
description: renderPostImportMessage (message, locale) })) description: renderPostImportMessage (message, locale) }))
}} }}
onChange={ev => { onChange={ev => {
editedRef.current = true
setSource (ev.target.value) setSource (ev.target.value)
setSourceError (null) setSourceError (null)
setSourceIssues ([]) setSourceIssues ([])
+19 -21
ファイルの表示
@@ -3,6 +3,7 @@ import { Check, LoaderCircle, Pencil, X } from 'lucide-react'
import { Fragment, useEffect, useMemo, useState } from 'react' import { Fragment, useEffect, useMemo, useState } from 'react'
import { useLocation } from 'react-router-dom' import { useLocation } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale' import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import TagLink from '@/components/TagLink' import TagLink from '@/components/TagLink'
import SortHeader from '@/components/SortHeader' import SortHeader from '@/components/SortHeader'
@@ -27,7 +28,7 @@ import { useUITranslation } from '@/lib/useUITranslation'
import { translateUIMessage } from '@/lib/i18n' import { translateUIMessage } from '@/lib/i18n'
import { canEditContent } from '@/lib/users' import { canEditContent } from '@/lib/users'
import type { FC, FormEvent } from 'react' import type { FC, FormEvent, SetStateAction } from 'react'
import type { FetchNicoTagsOrder, FetchNicoTagsOrderField, NicoTag, Tag, User } from '@/types' import type { FetchNicoTagsOrder, FetchNicoTagsOrderField, NicoTag, Tag, User } from '@/types'
@@ -61,12 +62,10 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
const qLinkStatus = (query.get ('link_status') || 'all') as LinkStatus const qLinkStatus = (query.get ('link_status') || 'all') as LinkStatus
const order = (query.get ('order') || 'updated_at:desc') as FetchNicoTagsOrder 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 [errorsByTagId, setErrorsByTagId] = useState<Record<number, string[]>> ({ })
const [linkStatus, setLinkStatus] = useState<LinkStatus> ('all') const [linkStatus, setLinkStatus] = useState<LinkStatus> ('all')
const [linkedTag, setLinkedTag] = useState ('') const [linkedTag, setLinkedTag] = useState ('')
const [name, setName] = useState ('') const [name, setName] = useState ('')
const [rawTags, setRawTags] = useState<Record<number, string>> ({ })
const [savingId, setSavingId] = useState<number | null> (null) const [savingId, setSavingId] = useState<number | null> (null)
const keys = { const keys = {
@@ -79,6 +78,19 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
const editable = canEditContent (user) const editable = canEditContent (user)
const totalPages = Math.ceil (count / limit) 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) => { const handleSearch = (e: FormEvent) => {
e.preventDefault () e.preventDefault ()
@@ -111,18 +123,14 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
variant: 'danger'}))) variant: 'danger'})))
return return
clearDraft ({ editingId: null, rawTags: { } })
setEditingId (tag.id) setEditingId (tag.id)
setRawTags (rawTags => ({ setRawTags ({ [tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ') })
...rawTags,
[tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')}))
setErrorsByTagId (errors => ({ ...errors, [tag.id]: [] })) setErrorsByTagId (errors => ({ ...errors, [tag.id]: [] }))
} }
const cancelEdit = (tag: NicoTag) => { const cancelEdit = (tag: NicoTag) => {
setEditingId (null) clearDraft ({ editingId: null, rawTags: { } })
setRawTags (rawTags => ({
...rawTags,
[tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')}))
setErrorsByTagId (errors => ({ ...errors, [tag.id]: [] })) setErrorsByTagId (errors => ({ ...errors, [tag.id]: [] }))
} }
@@ -136,7 +144,7 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
await apiPut<Tag[]> (`/tags/nico/${ id }`, formData, await apiPut<Tag[]> (`/tags/nico/${ id }`, formData,
{ locale, headers: { 'Content-Type': 'multipart/form-data' } }) { locale, headers: { 'Content-Type': 'multipart/form-data' } })
setErrorsByTagId (errors => ({ ...errors, [id]: [] })) setErrorsByTagId (errors => ({ ...errors, [id]: [] }))
setEditingId (null) clearDraft ({ editingId: null, rawTags: { } })
await queryClient.invalidateQueries ({ queryKey: tagsKeys.nicoRoot }) await queryClient.invalidateQueries ({ queryKey: tagsKeys.nicoRoot })
toast ({ description: label ('nico.updated') }) toast ({ description: label ('nico.updated') })
} }
@@ -161,21 +169,11 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
setName (qName) setName (qName)
setLinkedTag (qLinkedTag) setLinkedTag (qLinkedTag)
setLinkStatus (qLinkStatus) setLinkStatus (qLinkStatus)
setEditingId (null)
document.querySelector ('table')?.scrollIntoView ({ document.querySelector ('table')?.scrollIntoView ({
behavior: clientScrollBehaviour (animationMode) }) behavior: clientScrollBehaviour (animationMode) })
}, [animationMode, location.search, qLinkedTag, qLinkStatus, qName]) }, [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 (() => { useEffect (() => {
if (isError) if (isError)
{ {
+16 -21
ファイルの表示
@@ -2,6 +2,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'
import { useEffect, useState } from 'react' import { useEffect, useState } from 'react'
import { useParams } from 'react-router-dom' import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale' import { useLocale } from '@/lib/useLocale'
import TagLink from '@/components/TagLink' import TagLink from '@/components/TagLink'
import FieldError from '@/components/common/FieldError' import FieldError from '@/components/common/FieldError'
@@ -42,12 +43,12 @@ const TagDetailPage: FC = () => {
queryKey: tagKey, queryKey: tagKey,
queryFn: () => fetchTag (tagId, locale) }) queryFn: () => fetchTag (tagId, locale) })
const [name, setName] = useState (tag?.name ?? '') const { draft, setField, clearDraft } = useSessionDraft (`tag:${tagId}:${locale}`, {
const [category, setCategory] = useState<Category> (tag?.category ?? 'general') name: tag?.name ?? '', category: (tag?.category ?? 'general') as Category,
const [aliases, setAliases] = useState (tag?.aliases.join (' ') ?? '') aliases: tag?.aliases.join (' ') ?? '',
const [parentTags, setParentTags] = useState (tag?.parents.map (entry => entry.name).join (' ') parentTags: tag?.parents.map (entry => entry.name).join (' ') ?? '',
?? '') deprecated: tag?.deprecatedAt != null }, tag != null && tag.category !== 'nico')
const [deprecated, setDeprecated] = useState (tag?.deprecatedAt != null) const { name, category, aliases, parentTags, deprecated } = draft
const [disabled, setDisabled] = useState (tag == null || tag.category === 'nico') const [disabled, setDisabled] = useState (tag == null || tag.category === 'nico')
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } = const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<TagFormField> () useValidationErrors<TagFormField> ()
@@ -69,11 +70,10 @@ const TagDetailPage: FC = () => {
{ {
const data = await apiPut<Tag> (`/tags/${ id }`, formData, { locale }) const data = await apiPut<Tag> (`/tags/${ id }`, formData, { locale })
setName (data.name) clearDraft ({ name: data.name, category: data.category as Category,
setCategory (data.category as Category) aliases: data.aliases.join (' '),
setAliases (data.aliases.join (' ')) parentTags: data.parents.map (entry => entry.name).join (' '),
setParentTags (data.parents.map (t => t.name).join (' ')) deprecated: data.deprecatedAt != null })
setDeprecated (Boolean (data.deprecatedAt))
qc.invalidateQueries ({ queryKey: postsKeys.root }) qc.invalidateQueries ({ queryKey: postsKeys.root })
qc.invalidateQueries ({ queryKey: tagsKeys.root }) qc.invalidateQueries ({ queryKey: tagsKeys.root })
@@ -94,11 +94,6 @@ const TagDetailPage: FC = () => {
return 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') setDisabled (tag.category === 'nico')
}, [tag]) }, [tag])
@@ -129,7 +124,7 @@ const TagDetailPage: FC = () => {
type="text" type="text"
disabled={disabled} disabled={disabled}
value={name} value={name}
onChange={e => setName (e.target.value)} onChange={e => setField ('name', e.target.value)}
aria-describedby={describedBy} aria-describedby={describedBy}
aria-invalid={invalid} aria-invalid={invalid}
className={inputClass (invalid)}/> className={inputClass (invalid)}/>
@@ -142,7 +137,7 @@ const TagDetailPage: FC = () => {
<select <select
disabled={disabled} disabled={disabled}
value={category ?? ''} value={category ?? ''}
onChange={e => setCategory(e.target.value as Category)} onChange={e => setField ('category', e.target.value as Category)}
aria-describedby={describedBy} aria-describedby={describedBy}
aria-invalid={invalid} aria-invalid={invalid}
className={inputClass (invalid)}> className={inputClass (invalid)}>
@@ -164,7 +159,7 @@ const TagDetailPage: FC = () => {
type="text" type="text"
disabled={disabled} disabled={disabled}
value={aliases} value={aliases}
onChange={e => setAliases (e.target.value)} onChange={e => setField ('aliases', e.target.value)}
aria-describedby={describedBy} aria-describedby={describedBy}
aria-invalid={invalid} aria-invalid={invalid}
className={inputClass (invalid)}/> className={inputClass (invalid)}/>
@@ -180,7 +175,7 @@ const TagDetailPage: FC = () => {
type="text" type="text"
disabled={disabled} disabled={disabled}
value={parentTags} value={parentTags}
onChange={e => setParentTags (e.target.value)} onChange={e => setField ('parentTags', e.target.value)}
aria-describedby={describedBy} aria-describedby={describedBy}
aria-invalid={invalid} aria-invalid={invalid}
className={inputClass (invalid)}/> className={inputClass (invalid)}/>
@@ -193,7 +188,7 @@ const TagDetailPage: FC = () => {
type="checkbox" type="checkbox"
disabled={disabled} disabled={disabled}
checked={deprecated} checked={deprecated}
onChange={e => setDeprecated (e.target.checked)} onChange={e => setField ('deprecated', e.target.checked)}
aria-describedby={describedBy} aria-describedby={describedBy}
aria-invalid={invalid}/>)} aria-invalid={invalid}/>)}
</FormField> </FormField>
+4 -2
ファイルの表示
@@ -3,6 +3,7 @@ import { useQuery } from '@tanstack/react-query'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react' import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useParams } from 'react-router-dom' import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale' import { useLocale } from '@/lib/useLocale'
import ErrorScreen from '@/components/ErrorScreen' import ErrorScreen from '@/components/ErrorScreen'
import PostEditForm from '@/components/PostEditForm' import PostEditForm from '@/components/PostEditForm'
@@ -238,7 +239,8 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
const [rightSidebarWidth, setRightSidebarWidth] = useState (256) const [rightSidebarWidth, setRightSidebarWidth] = useState (256)
const [sidebarContainerWidth, setSidebarContainerWidth] = useState (0) const [sidebarContainerWidth, setSidebarContainerWidth] = useState (0)
const [comments, setComments] = useState<TheatreComment[]> ([]) const [comments, setComments] = useState<TheatreComment[]> ([])
const [content, setContent] = useState ('') const { draft: content, setDraft: setContent, clearDraft } =
useSessionDraft (`theatre:${id}:comment:${locale}`, '')
const [editingPost, setEditingPost] = useState<Post | null> (null) const [editingPost, setEditingPost] = useState<Post | null> (null)
const [loading, setLoading] = useState (false) const [loading, setLoading] = useState (false)
const { data: initialTheatre, error: theatreError } = useQuery ({ const { data: initialTheatre, error: theatreError } = useQuery ({
@@ -620,7 +622,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
setSending (true) setSending (true)
clearValidationErrors () clearValidationErrors ()
await apiPost (`/theatres/${ id }/comments`, { content }, { locale }) await apiPost (`/theatres/${ id }/comments`, { content }, { locale })
setContent ('') clearDraft ('')
commentsRef.current?.scrollTo ({ commentsRef.current?.scrollTo ({
top: 0, top: 0,
behavior: clientScrollBehaviour (animationMode) }) behavior: clientScrollBehaviour (animationMode) })
+12 -16
ファイルの表示
@@ -38,6 +38,7 @@ import {
upsertUserThemeSlot, upsertUserThemeSlot,
USER_THEME_SLOT_SELECTIONS, USER_THEME_SLOT_SELECTIONS,
} from '@/lib/settings' } from '@/lib/settings'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard' import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { useKeyboardShortcutSettings, useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts' import { useKeyboardShortcutSettings, useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
import { cn, inputClass } from '@/lib/utils' import { cn, inputClass } from '@/lib/utils'
@@ -672,11 +673,13 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
const location = useLocation () const location = useLocation ()
const navigate = useLocaleNavigate () const navigate = useLocaleNavigate ()
const dialogue = useDialogue () const dialogue = useDialogue ()
const { registerUnsavedChangesSource } = useUnsavedChangesGuard () const { registerUnsavedChangesSource, allowNextNavigation } = useUnsavedChangesGuard ()
const [inheritVsbl, setInheritVsbl] = useState (false) const [inheritVsbl, setInheritVsbl] = useState (false)
const [loading, setLoading] = useState (initialSettings == null) const [loading, setLoading] = useState (initialSettings == null)
const [name, setName] = useState (user?.name ?? '') const { draft: name, setDraft: setName, clearDraft: clearNameDraft,
discardDraft: discardNameDraft } =
useSessionDraft ('settings:account', user?.name ?? '', user != null)
const [settingsError, setSettingsError] = useState<string | null> (null) const [settingsError, setSettingsError] = useState<string | null> (null)
const [savedThemeMode, setSavedThemeMode] = const [savedThemeMode, setSavedThemeMode] =
useState<ClientThemeMode> (initialSettings?.theme ?? 'system') useState<ClientThemeMode> (initialSettings?.theme ?? 'system')
@@ -693,9 +696,9 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
const [savedThemeSlots, setSavedThemeSlots] = const [savedThemeSlots, setSavedThemeSlots] =
useState<UserThemeSlotMap> (() => ensureCompleteThemeSlots ( useState<UserThemeSlotMap> (() => ensureCompleteThemeSlots (
normaliseUserThemeSlots (initialThemeSlots ?? []))) normaliseUserThemeSlots (initialThemeSlots ?? [])))
const [draftThemeSlots, setDraftThemeSlots] = const { draft: draftThemeSlots, setDraft: setDraftThemeSlots,
useState<UserThemeSlotMap> (() => ensureCompleteThemeSlots ( clearDraft: clearThemeDraft } =
normaliseUserThemeSlots (initialThemeSlots ?? []))) useSessionDraft ('settings:theme-slots', savedThemeSlots, user != null && !loading)
const [dirtyStates, setDirtyStates] = const [dirtyStates, setDirtyStates] =
useState<Partial<Record<SettingsTab, SettingsTabDirtyState>>> ({ }) useState<Partial<Record<SettingsTab, SettingsTabDirtyState>>> ({ })
const [userCodeVsbl, setUserCodeVsbl] = useState (false) const [userCodeVsbl, setUserCodeVsbl] = useState (false)
@@ -819,7 +822,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
} }
const discardAccountChanges = () => { const discardAccountChanges = () => {
setName (savedName) discardNameDraft ()
clearUserValidationErrors () clearUserValidationErrors ()
} }
@@ -898,6 +901,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
return return
await discardCurrentTabChanges () await discardCurrentTabChanges ()
allowNextNavigation ()
applyActiveTab (nextTab) applyActiveTab (nextTab)
} }
@@ -1057,7 +1061,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
`/users/${ user.id }`, formData, `/users/${ user.id }`, formData,
{ headers: { 'Content-Type': 'multipart/form-data' } }) { headers: { 'Content-Type': 'multipart/form-data' } })
setUser (currentUser => ({ ...currentUser, ...data })) setUser (currentUser => ({ ...currentUser, ...data }))
setName (data.name ?? '') clearNameDraft (data.name ?? '')
toast ({ title: label ('account.nameSaved') }) toast ({ title: label ('account.nameSaved') })
} }
catch (submitError) catch (submitError)
@@ -1091,7 +1095,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
const completeThemeSlots = ensureCompleteThemeSlots (nextSavedThemeSlots) const completeThemeSlots = ensureCompleteThemeSlots (nextSavedThemeSlots)
setSavedThemeSlots (completeThemeSlots) setSavedThemeSlots (completeThemeSlots)
setDraftThemeSlots (completeThemeSlots) clearThemeDraft (completeThemeSlots)
setCachedUserThemeSlots (completeThemeSlots) setCachedUserThemeSlots (completeThemeSlots)
applyClientAppearance (completeThemeSlots) applyClientAppearance (completeThemeSlots)
toast ({ title: label ('theme.saved') }) toast ({ title: label ('theme.saved') })
@@ -1107,13 +1111,6 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
discardThemeChanges () discardThemeChanges ()
} }
useEffect (() => {
if (!user)
return
setName (user.name ?? '')
}, [user])
useEffect (() => { useEffect (() => {
if (!(user)) if (!(user))
return return
@@ -1146,7 +1143,6 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
setSavedActiveDarkThemeSlotNo (activeDarkThemeSlotNo) setSavedActiveDarkThemeSlotNo (activeDarkThemeSlotNo)
setDraftActiveDarkThemeSlotNo (activeDarkThemeSlotNo) setDraftActiveDarkThemeSlotNo (activeDarkThemeSlotNo)
setSavedThemeSlots (completeThemeSlots) setSavedThemeSlots (completeThemeSlots)
setDraftThemeSlots (completeThemeSlots)
setCachedUserThemeSlots (completeThemeSlots) setCachedUserThemeSlots (completeThemeSlots)
applyThemeAppearanceState ({ themeMode, applyThemeAppearanceState ({ themeMode,
activeLightThemeSlotNo, activeLightThemeSlotNo,
+30 -1
ファイルの表示
@@ -1,6 +1,6 @@
import { fireEvent, screen, waitFor } from '@testing-library/react' import { fireEvent, screen, waitFor } from '@testing-library/react'
import { Route, Routes } from 'react-router-dom' import { Route, Routes } from 'react-router-dom'
import { describe, expect, it, vi } from 'vitest' import { beforeEach, describe, expect, it, vi } from 'vitest'
import { textContentOf } from '@/test/text' import { textContentOf } from '@/test/text'
import WikiEditPage from '@/pages/wiki/WikiEditPage' import WikiEditPage from '@/pages/wiki/WikiEditPage'
@@ -10,6 +10,7 @@ import { renderWithProviders } from '@/test/render'
const api = vi.hoisted (() => ({ const api = vi.hoisted (() => ({
apiGet: vi.fn (), apiGet: vi.fn (),
apiPut: vi.fn (), apiPut: vi.fn (),
isApiError: vi.fn (() => false),
})) }))
const toastApi = vi.hoisted (() => ({ const toastApi = vi.hoisted (() => ({
@@ -39,6 +40,34 @@ const renderPage = (user = buildUser ({ role: 'member' })) =>
) )
describe ('WikiEditPage', () => { 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', () => { it ('blocks guests', () => {
renderPage (buildUser ({ role: 'guest' })) renderPage (buildUser ({ role: 'guest' }))
+10 -15
ファイルの表示
@@ -1,9 +1,9 @@
import { useQuery, useQueryClient } from '@tanstack/react-query' import { useQuery, useQueryClient } from '@tanstack/react-query'
import MarkdownIt from 'markdown-it' import MarkdownIt from 'markdown-it'
import { useEffect, useState } from 'react'
import MdEditor from 'react-markdown-editor-lite' import MdEditor from 'react-markdown-editor-lite'
import { useParams } from 'react-router-dom' import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale' import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation' import { useUITranslation } from '@/lib/useUITranslation'
import FieldError from '@/components/common/FieldError' import FieldError from '@/components/common/FieldError'
@@ -52,10 +52,11 @@ const WikiEditPage: FC<Props> = ({ user }) => {
queryKey: wikiKeys.show (id ?? '', { }, locale), queryKey: wikiKeys.show (id ?? '', { }, locale),
queryFn: () => apiGet<WikiPage> (`/wiki/${ encodeURIComponent (id ?? '') }`, { locale }), queryFn: () => apiGet<WikiPage> (`/wiki/${ encodeURIComponent (id ?? '') }`, { locale }),
enabled: editable }) enabled: editable })
const [body, setBody] = useState (wiki?.body ?? '') const { draft, setField, clearDraft, allowNextNavigation } =
const [loadedSource, setLoadedSource] = useState (wiki == null ? '' : source) useSessionDraft (`wiki:${source}`, { title: wiki?.title ?? '', body: wiki?.body ?? '' },
const pending = loading || loadedSource !== source editable && wiki != null)
const [title, setTitle] = useState (wiki?.title ?? '') const { title, body } = draft
const pending = loading
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } = const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<WikiFormField> () useValidationErrors<WikiFormField> ()
@@ -77,6 +78,8 @@ const WikiEditPage: FC<Props> = ({ user }) => {
prev == null ? prev : { ...prev, title, body }) prev == null ? prev : { ...prev, title, body })
qc.invalidateQueries ({ queryKey: wikiKeys.root }) qc.invalidateQueries ({ queryKey: wikiKeys.root })
toast ({ title: label ('shared:messages.postSuccess') }) toast ({ title: label ('shared:messages.postSuccess') })
clearDraft ()
allowNextNavigation ()
navigate (`/wiki/${ encodeURIComponent (title) }`) navigate (`/wiki/${ encodeURIComponent (title) }`)
} }
catch (e) catch (e)
@@ -87,14 +90,6 @@ const WikiEditPage: FC<Props> = ({ user }) => {
} }
} }
useEffect (() => {
if (!(editable) || wiki == null)
return
setTitle (wiki.title)
setBody (wiki.body)
setLoadedSource (source)
}, [editable, source, wiki])
if (!(editable)) if (!(editable))
return <Forbidden/> return <Forbidden/>
@@ -114,7 +109,7 @@ const WikiEditPage: FC<Props> = ({ user }) => {
{({ describedBy, invalid }) => ( {({ describedBy, invalid }) => (
<input type="text" <input type="text"
value={title} value={title}
onChange={e => setTitle (e.target.value)} onChange={e => setField ('title', e.target.value)}
aria-describedby={describedBy} aria-describedby={describedBy}
aria-invalid={invalid} aria-invalid={invalid}
className={inputClass (invalid)}/>)} className={inputClass (invalid)}/>)}
@@ -127,7 +122,7 @@ const WikiEditPage: FC<Props> = ({ user }) => {
style={{ height: '500px' }} style={{ height: '500px' }}
config={{ view: FIXED_WIKI_EDITOR_VIEW }} config={{ view: FIXED_WIKI_EDITOR_VIEW }}
renderHTML={text => mdParser.render (text)} renderHTML={text => mdParser.render (text)}
onChange={({ text }) => setBody (text)}/>)} onChange={({ text }) => setField ('body', text)}/>)}
</FormField> </FormField>
{/* 送信 */} {/* 送信 */}
+8 -5
ファイルの表示
@@ -1,10 +1,10 @@
import { useQueryClient } from '@tanstack/react-query' import { useQueryClient } from '@tanstack/react-query'
import MarkdownIt from 'markdown-it' import MarkdownIt from 'markdown-it'
import { useState } from 'react'
import MdEditor from 'react-markdown-editor-lite' import MdEditor from 'react-markdown-editor-lite'
import { useLocation } from 'react-router-dom' import { useLocation } from 'react-router-dom'
import 'react-markdown-editor-lite/lib/index.css' import 'react-markdown-editor-lite/lib/index.css'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale' import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation' import { useUITranslation } from '@/lib/useUITranslation'
import FieldError from '@/components/common/FieldError' import FieldError from '@/components/common/FieldError'
@@ -47,8 +47,9 @@ const WikiNewPage: FC<Props> = ({ user }) => {
const query = new URLSearchParams (location.search) const query = new URLSearchParams (location.search)
const titleQuery = query.get ('title') ?? '' const titleQuery = query.get ('title') ?? ''
const [title, setTitle] = useState (titleQuery) const { draft, setField, clearDraft, allowNextNavigation } =
const [body, setBody] = useState ('') useSessionDraft (`wiki:new:${locale}`, { title: titleQuery, body: '' }, editable)
const { title, body } = draft
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } = const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<WikiFormField> () useValidationErrors<WikiFormField> ()
@@ -69,6 +70,8 @@ const WikiNewPage: FC<Props> = ({ user }) => {
qc.invalidateQueries ({ queryKey: wikiKeys.root }), qc.invalidateQueries ({ queryKey: wikiKeys.root }),
qc.invalidateQueries ({ queryKey: tagsKeys.root })]) qc.invalidateQueries ({ queryKey: tagsKeys.root })])
toast ({ title: label ('shared:messages.postSuccess') }) toast ({ title: label ('shared:messages.postSuccess') })
clearDraft ()
allowNextNavigation ()
navigate (`/wiki/${ encodeURIComponent (data.title) }`) navigate (`/wiki/${ encodeURIComponent (data.title) }`)
} }
catch (e) catch (e)
@@ -95,7 +98,7 @@ const WikiNewPage: FC<Props> = ({ user }) => {
{({ describedBy, invalid }) => ( {({ describedBy, invalid }) => (
<input type="text" <input type="text"
value={title} value={title}
onChange={e => setTitle (e.target.value)} onChange={e => setField ('title', e.target.value)}
aria-describedby={describedBy} aria-describedby={describedBy}
aria-invalid={invalid} aria-invalid={invalid}
className={inputClass (invalid)}/>)} className={inputClass (invalid)}/>)}
@@ -108,7 +111,7 @@ const WikiNewPage: FC<Props> = ({ user }) => {
style={{ height: '500px' }} style={{ height: '500px' }}
config={{ view: FIXED_WIKI_EDITOR_VIEW }} config={{ view: FIXED_WIKI_EDITOR_VIEW }}
renderHTML={text => mdParser.render (text)} renderHTML={text => mdParser.render (text)}
onChange={({ text }) => setBody (text)}/>)} onChange={({ text }) => setField ('body', text)}/>)}
</FormField> </FormField>
{/* 送信 */} {/* 送信 */}
+5 -4
ファイルの表示
@@ -12,17 +12,18 @@ import type { ReactElement, ReactNode } from 'react'
type Options = { type Options = {
route?: string route?: string
queryClient?: QueryClient } queryClient?: QueryClient
draftScope?: string }
const TestContentContext = createContext<ReactNode> (null) const TestContentContext = createContext<ReactNode> (null)
const TestRoute = () => { const TestRoute = ({ draftScope }: { draftScope?: string }) => {
const children = useContext (TestContentContext) const children = useContext (TestContentContext)
return ( return (
<DialogueProvider> <DialogueProvider>
<UnsavedChangesGuardProvider> <UnsavedChangesGuardProvider draftScope={draftScope}>
<KeyboardShortcutsProvider> <KeyboardShortcutsProvider>
{children} {children}
</KeyboardShortcutsProvider> </KeyboardShortcutsProvider>
@@ -40,7 +41,7 @@ export const renderWithProviders = (
const Wrapper = ({ children }: { children: ReactNode }) => { const Wrapper = ({ children }: { children: ReactNode }) => {
const [router] = useState (() => createMemoryRouter ([{ const [router] = useState (() => createMemoryRouter ([{
path: '*', path: '*',
element: <TestRoute/> }], { element: <TestRoute draftScope={options.draftScope}/> }], {
initialEntries: [options.route ?? '/'] })) initialEntries: [options.route ?? '/'] }))
return ( return (
+1
ファイルの表示
@@ -9,6 +9,7 @@ beforeEach (() => {
afterEach (() => { afterEach (() => {
cleanup () cleanup ()
localStorage.clear () localStorage.clear ()
sessionStorage.clear ()
vi.restoreAllMocks () vi.restoreAllMocks ()
}) })