コミットを比較

..
3 コミット
作成者 SHA1 メッセージ 日付
Codex Night Worker e60c38c6b8 AI: address issue #97 2026-11-17 05:39:53 +09:00
みてるぞとCodex Night Worker dda3d87073 外部タグの履歴管理方式を変更 (#445) (#480)
Co-authored-by: Codex Night Worker <codex-night@localhost>
Reviewed-on: #480
Co-authored-by: miteruzo <miteruzo@naver.com>
2026-11-15 16:18:27 +09:00
テツノニジカとCodex Night Worker e13a52db9a AI: #454 広場のタグ検索,スマホ版だとサゼストが途中で見切れる問題 (#456)
Refs #454

## Automated implementation (requires human review)
[SidebarComponent.tsx](frontend/src/components/layout/SidebarComponent.tsx) の1行を修正しました。`overflow-y-auto` を `md` 以上に限定し、スマホでサゼストがサイドバーの領域外で切られる原因を取り除きました。

差分を確認済みです。指定に従い、テスト・lint・ビルドは未実行です。実画面でのスマホ表示とPC表示の確認も未実施です。

## Automated review (not a guarantee of correctness)
```text
The change restricts sidebar scrolling to medium and larger viewports. No actionable regression was identified in the current diff.

```

## Verification
- Tests/builds/migrations were not authorized and were not invoked by the controller.
- Codex was instructed not to run them; its command transcript should be inspected.
- Do not merge before manual acceptance and required checks.

---------

Co-authored-by: Codex Night Worker <codex-night@localhost>
Reviewed-on: #456
Co-authored-by: テツノニジカ <969+codex-bot@noreply.localhost>
2026-11-14 17:09:38 +09:00
57個のファイルの変更、4617行の追加、486行の削除
-35
ファイルの表示
@@ -1,35 +0,0 @@
## 背景
なぜ必要か。
## 対象範囲
- backend:
- frontend:
- docs:
- migration:
## やること
- [ ]
## 受け入れ条件
- [ ]
## 実行すべき確認
- [ ] `cd backend && bundle exec rspec`
- [ ] `cd frontend && npm run build`
- [ ] `cd frontend && npm run lint`
## 禁止事項
- unrelated refactor はしない
- 既存 API response shape を壊さない
- 認証・認可・BAN を弱めない
## Codex への指示
この issue を読んで実装してください。
不明点があれば、実装前に調査結果と選択肢を提示してください。
+1 -10
ファイルの表示
@@ -100,18 +100,9 @@ class PostVersionsController < ApplicationController
def external_tag_names_for snapshots
ids = snapshots.flatten.filter_map { _1['external_tag_id'] }.uniq
names = ExternalTag.where(id: ids).pluck(:id, :platform, :name).to_h { |id, platform, name|
ExternalTag.where(id: ids).pluck(:id, :platform, :name).to_h { |id, platform, name|
[id, "#{ platform }:#{ name }"]
}
missing_ids = ids - names.keys
HistoryAccess.visible(NicoTagVersion.all)
.where(tag_id: missing_ids)
.order(:tag_id, version_no: :desc)
.pluck(:tag_id, :name)
.each { |id, name| names[id] ||= name }
names
end
def snapshot_tag_literals snapshots, tag_names, external_tag_names
+19 -6
ファイルの表示
@@ -1,8 +1,11 @@
class ExternalTag < ApplicationRecord
before_create { SharedResourceIdAllocator.assign!(self) }
# Must run before dependent association callbacks.
before_destroy :prevent_destroy
enum :platform, nico: 'nico'
validates :platform, presence: true, inclusion: { in: ExternalTag.platforms.keys }
validate :immutable_identity, on: :update
has_many :post_external_tags, dependent: :delete_all
has_many :posts, through: :post_external_tags
@@ -16,11 +19,21 @@ class ExternalTag < ApplicationRecord
has_many :linked_tags, through: :nico_tag_relations, source: :tag
def snapshot_linked_tag_names language_code = 'ja'
linked_tags
.joins(:tag_names)
.where(tag_names: { language_code:, primary_flg: true })
.order('tag_names.name')
.pluck('tag_names.name')
def snapshot_linked_tag_ids = linked_tags.distinct.order(:id).pluck(:id)
def delete
raise ActiveRecord::ReadOnlyRecord, '外部タグは削除できません.'
end
private
def immutable_identity
errors.add(:platform, 'は変更できません.') if will_save_change_to_platform?
errors.add(:name, 'は変更できません.') if will_save_change_to_name?
end
def prevent_destroy
errors.add(:base, '外部タグは削除できません.')
throw(:abort)
end
end
+1 -15
ファイルの表示
@@ -106,21 +106,7 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
snapshot_reference(TagVersion, row),
snapshot_reference(NicoTagVersion, row, external: true)]
when 'nico_tag_versions'
# Legacy linked_tags snapshots contain names, not IDs. Match recorded names
# conservatively; never expose a private linked name through an external tag.
names = "JSON_MERGE_PRESERVE(JSON_ARRAY(private_tag.name), " +
"COALESCE(JSON_EXTRACT(private_tag.names, '$**.name'), JSON_ARRAY()))"
# DISTINCT prevents merging this independent name set into the correlated scan.
# Keep byte-distinct names even when the column collation considers them equal.
private_names = 'SELECT DISTINCT private_name.name, ' +
'CAST(private_name.name AS BINARY) AS name_bytes FROM tag_versions private_tag ' +
"JOIN (#{ discarded_keys('tag_versions', 'tag_id') }) blocked " +
'ON blocked.tag_id = private_tag.tag_id ' +
"JOIN JSON_TABLE(#{ names }, '$[*]' COLUMNS (name TEXT PATH '$')) private_name " +
"WHERE private_name.name <> ''"
["NOT EXISTS (SELECT 1 FROM (#{ private_names }) private_name WHERE " +
"LOCATE(CONCAT(' ', private_name.name, ' '), " +
"CONCAT(' ', COALESCE(#{ row }.linked_tags, ''), ' ')) > 0)"]
[list_reference('tag_versions', 'tag_id', "#{ row }.linked_tag_ids")]
when 'tag_versions'
[list_reference('tag_versions', 'tag_id', "#{ row }.parent_tag_ids")]
when 'tag_description_versions'
+6 -1
ファイルの表示
@@ -3,5 +3,10 @@ class NicoTagVersion < ApplicationRecord
belongs_to :external_tag, foreign_key: :tag_id, inverse_of: :nico_tag_versions
validates :name, presence: true
validates :event_type, inclusion: { in: ['create', 'update'] }
def name
tag = external_tag
"#{ tag.platform }:#{ tag.name }" if tag
end
end
+4 -1
ファイルの表示
@@ -139,6 +139,8 @@ class CountsVersionRepr
result = {}
table = model.table_name
comparison = @inclusive ? '<=' : '<'
name = model == NicoTagVersion ?
CountsResourceDefinition.new('nico_tags').expression('name', table) : 'name'
requests.each_slice(100) do |batch|
queries = batch.map do |id, point|
scope = HistoryAccess.visible(model.where(tag_id: id))
@@ -148,7 +150,8 @@ class CountsVersionRepr
"AND newer.version_no > #{ table }.version_no)", point)
quoted = model.connection.quote(point.iso8601(6))
names = model == TagVersion ? 'names' : 'JSON_OBJECT() AS names'
scope.select("tag_id, name, #{ names }, #{ quoted } AS reference_point").to_sql
scope.select("tag_id, #{ name } AS name, #{ names }, " +
"#{ quoted } AS reference_point").to_sql
end
next if queries.empty?
+4 -2
ファイルの表示
@@ -28,16 +28,18 @@ class CountsCandidates
[external, 'external', 'NULL', 'JSON_OBJECT()']]
sources = sources.map do |population, kind, category, names|
scope = population.scope.except(:select)
name = population.definition.expression('name')
if @params['query'].present?
pattern = "%#{ ApplicationRecord.sanitize_sql_like(@params['query']) }%"
scope = scope.where("(v.name LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" +
scope = scope.where("(#{ name } LIKE ? OR CAST(v.tag_id AS CHAR) = ? OR EXISTS (" +
"SELECT 1 FROM JSON_TABLE(COALESCE(JSON_EXTRACT(#{ names }, '$**.name'), " +
"JSON_ARRAY()), '$[*]' COLUMNS (name TEXT PATH '$')) candidate_name " +
'WHERE candidate_name.name LIKE ?))', pattern, @params['query'], pattern)
end
scope.select(Arel.sql(
"CONCAT('#{ kind }:', v.tag_id) AS value, v.tag_id AS id, " +
"v.name AS name, #{ names } AS names, #{ category } AS category, '#{ kind }' AS kind"))
"#{ name } AS name, #{ names } AS names, " +
"#{ category } AS category, '#{ kind }' AS kind"))
.to_sql
end
clauses = []
+1 -1
ファイルの表示
@@ -113,7 +113,7 @@ class CountsPopulation
else
raise ArgumentError unless definition.axes(history).include?(key)
scope = scope.where(definition.expression(key) => entry['value'])
scope = scope.where("#{ definition.expression(key) } <=> ?", entry['value'])
end
scope
end
+18 -3
ファイルの表示
@@ -105,12 +105,25 @@ class CountsResourceDefinition
def time_column = 'created_at'
def column(key)
raise ArgumentError unless fields.key?(key)
# Keep the V1 Counts field name at the API boundary only.
return 'linked_tag_ids' if resource == 'nico_tags' && key == 'linked_tags'
{ 'resource_id' => keys.first, 'user' => 'created_by_user_id' }.fetch(key, key)
end
def expression(key, row = 'v') = "#{ row }.#{ column(key) }"
def changes = fields.keys - COMMON.keys - ['updated_at', 'updated_by_user_id']
def expression(key, row = 'v')
if resource == 'nico_tags' && key == 'name'
return "(SELECT CONCAT(external_tags.platform, ':', external_tags.name) " +
"FROM external_tags WHERE external_tags.id = #{ row }.tag_id)"
end
"#{ row }.#{ column(key) }"
end
def changes
columns = fields.keys - COMMON.keys - ['updated_at', 'updated_by_user_id']
resource == 'nico_tags' ? columns - ['name'] : columns
end
def axes(history)
fields.reject { |_key, type| type == :json }.keys +
(resource == 'posts' ? ['tags'] : []) + (history ? ['changed_field'] : [])
@@ -118,7 +131,9 @@ class CountsResourceDefinition
def metadata
fields.map do |key, type|
{ key:, type:, nullable: model.columns_hash.fetch(column(key)).null,
nullable = (resource == 'nico_tags' && key == 'name') ||
model.columns_hash.fetch(column(key)).null
{ key:, type:, nullable:,
operators: OPERATORS.fetch(type, []) }
end
end
+3 -1
ファイルの表示
@@ -201,6 +201,8 @@ class CountsStateQuery
end
def listing
external_name = CountsResourceDefinition.new('nico_tags')
.expression('name', 'external_version')
catalog = <<~SQL
, tag_counts AS (
SELECT membership.kind, membership.tag_id, COUNT(*) AS post_count
@@ -209,7 +211,7 @@ class CountsStateQuery
SELECT 'internal' AS kind, tag_id, name, names,
deprecated_at FROM tag_at WHERE event_type <> 'discard'
UNION ALL
SELECT tc.kind, tc.tag_id, external_version.name, JSON_OBJECT() AS names,
SELECT tc.kind, tc.tag_id, #{ external_name } AS name, JSON_OBJECT() AS names,
NULL AS deprecated_at
FROM tag_counts tc
LEFT JOIN tag_at internal_version
+2
ファイルの表示
@@ -182,6 +182,7 @@ class CountsTableQuery
order = sort_sql { detail_expression(_1) }
query = query.order(Arel.sql((order + ['v.id ASC']).join(', ')))
.limit(limit).offset((page - 1) * limit)
query = query.preload(:external_tag) if @definition.resource == 'nico_tags'
rows = query.to_a
if ['posts', 'tags'].include?(@definition.resource)
point = population.history ? population.at :
@@ -486,6 +487,7 @@ class CountsTableQuery
table = model.table_name
scope = HistoryAccess.visible(model.where(tag_id: ids)).where('created_at <= ?', point)
scope = scope.includes(:external_tag) if model == NicoTagVersion
bound = @connection.quote(point)
if population.history && @definition.resource == 'posts'
key = kind == 'internal' ? 'tag_id' : 'external_tag_id'
+2 -2
ファイルの表示
@@ -1,4 +1,5 @@
class NicoTagVersionRecorder < VersionRecorder
EVENT_TYPES = ['create', 'update'].freeze
def self.record! external_tag:, event_type:, created_by_user:
new(external_tag:, event_type:, created_by_user:).record!
end
@@ -14,8 +15,7 @@ class NicoTagVersionRecorder < VersionRecorder
def record_key = :external_tag
def snapshot_attributes
{ name: "#{ @record.platform }:#{ @record.name }",
linked_tags: @record.snapshot_linked_tag_names.join(' ') }
{ linked_tag_ids: @record.snapshot_linked_tag_ids.join(' ') }
end
def tracks_version_no_on_record? = false
+5
ファイルの表示
@@ -0,0 +1,5 @@
class AddLinkedTagIdsToNicoTagVersions < ActiveRecord::Migration[8.0]
def change
add_column :nico_tag_versions, :linked_tag_ids, :text
end
end
+42
ファイルの表示
@@ -0,0 +1,42 @@
class MigrateLinkedTagsInNicoTagVersions < ActiveRecord::Migration[8.0]
class MigrationTagVersion < ActiveRecord::Base
self.table_name = 'tag_versions'
end
class MigrationNicoTagVersion < ActiveRecord::Base
self.table_name = 'nico_tag_versions'
end
def up
# 除票外部タグの恢復はないので除票履歴があれば全消しでよいはず.
execute <<~SQL
DELETE
t1
FROM
nico_tag_versions t1
INNER JOIN
nico_tag_versions t2
ON
t1.tag_id = t2.tag_id
AND t2.event_type = 'discard'
SQL
MigrationNicoTagVersion.find_each do |ntv|
linked_tag_ids = ntv.linked_tags.split.map { |name|
# 厳密には一意ぢゃないけどめんだぅだからこれでいいや.
MigrationTagVersion
.order(created_at: :desc, id: :desc)
.find_by("names ->> '$.ja.name' = ?", name)
&.tag_id
}.compact.uniq.sort.join(' ')
ntv.update_columns(linked_tag_ids:)
end
change_column_null :nico_tag_versions, :linked_tag_ids, false
end
def down
raise ActiveRecord::IrreversibleMigration, '戻せません.'
end
end
+6
ファイルの表示
@@ -0,0 +1,6 @@
class RemoveLinkedTagsFromNicoTagVersions < ActiveRecord::Migration[8.0]
def change
remove_column :nico_tag_versions, :linked_tags
remove_column :nico_tag_versions, :name
end
end
生成ファイル
+2 -3
ファイルの表示
@@ -10,7 +10,7 @@
#
# It's strongly recommended that you check this file into your version control system.
ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
ActiveRecord::Schema[8.0].define(version: 2026_11_08_020000) do
create_table "active_storage_attachments", charset: "utf8mb4", collation: "utf8mb4_0900_ai_ci", force: :cascade do |t|
t.string "name", null: false
t.string "record_type", null: false
@@ -301,10 +301,9 @@ ActiveRecord::Schema[8.0].define(version: 2026_10_15_010000) do
t.bigint "tag_id", null: false
t.integer "version_no", null: false
t.string "event_type", null: false
t.string "name", null: false
t.text "linked_tags", null: false
t.datetime "created_at", null: false
t.bigint "created_by_user_id"
t.text "linked_tag_ids", null: false
t.index ["created_at"], name: "index_nico_tag_versions_on_created_at"
t.index ["created_by_user_id", "created_at"], name: "index_nico_tag_versions_on_created_by_user_id_and_created_at", order: { created_at: :desc }
t.index ["tag_id", "created_at"], name: "index_nico_tag_versions_on_tag_id_and_created_at", order: { created_at: :desc }
+43 -8
ファイルの表示
@@ -11,28 +11,63 @@ RSpec.describe ExternalTag, type: :model do
expect(external.reload.name).to eq('raw tag[]')
end
it 'deletes post associations without deleting posts or version history' do
it 'does not allow a persisted external tag to change its platform or name' do
external = create(:external_tag, name: 'immutable')
expect { external.update!(name: 'renamed') }
.to raise_error(ActiveRecord::RecordInvalid)
expect(external.errors[:name]).to include('は変更できません.')
external.reload
external.platform = nil
expect { external.save! }.to raise_error(ActiveRecord::RecordInvalid)
expect(external.errors[:platform]).to include('は変更できません.')
expect(external.reload).to have_attributes(platform: 'nico', name: 'immutable')
end
it 'rejects delete, which bypasses destroy callbacks' do
external = create(:external_tag)
expect { external.delete }.to raise_error(ActiveRecord::ReadOnlyRecord)
expect(external.reload).to be_persisted
end
it 'increments the counter through post associations without changing identity' do
external = create(:external_tag, name: 'counter')
post = create(:post)
expect {
PostExternalTag.create!(post:, external_tag: external)
}.to change { external.reload.post_count }.by(1)
expect(external.reload).to have_attributes(platform: 'nico', name: 'counter')
end
it 'does not destroy external tags or their post associations and history' do
external = create(:external_tag)
post = create(:post)
PostExternalTag.create!(post:, external_tag: external)
version = NicoTagVersionRecorder.record!(
external_tag: external, event_type: :create, created_by_user: nil)
external.destroy!
expect { external.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)
expect(PostExternalTag.where(external_tag_id: external.id)).to be_empty
expect(post.reload.external_tags).to be_empty
expect(external.reload).to be_persisted
expect(PostExternalTag.exists?(post:, external_tag: external)).to be(true)
expect(post.reload.external_tags).to contain_exactly(external)
expect(version.reload.tag_id).to eq(external.id)
end
it 'deletes external links without deleting linked internal tags' do
it 'does not destroy an external tag or its links to internal tags' do
external = create(:external_tag)
tag = create(:tag)
NicoTagRelation.create!(nico_tag: external, tag:)
relation = NicoTagRelation.create!(nico_tag: external, tag:)
external.destroy!
expect { external.destroy! }.to raise_error(ActiveRecord::RecordNotDestroyed)
expect(NicoTagRelation.where(nico_tag_id: external.id)).to be_empty
expect(external.reload).to be_persisted
expect(relation.reload).to be_persisted
expect(Tag.exists?(tag.id)).to be(true)
end
end
+3 -3
ファイルの表示
@@ -76,7 +76,7 @@ RSpec.describe 'Counts artifact policy and external references' do
end
end
it 'does not expose a private linked tag name 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')
TagVersion.create!(tag:, version_no: 1, event_type: 'discard', name: 'private-linked-name',
category: 'general', aliases: '', parent_tag_ids: '', created_at: Time.utc(2024),
@@ -84,7 +84,7 @@ RSpec.describe 'Counts artifact policy and external references' do
auto_generated: false, aliases: [] } })
external = create(:external_tag, name: 'public-external')
row = NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
name: 'nico:public-external', linked_tags: 'private-linked-name',
linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024))
post = create(:post)
snapshot = PostVersion.create!(post:, version_no: 1, event_type: 'create',
@@ -99,7 +99,7 @@ RSpec.describe 'Counts artifact policy and external references' do
expect(HistoryAccess.visible(NicoTagVersion.where(id: row.id))).to exist
end
public_row = NicoTagVersion.create!(external_tag: external, version_no: 2, event_type: 'update',
name: 'nico:public-external', linked_tags: 'private-linked-name-extra',
linked_tag_ids: '',
created_at: Time.utc(2024, 7))
HistoryAccess.set(user: nil) do
expect(HistoryAccess.visible(NicoTagVersion.where(id: public_row.id))).to exist
+3 -4
ファイルの表示
@@ -10,23 +10,22 @@ RSpec.describe 'Shared Tag and ExternalTag IDs', type: :model do
expect(next_tag.id).to be > external.id
end
it 'does not reuse physically deleted IDs in either table' do
it 'does not reuse IDs after internal deletion while external tags remain' do
tag = create(:tag)
external = create(:external_tag)
TagName.where(tag_id: tag.id).delete_all
tag.destroy!
external.destroy!
expect(ExternalTag.exists?(external.id)).to be(true)
expect(create(:tag).id).to be > external.id
expect(create(:external_tag).id).to be > external.id
end
it 'retains existing overlapping IDs without renumbering on update or insert' do
it 'retains overlapping IDs after a tag update and a new allocation' do
tag = create(:tag)
external = create(:external_tag)
external.update_columns(id: tag.id)
tag.update!(category: :meta)
external.update!(name: 'updated_external')
before_tag = tag.reload.attributes
before_external = external.reload.attributes
+15 -5
ファイルの表示
@@ -47,24 +47,34 @@ RSpec.describe VersionRecord, type: :model do
external_tag: nico_tag,
version_no: 1,
event_type: 'create',
name: "nico:#{ nico_tag.name }",
linked_tags: '',
linked_tag_ids: '',
created_at: Time.current,
created_by_user: nil
)
expect {
version.update!(name: 'nico:changed')
version.update!(linked_tag_ids: '123')
}.to raise_error(ActiveRecord::ReadOnlyRecord)
end
it 'rejects discard and restore versions for external tags' do
[:discard, :restore].each do |event_type|
version = NicoTagVersion.new(
external_tag: nico_tag, version_no: 1, event_type:,
linked_tag_ids: '', created_at: Time.current)
expect(version).not_to be_valid
expect(version.errors[:event_type]).not_to be_empty
end
end
it 'prevents NicoTagVersion destroy' do
version = NicoTagVersion.create!(
external_tag: nico_tag,
version_no: 1,
event_type: 'create',
name: "nico:#{ nico_tag.name }",
linked_tags: '',
linked_tag_ids: '',
created_at: Time.current,
created_by_user: nil
)
+114 -6
ファイルの表示
@@ -19,7 +19,7 @@ RSpec.describe 'Counts table API', type: :request do
names: { ja: { name: 'alpha', script_code: 'Jpan', auto_generated: false, aliases: [] } },
created_at: Time.utc(2023))
NicoTagVersion.create!(external_tag: external, version_no: 1,
event_type: 'create', name: 'beta', linked_tags: '', created_at: Time.utc(2023))
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
snapshots = [
{ tag_id: tag.id, version_no: 1, name: 'alpha', category: 'general', sections: [] },
{ external_tag_id: external.id }]
@@ -50,6 +50,115 @@ RSpec.describe 'Counts table API', type: :request do
def versions(result) = result.fetch('versions').map { _1.fetch('version_no') }
context 'nico link ID snapshots through the V1 field name' do
let(:base) do
super().merge(resource: 'nico_tags')
end
before do
NicoTagVersion.create!(external_tag: external, version_no: 2,
event_type: 'update', linked_tag_ids: tag.id.to_s,
created_at: Time.utc(2024, 1, 1))
NicoTagVersion.create!(external_tag: external, version_no: 3,
event_type: 'update', linked_tag_ids: '',
created_at: Time.utc(2024, 2, 1))
end
it 'returns ID values under linked_tags without exposing the physical column key' do
result = query
expect(versions(result)).to eq([1, 2, 3])
expect(result['versions'].map { _1.fetch('linked_tags') }).to eq(['', tag.id.to_s, ''])
result['versions'].each do |row|
expect(row).not_to have_key('linked_tag_ids')
expect(row.fetch('name')).to eq('nico:beta')
end
end
it 'preloads external names separately for aliased link-change details' do
statements = []
listener = lambda do |_name, _start, _finish, _id, payload|
statements << payload[:sql]
end
ActiveSupport::Notifications.subscribed(listener, 'sql.active_record') do
result = query(axis('changed_field', 'linked_tags'))
expect(versions(result)).to eq([2, 3])
expect(result.fetch('versions').map { _1.fetch('name') })
.to eq(['nico:beta', 'nico:beta'])
end
details = statements.find { _1.include?('AS counts_latest') }
expect(details).not_to be_nil
expect(details).not_to include('JOIN `external_tags`')
names = statements.select { _1.match?(/SELECT .* FROM `external_tags`/) }
expect(names.length).to eq(1)
end
it 'advertises the legacy field, label and default columns only' do
get '/counts/definitions/nico_tags', params: { locale: 'ja' }
expect(response).to have_http_status(:ok)
body = response.parsed_body
['fields', 'filter_fields', 'output_fields'].each do |collection|
keys = body.fetch(collection).map { _1.fetch('key') }
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
field = body.fetch('output_fields').find { _1['key'] == 'linked_tags' }
expect(field.fetch('label')).to eq('counts:attributes.linked_tags')
body.fetch('axes').each_value do |keys|
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
body.fetch('defaults').select { _1['mode'] == 'details' }.each do |entry|
settings = entry.fetch('params').to_h { [_1.fetch('key'), _1.fetch('value')] }
expect(settings.fetch('columns').split).to include('name', 'linked_tags')
expect(settings.fetch('columns').split).not_to include('linked_tag_ids')
end
end
it 'filters IDs and legacy drills and compares link changes through linked_tags' do
predicate = { conditions: '', 'conditions.0.field' => 'linked_tags',
'conditions.0.operator' => 'eq', 'conditions.0.value' => tag.id.to_s }
expect(versions(query(predicate))).to eq([2])
expect(versions(query(axis('linked_tags', tag.id.to_s, root: 'drill')))).to eq([2])
expect(versions(query(axis('changed_field', 'linked_tags')))).to eq([2, 3])
expect(versions(query(predicate.merge('conditions.0.value' => 'alpha')))).to be_empty
end
it 'sorts ID snapshots through the public field in both directions' do
expect(versions(query(sort: 'linked_tags:asc version_no:asc'))).to eq([1, 3, 2])
expect(versions(query(sort: 'linked_tags:desc version_no:asc'))).to eq([2, 1, 3])
end
it 'restores historical link IDs before applying a latest snapshot filter' do
predicate = { definition: 'latest', at: '2024-01-15T00:00:00Z',
conditions: '', 'conditions.0.field' => 'linked_tags',
'conditions.0.operator' => 'eq', 'conditions.0.value' => tag.id.to_s }
expect(versions(query(predicate))).to eq([2])
expect(versions(query(predicate.except(:at)))).to be_empty
end
it 'groups by linked_tags ID values and accepts the resulting drill condition' do
sign_in_as(create(:user, :admin))
result = query(mode: 'summary', rows: 'linked_tags', cols: '', sort: '')
expect(result.fetch('cells')).to match_array([
{ 'values' => [''], 'count' => 2 },
{ 'values' => [tag.id.to_s], 'count' => 1 }])
expect(versions(query(axis('linked_tags', tag.id.to_s)))).to eq([2])
end
it 'rejects the physical column as a public filter, axis, sort or change field' do
sign_in_as(create(:user, :admin))
[
axis('linked_tag_ids', tag.id.to_s),
axis('changed_field', 'linked_tag_ids'),
{ mode: 'summary', rows: 'linked_tag_ids', cols: '', sort: '' },
{ sort: 'linked_tag_ids:asc' }].each do |invalid|
get '/counts/query', params: base.merge(invalid)
expect(response).to have_http_status(:bad_request), invalid.inspect
end
end
end
it 'identifies a totals timeout without exposing SQL in the error response' do
allow_any_instance_of(CountsPivotTotals).to receive(:call)
.and_raise(CountsPivotTotals::TimedOut, 'private SQL')
@@ -223,11 +332,10 @@ RSpec.describe 'Counts table API', type: :request do
expect(versions(query(tags: 'renamed-alpha'))).to eq([1, 2, 4])
end
it 'resolves external names from current registrations too' do
external.update!(name: 'renamed-beta')
expect(versions(query(tags: 'nico:renamed-beta'))).to eq([1])
expect(versions(query(tags: 'nico:beta'))).to eq([])
expect(versions(query(tags: 'not:nico:renamed-beta'))).to eq([2, 3, 4])
it 'resolves immutable external names across historical snapshots' do
expect(versions(query(tags: 'nico:beta'))).to eq([1])
expect(versions(query(tags: 'nico:renamed-beta'))).to eq([])
expect(versions(query(tags: 'not:nico:beta'))).to eq([2, 3, 4])
end
end
+8 -14
ファイルの表示
@@ -38,12 +38,9 @@ RSpec.describe 'NicoTags', type: :request do
end
it 'filters by nico tag name, linked tag name, and link status' do
linked = create(:external_tag)
linked.update!(name: 'search_linked')
unlinked = create(:external_tag)
unlinked.update!(name: 'search_unlinked')
other = create(:external_tag)
other.update!(name: 'other')
linked = create(:external_tag, name: 'search_linked')
unlinked = create(:external_tag, name: 'search_unlinked')
other = create(:external_tag, name: 'other')
destination = create(:tag, category: :general)
primary_tag_name_for(destination, 'ja').update!(name: 'destination_search')
NicoTagRelation.create!(nico_tag: linked, tag: destination)
@@ -80,11 +77,9 @@ RSpec.describe 'NicoTags', type: :request do
end
it 'sorts by name and timestamps' do
older = create(:external_tag)
older.update!(name: 'ordered_a')
older = create(:external_tag, name: 'ordered_a')
older.update_columns(created_at: 2.days.ago)
newer = create(:external_tag)
newer.update!(name: 'ordered_b')
newer = create(:external_tag, name: 'ordered_b')
newer.update_columns(created_at: 1.day.ago)
older_post_tag =
PostExternalTag.create!(post: create(:post), external_tag: older)
@@ -189,9 +184,8 @@ RSpec.describe 'NicoTags', type: :request do
versions = nico_tag.reload.nico_tag_versions.order(:version_no)
expect(versions.map(&:event_type)).to eq(['create', 'update'])
expect(versions.last.linked_tags.split).to match_array([
'nico_linked_a',
'nico_linked_b'])
expect(versions.last.linked_tag_ids.split.map(&:to_i))
.to match_array([linked_a.id, linked_b.id])
expect(versions.last.created_by_user_id).to eq(admin.id)
end
@@ -210,7 +204,7 @@ RSpec.describe 'NicoTags', type: :request do
expect(json).to eq([])
expect(nico_tag.reload.linked_tags).to be_empty
expect(nico_tag.nico_tag_versions.order(:version_no).last)
.to have_attributes(linked_tags: '', created_by_user: member)
.to have_attributes(linked_tag_ids: '', created_by_user: member)
end
it 'returns the tags field error when a nico tag is specified directly' do
+1 -1
ファイルの表示
@@ -20,7 +20,7 @@ RSpec.describe 'Post history privacy', type: :request do
created_at: origin + index.hours)
end
NicoTagVersion.create!(external_tag: external, version_no: 1, event_type: 'create',
name: 'nico:external-history-tag', linked_tags: 'private-history-tag',
linked_tag_ids: tag.id.to_s,
created_at: origin)
['create', 'discard', 'restore', 'update'].each_with_index do |event, index|
snapshots =
+49
ファイルの表示
@@ -22,6 +22,55 @@ RSpec.describe 'Counts export contracts' do
.and_return(@counts_export_dir)
end
context 'nico link IDs with the V1 export field name' do
let(:tag) { create(:tag, primary_name: 'linked export tag') }
let(:external) { create(:external_tag, name: 'external export tag') }
let(:payload) do
super().merge('resource' => 'nico_tags', 'columns' => 'linked_tags',
'headers' => '["linked_tags"]')
end
before do
NicoTagVersion.create!(external_tag: external, version_no: 1,
event_type: 'create', linked_tag_ids: '', created_at: Time.utc(2023))
NicoTagVersion.create!(external_tag: external, version_no: 2,
event_type: 'update', linked_tag_ids: tag.id.to_s, created_at: Time.utc(2024))
end
it 'exports recorded IDs with the legacy JSON key and metadata' do
result = JSON.parse(CountsTableExport.new(payload).body.to_a.join)
expect(result.fetch('data')).to eq([
{ 'linked_tags' => '' }, { 'linked_tags' => tag.id.to_s }])
expect(result.fetch('metadata').fetch('columns')).to eq(['linked_tags'])
keys = result.fetch('metadata').fetch('fields').map { _1.fetch('key') }
expect(keys).to include('linked_tags')
expect(keys).not_to include('linked_tag_ids')
end
it 'exports the selected legacy CSV header and ID values' do
body = CountsTableExport.new(payload.merge('format' => 'csv')).body.to_a.join
expect(CSV.parse(body.delete_prefix("\uFEFF")))
.to eq([['linked_tags'], [''], [tag.id.to_s]])
end
it 'keeps the legacy link column in default JSON exports' do
options = payload.except('columns', 'headers')
result = JSON.parse(CountsTableExport.new(options).body.to_a.join)
expect(result.fetch('metadata').fetch('columns')).to include('linked_tags')
result.fetch('data').each do |row|
expect(row).to have_key('linked_tags')
expect(row).not_to have_key('linked_tag_ids')
end
end
it 'rejects the physical column as a selected CSV or JSON field' do
['csv', 'json'].each do |format|
options = payload.merge('format' => format, 'columns' => 'linked_tag_ids')
expect { CountsTableExport.new(options) }.to raise_error(ArgumentError)
end
end
end
context 'serialization after the authorised query' do
let(:rows) { [{ title: "=formula\n\"quoted\"" }, { title: 'second' }] }
let(:page) do
+18 -8
ファイルの表示
@@ -8,21 +8,23 @@ RSpec.describe NicoTagVersionRecorder do
described_class.record!(external_tag:, event_type:, created_by_user: member)
end
it 'records the external association and platform-qualified name' do
it 'records the external association and derives the platform-qualified name' do
version = record(:create)
expect(version).to have_attributes(
external_tag:, version_no: 1, event_type: 'create',
name: 'nico:raw tag[]', linked_tags: '', created_by_user: member)
name: 'nico:raw tag[]', linked_tag_ids: '', created_by_user: member)
expect(external_tag.reload.nico_tag_versions).to contain_exactly(version)
end
it 'uses the latest history number when the record has no version_no column' do
first = record(:create)
external_tag.update!(name: 'changed')
tag = create(:tag)
NicoTagRelation.create!(nico_tag: external_tag, tag:)
second = record(:update)
expect(second).to have_attributes(version_no: 2, name: 'nico:changed')
expect(second).to have_attributes(version_no: 2, name: 'nico:raw tag[]',
linked_tag_ids: tag.id.to_s)
expect(first.reload.name).to eq('nico:raw tag[]')
expect(external_tag.reload.has_attribute?(:version_no)).to be(false)
end
@@ -40,7 +42,7 @@ RSpec.describe NicoTagVersionRecorder do
expect(version).to have_attributes(
external_tag: external, name: 'registered_external:foo', version_no: 1,
event_type: 'create', linked_tags: '', created_by_user: member)
event_type: 'create', linked_tag_ids: '', created_by_user: member)
end
it 'returns the latest version without appending an unchanged snapshot' do
@@ -64,13 +66,21 @@ RSpec.describe NicoTagVersionRecorder do
expect(external_tag.nico_tag_versions).to contain_exactly(first)
end
it 'records sorted linked internal names and later link removal' do
it 'rejects discard and restore events for external tags' do
[:discard, :restore].each do |event_type|
expect { record(event_type) }
.to raise_error(ArgumentError, "Invalid event_type: #{ event_type }")
end
end
it 'records sorted linked internal IDs and later link removal' do
tags = ['z_link', 'a_link'].map { |name| create(:tag, primary_name: name, category: :general) }
tags.each { |tag| NicoTagRelation.create!(nico_tag: external_tag, tag:) }
expect(record(:create).linked_tags).to eq('a_link z_link')
expect(record(:create).linked_tag_ids).to eq(tags.map(&:id).sort.join(' '))
external_tag.linked_tags = [tags.first]
expect(record(:update)).to have_attributes(version_no: 2, linked_tags: 'z_link')
expect(record(:update)).to have_attributes(version_no: 2, linked_tag_ids: tags.first.id.to_s)
end
end
+3366
ファイルの表示
ファイル差分が大きすぎるため省略します 差分を読み込み
+12 -4
ファイルの表示
@@ -158,7 +158,15 @@ private ID の正誤に応じて許可可否を変えないため、条件の一
非公開列を含む列順変更は API の column_values_editable でも不可と通知する。
公開列の値を使うソートは引き続き利用できる。
明細には元の認可を適用し、抽出条件自体や取得済みの全言語値を表示設定で改変しない。
外部タグ履歴の linked_tags は名前しか記録していないため、非公開タグの記録名を含む
スナップショットを保守的に非公開とする。名前全体を空白区切りの境界で照合する。
区切りが曖昧な旧データでは過剰な秘匿の可能性はあるが、参照 ID がない旧形式から
名前の公開可否を楽観的に推定しない。
外部タグ履歴の linked_tag_ids は、連携する内部タグの ID を半角スペース区切りで
記録する。除票履歴のある内部タグの ID を含むスナップショットを非管理者へ公開しない。
名前や UI ロカールを参照 ID の判定に使わない。
外部タグ名は履歴に保存せず、external_tags の platform と name を参照する。
V1 Counts の公開フィールド名は linked_tags を維持し、DB の linked_tag_ids へ対応付ける。
明細・フィルタ・集計軸・変更項目・ソート・CSV / JSON 出力で同じ対応付けを使う。
既定列と既存の表示ラベルも linked_tags のままとし、値は ID のスペース区切りとする。
linked_tag_ids は物理カラム名であり、Counts の公開フィールドとしては受け付けない。
旧 URL や保存済み設定のフィールド指定は維持できるが、値にタグ名を指定した検索条件や
ドリル条件は ID 値への見直しが必要となる。旧履歴の名称は移行後の ID 列から復元できず、
現在の名称からの推定変換も行わない。
+2 -1
ファイルの表示
@@ -379,7 +379,8 @@ const RoutedApp = ({ locales }: { locales: AvailableLocale[] }) => {
<PageHead>
{robots != null && <meta name="robots" content={robots}/>}
</PageHead>
<UnsavedChangesGuardProvider>
<UnsavedChangesGuardProvider
draftScope={user == null ? '' : `${user.id}:${user.role}`}>
<KeyboardShortcutsProvider>
<MotionConfig
reducedMotion={
+22 -1
ファイルの表示
@@ -1,5 +1,5 @@
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 PostEditForm from '@/components/PostEditForm'
@@ -29,6 +29,27 @@ vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({
}))
describe ('PostEditForm', () => {
beforeEach (() => vi.clearAllMocks ())
it ('submits restored edits against their original version', async () => {
const post = buildPost ({ id: 8, versionNo: 4 })
sessionStorage.setItem ('session-draft:1:anonymous:post:8:ja', JSON.stringify ({
baseVersionNo: 3, title: 'restored title', tags: 'テストタグ', duration: '',
parentPostIds: '', originalCreatedFrom: null, originalCreatedBefore: null }))
postsApi.updatePost.mockResolvedValueOnce ({ ...post, versionNo: 5 })
render (<PostEditForm post={post} onSave={vi.fn ()}/>)
expect (screen.getByDisplayValue ('restored title')).toBeInTheDocument ()
fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
await waitFor (() => {
expect (postsApi.updatePost).toHaveBeenCalledWith (
expect.objectContaining ({ title: 'restored title' }),
{ baseVersionNo: 3 }, 'ja')
})
expect (sessionStorage.getItem ('session-draft:1:anonymous:post:8:ja')).toBeNull ()
})
it ('submits edited post fields with the current base version', async () => {
const onSave = vi.fn ()
const post = buildPost ({
+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 PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
import FieldError from '@/components/common/FieldError'
@@ -56,17 +57,17 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
const locale = useLocale ()
const { label } = useUITranslation ('posts')
const [disabled, setDisabled] = useState (false)
const [duration, setDuration] = useState<string> (videoMsToDurationValue (post.videoMs))
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<PostFormField> ()
const [originalCreatedBefore, setOriginalCreatedBefore] =
useState<string | null> (post.originalCreatedBefore)
const [originalCreatedFrom, setOriginalCreatedFrom] =
useState<string | null> (post.originalCreatedFrom)
const [parentPostIds, setParentPostIds] =
useState ((post.parentPosts ?? []).map (p => p.id).join (' '))
const [tags, setTags] = useState<string> (() => tagsToStr (post.tags))
const [title, setTitle] = useState (post.title)
const { draft, setField, clearDraft } = useSessionDraft (`post:${post.id}:${locale}`, {
baseVersionNo: post.versionNo,
duration: videoMsToDurationValue (post.videoMs),
originalCreatedBefore: post.originalCreatedBefore,
originalCreatedFrom: post.originalCreatedFrom,
parentPostIds: (post.parentPosts ?? []).map (entry => entry.id).join (' '),
tags: tagsToStr (post.tags), title: post.title })
const { baseVersionNo, duration, originalCreatedBefore, originalCreatedFrom,
parentPostIds, tags, title } = draft
const videoFlg =
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
@@ -83,6 +84,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
try
{
const data = await updatePost (postData, options, locale)
clearDraft ({ ...draft, baseVersionNo: data.versionNo })
onSave ({ ...post,
versionNo: data.versionNo,
title: data.title,
@@ -132,7 +134,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore },
{ baseVersionNo: post.versionNo, merge: true })
{ baseVersionNo, merge: true })
return
}
@@ -141,7 +143,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore },
{ baseVersionNo: post.versionNo, force: true })
{ baseVersionNo, force: true })
return
}
}
@@ -156,7 +158,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore },
{ baseVersionNo: post.versionNo })
{ baseVersionNo })
}
finally
{
@@ -164,11 +166,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
}
}
useEffect (() => {
setTags (tagsToStr (post.tags))
setDuration (videoMsToDurationValue (post.videoMs))
}, [post])
return (
<form onSubmit={handleSubmit} className="max-w-xl pt-2 space-y-4">
<FieldError messages={baseErrors}/>
@@ -177,28 +174,28 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
label={label ('shared:labels.title')}
value={title ?? ''}
disabled={disabled}
onChange={setTitle}/>
onChange={value => setField ('title', value)}/>
<PostTextField
label={label ('shared:labels.parentPosts')}
value={parentPostIds}
disabled={disabled}
errors={fieldErrors.parentPostIds}
onChange={setParentPostIds}/>
onChange={value => setField ('parentPostIds', value)}/>
<PostTagsField
disabled={disabled}
tags={tags}
setTags={setTags}
setTags={value => setField ('tags', value)}
errors={fieldErrors.tags}/>
{/* オリジナルの作成日時 */}
<PostOriginalCreatedTimeField
disabled={disabled}
originalCreatedFrom={originalCreatedFrom}
setOriginalCreatedFrom={setOriginalCreatedFrom}
setOriginalCreatedFrom={value => setField ('originalCreatedFrom', value)}
originalCreatedBefore={originalCreatedBefore}
setOriginalCreatedBefore={setOriginalCreatedBefore}
setOriginalCreatedBefore={value => setField ('originalCreatedBefore', value)}
errors={groupedMessages (
fieldErrors.originalCreatedAt,
fieldErrors.originalCreatedFrom,
@@ -209,7 +206,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
value={duration}
disabled={disabled}
errors={fieldErrors.videoMs}
onChange={setDuration}/>)}
onChange={value => setField ('duration', value)}/>)}
{/* 送信 */}
<Button type="submit" disabled={disabled}>
+18 -2
ファイルの表示
@@ -1,9 +1,25 @@
import { fireEvent, render, screen } from '@testing-library/react'
import { describe, expect, it } from 'vitest'
import { fireEvent, render, screen, waitFor } from '@testing-library/react'
import { describe, expect, it, vi } from 'vitest'
import TabGroup, { Tab } from '@/components/common/TabGroup'
describe ('TabGroup', () => {
it ('waits for approval and retains the current tab after cancellation', async () => {
const onBeforeChange = vi.fn ().mockResolvedValueOnce (false).mockResolvedValueOnce (true)
render (
<TabGroup onBeforeChange={onBeforeChange}>
<Tab name="A">Alpha</Tab>
<Tab name="B">Beta</Tab>
</TabGroup>)
fireEvent.click (screen.getByText ('B'))
await waitFor (() => expect (onBeforeChange).toHaveBeenCalledTimes (1))
expect (screen.getByText ('Alpha')).toBeInTheDocument ()
fireEvent.click (screen.getByText ('B'))
await waitFor (() => expect (screen.getByText ('Beta')).toBeInTheDocument ())
})
it ('uses the init tab and switches tabs when clicked', () => {
render (
<TabGroup>
+5 -3
ファイルの表示
@@ -10,12 +10,12 @@ type TabProps = { name: React.ReactNode
type Props = {
children: React.ReactNode
rightAddon?: React.ReactNode
}
onBeforeChange?: () => boolean | Promise<boolean> }
export const Tab = ({ children }: TabProps) => <>{children}</>
const TabGroup: FC<Props> = ({ children, rightAddon }) => {
const TabGroup: FC<Props> = ({ children, rightAddon, onBeforeChange }) => {
const tabs = React.Children.toArray (children) as React.ReactElement<TabProps>[]
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',
i === current && 'font-bold',
)}
onClick={() => {
onClick={async () => {
if (i === current) return
if (onBeforeChange != null && !(await onBeforeChange ())) return
setCurrent (i)
}}>
{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 PostImportRowForm from '@/components/posts/import/PostImportRowForm'
@@ -22,6 +22,19 @@ describe ('PostImportRowForm', () => {
api.apiGet.mockResolvedValue (new Blob (['img'], { type: 'image/png' }))
})
it ('restores pending row edits when the editor remounts', () => {
const row = buildPostImportRow ({ attributes: { title: 'original' } })
const controls: DialogueFormControls = {
close: vi.fn (), confirm: vi.fn (), setActions: vi.fn () }
const first = render (
<PostImportRowForm row={row} controls={controls} onSave={vi.fn ()}/>)
fireEvent.change (screen.getByDisplayValue ('original'), { target: { value: 'row draft' } })
first.unmount ()
render (<PostImportRowForm row={row} controls={controls} onSave={vi.fn ()}/>)
expect (screen.getByDisplayValue ('row draft')).toBeInTheDocument ()
})
it ('resets only the draft, then saves with resetRequested', async () => {
const row = buildPostImportRow ()
row.attributes.title = 'manual title'
+20 -9
ファイルの表示
@@ -8,10 +8,11 @@ import PostTextField from '@/components/posts/PostTextField'
import PostImportThumbnailPreview from '@/components/posts/import/PostImportThumbnailPreview'
import { hasThumbnailBaseValue, hasVideoTag } from '@/lib/postImportRows'
import { renderPostImportMessage } from '@/components/posts/import/postImportRowStatus'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
import type { FC, ReactNode } from 'react'
import type { FC, ReactNode, SetStateAction } from 'react'
import type { DialogueFormControls } from '@/lib/dialogues/useDialogue'
import type { PostImportEditableDraft, PostImportRow } from '@/lib/postImportTypes'
@@ -21,6 +22,7 @@ type Draft = PostImportEditableDraft
type Props = {
row: PostImportRow
controls: DialogueFormControls
onDirtyStateChange?: (dirty: boolean, discard: () => void) => void
onSave: (args: { draft: Draft
resetRequested: boolean }) => Promise<{
saved: boolean
@@ -96,6 +98,7 @@ const thumbnailWarnings = (
const PostImportRowForm: FC<Props> = (
{ row,
controls,
onDirtyStateChange,
onSave },
) => {
const locale = useLocale ()
@@ -103,21 +106,26 @@ const PostImportRowForm: FC<Props> = (
const groupedMessages = (...values: (string[] | undefined)[]): ReactNode[] =>
[...new Set (values.flatMap (value => value ?? []))]
.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 [saving, setSaving] = useState (false)
const [resetRequested, setResetRequested] = useState (false)
const [committedThumbnailBase, setCommittedThumbnailBase] = useState (
() => String (row.attributes.thumbnailBase ?? ''))
useEffect (() => {
const nextDraft = buildDraft (row)
setDraft (nextDraft)
setMessageRow (null)
setResetRequested (false)
setCommittedThumbnailBase (String (row.attributes.thumbnailBase ?? ''))
}, [row])
useEffect (() => {
onDirtyStateChange?.(dirty, discardDraft)
}, [dirty, discardDraft, onDirtyStateChange])
const displayRow = messageRow ?? row
const resetDraft = useMemo (
() => buildResetDraft (row),
@@ -157,11 +165,11 @@ const PostImportRowForm: FC<Props> = (
return false
setDraft (resetDraft)
setResetRequested (true)
setField ('resetRequested', true)
setMessageRow (null)
setCommittedThumbnailBase (resetDraft.thumbnailBase)
return false
}, [controls, resetDisabled, resetDraft, label])
}, [controls, resetDisabled, resetDraft, label, setDraft, setField])
const save = useCallback (async (): Promise<boolean> => {
setSaving (true)
@@ -169,7 +177,10 @@ const PostImportRowForm: FC<Props> = (
{
const result = await onSave ({ draft, resetRequested })
if (result.saved)
{
clearDraft ()
return true
}
if (result.row != null)
setMessageRow (result.row)
@@ -179,7 +190,7 @@ const PostImportRowForm: FC<Props> = (
{
setSaving (false)
}
}, [draft, onSave, resetRequested])
}, [clearDraft, draft, onSave, resetRequested])
useEffect (() => {
controls.setActions ([{
+8 -61
ファイルの表示
@@ -1,72 +1,17 @@
import { translateUIMessage } from '@/lib/i18n'
import { readSessionStorage, writeSessionStorage, removeSessionStorage }
from '@/lib/sessionStorage'
import type { StorageErrorHandler } from '@/lib/postImportTypes'
const SOURCE_DRAFT_KEY = 'post-import-source-draft'
const readStorage = (
key: string,
onError?: StorageErrorHandler,
): string | null => {
if (typeof window === 'undefined')
return null
try
{
return sessionStorage.getItem (key)
}
catch
{
onError?.(translateUIMessage ('storage.readFailed', 'imports', 'ja').text)
return null
}
}
const writeStorage = (
key: string,
value: string,
onError?: StorageErrorHandler,
): boolean => {
if (typeof window === 'undefined')
return false
try
{
sessionStorage.setItem (key, value)
return true
}
catch
{
onError?.(translateUIMessage ('storage.writeFailed', 'imports', 'ja').text)
return false
}
}
const removeStorage = (
key: string,
onError?: StorageErrorHandler,
) => {
if (typeof window === 'undefined')
return
try
{
sessionStorage.removeItem (key)
}
catch
{
onError?.(translateUIMessage ('storage.clearFailed', 'imports', 'ja').text)
}
}
export const loadPostImportSourceDraft = (
onError?: StorageErrorHandler,
): { source: string } => {
const raw = readStorage (SOURCE_DRAFT_KEY, onError)
const raw = readSessionStorage (SOURCE_DRAFT_KEY, () =>
onError?.(translateUIMessage ('storage.readFailed', 'imports', 'ja').text))
if (raw == null)
return { source: '' }
@@ -86,11 +31,13 @@ export const savePostImportSourceDraft = (
source: string,
onError?: StorageErrorHandler,
): 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 = (
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 { renderWithProviders } from '@/test/render'
const GuardHarness = () => {
const GuardHarness = ({ onDiscard }: { onDiscard?: () => void }) => {
const [dirty, setDirty] = useState (true)
const location = useLocation ()
const navigate = useNavigate ()
const discard = vi.fn (() => setDirty (false))
const discard = () => {
onDiscard?.()
setDirty (false)
}
const { allowNextNavigation } = useUnsavedChangesGuard ({
dirty,
onDiscard: discard })
@@ -31,6 +34,18 @@ const GuardHarness = () => {
}
describe ('useUnsavedChangesGuard', () => {
it ('uses the current discard callback while dirty state stays unchanged', async () => {
const original = vi.fn ()
const current = vi.fn ()
const view = renderWithProviders (<GuardHarness onDiscard={original}/>)
view.rerender (<GuardHarness onDiscard={current}/>)
fireEvent.click (screen.getByRole ('button', { name: 'move' }))
fireEvent.click (await screen.findByRole ('button', { name: '変更を破棄して移動' }))
await waitFor (() => expect (current).toHaveBeenCalledTimes (1))
expect (original).not.toHaveBeenCalled ()
})
it ('blocks route changes and resets a cancelled transition', async () => {
renderWithProviders (<GuardHarness/>, { route: '/current' })
+39 -28
ファイルの表示
@@ -23,17 +23,20 @@ type UseUnsavedChangesGuardOptions = {
onDiscard?: () => void | Promise<void> }
type UnsavedChangesGuardContextValue = {
draftScope: string
hasUnsavedChanges: boolean
registerUnsavedChangesSource: (
source: UnsavedChangesSource,
) => () => void
allowNextNavigation: () => void }
allowNextNavigation: () => void
confirmNavigation: () => Promise<boolean> }
const UnsavedChangesGuardContext =
createContext<UnsavedChangesGuardContextValue | null> (null)
export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children }) => {
export const UnsavedChangesGuardProvider: FC<PropsWithChildren<{
draftScope?: string }>> = ({ children, draftScope = 'anonymous' }) => {
const dialogue = useDialogue ()
const { label } = useUITranslation ('settings')
const sourcesRef = useRef (new Map<symbol, UnsavedChangesSource> ())
@@ -117,6 +120,12 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children })
}
}, [dialogue, hasUnsavedChanges, label])
const confirmNavigation = useCallback (async (): Promise<boolean> => {
if (!(await confirmDiscardChanges ())) return false
await Promise.all (dirtySources.map (source => source.discard ()))
return true
}, [confirmDiscardChanges, dirtySources])
useEffect (() => {
if (blocker.state !== 'blocked' || handlingBlockedTransitionRef.current)
return
@@ -125,33 +134,24 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children })
void (async () => {
try
{
const confirmed = await confirmDiscardChanges ()
if (!(confirmed))
{
blocker.reset ()
return
}
let discardResults: Array<void | Promise<void>>
try
{
discardResults = dirtySources.map (source => source.discard ())
}
catch
{
const confirmed = await confirmNavigation ()
if (!confirmed) {
blocker.reset ()
return
}
}
blocker.proceed ()
await Promise.allSettled (discardResults)
blocker.proceed ()
}
catch
{
blocker.reset ()
}
finally
{
handlingBlockedTransitionRef.current = false
}
}) ()
}, [blocker, confirmDiscardChanges, dirtySources])
}, [blocker, confirmNavigation])
useEffect (() => {
if (!(hasUnsavedChanges))
@@ -162,21 +162,30 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children })
event.returnValue = ''
}
const handlePageHide = () => {
for (const source of sourcesRef.current.values ())
if (source.dirty) void source.discard ()
}
window.addEventListener ('beforeunload', handleBeforeUnload)
window.addEventListener ('pagehide', handlePageHide)
return () => {
window.removeEventListener ('beforeunload', handleBeforeUnload)
window.removeEventListener ('pagehide', handlePageHide)
}
}, [hasUnsavedChanges])
const value = useMemo<UnsavedChangesGuardContextValue> (() => ({
draftScope,
hasUnsavedChanges,
registerUnsavedChangesSource,
allowNextNavigation,
}), [
confirmNavigation }), [
allowNextNavigation,
confirmNavigation,
draftScope,
hasUnsavedChanges,
registerUnsavedChangesSource,
])
registerUnsavedChangesSource])
return (
<UnsavedChangesGuardContext.Provider value={value}>
@@ -194,15 +203,17 @@ export const useUnsavedChangesGuard = (
throw new Error ('UnsavedChangesGuardProvider が必要です.')
const { registerUnsavedChangesSource } = context
const source = useRef (options)
source.current = options
const active = options != null
useEffect (() => {
if (options == null)
return
if (!active) return
return registerUnsavedChangesSource ({
dirty: options.dirty,
discard: options.onDiscard ?? (() => undefined) })
}, [options?.dirty, options?.onDiscard, registerUnsavedChangesSource])
dirty: source.current?.dirty ?? false,
discard: () => source.current?.onDiscard?.() })
}, [active, options?.dirty, registerUnsavedChangesSource])
return context
}
+9
ファイルの表示
@@ -2,6 +2,7 @@ import { animate, motion, useMotionTemplate, useMotionValue } from 'framer-motio
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { useLocale } from '@/lib/useLocale'
import PrefetchLink from '@/components/PrefetchLink'
import MainArea from '@/components/layout/MainArea'
@@ -4190,6 +4191,14 @@ const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
setHistory ([])
}
useUnsavedChangesGuard ({
dirty: !restorePromptVisible && (
(!saved && answers.length > 0)
|| questionSuggestion.trim () !== ''
|| questionSuggestionSelectedId != null
|| (extraQuestionState !== 'saved' && Object.keys (extraQuestionAnswers).length > 0)),
onDiscard: reset })
const continueStoredGame = () => {
setRestorePromptVisible (false)
setPhase (storedGame?.phase ?? 'question')
+5 -4
ファイルの表示
@@ -2,6 +2,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'
import { useEffect, useMemo, useState } from 'react'
import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
import TagLink from '@/components/TagLink'
@@ -38,8 +39,9 @@ const DeerjikistDetailPage: FC = () => {
const tag = qData?.tag
const deerjikists = useMemo (() => qData?.deerjikists ?? [], [qData])
const [data, setData] =
useState<(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> (deerjikists)
const { draft: data, setDraft: setData, clearDraft } = useSessionDraft<
(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> (
`deerjikists:${tagId}:${locale}`, deerjikists, tag != null)
const [disabled, setDisabled] = useState (tag == null)
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<DeerjikistFormField> ()
@@ -54,7 +56,7 @@ const DeerjikistDetailPage: FC = () => {
{
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 })
toast ({ description: label ('messages.updated') })
@@ -78,7 +80,6 @@ const DeerjikistDetailPage: FC = () => {
return
}
setData (deerjikists)
setDisabled (false)
}, [tag, deerjikists])
+25 -27
ファイルの表示
@@ -2,6 +2,7 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useEffect, useState } from 'react'
import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import TagLink from '@/components/TagLink'
import WikiBody from '@/components/WikiBody'
@@ -40,12 +41,23 @@ const MaterialDetailPage: FC = () => {
queryFn: () => fetchMaterial (id ?? '', locale),
enabled: id != null })
const [exportPath, setExportPath] = useState (material?.exportPaths.legacyDrive ?? '')
const [file, setFile] = useState<File | null> (null)
const [filePreview, setFilePreview] = useState (
material?.contentType != null ? material.file ?? '' : '')
const [tag, setTag] = useState (material?.tag?.name ?? '')
const [url, setURL] = useState (material?.url ?? '')
const { draft, setField, clearDraft, confirmNavigation } =
useSessionDraft (`material:${id}:${locale}`, {
tag: material?.tag?.name ?? '', url: material?.url ?? '',
exportPath: material?.exportPaths.legacyDrive ?? '', file: null as File | null },
material != null)
const { tag, url, exportPath, file } = draft
const [filePreview, setFilePreview] = useState ('')
useEffect (() => {
const preview =
file == null
? (material?.contentType != null ? material.file ?? '' : '')
: URL.createObjectURL (file)
setFilePreview (preview)
return () => {
if (file != null) URL.revokeObjectURL (preview)
}
}, [file, material?.contentType, material?.file])
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<MaterialFormField> ()
@@ -53,20 +65,6 @@ const MaterialDetailPage: FC = () => {
? material.tag?.name ?? message ('unnamed', { id: material.id }).text
: ''
useEffect (() => {
if (!(material))
return
setTag (material.tag?.name ?? '')
setURL (material.url ?? '')
setExportPath (material.exportPaths.legacyDrive ?? '')
if (material.file && material.contentType)
{
setFilePreview (material.file)
setFile (null)
}
}, [material])
const invalidateMaterialQueries = async () => {
await qc.invalidateQueries ({ queryKey: materialsKeys.root })
}
@@ -85,6 +83,8 @@ const MaterialDetailPage: FC = () => {
return await updateMaterial (id ?? '', formData, locale)
},
onSuccess: async data => {
clearDraft ({ tag: data.tag?.name ?? '', url: data.url ?? '',
exportPath: data.exportPaths.legacyDrive ?? '', file: null })
qc.setQueryData (materialsKeys.show (id ?? '', locale), data)
await invalidateMaterialQueries ()
toast ({ title: label ('updated') })
@@ -133,7 +133,7 @@ const MaterialDetailPage: FC = () => {
|| (/audio\/.*/.test (material.contentType) && (
<audio src={material.file} controls/>)))}
<TabGroup>
<TabGroup onBeforeChange={confirmNavigation}>
{material.tag && (
<Tab name={label ('navigation:wiki')}>
<WikiBody
@@ -152,7 +152,7 @@ const MaterialDetailPage: FC = () => {
describedBy={describedBy}
invalid={invalid}
value={tag}
setValue={setTag}/>)}
setValue={value => setField ('tag', value)}/>)}
</FormField>
<FormField label={label ('file')} messages={fieldErrors.file}>
@@ -165,9 +165,7 @@ const MaterialDetailPage: FC = () => {
aria-invalid={invalid}
onChange={e => {
const nextFile = e.target.files?.[0]
setFile (nextFile ?? null)
setFilePreview (
nextFile ? URL.createObjectURL (nextFile) : '')
setField ('file', nextFile ?? null)
}}/>
{(file && filePreview) && (
(/image\/.*/.test (file.type) && (
@@ -198,7 +196,7 @@ const MaterialDetailPage: FC = () => {
<input
type="url"
value={url}
onChange={e => setURL (e.target.value)}
onChange={e => setField ('url', e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>)}
@@ -209,7 +207,7 @@ const MaterialDetailPage: FC = () => {
<input
type="text"
value={exportPath}
onChange={e => setExportPath (e.target.value)}
onChange={e => setField ('exportPath', e.target.value)}
placeholder={message ('exportPlaceholder').text}
lang={message ('exportPlaceholder').language}
aria-describedby={describedBy}
+19 -10
ファイルの表示
@@ -1,7 +1,8 @@
import { useMutation, useQueryClient } from '@tanstack/react-query'
import { useState } from 'react'
import { useEffect, useState } from 'react'
import { useLocation } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import FieldError from '@/components/common/FieldError'
import Form from '@/components/common/Form'
@@ -37,11 +38,18 @@ const MaterialNewPage: FC = () => {
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 [tag, setTag] = useState (tagQuery)
const [url, setURL] = useState ('')
const [exportPath, setExportPath] = useState ('')
useEffect (() => {
const preview = file == null ? '' : URL.createObjectURL (file)
setFilePreview (preview)
return () => {
if (file != null) URL.revokeObjectURL (preview)
}
}, [file])
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<MaterialFormField> ()
@@ -59,8 +67,10 @@ const MaterialNewPage: FC = () => {
return await createMaterial (formData, locale)
},
onSuccess: async () => {
clearDraft ()
await qc.invalidateQueries ({ queryKey: materialsKeys.root })
toast ({ title: label ('sent') })
allowNextNavigation ()
navigate (safeReturnTo || '/materials')
},
onError: error => {
@@ -88,7 +98,7 @@ const MaterialNewPage: FC = () => {
describedBy={describedBy}
invalid={invalid}
value={tag}
setValue={setTag}/>)}
setValue={value => setField ('tag', value)}/>)}
</FormField>
{/* ファイル */}
@@ -102,8 +112,7 @@ const MaterialNewPage: FC = () => {
aria-invalid={invalid}
onChange={e => {
const f = e.target.files?.[0]
setFile (f ?? null)
setFilePreview (f ? URL.createObjectURL (f) : '')
setField ('file', f ?? null)
}}/>
{(file && filePreview) && (
(/image\/.*/.test (file.type) && (
@@ -135,7 +144,7 @@ const MaterialNewPage: FC = () => {
<input
type="url"
value={url}
onChange={e => setURL (e.target.value)}
onChange={e => setField ('url', e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>)}
@@ -148,7 +157,7 @@ const MaterialNewPage: FC = () => {
<input
type="text"
value={exportPath}
onChange={e => setExportPath (e.target.value)}
onChange={e => setField ('exportPath', e.target.value)}
placeholder={message ('exportPlaceholder').text}
lang={message ('exportPlaceholder').language}
aria-describedby={describedBy}
+12 -15
ファイルの表示
@@ -1,6 +1,6 @@
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
import { useState } from 'react'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import FormField from '@/components/common/FormField'
import PageTitle from '@/components/common/PageTitle'
@@ -41,12 +41,11 @@ const MaterialSyncSuppressionsPage: FC = () => {
const locale = useLocale ()
const { message, label } = useUITranslation ('materials')
const qc = useQueryClient ()
const [sourceKind, setSourceKind] =
useState<MaterialSyncSuppressionSourceKind> ('uri')
const [sourceUri, setSourceUri] = useState ('')
const [drivePath, setDrivePath] = useState ('')
const [driveFileId, setDriveFileId] = useState ('')
const [reason, setReason] = useState<MaterialSyncSuppressionReason> (REASONS[0])
const { draft, setField, clearDraft } = useSessionDraft (`material-suppressions:${locale}`, {
sourceKind: 'uri' as MaterialSyncSuppressionSourceKind,
sourceUri: '', drivePath: '', driveFileId: '',
reason: REASONS[0] as MaterialSyncSuppressionReason })
const { sourceKind, sourceUri, drivePath, driveFileId, reason } = draft
const { data, isError, isLoading } = useQuery ({
queryKey: materialsKeys.suppressions (locale),
@@ -63,9 +62,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
onSuccess: async () => {
await qc.invalidateQueries ({ queryKey: materialsKeys.suppressions (locale) })
await qc.invalidateQueries ({ queryKey: materialsKeys.root })
setSourceUri ('')
setDrivePath ('')
setDriveFileId ('')
clearDraft ({ ...draft, sourceUri: '', drivePath: '', driveFileId: '' })
toast ({ title: label ('suppressions.registered') })
},
onError: () => {
@@ -96,7 +93,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
{({ invalid }) => (
<select
value={sourceKind}
onChange={e => setSourceKind (
onChange={e => setField ('sourceKind',
e.target.value as MaterialSyncSuppressionSourceKind)}
className={inputClass (invalid)}>
{Object.entries (SOURCE_KIND_LABELS).map (([value, key]) => (
@@ -111,7 +108,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
<input
type="text"
value={sourceUri}
onChange={e => setSourceUri (e.target.value)}
onChange={e => setField ('sourceUri', e.target.value)}
className={inputClass (invalid)}/>)}
</FormField>
@@ -120,7 +117,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
<input
type="text"
value={drivePath}
onChange={e => setDrivePath (e.target.value)}
onChange={e => setField ('drivePath', e.target.value)}
className={inputClass (invalid)}/>)}
</FormField>
@@ -129,7 +126,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
<input
type="text"
value={driveFileId}
onChange={e => setDriveFileId (e.target.value)}
onChange={e => setField ('driveFileId', e.target.value)}
className={inputClass (invalid)}/>)}
</FormField>
@@ -137,7 +134,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
{({ invalid }) => (
<select
value={reason}
onChange={e => setReason (e.target.value as MaterialSyncSuppressionReason)}
onChange={e => setField ('reason', e.target.value as MaterialSyncSuppressionReason)}
className={inputClass (invalid)}>
{REASONS.map (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 { useEffect, useRef } from 'react'
import { useParams } from 'react-router-dom'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { useLocale } from '@/lib/useLocale'
import PostEditForm from '@/components/PostEditForm'
import PostEmbed from '@/components/PostEmbed'
@@ -33,6 +35,7 @@ const PostDetailPage: FC<Props> = ({ user }) => {
const locale = useLocale ()
const { message, label } = useUITranslation ('posts')
const editable = canEditContent (user)
const { confirmNavigation } = useUnsavedChangesGuard ()
const behaviourSettings = useClientBehaviourSettings ()
const thumbnailMode = behaviourSettings.thumbnailMode ?? 'normal'
const animationMode = behaviourSettings.animation ?? 'normal'
@@ -163,7 +166,7 @@ const PostDetailPage: FC<Props> = ({ user }) => {
className={cn ('text-white', viewedClass)}>
{label (post.viewed ? 'detail.viewed' : 'detail.unviewed')}
</Button>
<TabGroup>
<TabGroup onBeforeChange={confirmNavigation}>
<Tab name={label ('shared:labels.relations')}>
{post.related.length > 0
? <PostList posts={post.related}/>
+32 -40
ファイルの表示
@@ -42,13 +42,14 @@ import {
} from '@/lib/postImportRows'
import { clearPostImportSourceDraft } from '@/lib/postImportStorage'
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { cn } from '@/lib/utils'
import { canEditContent } from '@/lib/users'
import Forbidden from '@/pages/Forbidden'
import type { FC } from 'react'
import type { DialogueFormControls } from '@/lib/dialogues/useDialogue'
import type {
PostImportDisplayTag,
PostImportEditableDraft,
@@ -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 locale = useLocale ()
const { message, label } = useUITranslation ('imports')
@@ -614,8 +595,13 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
? { duration: .08, ease: 'linear' as const }
: { duration: .2, ease: 'easeOut' as const }
const [rows, setRows] = useState<PostImportRow[] | null> (
() => buildInitialRows (parsePostNewReviewUrls (location.search)))
const { draft: rows, setDraft: setRows, clearDraft, allowNextNavigation, ready } =
useSessionDraft (`post-import:review:${location.search}`,
buildInitialRows (parsePostNewReviewUrls (location.search)), editable,
value => value.some (row => row.importStatus !== 'created'
&& row.skipReason !== 'existing'))
const { clearDraft: clearSourceDraft } =
useSessionDraft ('post-import:source', '', editable)
const [metadataLoading, setMetadataLoading] = useState (false)
const [submitting, setSubmitting] = useState (false)
const [busyRowIds, setBusyRowIds] = useState<Set<number>> (new Set ())
@@ -623,22 +609,13 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
const [showExistingRows, setShowExistingRows] = useState (false)
const rowsRef = useRef<PostImportRow[]> ([])
const metadataSequenceRef = useRef (0)
const discardChanges = useCallback (() => undefined, [])
const dirty = useMemo (
() => rows?.some (row => editableRowDirty (row)) ?? false,
[rows],
)
const { allowNextNavigation } = useUnsavedChangesGuard ({
dirty,
onDiscard: discardChanges,
})
rowsRef.current = rows
const commitRows = useCallback ((nextRows: PostImportRow[]) => {
rowsRef.current = nextRows
setRows (nextRows)
return nextRows
}, [])
}, [setRows])
const updateRows = useCallback ((
updater: (currentRows: PostImportRow[]) => PostImportRow[],
@@ -654,17 +631,18 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
[])
const finishImport = useCallback (() => {
allowNextNavigation ()
clearDraft ()
clearSourceDraft ('')
clearPostImportSourceDraft (message =>
toast ({ title: label ('review.clearFailed'),
description: renderPostImportMessage (message, locale) }))
allowNextNavigation ()
navigate ('/posts')
}, [allowNextNavigation, navigate, label, locale])
}, [allowNextNavigation, clearDraft, clearSourceDraft, navigate, label, locale])
useEffect (() => {
const urls = parsePostNewReviewUrls (location.search)
const initialRows = buildInitialRows (urls)
commitRows (initialRows)
if (!ready) return
const initialRows = rowsRef.current
let active = true
const sequence = ++metadataSequenceRef.current
@@ -778,7 +756,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
active = false
controllers.forEach (controller => controller.abort ())
}
}, [commitRows, currentRowBySource, location.search, updateRows, locale])
}, [currentRowBySource, location.search, updateRows, locale, ready])
useEffect (() => {
if (editingRow == null || resultRepairMode (rowsRef.current) !== 'failed')
@@ -924,6 +902,9 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
}
const openEditingDialogue = async (row: PostImportRow) => {
const draftState = { dirty: false, discard: () => { },
confirm: null as null | DialogueFormControls['confirm'] }
const saveRowDraft = (
{ draft, resetRequested }: {
draft: PostImportEditableDraft
@@ -934,12 +915,23 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
await dialogue.form ({
title: label ('review.editPost'),
cancelText: label ('shared:actions.cancel'),
onCancel: async () => !draftState.dirty
|| (await draftState.confirm?.({
title: label ('settings:unsaved.leavePage'),
confirmText: label ('settings:unsaved.discardAndMove'),
cancelText: label ('shared:actions.cancel'), variant: 'danger' })) === true,
size: 'large',
body: controls => (
<PostImportRowForm
row={row}
controls={controls}
onDirtyStateChange={(dirty, discard) => {
draftState.dirty = dirty
draftState.discard = discard
draftState.confirm = controls.confirm
}}
onSave={saveRowDraft}/>) })
draftState.discard ()
}
const editRow = async (row: PostImportRow) => {
+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 { useUITranslation } from '@/lib/useUITranslation'
import { renderPostImportMessage } from '@/components/posts/import/postImportRowStatus'
@@ -22,10 +23,6 @@ import {
extractImportSourceUrls,
validateImportSource,
} from '@/lib/postImportSourceValidation'
import {
loadPostImportSourceDraft,
savePostImportSourceDraft,
} from '@/lib/postImportStorage'
import { canEditContent } from '@/lib/users'
import Forbidden from '@/pages/Forbidden'
@@ -45,12 +42,11 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
const { message: uiMessage, label } = useUITranslation ('imports')
const editable = canEditContent (user)
const navigate = useLocaleNavigate ()
const [source, setSource] = useState ('')
const { draft: source, setDraft: setSource, allowNextNavigation } =
useSessionDraft ('post-import:source', '', editable)
const [loading, setLoading] = useState (false)
const [sourceIssues, setSourceIssues] = useState<ReturnType<typeof validateImportSource>> ([])
const [sourceError, setSourceError] = useState<string | null> (null)
const saveTimer = useRef<number | null> (null)
const editedRef = useRef (false)
const lineCount = countImportSourceLines (source)
const sourceUrls = extractImportSourceUrls (source)
@@ -62,36 +58,6 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
.filter (value => value != null)
.join (' ')
useEffect (() => {
const draft = loadPostImportSourceDraft (message =>
toast ({ title: label ('source.restoreFailed'),
description: renderPostImportMessage (message, locale) }))
if (!(editedRef.current))
{
setSource (current =>
current === ''
? draft.source
: current)
}
}, [label, locale])
useEffect (() => {
if (saveTimer.current != null)
window.clearTimeout (saveTimer.current)
saveTimer.current = window.setTimeout (() => {
savePostImportSourceDraft (source, message =>
toast ({ title: label ('source.saveFailed'),
description: renderPostImportMessage (message, locale) }))
}, 300)
return () => {
if (saveTimer.current != null)
window.clearTimeout (saveTimer.current)
}
}, [source, label, locale])
const preview = async () => {
if (lineCount === 0)
{
@@ -115,6 +81,7 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
setSourceError (null)
try
{
allowNextNavigation ()
navigate (buildPostNewReviewPath (sourceUrls))
}
finally
@@ -147,7 +114,6 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
description: renderPostImportMessage (message, locale) }))
}}
onChange={ev => {
editedRef.current = true
setSource (ev.target.value)
setSourceError (null)
setSourceIssues ([])
+19 -21
ファイルの表示
@@ -3,6 +3,7 @@ import { Check, LoaderCircle, Pencil, X } from 'lucide-react'
import { Fragment, useEffect, useMemo, useState } from 'react'
import { useLocation } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import TagLink from '@/components/TagLink'
import SortHeader from '@/components/SortHeader'
@@ -27,7 +28,7 @@ import { useUITranslation } from '@/lib/useUITranslation'
import { translateUIMessage } from '@/lib/i18n'
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'
@@ -61,12 +62,10 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
const qLinkStatus = (query.get ('link_status') || 'all') as LinkStatus
const order = (query.get ('order') || 'updated_at:desc') as FetchNicoTagsOrder
const [editingId, setEditingId] = useState<number | null> (null)
const [errorsByTagId, setErrorsByTagId] = useState<Record<number, string[]>> ({ })
const [linkStatus, setLinkStatus] = useState<LinkStatus> ('all')
const [linkedTag, setLinkedTag] = useState ('')
const [name, setName] = useState ('')
const [rawTags, setRawTags] = useState<Record<number, string>> ({ })
const [savingId, setSavingId] = useState<number | null> (null)
const keys = {
@@ -79,6 +78,19 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
const editable = canEditContent (user)
const totalPages = Math.ceil (count / limit)
const { draft, setField, clearDraft } = useSessionDraft (
`nico-links:${locale}:${location.search}`,
{ editingId: null as number | null, rawTags: { } as Record<number, string> },
editable && data != null, value => {
const tag = nicoTags.find (tag => tag.id === value.editingId)
return tag != null
&& value.rawTags[tag.id] !== tag.linkedTags.map (entry => entry.name).join (' ')
})
const { editingId, rawTags } = draft
const setEditingId = (value: number | null) => setField ('editingId', value)
const setRawTags = (value: SetStateAction<Record<number, string>>) =>
setField ('rawTags', value)
const handleSearch = (e: FormEvent) => {
e.preventDefault ()
@@ -111,18 +123,14 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
variant: 'danger'})))
return
clearDraft ({ editingId: null, rawTags: { } })
setEditingId (tag.id)
setRawTags (rawTags => ({
...rawTags,
[tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')}))
setRawTags ({ [tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ') })
setErrorsByTagId (errors => ({ ...errors, [tag.id]: [] }))
}
const cancelEdit = (tag: NicoTag) => {
setEditingId (null)
setRawTags (rawTags => ({
...rawTags,
[tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')}))
clearDraft ({ editingId: null, rawTags: { } })
setErrorsByTagId (errors => ({ ...errors, [tag.id]: [] }))
}
@@ -136,7 +144,7 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
await apiPut<Tag[]> (`/tags/nico/${ id }`, formData,
{ locale, headers: { 'Content-Type': 'multipart/form-data' } })
setErrorsByTagId (errors => ({ ...errors, [id]: [] }))
setEditingId (null)
clearDraft ({ editingId: null, rawTags: { } })
await queryClient.invalidateQueries ({ queryKey: tagsKeys.nicoRoot })
toast ({ description: label ('nico.updated') })
}
@@ -161,21 +169,11 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
setName (qName)
setLinkedTag (qLinkedTag)
setLinkStatus (qLinkStatus)
setEditingId (null)
document.querySelector ('table')?.scrollIntoView ({
behavior: clientScrollBehaviour (animationMode) })
}, [animationMode, location.search, qLinkedTag, qLinkStatus, qName])
useEffect (() => {
if (!(data))
return
setRawTags (Object.fromEntries (data.tags.map (tag => [
tag.id,
tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')])))
}, [data])
useEffect (() => {
if (isError)
{
+16 -21
ファイルの表示
@@ -2,6 +2,7 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'
import { useEffect, useState } from 'react'
import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import TagLink from '@/components/TagLink'
import FieldError from '@/components/common/FieldError'
@@ -42,12 +43,12 @@ const TagDetailPage: FC = () => {
queryKey: tagKey,
queryFn: () => fetchTag (tagId, locale) })
const [name, setName] = useState (tag?.name ?? '')
const [category, setCategory] = useState<Category> (tag?.category ?? 'general')
const [aliases, setAliases] = useState (tag?.aliases.join (' ') ?? '')
const [parentTags, setParentTags] = useState (tag?.parents.map (entry => entry.name).join (' ')
?? '')
const [deprecated, setDeprecated] = useState (tag?.deprecatedAt != null)
const { draft, setField, clearDraft } = useSessionDraft (`tag:${tagId}:${locale}`, {
name: tag?.name ?? '', category: (tag?.category ?? 'general') as Category,
aliases: tag?.aliases.join (' ') ?? '',
parentTags: tag?.parents.map (entry => entry.name).join (' ') ?? '',
deprecated: tag?.deprecatedAt != null }, tag != null && tag.category !== 'nico')
const { name, category, aliases, parentTags, deprecated } = draft
const [disabled, setDisabled] = useState (tag == null || tag.category === 'nico')
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<TagFormField> ()
@@ -69,11 +70,10 @@ const TagDetailPage: FC = () => {
{
const data = await apiPut<Tag> (`/tags/${ id }`, formData, { locale })
setName (data.name)
setCategory (data.category as Category)
setAliases (data.aliases.join (' '))
setParentTags (data.parents.map (t => t.name).join (' '))
setDeprecated (Boolean (data.deprecatedAt))
clearDraft ({ name: data.name, category: data.category as Category,
aliases: data.aliases.join (' '),
parentTags: data.parents.map (entry => entry.name).join (' '),
deprecated: data.deprecatedAt != null })
qc.invalidateQueries ({ queryKey: postsKeys.root })
qc.invalidateQueries ({ queryKey: tagsKeys.root })
@@ -94,11 +94,6 @@ const TagDetailPage: FC = () => {
return
}
setName (tag.name)
setCategory (tag.category as Category)
setAliases (tag.aliases.join (' '))
setParentTags (tag.parents.map (t => t.name).join (' '))
setDeprecated (Boolean (tag.deprecatedAt))
setDisabled (tag.category === 'nico')
}, [tag])
@@ -129,7 +124,7 @@ const TagDetailPage: FC = () => {
type="text"
disabled={disabled}
value={name}
onChange={e => setName (e.target.value)}
onChange={e => setField ('name', e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>
@@ -142,7 +137,7 @@ const TagDetailPage: FC = () => {
<select
disabled={disabled}
value={category ?? ''}
onChange={e => setCategory(e.target.value as Category)}
onChange={e => setField ('category', e.target.value as Category)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}>
@@ -164,7 +159,7 @@ const TagDetailPage: FC = () => {
type="text"
disabled={disabled}
value={aliases}
onChange={e => setAliases (e.target.value)}
onChange={e => setField ('aliases', e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>
@@ -180,7 +175,7 @@ const TagDetailPage: FC = () => {
type="text"
disabled={disabled}
value={parentTags}
onChange={e => setParentTags (e.target.value)}
onChange={e => setField ('parentTags', e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>
@@ -193,7 +188,7 @@ const TagDetailPage: FC = () => {
type="checkbox"
disabled={disabled}
checked={deprecated}
onChange={e => setDeprecated (e.target.checked)}
onChange={e => setField ('deprecated', e.target.checked)}
aria-describedby={describedBy}
aria-invalid={invalid}/>)}
</FormField>
+4 -2
ファイルの表示
@@ -3,6 +3,7 @@ import { useQuery } from '@tanstack/react-query'
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import ErrorScreen from '@/components/ErrorScreen'
import PostEditForm from '@/components/PostEditForm'
@@ -238,7 +239,8 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
const [rightSidebarWidth, setRightSidebarWidth] = useState (256)
const [sidebarContainerWidth, setSidebarContainerWidth] = useState (0)
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 [loading, setLoading] = useState (false)
const { data: initialTheatre, error: theatreError } = useQuery ({
@@ -620,7 +622,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
setSending (true)
clearValidationErrors ()
await apiPost (`/theatres/${ id }/comments`, { content }, { locale })
setContent ('')
clearDraft ('')
commentsRef.current?.scrollTo ({
top: 0,
behavior: clientScrollBehaviour (animationMode) })
+12 -16
ファイルの表示
@@ -38,6 +38,7 @@ import {
upsertUserThemeSlot,
USER_THEME_SLOT_SELECTIONS,
} from '@/lib/settings'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
import { useKeyboardShortcutSettings, useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
import { cn, inputClass } from '@/lib/utils'
@@ -672,11 +673,13 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
const location = useLocation ()
const navigate = useLocaleNavigate ()
const dialogue = useDialogue ()
const { registerUnsavedChangesSource } = useUnsavedChangesGuard ()
const { registerUnsavedChangesSource, allowNextNavigation } = useUnsavedChangesGuard ()
const [inheritVsbl, setInheritVsbl] = useState (false)
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 [savedThemeMode, setSavedThemeMode] =
useState<ClientThemeMode> (initialSettings?.theme ?? 'system')
@@ -693,9 +696,9 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
const [savedThemeSlots, setSavedThemeSlots] =
useState<UserThemeSlotMap> (() => ensureCompleteThemeSlots (
normaliseUserThemeSlots (initialThemeSlots ?? [])))
const [draftThemeSlots, setDraftThemeSlots] =
useState<UserThemeSlotMap> (() => ensureCompleteThemeSlots (
normaliseUserThemeSlots (initialThemeSlots ?? [])))
const { draft: draftThemeSlots, setDraft: setDraftThemeSlots,
clearDraft: clearThemeDraft } =
useSessionDraft ('settings:theme-slots', savedThemeSlots, user != null && !loading)
const [dirtyStates, setDirtyStates] =
useState<Partial<Record<SettingsTab, SettingsTabDirtyState>>> ({ })
const [userCodeVsbl, setUserCodeVsbl] = useState (false)
@@ -819,7 +822,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
}
const discardAccountChanges = () => {
setName (savedName)
discardNameDraft ()
clearUserValidationErrors ()
}
@@ -898,6 +901,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
return
await discardCurrentTabChanges ()
allowNextNavigation ()
applyActiveTab (nextTab)
}
@@ -1057,7 +1061,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
`/users/${ user.id }`, formData,
{ headers: { 'Content-Type': 'multipart/form-data' } })
setUser (currentUser => ({ ...currentUser, ...data }))
setName (data.name ?? '')
clearNameDraft (data.name ?? '')
toast ({ title: label ('account.nameSaved') })
}
catch (submitError)
@@ -1091,7 +1095,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
const completeThemeSlots = ensureCompleteThemeSlots (nextSavedThemeSlots)
setSavedThemeSlots (completeThemeSlots)
setDraftThemeSlots (completeThemeSlots)
clearThemeDraft (completeThemeSlots)
setCachedUserThemeSlots (completeThemeSlots)
applyClientAppearance (completeThemeSlots)
toast ({ title: label ('theme.saved') })
@@ -1107,13 +1111,6 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
discardThemeChanges ()
}
useEffect (() => {
if (!user)
return
setName (user.name ?? '')
}, [user])
useEffect (() => {
if (!(user))
return
@@ -1146,7 +1143,6 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
setSavedActiveDarkThemeSlotNo (activeDarkThemeSlotNo)
setDraftActiveDarkThemeSlotNo (activeDarkThemeSlotNo)
setSavedThemeSlots (completeThemeSlots)
setDraftThemeSlots (completeThemeSlots)
setCachedUserThemeSlots (completeThemeSlots)
applyThemeAppearanceState ({ themeMode,
activeLightThemeSlotNo,
+30 -1
ファイルの表示
@@ -1,6 +1,6 @@
import { fireEvent, screen, waitFor } from '@testing-library/react'
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 WikiEditPage from '@/pages/wiki/WikiEditPage'
@@ -10,6 +10,7 @@ import { renderWithProviders } from '@/test/render'
const api = vi.hoisted (() => ({
apiGet: vi.fn (),
apiPut: vi.fn (),
isApiError: vi.fn (() => false),
}))
const toastApi = vi.hoisted (() => ({
@@ -39,6 +40,34 @@ const renderPage = (user = buildUser ({ role: 'member' })) =>
)
describe ('WikiEditPage', () => {
beforeEach (() => vi.clearAllMocks ())
it ('restores a draft after the server baseline arrives', async () => {
sessionStorage.setItem ('session-draft:1:anonymous:wiki:ja:9', JSON.stringify ({
title: '入力中の表題', body: '入力中の本文' }))
api.apiGet.mockResolvedValueOnce (buildWikiPage ({ title: '既存', body: '本文' }))
renderPage ()
expect (await screen.findByDisplayValue ('入力中の表題')).toBeInTheDocument ()
expect (screen.getByLabelText ('本文エディタ')).toHaveValue ('入力中の本文')
})
it ('keeps the draft after a rejected submission', async () => {
api.apiGet.mockResolvedValueOnce (buildWikiPage ({ title: '既存', body: '本文' }))
api.apiPut.mockRejectedValueOnce (new Error ('unavailable'))
renderPage ()
fireEvent.change (await screen.findByDisplayValue ('既存'), {
target: { value: '未送信の表題' } })
fireEvent.click (screen.getByRole ('button', { name: '編輯' }))
await waitFor (() => expect (api.apiPut).toHaveBeenCalled ())
expect (screen.getByDisplayValue ('未送信の表題')).toBeInTheDocument ()
expect (sessionStorage.getItem ('session-draft:1:anonymous:wiki:ja:9'))
.toContain ('未送信の表題')
})
it ('blocks guests', () => {
renderPage (buildUser ({ role: 'guest' }))
+10 -15
ファイルの表示
@@ -1,9 +1,9 @@
import { useQuery, useQueryClient } from '@tanstack/react-query'
import MarkdownIt from 'markdown-it'
import { useEffect, useState } from 'react'
import MdEditor from 'react-markdown-editor-lite'
import { useParams } from 'react-router-dom'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
import FieldError from '@/components/common/FieldError'
@@ -52,10 +52,11 @@ const WikiEditPage: FC<Props> = ({ user }) => {
queryKey: wikiKeys.show (id ?? '', { }, locale),
queryFn: () => apiGet<WikiPage> (`/wiki/${ encodeURIComponent (id ?? '') }`, { locale }),
enabled: editable })
const [body, setBody] = useState (wiki?.body ?? '')
const [loadedSource, setLoadedSource] = useState (wiki == null ? '' : source)
const pending = loading || loadedSource !== source
const [title, setTitle] = useState (wiki?.title ?? '')
const { draft, setField, clearDraft, allowNextNavigation } =
useSessionDraft (`wiki:${source}`, { title: wiki?.title ?? '', body: wiki?.body ?? '' },
editable && wiki != null)
const { title, body } = draft
const pending = loading
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<WikiFormField> ()
@@ -77,6 +78,8 @@ const WikiEditPage: FC<Props> = ({ user }) => {
prev == null ? prev : { ...prev, title, body })
qc.invalidateQueries ({ queryKey: wikiKeys.root })
toast ({ title: label ('shared:messages.postSuccess') })
clearDraft ()
allowNextNavigation ()
navigate (`/wiki/${ encodeURIComponent (title) }`)
}
catch (e)
@@ -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))
return <Forbidden/>
@@ -114,7 +109,7 @@ const WikiEditPage: FC<Props> = ({ user }) => {
{({ describedBy, invalid }) => (
<input type="text"
value={title}
onChange={e => setTitle (e.target.value)}
onChange={e => setField ('title', e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>)}
@@ -127,7 +122,7 @@ const WikiEditPage: FC<Props> = ({ user }) => {
style={{ height: '500px' }}
config={{ view: FIXED_WIKI_EDITOR_VIEW }}
renderHTML={text => mdParser.render (text)}
onChange={({ text }) => setBody (text)}/>)}
onChange={({ text }) => setField ('body', text)}/>)}
</FormField>
{/* 送信 */}
+8 -5
ファイルの表示
@@ -1,10 +1,10 @@
import { useQueryClient } from '@tanstack/react-query'
import MarkdownIt from 'markdown-it'
import { useState } from 'react'
import MdEditor from 'react-markdown-editor-lite'
import { useLocation } from 'react-router-dom'
import 'react-markdown-editor-lite/lib/index.css'
import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
import { useUITranslation } from '@/lib/useUITranslation'
import FieldError from '@/components/common/FieldError'
@@ -47,8 +47,9 @@ const WikiNewPage: FC<Props> = ({ user }) => {
const query = new URLSearchParams (location.search)
const titleQuery = query.get ('title') ?? ''
const [title, setTitle] = useState (titleQuery)
const [body, setBody] = useState ('')
const { draft, setField, clearDraft, allowNextNavigation } =
useSessionDraft (`wiki:new:${locale}`, { title: titleQuery, body: '' }, editable)
const { title, body } = draft
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors<WikiFormField> ()
@@ -69,6 +70,8 @@ const WikiNewPage: FC<Props> = ({ user }) => {
qc.invalidateQueries ({ queryKey: wikiKeys.root }),
qc.invalidateQueries ({ queryKey: tagsKeys.root })])
toast ({ title: label ('shared:messages.postSuccess') })
clearDraft ()
allowNextNavigation ()
navigate (`/wiki/${ encodeURIComponent (data.title) }`)
}
catch (e)
@@ -95,7 +98,7 @@ const WikiNewPage: FC<Props> = ({ user }) => {
{({ describedBy, invalid }) => (
<input type="text"
value={title}
onChange={e => setTitle (e.target.value)}
onChange={e => setField ('title', e.target.value)}
aria-describedby={describedBy}
aria-invalid={invalid}
className={inputClass (invalid)}/>)}
@@ -108,7 +111,7 @@ const WikiNewPage: FC<Props> = ({ user }) => {
style={{ height: '500px' }}
config={{ view: FIXED_WIKI_EDITOR_VIEW }}
renderHTML={text => mdParser.render (text)}
onChange={({ text }) => setBody (text)}/>)}
onChange={({ text }) => setField ('body', text)}/>)}
</FormField>
{/* 送信 */}
+5 -4
ファイルの表示
@@ -12,17 +12,18 @@ import type { ReactElement, ReactNode } from 'react'
type Options = {
route?: string
queryClient?: QueryClient }
queryClient?: QueryClient
draftScope?: string }
const TestContentContext = createContext<ReactNode> (null)
const TestRoute = () => {
const TestRoute = ({ draftScope }: { draftScope?: string }) => {
const children = useContext (TestContentContext)
return (
<DialogueProvider>
<UnsavedChangesGuardProvider>
<UnsavedChangesGuardProvider draftScope={draftScope}>
<KeyboardShortcutsProvider>
{children}
</KeyboardShortcutsProvider>
@@ -40,7 +41,7 @@ export const renderWithProviders = (
const Wrapper = ({ children }: { children: ReactNode }) => {
const [router] = useState (() => createMemoryRouter ([{
path: '*',
element: <TestRoute/> }], {
element: <TestRoute draftScope={options.draftScope}/> }], {
initialEntries: [options.route ?? '/'] }))
return (
+1
ファイルの表示
@@ -9,6 +9,7 @@ beforeEach (() => {
afterEach (() => {
cleanup ()
localStorage.clear ()
sessionStorage.clear ()
vi.restoreAllMocks ()
})