コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
d6fc57a00e |
+1
-1
@@ -424,7 +424,7 @@ races according to the target constraint's business meaning.
|
||||
and JSON keys are generally snake_case.
|
||||
- Preserve existing HTTP status conventions:
|
||||
`:unauthorized` for no user, `:forbidden` for insufficient role or banned
|
||||
user, `:not_found` for missing records, and `:unprocessable_entity` for
|
||||
user, `:not_found` for missing records, and `:unprocessable_content` for
|
||||
validation failures.
|
||||
- For diagnostic or internal helper JSON, prefer a deliberately light response
|
||||
shape over full representation classes when callers only need identifiers,
|
||||
|
||||
@@ -95,7 +95,7 @@ class ApplicationController < ActionController::API
|
||||
render_validation_error base: ['すでに存在してゐます.']
|
||||
end
|
||||
|
||||
def render_validation_error record = nil, fields: { }, base: [], status: :unprocessable_entity
|
||||
def render_validation_error record = nil, fields: { }, base: [], status: :unprocessable_content
|
||||
errors = { }
|
||||
|
||||
if record
|
||||
|
||||
@@ -18,7 +18,7 @@ class CountsExportsController < ApplicationController
|
||||
render json: { error: 'private_condition' }, status: :forbidden
|
||||
rescue CountsTableQuery::TooManyColumns
|
||||
render json: { error: 'too_many_columns', max_columns: CountsTableQuery::MAX_COLUMNS },
|
||||
status: :unprocessable_entity
|
||||
status: :unprocessable_content
|
||||
rescue ActiveRecord::StatementTimeout
|
||||
render json: { error: 'counts_query_timeout' }, status: :service_unavailable
|
||||
rescue ArgumentError, TypeError, KeyError, JSON::ParserError
|
||||
@@ -63,7 +63,7 @@ class CountsExportsController < ApplicationController
|
||||
render json: { error: 'private_condition' }, status: :forbidden
|
||||
rescue CountsTableQuery::TooManyColumns
|
||||
render json: { error: 'too_many_columns', max_columns: CountsTableQuery::MAX_COLUMNS },
|
||||
status: :unprocessable_entity
|
||||
status: :unprocessable_content
|
||||
rescue ActiveRecord::StatementTimeout
|
||||
render json: { error: 'counts_query_timeout' }, status: :service_unavailable
|
||||
rescue ArgumentError, TypeError, KeyError, JSON::ParserError
|
||||
@@ -107,7 +107,7 @@ class CountsExportsController < ApplicationController
|
||||
render json: { error: 'private_condition' }, status: :forbidden
|
||||
rescue CountsTableQuery::TooManyColumns
|
||||
render json: { error: 'too_many_columns', max_columns: CountsTableQuery::MAX_COLUMNS },
|
||||
status: :unprocessable_entity
|
||||
status: :unprocessable_content
|
||||
rescue ActiveRecord::StatementTimeout
|
||||
render json: { error: 'counts_query_timeout' }, status: :service_unavailable
|
||||
rescue ArgumentError, TypeError, KeyError, JSON::ParserError
|
||||
|
||||
@@ -24,7 +24,7 @@ class CountsTablesController < ApplicationController
|
||||
render json: { error: 'private_condition' }, status: :forbidden
|
||||
rescue CountsTableQuery::TooManyColumns
|
||||
render json: { error: 'too_many_columns', max_columns: CountsTableQuery::MAX_COLUMNS },
|
||||
status: :unprocessable_entity
|
||||
status: :unprocessable_content
|
||||
rescue CountsPivotTotals::TimedOut
|
||||
Rails.logger.warn('counts_query_timeout: pivot_totals')
|
||||
render json: { error: 'counts_query_timeout', stage: 'totals',
|
||||
|
||||
@@ -15,7 +15,7 @@ class GekanatorGamesController < ApplicationController
|
||||
answers:)
|
||||
|
||||
if game.invalid?
|
||||
render json: { errors: game.errors.full_messages }, status: :unprocessable_entity
|
||||
render json: { errors: game.errors.full_messages }, status: :unprocessable_content
|
||||
return
|
||||
end
|
||||
|
||||
@@ -31,7 +31,7 @@ class GekanatorGamesController < ApplicationController
|
||||
learned_example_count:
|
||||
}, status: :created
|
||||
rescue ActiveRecord::RecordInvalid => e
|
||||
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_entity
|
||||
render json: { errors: e.record.errors.full_messages }, status: :unprocessable_content
|
||||
end
|
||||
|
||||
def extra_questions
|
||||
|
||||
@@ -536,7 +536,7 @@ class MaterialsController < ApplicationController
|
||||
errors: { },
|
||||
base_errors: ['ZIP export に必要な素材ファイルが欠損しています.'],
|
||||
missing_files: },
|
||||
status: :unprocessable_entity
|
||||
status: :unprocessable_content
|
||||
end
|
||||
|
||||
def build_uploaded_material_blob! file, file_sha256
|
||||
|
||||
@@ -429,7 +429,7 @@ class PostsController < ApplicationController
|
||||
filters = literals.map do |literal|
|
||||
internal, = source_ids.fetch(literal[:name])
|
||||
name = internal.empty? ? literal[:name] : names[internal.first]
|
||||
return head :unprocessable_entity unless name && internal.length <= 1
|
||||
return head :unprocessable_content unless name && internal.length <= 1
|
||||
|
||||
literal[:negative] ? "not:#{ name }" : name
|
||||
end
|
||||
@@ -438,7 +438,7 @@ class PostsController < ApplicationController
|
||||
literals.zip(translated).each do |literal, translation|
|
||||
unless (source_ids.fetch(literal[:name]).map(&:sort) ==
|
||||
target_ids.fetch(translation[:name]).map(&:sort))
|
||||
return head :unprocessable_entity
|
||||
return head :unprocessable_content
|
||||
end
|
||||
end
|
||||
index = 0
|
||||
|
||||
@@ -55,7 +55,7 @@ class TheatresController < ApplicationController
|
||||
theatre = Theatre.find_by(id: params[:id])
|
||||
return head :not_found unless theatre
|
||||
requested_post_id = params[:post_id].to_i
|
||||
return head :unprocessable_entity if requested_post_id <= 0
|
||||
return head :unprocessable_content if requested_post_id <= 0
|
||||
|
||||
skipped = false
|
||||
conflicted = false
|
||||
@@ -95,7 +95,7 @@ class TheatresController < ApplicationController
|
||||
theatre = Theatre.find_by(id: params[:id])
|
||||
return head :not_found unless theatre
|
||||
requested_post_id = params[:post_id].to_i
|
||||
return head :unprocessable_entity if requested_post_id <= 0
|
||||
return head :unprocessable_content if requested_post_id <= 0
|
||||
|
||||
conflicted = false
|
||||
|
||||
|
||||
@@ -20,7 +20,7 @@ RSpec.describe 'error responses', type: :request do
|
||||
|
||||
patch "/tags/#{ tag.id }", params: { category: 'nico' }
|
||||
|
||||
expect(response).to have_http_status(:unprocessable_entity)
|
||||
expect(response).to have_http_status(:unprocessable_content)
|
||||
expect(json).to include(
|
||||
'type' => 'validation_error',
|
||||
'message' => '入力内容を確認してください.',
|
||||
@@ -37,7 +37,7 @@ RSpec.describe 'error responses', type: :request do
|
||||
|
||||
put "/users/#{ user.id }", params: { name: 'a' * 256 }
|
||||
|
||||
expect(response).to have_http_status(:unprocessable_entity)
|
||||
expect(response).to have_http_status(:unprocessable_content)
|
||||
expect(json).to include(
|
||||
'type' => 'validation_error',
|
||||
'message' => '入力内容を確認してください.')
|
||||
|
||||
+1
-2
@@ -379,8 +379,7 @@ const RoutedApp = ({ locales }: { locales: AvailableLocale[] }) => {
|
||||
<PageHead>
|
||||
{robots != null && <meta name="robots" content={robots}/>}
|
||||
</PageHead>
|
||||
<UnsavedChangesGuardProvider
|
||||
draftScope={user == null ? '' : `${user.id}:${user.role}`}>
|
||||
<UnsavedChangesGuardProvider>
|
||||
<KeyboardShortcutsProvider>
|
||||
<MotionConfig
|
||||
reducedMotion={
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import { textContentOf } from '@/test/text'
|
||||
import PostEditForm from '@/components/PostEditForm'
|
||||
@@ -29,27 +29,6 @@ vi.mock ('@/lib/dialogues/useDialogue', async importOriginal => ({
|
||||
}))
|
||||
|
||||
describe ('PostEditForm', () => {
|
||||
beforeEach (() => vi.clearAllMocks ())
|
||||
|
||||
it ('submits restored edits against their original version', async () => {
|
||||
const post = buildPost ({ id: 8, versionNo: 4 })
|
||||
sessionStorage.setItem ('session-draft:1:anonymous:post:8:ja', JSON.stringify ({
|
||||
baseVersionNo: 3, title: 'restored title', tags: 'テストタグ', duration: '',
|
||||
parentPostIds: '', originalCreatedFrom: null, originalCreatedBefore: null }))
|
||||
postsApi.updatePost.mockResolvedValueOnce ({ ...post, versionNo: 5 })
|
||||
render (<PostEditForm post={post} onSave={vi.fn ()}/>)
|
||||
|
||||
expect (screen.getByDisplayValue ('restored title')).toBeInTheDocument ()
|
||||
fireEvent.submit (screen.getByRole ('button', { name: '更新' }).closest ('form')!)
|
||||
|
||||
await waitFor (() => {
|
||||
expect (postsApi.updatePost).toHaveBeenCalledWith (
|
||||
expect.objectContaining ({ title: 'restored title' }),
|
||||
{ baseVersionNo: 3 }, 'ja')
|
||||
})
|
||||
expect (sessionStorage.getItem ('session-draft:1:anonymous:post:8:ja')).toBeNull ()
|
||||
})
|
||||
|
||||
it ('submits edited post fields with the current base version', async () => {
|
||||
const onSave = vi.fn ()
|
||||
const post = buildPost ({
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
import { useMemo, useState } from 'react'
|
||||
import { useEffect, useMemo, useState } from 'react'
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
|
||||
import FieldError from '@/components/common/FieldError'
|
||||
@@ -57,17 +56,17 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
const locale = useLocale ()
|
||||
const { label } = useUITranslation ('posts')
|
||||
const [disabled, setDisabled] = useState (false)
|
||||
const [duration, setDuration] = useState<string> (videoMsToDurationValue (post.videoMs))
|
||||
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
|
||||
useValidationErrors<PostFormField> ()
|
||||
const { draft, setField, clearDraft } = useSessionDraft (`post:${post.id}:${locale}`, {
|
||||
baseVersionNo: post.versionNo,
|
||||
duration: videoMsToDurationValue (post.videoMs),
|
||||
originalCreatedBefore: post.originalCreatedBefore,
|
||||
originalCreatedFrom: post.originalCreatedFrom,
|
||||
parentPostIds: (post.parentPosts ?? []).map (entry => entry.id).join (' '),
|
||||
tags: tagsToStr (post.tags), title: post.title })
|
||||
const { baseVersionNo, duration, originalCreatedBefore, originalCreatedFrom,
|
||||
parentPostIds, tags, title } = draft
|
||||
const [originalCreatedBefore, setOriginalCreatedBefore] =
|
||||
useState<string | null> (post.originalCreatedBefore)
|
||||
const [originalCreatedFrom, setOriginalCreatedFrom] =
|
||||
useState<string | null> (post.originalCreatedFrom)
|
||||
const [parentPostIds, setParentPostIds] =
|
||||
useState ((post.parentPosts ?? []).map (p => p.id).join (' '))
|
||||
const [tags, setTags] = useState<string> (() => tagsToStr (post.tags))
|
||||
const [title, setTitle] = useState (post.title)
|
||||
|
||||
const videoFlg =
|
||||
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
|
||||
@@ -84,7 +83,6 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
try
|
||||
{
|
||||
const data = await updatePost (postData, options, locale)
|
||||
clearDraft ({ ...draft, baseVersionNo: data.versionNo })
|
||||
onSave ({ ...post,
|
||||
versionNo: data.versionNo,
|
||||
title: data.title,
|
||||
@@ -134,7 +132,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
await update ({ id: post.id, title, tags, parentPostIds,
|
||||
duration: videoFlg ? duration : null,
|
||||
originalCreatedFrom, originalCreatedBefore },
|
||||
{ baseVersionNo, merge: true })
|
||||
{ baseVersionNo: post.versionNo, merge: true })
|
||||
return
|
||||
}
|
||||
|
||||
@@ -143,7 +141,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
await update ({ id: post.id, title, tags, parentPostIds,
|
||||
duration: videoFlg ? duration : null,
|
||||
originalCreatedFrom, originalCreatedBefore },
|
||||
{ baseVersionNo, force: true })
|
||||
{ baseVersionNo: post.versionNo, force: true })
|
||||
return
|
||||
}
|
||||
}
|
||||
@@ -158,7 +156,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
await update ({ id: post.id, title, tags, parentPostIds,
|
||||
duration: videoFlg ? duration : null,
|
||||
originalCreatedFrom, originalCreatedBefore },
|
||||
{ baseVersionNo })
|
||||
{ baseVersionNo: post.versionNo })
|
||||
}
|
||||
finally
|
||||
{
|
||||
@@ -166,6 +164,11 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
}
|
||||
}
|
||||
|
||||
useEffect (() => {
|
||||
setTags (tagsToStr (post.tags))
|
||||
setDuration (videoMsToDurationValue (post.videoMs))
|
||||
}, [post])
|
||||
|
||||
return (
|
||||
<form onSubmit={handleSubmit} className="max-w-xl pt-2 space-y-4">
|
||||
<FieldError messages={baseErrors}/>
|
||||
@@ -174,28 +177,28 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
label={label ('shared:labels.title')}
|
||||
value={title ?? ''}
|
||||
disabled={disabled}
|
||||
onChange={value => setField ('title', value)}/>
|
||||
onChange={setTitle}/>
|
||||
|
||||
<PostTextField
|
||||
label={label ('shared:labels.parentPosts')}
|
||||
value={parentPostIds}
|
||||
disabled={disabled}
|
||||
errors={fieldErrors.parentPostIds}
|
||||
onChange={value => setField ('parentPostIds', value)}/>
|
||||
onChange={setParentPostIds}/>
|
||||
|
||||
<PostTagsField
|
||||
disabled={disabled}
|
||||
tags={tags}
|
||||
setTags={value => setField ('tags', value)}
|
||||
setTags={setTags}
|
||||
errors={fieldErrors.tags}/>
|
||||
|
||||
{/* オリジナルの作成日時 */}
|
||||
<PostOriginalCreatedTimeField
|
||||
disabled={disabled}
|
||||
originalCreatedFrom={originalCreatedFrom}
|
||||
setOriginalCreatedFrom={value => setField ('originalCreatedFrom', value)}
|
||||
setOriginalCreatedFrom={setOriginalCreatedFrom}
|
||||
originalCreatedBefore={originalCreatedBefore}
|
||||
setOriginalCreatedBefore={value => setField ('originalCreatedBefore', value)}
|
||||
setOriginalCreatedBefore={setOriginalCreatedBefore}
|
||||
errors={groupedMessages (
|
||||
fieldErrors.originalCreatedAt,
|
||||
fieldErrors.originalCreatedFrom,
|
||||
@@ -206,7 +209,7 @@ const PostEditForm: FC<Props> = ({ post, onSave }) => {
|
||||
value={duration}
|
||||
disabled={disabled}
|
||||
errors={fieldErrors.videoMs}
|
||||
onChange={value => setField ('duration', value)}/>)}
|
||||
onChange={setDuration}/>)}
|
||||
|
||||
{/* 送信 */}
|
||||
<Button type="submit" disabled={disabled}>
|
||||
|
||||
@@ -1,25 +1,9 @@
|
||||
import { fireEvent, render, screen, waitFor } from '@testing-library/react'
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
import { fireEvent, render, screen } from '@testing-library/react'
|
||||
import { describe, expect, it } from 'vitest'
|
||||
|
||||
import TabGroup, { Tab } from '@/components/common/TabGroup'
|
||||
|
||||
describe ('TabGroup', () => {
|
||||
it ('waits for approval and retains the current tab after cancellation', async () => {
|
||||
const onBeforeChange = vi.fn ().mockResolvedValueOnce (false).mockResolvedValueOnce (true)
|
||||
render (
|
||||
<TabGroup onBeforeChange={onBeforeChange}>
|
||||
<Tab name="A">Alpha</Tab>
|
||||
<Tab name="B">Beta</Tab>
|
||||
</TabGroup>)
|
||||
|
||||
fireEvent.click (screen.getByText ('B'))
|
||||
await waitFor (() => expect (onBeforeChange).toHaveBeenCalledTimes (1))
|
||||
expect (screen.getByText ('Alpha')).toBeInTheDocument ()
|
||||
|
||||
fireEvent.click (screen.getByText ('B'))
|
||||
await waitFor (() => expect (screen.getByText ('Beta')).toBeInTheDocument ())
|
||||
})
|
||||
|
||||
it ('uses the init tab and switches tabs when clicked', () => {
|
||||
render (
|
||||
<TabGroup>
|
||||
|
||||
@@ -10,12 +10,12 @@ type TabProps = { name: React.ReactNode
|
||||
type Props = {
|
||||
children: React.ReactNode
|
||||
rightAddon?: React.ReactNode
|
||||
onBeforeChange?: () => boolean | Promise<boolean> }
|
||||
}
|
||||
|
||||
export const Tab = ({ children }: TabProps) => <>{children}</>
|
||||
|
||||
|
||||
const TabGroup: FC<Props> = ({ children, rightAddon, onBeforeChange }) => {
|
||||
const TabGroup: FC<Props> = ({ children, rightAddon }) => {
|
||||
const tabs = React.Children.toArray (children) as React.ReactElement<TabProps>[]
|
||||
|
||||
const [current, setCurrent] = useState<number> (() => {
|
||||
@@ -36,9 +36,7 @@ const TabGroup: FC<Props> = ({ children, rightAddon, onBeforeChange }) => {
|
||||
'focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring',
|
||||
i === current && 'font-bold',
|
||||
)}
|
||||
onClick={async () => {
|
||||
if (i === current) return
|
||||
if (onBeforeChange != null && !(await onBeforeChange ())) return
|
||||
onClick={() => {
|
||||
setCurrent (i)
|
||||
}}>
|
||||
{tab.props.name}
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { act, fireEvent, screen, waitFor } from '@testing-library/react'
|
||||
import { act, screen, waitFor } from '@testing-library/react'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import PostImportRowForm from '@/components/posts/import/PostImportRowForm'
|
||||
@@ -22,19 +22,6 @@ describe ('PostImportRowForm', () => {
|
||||
api.apiGet.mockResolvedValue (new Blob (['img'], { type: 'image/png' }))
|
||||
})
|
||||
|
||||
it ('restores pending row edits when the editor remounts', () => {
|
||||
const row = buildPostImportRow ({ attributes: { title: 'original' } })
|
||||
const controls: DialogueFormControls = {
|
||||
close: vi.fn (), confirm: vi.fn (), setActions: vi.fn () }
|
||||
const first = render (
|
||||
<PostImportRowForm row={row} controls={controls} onSave={vi.fn ()}/>)
|
||||
fireEvent.change (screen.getByDisplayValue ('original'), { target: { value: 'row draft' } })
|
||||
first.unmount ()
|
||||
|
||||
render (<PostImportRowForm row={row} controls={controls} onSave={vi.fn ()}/>)
|
||||
expect (screen.getByDisplayValue ('row draft')).toBeInTheDocument ()
|
||||
})
|
||||
|
||||
it ('resets only the draft, then saves with resetRequested', async () => {
|
||||
const row = buildPostImportRow ()
|
||||
row.attributes.title = 'manual title'
|
||||
|
||||
@@ -8,11 +8,10 @@ import PostTextField from '@/components/posts/PostTextField'
|
||||
import PostImportThumbnailPreview from '@/components/posts/import/PostImportThumbnailPreview'
|
||||
import { hasThumbnailBaseValue, hasVideoTag } from '@/lib/postImportRows'
|
||||
import { renderPostImportMessage } from '@/components/posts/import/postImportRowStatus'
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import { useUITranslation } from '@/lib/useUITranslation'
|
||||
|
||||
import type { FC, ReactNode, SetStateAction } from 'react'
|
||||
import type { FC, ReactNode } from 'react'
|
||||
|
||||
import type { DialogueFormControls } from '@/lib/dialogues/useDialogue'
|
||||
import type { PostImportEditableDraft, PostImportRow } from '@/lib/postImportTypes'
|
||||
@@ -22,7 +21,6 @@ type Draft = PostImportEditableDraft
|
||||
type Props = {
|
||||
row: PostImportRow
|
||||
controls: DialogueFormControls
|
||||
onDirtyStateChange?: (dirty: boolean, discard: () => void) => void
|
||||
onSave: (args: { draft: Draft
|
||||
resetRequested: boolean }) => Promise<{
|
||||
saved: boolean
|
||||
@@ -98,7 +96,6 @@ const thumbnailWarnings = (
|
||||
const PostImportRowForm: FC<Props> = (
|
||||
{ row,
|
||||
controls,
|
||||
onDirtyStateChange,
|
||||
onSave },
|
||||
) => {
|
||||
const locale = useLocale ()
|
||||
@@ -106,26 +103,21 @@ const PostImportRowForm: FC<Props> = (
|
||||
const groupedMessages = (...values: (string[] | undefined)[]): ReactNode[] =>
|
||||
[...new Set (values.flatMap (value => value ?? []))]
|
||||
.map (value => renderPostImportMessage (value, locale))
|
||||
const { draft: state, setField, clearDraft, discardDraft, dirty } = useSessionDraft (
|
||||
`post-import:row:${row.sourceRow}:${row.resetSnapshot.url}`,
|
||||
{ value: buildDraft (row), resetRequested: false })
|
||||
const { value: draft, resetRequested } = state
|
||||
const setDraft = useCallback ((value: SetStateAction<Draft>) =>
|
||||
setField ('value', value), [setField])
|
||||
const [draft, setDraft] = useState<Draft> (() => buildDraft (row))
|
||||
const [messageRow, setMessageRow] = useState<PostImportRow | null> (null)
|
||||
const [saving, setSaving] = useState (false)
|
||||
const [resetRequested, setResetRequested] = useState (false)
|
||||
const [committedThumbnailBase, setCommittedThumbnailBase] = useState (
|
||||
() => String (row.attributes.thumbnailBase ?? ''))
|
||||
|
||||
useEffect (() => {
|
||||
const nextDraft = buildDraft (row)
|
||||
setDraft (nextDraft)
|
||||
setMessageRow (null)
|
||||
setResetRequested (false)
|
||||
setCommittedThumbnailBase (String (row.attributes.thumbnailBase ?? ''))
|
||||
}, [row])
|
||||
|
||||
useEffect (() => {
|
||||
onDirtyStateChange?.(dirty, discardDraft)
|
||||
}, [dirty, discardDraft, onDirtyStateChange])
|
||||
|
||||
const displayRow = messageRow ?? row
|
||||
const resetDraft = useMemo (
|
||||
() => buildResetDraft (row),
|
||||
@@ -165,11 +157,11 @@ const PostImportRowForm: FC<Props> = (
|
||||
return false
|
||||
|
||||
setDraft (resetDraft)
|
||||
setField ('resetRequested', true)
|
||||
setResetRequested (true)
|
||||
setMessageRow (null)
|
||||
setCommittedThumbnailBase (resetDraft.thumbnailBase)
|
||||
return false
|
||||
}, [controls, resetDisabled, resetDraft, label, setDraft, setField])
|
||||
}, [controls, resetDisabled, resetDraft, label])
|
||||
|
||||
const save = useCallback (async (): Promise<boolean> => {
|
||||
setSaving (true)
|
||||
@@ -177,10 +169,7 @@ const PostImportRowForm: FC<Props> = (
|
||||
{
|
||||
const result = await onSave ({ draft, resetRequested })
|
||||
if (result.saved)
|
||||
{
|
||||
clearDraft ()
|
||||
return true
|
||||
}
|
||||
|
||||
if (result.row != null)
|
||||
setMessageRow (result.row)
|
||||
@@ -190,7 +179,7 @@ const PostImportRowForm: FC<Props> = (
|
||||
{
|
||||
setSaving (false)
|
||||
}
|
||||
}, [clearDraft, draft, onSave, resetRequested])
|
||||
}, [draft, onSave, resetRequested])
|
||||
|
||||
useEffect (() => {
|
||||
controls.setActions ([{
|
||||
|
||||
@@ -1,17 +1,72 @@
|
||||
import { translateUIMessage } from '@/lib/i18n'
|
||||
import { readSessionStorage, writeSessionStorage, removeSessionStorage }
|
||||
from '@/lib/sessionStorage'
|
||||
|
||||
import type { StorageErrorHandler } from '@/lib/postImportTypes'
|
||||
|
||||
const SOURCE_DRAFT_KEY = 'post-import-source-draft'
|
||||
|
||||
|
||||
const readStorage = (
|
||||
key: string,
|
||||
onError?: StorageErrorHandler,
|
||||
): string | null => {
|
||||
if (typeof window === 'undefined')
|
||||
return null
|
||||
|
||||
try
|
||||
{
|
||||
return sessionStorage.getItem (key)
|
||||
}
|
||||
catch
|
||||
{
|
||||
onError?.(translateUIMessage ('storage.readFailed', 'imports', 'ja').text)
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const writeStorage = (
|
||||
key: string,
|
||||
value: string,
|
||||
onError?: StorageErrorHandler,
|
||||
): boolean => {
|
||||
if (typeof window === 'undefined')
|
||||
return false
|
||||
|
||||
try
|
||||
{
|
||||
sessionStorage.setItem (key, value)
|
||||
return true
|
||||
}
|
||||
catch
|
||||
{
|
||||
onError?.(translateUIMessage ('storage.writeFailed', 'imports', 'ja').text)
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
const removeStorage = (
|
||||
key: string,
|
||||
onError?: StorageErrorHandler,
|
||||
) => {
|
||||
if (typeof window === 'undefined')
|
||||
return
|
||||
|
||||
try
|
||||
{
|
||||
sessionStorage.removeItem (key)
|
||||
}
|
||||
catch
|
||||
{
|
||||
onError?.(translateUIMessage ('storage.clearFailed', 'imports', 'ja').text)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export const loadPostImportSourceDraft = (
|
||||
onError?: StorageErrorHandler,
|
||||
): { source: string } => {
|
||||
const raw = readSessionStorage (SOURCE_DRAFT_KEY, () =>
|
||||
onError?.(translateUIMessage ('storage.readFailed', 'imports', 'ja').text))
|
||||
const raw = readStorage (SOURCE_DRAFT_KEY, onError)
|
||||
if (raw == null)
|
||||
return { source: '' }
|
||||
|
||||
@@ -31,13 +86,11 @@ export const savePostImportSourceDraft = (
|
||||
source: string,
|
||||
onError?: StorageErrorHandler,
|
||||
): boolean =>
|
||||
writeSessionStorage (SOURCE_DRAFT_KEY, JSON.stringify ({ source }), () =>
|
||||
onError?.(translateUIMessage ('storage.writeFailed', 'imports', 'ja').text))
|
||||
writeStorage (SOURCE_DRAFT_KEY, JSON.stringify ({ source }), onError)
|
||||
|
||||
|
||||
export const clearPostImportSourceDraft = (
|
||||
onError?: StorageErrorHandler,
|
||||
) => {
|
||||
removeSessionStorage (SOURCE_DRAFT_KEY, () =>
|
||||
onError?.(translateUIMessage ('storage.clearFailed', 'imports', 'ja').text))
|
||||
removeStorage (SOURCE_DRAFT_KEY, onError)
|
||||
}
|
||||
|
||||
@@ -1,58 +0,0 @@
|
||||
export const readSessionStorage = (
|
||||
key: string,
|
||||
onError?: () => void,
|
||||
): string | null => {
|
||||
if (typeof window === 'undefined')
|
||||
return null
|
||||
|
||||
try
|
||||
{
|
||||
return sessionStorage.getItem (key)
|
||||
}
|
||||
catch
|
||||
{
|
||||
onError?.()
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export const writeSessionStorage = (
|
||||
key: string,
|
||||
value: string,
|
||||
onError?: () => void,
|
||||
): boolean => {
|
||||
if (typeof window === 'undefined')
|
||||
return false
|
||||
|
||||
try
|
||||
{
|
||||
sessionStorage.setItem (key, value)
|
||||
return true
|
||||
}
|
||||
catch
|
||||
{
|
||||
onError?.()
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
export const removeSessionStorage = (
|
||||
key: string,
|
||||
onError?: () => void,
|
||||
) => {
|
||||
if (typeof window === 'undefined')
|
||||
return
|
||||
|
||||
try
|
||||
{
|
||||
sessionStorage.removeItem (key)
|
||||
}
|
||||
catch
|
||||
{
|
||||
onError?.()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,249 +0,0 @@
|
||||
import { act, fireEvent, screen, waitFor } from '@testing-library/react'
|
||||
import { renderToString } from 'react-dom/server'
|
||||
import { createMemoryRouter, RouterProvider, useLocation, useNavigate } from 'react-router-dom'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import DialogueProvider from '@/components/dialogues/DialogueProvider'
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { UnsavedChangesGuardProvider } from '@/lib/useUnsavedChangesGuard'
|
||||
import { renderWithProviders } from '@/test/render'
|
||||
|
||||
const storageKey = 'session-draft:1:anonymous:editor'
|
||||
const initialDraft = { title: 'original', file: null as File | null }
|
||||
|
||||
const Editor = (
|
||||
{ name = 'editor', initial = initialDraft, active = true }: {
|
||||
name?: string
|
||||
initial?: typeof initialDraft
|
||||
active?: boolean },
|
||||
) => {
|
||||
const { draft, setField, clearDraft, allowNextNavigation } =
|
||||
useSessionDraft (name, initial, active)
|
||||
const location = useLocation ()
|
||||
const navigate = useNavigate ()
|
||||
|
||||
return (
|
||||
<>
|
||||
<output aria-label="location">{location.pathname}</output>
|
||||
<input aria-label="title" value={draft.title}
|
||||
onChange={event => setField ('title', event.target.value)}/>
|
||||
<input aria-label="file" type="file"
|
||||
onChange={event => setField ('file', event.target.files?.[0] ?? null)}/>
|
||||
<output aria-label="filename">{draft.file?.name}</output>
|
||||
<button onClick={() => navigate ('/away')}>leave</button>
|
||||
<button onClick={() => navigate (-1)}>back</button>
|
||||
<button onClick={() => {
|
||||
clearDraft ()
|
||||
allowNextNavigation ()
|
||||
navigate ('/saved')
|
||||
}}>save</button>
|
||||
</>)
|
||||
}
|
||||
|
||||
describe ('session drafts and navigation', () => {
|
||||
beforeEach (() => sessionStorage.clear ())
|
||||
|
||||
it ('does not store pristine input or warn before it changes', () => {
|
||||
renderWithProviders (<Editor/>, { route: '/editor' })
|
||||
expect (sessionStorage.getItem (storageKey)).toBeNull ()
|
||||
fireEvent.click (screen.getByText ('leave'))
|
||||
expect (screen.getByLabelText ('location')).toHaveTextContent ('/away')
|
||||
expect (screen.queryByRole ('dialog')).not.toBeInTheDocument ()
|
||||
})
|
||||
|
||||
it ('stores changed input immediately and restores it after remounting', () => {
|
||||
const first = renderWithProviders (<Editor/>)
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
|
||||
expect (JSON.parse (sessionStorage.getItem (storageKey)!)).toEqual ({
|
||||
title: 'draft', file: null })
|
||||
first.unmount ()
|
||||
|
||||
renderWithProviders (<Editor/>)
|
||||
expect (screen.getByLabelText ('title')).toHaveValue ('draft')
|
||||
})
|
||||
|
||||
it ('preserves input and storage when navigation is cancelled', async () => {
|
||||
renderWithProviders (<Editor/>, { route: '/editor' })
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
|
||||
fireEvent.click (screen.getByText ('leave'))
|
||||
fireEvent.click (await screen.findByRole ('button', { name: '取消' }))
|
||||
|
||||
await waitFor (() => expect (screen.queryByRole ('dialog')).not.toBeInTheDocument ())
|
||||
expect (screen.getByLabelText ('location')).toHaveTextContent ('/editor')
|
||||
expect (screen.getByLabelText ('title')).toHaveValue ('draft')
|
||||
expect (sessionStorage.getItem (storageKey)).toContain ('draft')
|
||||
})
|
||||
|
||||
it ('discards both live input and its stored copy after confirmation', async () => {
|
||||
renderWithProviders (<Editor/>, { route: '/editor' })
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
|
||||
fireEvent.click (screen.getByText ('leave'))
|
||||
fireEvent.click (await screen.findByRole ('button', { name: '変更を破棄して移動' }))
|
||||
|
||||
await waitFor (() => {
|
||||
expect (screen.getByLabelText ('location')).toHaveTextContent ('/away')
|
||||
})
|
||||
expect (sessionStorage.getItem (storageKey)).toBeNull ()
|
||||
expect (screen.getByLabelText ('title')).toHaveValue ('original')
|
||||
})
|
||||
|
||||
it ('warns for history navigation too', async () => {
|
||||
renderWithProviders (<Editor/>, { route: '/editor' })
|
||||
fireEvent.click (screen.getByText ('leave'))
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
|
||||
fireEvent.click (screen.getByText ('back'))
|
||||
expect (await screen.findByRole ('dialog')).toBeInTheDocument ()
|
||||
expect (screen.getByLabelText ('location')).toHaveTextContent ('/away')
|
||||
})
|
||||
|
||||
it ('clears successful submissions without prompting on their next navigation', () => {
|
||||
renderWithProviders (<Editor/>, { route: '/editor' })
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'saved' } })
|
||||
fireEvent.click (screen.getByText ('save'))
|
||||
expect (screen.getByLabelText ('location')).toHaveTextContent ('/saved')
|
||||
expect (sessionStorage.getItem (storageKey)).toBeNull ()
|
||||
expect (screen.queryByRole ('dialog')).not.toBeInTheDocument ()
|
||||
})
|
||||
|
||||
it ('retains drafts until a browser departure actually occurs', () => {
|
||||
renderWithProviders (<Editor/>)
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
|
||||
const event = new Event ('beforeunload', { cancelable: true })
|
||||
window.dispatchEvent (event)
|
||||
expect (event.defaultPrevented).toBe (true)
|
||||
expect (sessionStorage.getItem (storageKey)).toContain ('draft')
|
||||
|
||||
fireEvent (window, new Event ('pagehide'))
|
||||
expect (sessionStorage.getItem (storageKey)).toBeNull ()
|
||||
expect (screen.getByLabelText ('title')).toHaveValue ('original')
|
||||
})
|
||||
|
||||
it ('keeps dirty input across background data refreshes', () => {
|
||||
const view = renderWithProviders (<Editor/>)
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'my draft' } })
|
||||
view.rerender (<Editor initial={{ title: 'new server value', file: null }}/>)
|
||||
expect (screen.getByLabelText ('title')).toHaveValue ('my draft')
|
||||
})
|
||||
|
||||
it ('preserves newly added list rows with an empty nullable selection', () => {
|
||||
const ListEditor = () => {
|
||||
const { draft, setDraft } = useSessionDraft ('list', [
|
||||
{ platform: 'youtube' as string | null, code: 'original' }])
|
||||
return (
|
||||
<>
|
||||
<output aria-label="rows">{JSON.stringify (draft)}</output>
|
||||
<button onClick={() => setDraft ([...draft, { platform: null, code: '' }])}>
|
||||
add row
|
||||
</button>
|
||||
</>)
|
||||
}
|
||||
const first = renderWithProviders (<ListEditor/>)
|
||||
fireEvent.click (screen.getByText ('add row'))
|
||||
first.unmount ()
|
||||
|
||||
renderWithProviders (<ListEditor/>)
|
||||
expect (JSON.parse (screen.getByLabelText ('rows').textContent!)).toEqual ([
|
||||
{ platform: 'youtube', code: 'original' }, { platform: null, code: '' }])
|
||||
})
|
||||
|
||||
it ('does not restore a different resource or an inactive editor', () => {
|
||||
sessionStorage.setItem (storageKey, JSON.stringify ({ title: 'private draft', file: null }))
|
||||
const view = renderWithProviders (<Editor name="other"/>)
|
||||
expect (screen.getByLabelText ('title')).toHaveValue ('original')
|
||||
view.rerender (<Editor active={false}/>)
|
||||
expect (screen.getByLabelText ('title')).toHaveValue ('original')
|
||||
expect (sessionStorage.getItem (storageKey)).toContain ('private draft')
|
||||
})
|
||||
|
||||
it ('keeps drafts separate across accounts and roles', () => {
|
||||
const first = renderWithProviders (<Editor/>, { draftScope: '1:admin' })
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'admin draft' } })
|
||||
first.unmount ()
|
||||
|
||||
const second = renderWithProviders (<Editor/>, { draftScope: '1:member' })
|
||||
expect (screen.getByLabelText ('title')).toHaveValue ('original')
|
||||
second.unmount ()
|
||||
|
||||
renderWithProviders (<Editor/>, { draftScope: '2:admin' })
|
||||
expect (screen.getByLabelText ('title')).toHaveValue ('original')
|
||||
})
|
||||
|
||||
it ('removes the draft after all changes are reverted', () => {
|
||||
renderWithProviders (<Editor/>)
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'original' } })
|
||||
expect (sessionStorage.getItem (storageKey)).toBeNull ()
|
||||
const event = new Event ('beforeunload', { cancelable: true })
|
||||
window.dispatchEvent (event)
|
||||
expect (event.defaultPrevented).toBe (false)
|
||||
})
|
||||
|
||||
it.each (['{', 'null', '{"title":12,"file":null}']) (
|
||||
'ignores corrupt or incompatible storage: %s', raw => {
|
||||
sessionStorage.setItem (storageKey, raw)
|
||||
renderWithProviders (<Editor/>)
|
||||
expect (screen.getByLabelText ('title')).toHaveValue ('original')
|
||||
expect (sessionStorage.getItem (storageKey)).toBeNull ()
|
||||
})
|
||||
|
||||
it ('continues guarding input when browser storage is unavailable', async () => {
|
||||
vi.spyOn (Storage.prototype, 'getItem').mockImplementation (() => {
|
||||
throw new DOMException ('disabled')
|
||||
})
|
||||
vi.spyOn (Storage.prototype, 'setItem').mockImplementation (() => {
|
||||
throw new DOMException ('quota')
|
||||
})
|
||||
renderWithProviders (<Editor/>)
|
||||
fireEvent.change (screen.getByLabelText ('title'), { target: { value: 'draft' } })
|
||||
fireEvent.click (screen.getByText ('leave'))
|
||||
expect (await screen.findByRole ('dialog')).toBeInTheDocument ()
|
||||
})
|
||||
|
||||
it ('restores selected file contents as well as text', async () => {
|
||||
const first = renderWithProviders (<Editor/>)
|
||||
const file = new File (['image data'], 'draft.png', { type: 'image/png' })
|
||||
fireEvent.change (screen.getByLabelText ('file'), { target: { files: [file] } })
|
||||
await waitFor (() => {
|
||||
expect (sessionStorage.getItem (storageKey)).toContain ('draft.png')
|
||||
})
|
||||
first.unmount ()
|
||||
|
||||
renderWithProviders (<Editor/>)
|
||||
expect (screen.getByLabelText ('filename')).toHaveTextContent ('draft.png')
|
||||
expect (JSON.parse (sessionStorage.getItem (storageKey)!).file.data)
|
||||
.toBe ('data:image/png;base64,aW1hZ2UgZGF0YQ==')
|
||||
})
|
||||
|
||||
it ('does not recreate discarded drafts when a pending file read finishes', async () => {
|
||||
const pending = { reader: null as FileReader | null }
|
||||
vi.spyOn (FileReader.prototype, 'readAsDataURL').mockImplementation (function (this: FileReader) {
|
||||
pending.reader = this
|
||||
})
|
||||
renderWithProviders (<Editor/>)
|
||||
fireEvent.change (screen.getByLabelText ('file'), {
|
||||
target: { files: [new File (['data'], 'pending.png')] } })
|
||||
expect (pending.reader).not.toBeNull ()
|
||||
|
||||
fireEvent (window, new Event ('pagehide'))
|
||||
const reader = pending.reader!
|
||||
Object.defineProperty (reader, 'result', { value: 'data:;base64,ZGF0YQ==' })
|
||||
await act (async () => {
|
||||
reader.dispatchEvent (new ProgressEvent ('load'))
|
||||
})
|
||||
expect (sessionStorage.getItem (storageKey)).toBeNull ()
|
||||
})
|
||||
|
||||
it ('keeps browser drafts out of the server render and initial hydration markup', () => {
|
||||
sessionStorage.setItem (storageKey, JSON.stringify ({ title: 'browser draft', file: null }))
|
||||
const router = createMemoryRouter ([{ path: '*', element: (
|
||||
<DialogueProvider>
|
||||
<UnsavedChangesGuardProvider>
|
||||
<Editor/>
|
||||
</UnsavedChangesGuardProvider>
|
||||
</DialogueProvider>) }])
|
||||
const html = renderToString (<RouterProvider router={router}/>)
|
||||
expect (html).toContain ('original')
|
||||
expect (html).not.toContain ('browser draft')
|
||||
expect (sessionStorage.getItem (storageKey)).toContain ('browser draft')
|
||||
})
|
||||
})
|
||||
@@ -1,180 +0,0 @@
|
||||
import { useCallback, useEffect, useRef, useState } from 'react'
|
||||
|
||||
import { readSessionStorage, removeSessionStorage, writeSessionStorage }
|
||||
from '@/lib/sessionStorage'
|
||||
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
||||
|
||||
import type { SetStateAction } from 'react'
|
||||
|
||||
const fileIds = new WeakMap<File, number> ()
|
||||
let fileSequence = 0
|
||||
|
||||
const serialiseIdentity = (value: unknown): string =>
|
||||
JSON.stringify (value, (_key, item) => {
|
||||
if (typeof File === 'undefined' || !(item instanceof File)) return item
|
||||
if (!fileIds.has (item)) fileIds.set (item, ++fileSequence)
|
||||
return { fileId: fileIds.get (item) }
|
||||
})
|
||||
|
||||
const serialiseDraft = (value: unknown): string | Promise<string> => {
|
||||
const files: File[] = []
|
||||
const raw = JSON.stringify (value, (_key, item) => {
|
||||
if (typeof File === 'undefined' || !(item instanceof File)) return item
|
||||
return { sessionDraftFileId: files.push (item) - 1 }
|
||||
})
|
||||
if (files.length === 0) return raw
|
||||
return Promise.all (files.map (file => new Promise ((resolve, reject) => {
|
||||
const reader = new FileReader ()
|
||||
reader.onerror = () => reject (reader.error)
|
||||
reader.onload = () => resolve ({
|
||||
sessionDraftFileFlg: true, name: file.name, type: file.type,
|
||||
lastModified: file.lastModified, data: reader.result })
|
||||
reader.readAsDataURL (file)
|
||||
}))).then (values => JSON.stringify (JSON.parse (raw, (_key, item) =>
|
||||
item?.sessionDraftFileId == null ? item : values[item.sessionDraftFileId])))
|
||||
}
|
||||
|
||||
const parseDraft = (raw: string): unknown =>
|
||||
JSON.parse (raw, (_key, value) => {
|
||||
if (value?.sessionDraftFileFlg !== true) return value
|
||||
if (typeof value.name !== 'string' || typeof value.type !== 'string'
|
||||
|| typeof value.lastModified !== 'number' || typeof value.data !== 'string')
|
||||
throw new Error ('Invalid draft file')
|
||||
const data = atob (value.data.slice (value.data.indexOf (',') + 1))
|
||||
const bytes = Uint8Array.from (data, character => character.charCodeAt (0))
|
||||
return new File ([bytes], value.name, {
|
||||
type: value.type, lastModified: value.lastModified })
|
||||
})
|
||||
|
||||
const validDraft = (value: unknown, initial: unknown, nullable = false): boolean => {
|
||||
if (nullable && value == null && typeof initial !== 'object') return true
|
||||
if (initial == null)
|
||||
return value == null || typeof value === 'string' || typeof value === 'number'
|
||||
|| (typeof File !== 'undefined' && value instanceof File)
|
||||
if (Array.isArray (initial))
|
||||
return Array.isArray (value)
|
||||
&& (initial.length === 0 || value.every (item => validDraft (item, initial[0], true)))
|
||||
if (typeof initial !== 'object') return typeof value === typeof initial
|
||||
if (value == null || typeof value !== 'object' || Array.isArray (value)) return false
|
||||
return Object.entries (initial).every (([key, item]) =>
|
||||
validDraft ((value as Record<string, unknown>)[key], item, nullable))
|
||||
}
|
||||
|
||||
type DraftEntry<T> = {
|
||||
key: string
|
||||
initial: string
|
||||
baseline: T
|
||||
value: T }
|
||||
|
||||
// Server data supplies the baseline; background refetches never replace dirty input.
|
||||
export const useSessionDraft = <T,> (
|
||||
name: string,
|
||||
initial: T,
|
||||
active = true,
|
||||
difference?: (value: T, baseline: T) => boolean,
|
||||
) => {
|
||||
const { draftScope, allowNextNavigation, confirmNavigation } = useUnsavedChangesGuard ()
|
||||
const key = `session-draft:1:${draftScope}:${name}`
|
||||
const available = active && draftScope !== ''
|
||||
const identity = serialiseIdentity (initial)
|
||||
const [entry, setEntry] = useState<DraftEntry<T> | null> (null)
|
||||
const revision = useRef (0)
|
||||
const current = useRef ({ key, initial, identity, entry })
|
||||
current.current = { key, initial, identity, entry }
|
||||
const ready = available && entry?.key === key
|
||||
const pristine = entry == null
|
||||
|| serialiseIdentity (entry.value) === serialiseIdentity (entry.baseline)
|
||||
const draft = ready && !(pristine && entry.initial !== identity) ? entry.value : initial
|
||||
const dirty = ready && (difference?.(draft, entry.baseline) ?? !pristine)
|
||||
|
||||
useEffect (() => {
|
||||
if (!available) return
|
||||
const { initial } = current.current
|
||||
setEntry (previous => {
|
||||
if (previous?.key === key)
|
||||
{
|
||||
if (previous.initial === identity) return previous
|
||||
const clean = serialiseIdentity (previous.value) === serialiseIdentity (previous.baseline)
|
||||
return { key, initial: identity, baseline: initial,
|
||||
value: clean ? initial : previous.value }
|
||||
}
|
||||
const raw = readSessionStorage (key)
|
||||
try
|
||||
{
|
||||
const value: unknown = raw == null ? initial : parseDraft (raw)
|
||||
if (validDraft (value, initial))
|
||||
return { key, initial: identity, baseline: initial, value: value as T }
|
||||
}
|
||||
catch
|
||||
{
|
||||
// Corrupt or obsolete browser data must not break the editor.
|
||||
}
|
||||
removeSessionStorage (key)
|
||||
return { key, initial: identity, baseline: initial, value: initial }
|
||||
})
|
||||
}, [available, key, identity])
|
||||
|
||||
useEffect (() => {
|
||||
if (!ready) return
|
||||
const sequence = ++revision.current
|
||||
if (pristine)
|
||||
{
|
||||
removeSessionStorage (key)
|
||||
return
|
||||
}
|
||||
const write = (value: string) => {
|
||||
if (!writeSessionStorage (key, value)) removeSessionStorage (key)
|
||||
}
|
||||
const contents = serialiseDraft (draft)
|
||||
if (typeof contents === 'string')
|
||||
write (contents)
|
||||
else
|
||||
void contents.then (value => {
|
||||
if (revision.current === sequence) write (value)
|
||||
}).catch (() => {
|
||||
// File failures leave the live input and navigation guard intact.
|
||||
})
|
||||
}, [pristine, draft, key, ready])
|
||||
|
||||
const setDraft = useCallback ((value: SetStateAction<T>) => {
|
||||
const source = current.current
|
||||
setEntry (previous => {
|
||||
const present = previous?.key === source.key ? previous.value : source.initial
|
||||
const next =
|
||||
typeof value === 'function'
|
||||
? (value as (current: T) => T) (present)
|
||||
: value
|
||||
return { key: source.key, initial: source.identity,
|
||||
baseline: previous?.key === source.key ? previous.baseline : source.initial,
|
||||
value: next }
|
||||
})
|
||||
}, [])
|
||||
|
||||
const setField = useCallback (<Key extends keyof T,> (
|
||||
field: Key,
|
||||
value: SetStateAction<T[Key]>,
|
||||
) => setDraft (previous => ({ ...previous,
|
||||
[field]:
|
||||
typeof value === 'function'
|
||||
? (value as (current: T[Key]) => T[Key]) (previous[field])
|
||||
: value })), [setDraft])
|
||||
|
||||
const clearDraft = useCallback ((value?: T) => {
|
||||
const source = current.current
|
||||
++revision.current
|
||||
removeSessionStorage (source.key)
|
||||
const present = source.entry?.key === source.key ? source.entry.value : source.initial
|
||||
const next = value ?? present
|
||||
setEntry ({ key: source.key, initial: source.identity, baseline: next, value: next })
|
||||
}, [])
|
||||
|
||||
const discardDraft = useCallback (() => {
|
||||
const source = current.current
|
||||
clearDraft (source.entry?.key === source.key ? source.entry.baseline : source.initial)
|
||||
}, [clearDraft])
|
||||
|
||||
useUnsavedChangesGuard ({ dirty, onDiscard: discardDraft })
|
||||
|
||||
return { draft, setDraft, setField, clearDraft, discardDraft, dirty,
|
||||
ready, allowNextNavigation, confirmNavigation }
|
||||
}
|
||||
@@ -6,14 +6,11 @@ import { describe, expect, it, vi } from 'vitest'
|
||||
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
||||
import { renderWithProviders } from '@/test/render'
|
||||
|
||||
const GuardHarness = ({ onDiscard }: { onDiscard?: () => void }) => {
|
||||
const GuardHarness = () => {
|
||||
const [dirty, setDirty] = useState (true)
|
||||
const location = useLocation ()
|
||||
const navigate = useNavigate ()
|
||||
const discard = () => {
|
||||
onDiscard?.()
|
||||
setDirty (false)
|
||||
}
|
||||
const discard = vi.fn (() => setDirty (false))
|
||||
const { allowNextNavigation } = useUnsavedChangesGuard ({
|
||||
dirty,
|
||||
onDiscard: discard })
|
||||
@@ -34,18 +31,6 @@ const GuardHarness = ({ onDiscard }: { onDiscard?: () => void }) => {
|
||||
}
|
||||
|
||||
describe ('useUnsavedChangesGuard', () => {
|
||||
it ('uses the current discard callback while dirty state stays unchanged', async () => {
|
||||
const original = vi.fn ()
|
||||
const current = vi.fn ()
|
||||
const view = renderWithProviders (<GuardHarness onDiscard={original}/>)
|
||||
view.rerender (<GuardHarness onDiscard={current}/>)
|
||||
fireEvent.click (screen.getByRole ('button', { name: 'move' }))
|
||||
fireEvent.click (await screen.findByRole ('button', { name: '変更を破棄して移動' }))
|
||||
|
||||
await waitFor (() => expect (current).toHaveBeenCalledTimes (1))
|
||||
expect (original).not.toHaveBeenCalled ()
|
||||
})
|
||||
|
||||
it ('blocks route changes and resets a cancelled transition', async () => {
|
||||
renderWithProviders (<GuardHarness/>, { route: '/current' })
|
||||
|
||||
|
||||
@@ -23,20 +23,17 @@ type UseUnsavedChangesGuardOptions = {
|
||||
onDiscard?: () => void | Promise<void> }
|
||||
|
||||
type UnsavedChangesGuardContextValue = {
|
||||
draftScope: string
|
||||
hasUnsavedChanges: boolean
|
||||
registerUnsavedChangesSource: (
|
||||
source: UnsavedChangesSource,
|
||||
) => () => void
|
||||
allowNextNavigation: () => void
|
||||
confirmNavigation: () => Promise<boolean> }
|
||||
allowNextNavigation: () => void }
|
||||
|
||||
const UnsavedChangesGuardContext =
|
||||
createContext<UnsavedChangesGuardContextValue | null> (null)
|
||||
|
||||
|
||||
export const UnsavedChangesGuardProvider: FC<PropsWithChildren<{
|
||||
draftScope?: string }>> = ({ children, draftScope = 'anonymous' }) => {
|
||||
export const UnsavedChangesGuardProvider: FC<PropsWithChildren> = ({ children }) => {
|
||||
const dialogue = useDialogue ()
|
||||
const { label } = useUITranslation ('settings')
|
||||
const sourcesRef = useRef (new Map<symbol, UnsavedChangesSource> ())
|
||||
@@ -120,12 +117,6 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren<{
|
||||
}
|
||||
}, [dialogue, hasUnsavedChanges, label])
|
||||
|
||||
const confirmNavigation = useCallback (async (): Promise<boolean> => {
|
||||
if (!(await confirmDiscardChanges ())) return false
|
||||
await Promise.all (dirtySources.map (source => source.discard ()))
|
||||
return true
|
||||
}, [confirmDiscardChanges, dirtySources])
|
||||
|
||||
useEffect (() => {
|
||||
if (blocker.state !== 'blocked' || handlingBlockedTransitionRef.current)
|
||||
return
|
||||
@@ -134,24 +125,33 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren<{
|
||||
void (async () => {
|
||||
try
|
||||
{
|
||||
const confirmed = await confirmNavigation ()
|
||||
if (!confirmed) {
|
||||
const confirmed = await confirmDiscardChanges ()
|
||||
if (!(confirmed))
|
||||
{
|
||||
blocker.reset ()
|
||||
return
|
||||
}
|
||||
|
||||
let discardResults: Array<void | Promise<void>>
|
||||
try
|
||||
{
|
||||
discardResults = dirtySources.map (source => source.discard ())
|
||||
}
|
||||
catch
|
||||
{
|
||||
blocker.reset ()
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
blocker.proceed ()
|
||||
}
|
||||
catch
|
||||
{
|
||||
blocker.reset ()
|
||||
blocker.proceed ()
|
||||
await Promise.allSettled (discardResults)
|
||||
}
|
||||
finally
|
||||
{
|
||||
handlingBlockedTransitionRef.current = false
|
||||
}
|
||||
}) ()
|
||||
}, [blocker, confirmNavigation])
|
||||
}, [blocker, confirmDiscardChanges, dirtySources])
|
||||
|
||||
useEffect (() => {
|
||||
if (!(hasUnsavedChanges))
|
||||
@@ -162,30 +162,21 @@ export const UnsavedChangesGuardProvider: FC<PropsWithChildren<{
|
||||
event.returnValue = ''
|
||||
}
|
||||
|
||||
const handlePageHide = () => {
|
||||
for (const source of sourcesRef.current.values ())
|
||||
if (source.dirty) void source.discard ()
|
||||
}
|
||||
|
||||
window.addEventListener ('beforeunload', handleBeforeUnload)
|
||||
window.addEventListener ('pagehide', handlePageHide)
|
||||
return () => {
|
||||
window.removeEventListener ('beforeunload', handleBeforeUnload)
|
||||
window.removeEventListener ('pagehide', handlePageHide)
|
||||
}
|
||||
}, [hasUnsavedChanges])
|
||||
|
||||
const value = useMemo<UnsavedChangesGuardContextValue> (() => ({
|
||||
draftScope,
|
||||
hasUnsavedChanges,
|
||||
registerUnsavedChangesSource,
|
||||
allowNextNavigation,
|
||||
confirmNavigation }), [
|
||||
}), [
|
||||
allowNextNavigation,
|
||||
confirmNavigation,
|
||||
draftScope,
|
||||
hasUnsavedChanges,
|
||||
registerUnsavedChangesSource])
|
||||
registerUnsavedChangesSource,
|
||||
])
|
||||
|
||||
return (
|
||||
<UnsavedChangesGuardContext.Provider value={value}>
|
||||
@@ -203,17 +194,15 @@ export const useUnsavedChangesGuard = (
|
||||
throw new Error ('UnsavedChangesGuardProvider が必要です.')
|
||||
|
||||
const { registerUnsavedChangesSource } = context
|
||||
const source = useRef (options)
|
||||
source.current = options
|
||||
const active = options != null
|
||||
|
||||
useEffect (() => {
|
||||
if (!active) return
|
||||
if (options == null)
|
||||
return
|
||||
|
||||
return registerUnsavedChangesSource ({
|
||||
dirty: source.current?.dirty ?? false,
|
||||
discard: () => source.current?.onDiscard?.() })
|
||||
}, [active, options?.dirty, registerUnsavedChangesSource])
|
||||
dirty: options.dirty,
|
||||
discard: options.onDiscard ?? (() => undefined) })
|
||||
}, [options?.dirty, options?.onDiscard, registerUnsavedChangesSource])
|
||||
|
||||
return context
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@ import { animate, motion, useMotionTemplate, useMotionValue } from 'framer-motio
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { useCallback, useEffect, useId, useMemo, useRef, useState } from 'react'
|
||||
|
||||
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import PrefetchLink from '@/components/PrefetchLink'
|
||||
import MainArea from '@/components/layout/MainArea'
|
||||
@@ -4191,14 +4190,6 @@ const GekanatorPage: FC<{ user: User | null }> = ({ user }) => {
|
||||
setHistory ([])
|
||||
}
|
||||
|
||||
useUnsavedChangesGuard ({
|
||||
dirty: !restorePromptVisible && (
|
||||
(!saved && answers.length > 0)
|
||||
|| questionSuggestion.trim () !== ''
|
||||
|| questionSuggestionSelectedId != null
|
||||
|| (extraQuestionState !== 'saved' && Object.keys (extraQuestionAnswers).length > 0)),
|
||||
onDiscard: reset })
|
||||
|
||||
const continueStoredGame = () => {
|
||||
setRestorePromptVisible (false)
|
||||
setPhase (storedGame?.phase ?? 'question')
|
||||
|
||||
@@ -2,7 +2,6 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { useEffect, useMemo, useState } from 'react'
|
||||
import { useParams } from 'react-router-dom'
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import { useUITranslation } from '@/lib/useUITranslation'
|
||||
import TagLink from '@/components/TagLink'
|
||||
@@ -39,9 +38,8 @@ const DeerjikistDetailPage: FC = () => {
|
||||
const tag = qData?.tag
|
||||
const deerjikists = useMemo (() => qData?.deerjikists ?? [], [qData])
|
||||
|
||||
const { draft: data, setDraft: setData, clearDraft } = useSessionDraft<
|
||||
(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> (
|
||||
`deerjikists:${tagId}:${locale}`, deerjikists, tag != null)
|
||||
const [data, setData] =
|
||||
useState<(Omit<Deerjikist, 'platform'> & { platform: Platform | null })[]> (deerjikists)
|
||||
const [disabled, setDisabled] = useState (tag == null)
|
||||
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
|
||||
useValidationErrors<DeerjikistFormField> ()
|
||||
@@ -56,7 +54,7 @@ const DeerjikistDetailPage: FC = () => {
|
||||
{
|
||||
setDisabled (true)
|
||||
|
||||
clearDraft (await apiPut<Deerjikist[]> (`/tags/${ id }/deerjikists`, data, { locale }))
|
||||
setData (await apiPut<Deerjikist[]> (`/tags/${ id }/deerjikists`, data, { locale }))
|
||||
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
||||
|
||||
toast ({ description: label ('messages.updated') })
|
||||
@@ -80,6 +78,7 @@ const DeerjikistDetailPage: FC = () => {
|
||||
return
|
||||
}
|
||||
|
||||
setData (deerjikists)
|
||||
setDisabled (false)
|
||||
}, [tag, deerjikists])
|
||||
|
||||
|
||||
@@ -2,7 +2,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { useEffect, useState } from 'react'
|
||||
import { useParams } from 'react-router-dom'
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import TagLink from '@/components/TagLink'
|
||||
import WikiBody from '@/components/WikiBody'
|
||||
@@ -41,23 +40,12 @@ const MaterialDetailPage: FC = () => {
|
||||
queryFn: () => fetchMaterial (id ?? '', locale),
|
||||
enabled: id != null })
|
||||
|
||||
const { draft, setField, clearDraft, confirmNavigation } =
|
||||
useSessionDraft (`material:${id}:${locale}`, {
|
||||
tag: material?.tag?.name ?? '', url: material?.url ?? '',
|
||||
exportPath: material?.exportPaths.legacyDrive ?? '', file: null as File | null },
|
||||
material != null)
|
||||
const { tag, url, exportPath, file } = draft
|
||||
const [filePreview, setFilePreview] = useState ('')
|
||||
useEffect (() => {
|
||||
const preview =
|
||||
file == null
|
||||
? (material?.contentType != null ? material.file ?? '' : '')
|
||||
: URL.createObjectURL (file)
|
||||
setFilePreview (preview)
|
||||
return () => {
|
||||
if (file != null) URL.revokeObjectURL (preview)
|
||||
}
|
||||
}, [file, material?.contentType, material?.file])
|
||||
const [exportPath, setExportPath] = useState (material?.exportPaths.legacyDrive ?? '')
|
||||
const [file, setFile] = useState<File | null> (null)
|
||||
const [filePreview, setFilePreview] = useState (
|
||||
material?.contentType != null ? material.file ?? '' : '')
|
||||
const [tag, setTag] = useState (material?.tag?.name ?? '')
|
||||
const [url, setURL] = useState (material?.url ?? '')
|
||||
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
|
||||
useValidationErrors<MaterialFormField> ()
|
||||
|
||||
@@ -65,6 +53,20 @@ const MaterialDetailPage: FC = () => {
|
||||
? material.tag?.name ?? message ('unnamed', { id: material.id }).text
|
||||
: ''
|
||||
|
||||
useEffect (() => {
|
||||
if (!(material))
|
||||
return
|
||||
|
||||
setTag (material.tag?.name ?? '')
|
||||
setURL (material.url ?? '')
|
||||
setExportPath (material.exportPaths.legacyDrive ?? '')
|
||||
if (material.file && material.contentType)
|
||||
{
|
||||
setFilePreview (material.file)
|
||||
setFile (null)
|
||||
}
|
||||
}, [material])
|
||||
|
||||
const invalidateMaterialQueries = async () => {
|
||||
await qc.invalidateQueries ({ queryKey: materialsKeys.root })
|
||||
}
|
||||
@@ -83,8 +85,6 @@ const MaterialDetailPage: FC = () => {
|
||||
return await updateMaterial (id ?? '', formData, locale)
|
||||
},
|
||||
onSuccess: async data => {
|
||||
clearDraft ({ tag: data.tag?.name ?? '', url: data.url ?? '',
|
||||
exportPath: data.exportPaths.legacyDrive ?? '', file: null })
|
||||
qc.setQueryData (materialsKeys.show (id ?? '', locale), data)
|
||||
await invalidateMaterialQueries ()
|
||||
toast ({ title: label ('updated') })
|
||||
@@ -133,7 +133,7 @@ const MaterialDetailPage: FC = () => {
|
||||
|| (/audio\/.*/.test (material.contentType) && (
|
||||
<audio src={material.file} controls/>)))}
|
||||
|
||||
<TabGroup onBeforeChange={confirmNavigation}>
|
||||
<TabGroup>
|
||||
{material.tag && (
|
||||
<Tab name={label ('navigation:wiki')}>
|
||||
<WikiBody
|
||||
@@ -152,7 +152,7 @@ const MaterialDetailPage: FC = () => {
|
||||
describedBy={describedBy}
|
||||
invalid={invalid}
|
||||
value={tag}
|
||||
setValue={value => setField ('tag', value)}/>)}
|
||||
setValue={setTag}/>)}
|
||||
</FormField>
|
||||
|
||||
<FormField label={label ('file')} messages={fieldErrors.file}>
|
||||
@@ -165,7 +165,9 @@ const MaterialDetailPage: FC = () => {
|
||||
aria-invalid={invalid}
|
||||
onChange={e => {
|
||||
const nextFile = e.target.files?.[0]
|
||||
setField ('file', nextFile ?? null)
|
||||
setFile (nextFile ?? null)
|
||||
setFilePreview (
|
||||
nextFile ? URL.createObjectURL (nextFile) : '')
|
||||
}}/>
|
||||
{(file && filePreview) && (
|
||||
(/image\/.*/.test (file.type) && (
|
||||
@@ -196,7 +198,7 @@ const MaterialDetailPage: FC = () => {
|
||||
<input
|
||||
type="url"
|
||||
value={url}
|
||||
onChange={e => setField ('url', e.target.value)}
|
||||
onChange={e => setURL (e.target.value)}
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}
|
||||
className={inputClass (invalid)}/>)}
|
||||
@@ -207,7 +209,7 @@ const MaterialDetailPage: FC = () => {
|
||||
<input
|
||||
type="text"
|
||||
value={exportPath}
|
||||
onChange={e => setField ('exportPath', e.target.value)}
|
||||
onChange={e => setExportPath (e.target.value)}
|
||||
placeholder={message ('exportPlaceholder').text}
|
||||
lang={message ('exportPlaceholder').language}
|
||||
aria-describedby={describedBy}
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import { useMutation, useQueryClient } from '@tanstack/react-query'
|
||||
import { useEffect, useState } from 'react'
|
||||
import { useState } from 'react'
|
||||
import { useLocation } from 'react-router-dom'
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
|
||||
import FieldError from '@/components/common/FieldError'
|
||||
import Form from '@/components/common/Form'
|
||||
@@ -38,18 +37,11 @@ const MaterialNewPage: FC = () => {
|
||||
|
||||
const navigate = useLocaleNavigate ()
|
||||
|
||||
const { draft, setField, clearDraft, allowNextNavigation } =
|
||||
useSessionDraft (`material:new:${locale}`, {
|
||||
tag: tagQuery, url: '', exportPath: '', file: null as File | null })
|
||||
const { tag, url, exportPath, file } = draft
|
||||
const [file, setFile] = useState<File | null> (null)
|
||||
const [filePreview, setFilePreview] = useState ('')
|
||||
useEffect (() => {
|
||||
const preview = file == null ? '' : URL.createObjectURL (file)
|
||||
setFilePreview (preview)
|
||||
return () => {
|
||||
if (file != null) URL.revokeObjectURL (preview)
|
||||
}
|
||||
}, [file])
|
||||
const [tag, setTag] = useState (tagQuery)
|
||||
const [url, setURL] = useState ('')
|
||||
const [exportPath, setExportPath] = useState ('')
|
||||
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
|
||||
useValidationErrors<MaterialFormField> ()
|
||||
|
||||
@@ -67,10 +59,8 @@ const MaterialNewPage: FC = () => {
|
||||
return await createMaterial (formData, locale)
|
||||
},
|
||||
onSuccess: async () => {
|
||||
clearDraft ()
|
||||
await qc.invalidateQueries ({ queryKey: materialsKeys.root })
|
||||
toast ({ title: label ('sent') })
|
||||
allowNextNavigation ()
|
||||
navigate (safeReturnTo || '/materials')
|
||||
},
|
||||
onError: error => {
|
||||
@@ -98,7 +88,7 @@ const MaterialNewPage: FC = () => {
|
||||
describedBy={describedBy}
|
||||
invalid={invalid}
|
||||
value={tag}
|
||||
setValue={value => setField ('tag', value)}/>)}
|
||||
setValue={setTag}/>)}
|
||||
</FormField>
|
||||
|
||||
{/* ファイル */}
|
||||
@@ -112,7 +102,8 @@ const MaterialNewPage: FC = () => {
|
||||
aria-invalid={invalid}
|
||||
onChange={e => {
|
||||
const f = e.target.files?.[0]
|
||||
setField ('file', f ?? null)
|
||||
setFile (f ?? null)
|
||||
setFilePreview (f ? URL.createObjectURL (f) : '')
|
||||
}}/>
|
||||
{(file && filePreview) && (
|
||||
(/image\/.*/.test (file.type) && (
|
||||
@@ -144,7 +135,7 @@ const MaterialNewPage: FC = () => {
|
||||
<input
|
||||
type="url"
|
||||
value={url}
|
||||
onChange={e => setField ('url', e.target.value)}
|
||||
onChange={e => setURL (e.target.value)}
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}
|
||||
className={inputClass (invalid)}/>)}
|
||||
@@ -157,7 +148,7 @@ const MaterialNewPage: FC = () => {
|
||||
<input
|
||||
type="text"
|
||||
value={exportPath}
|
||||
onChange={e => setField ('exportPath', e.target.value)}
|
||||
onChange={e => setExportPath (e.target.value)}
|
||||
placeholder={message ('exportPlaceholder').text}
|
||||
lang={message ('exportPlaceholder').language}
|
||||
aria-describedby={describedBy}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { useState } from 'react'
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import FormField from '@/components/common/FormField'
|
||||
import PageTitle from '@/components/common/PageTitle'
|
||||
@@ -41,11 +41,12 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
||||
const locale = useLocale ()
|
||||
const { message, label } = useUITranslation ('materials')
|
||||
const qc = useQueryClient ()
|
||||
const { draft, setField, clearDraft } = useSessionDraft (`material-suppressions:${locale}`, {
|
||||
sourceKind: 'uri' as MaterialSyncSuppressionSourceKind,
|
||||
sourceUri: '', drivePath: '', driveFileId: '',
|
||||
reason: REASONS[0] as MaterialSyncSuppressionReason })
|
||||
const { sourceKind, sourceUri, drivePath, driveFileId, reason } = draft
|
||||
const [sourceKind, setSourceKind] =
|
||||
useState<MaterialSyncSuppressionSourceKind> ('uri')
|
||||
const [sourceUri, setSourceUri] = useState ('')
|
||||
const [drivePath, setDrivePath] = useState ('')
|
||||
const [driveFileId, setDriveFileId] = useState ('')
|
||||
const [reason, setReason] = useState<MaterialSyncSuppressionReason> (REASONS[0])
|
||||
|
||||
const { data, isError, isLoading } = useQuery ({
|
||||
queryKey: materialsKeys.suppressions (locale),
|
||||
@@ -62,7 +63,9 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
||||
onSuccess: async () => {
|
||||
await qc.invalidateQueries ({ queryKey: materialsKeys.suppressions (locale) })
|
||||
await qc.invalidateQueries ({ queryKey: materialsKeys.root })
|
||||
clearDraft ({ ...draft, sourceUri: '', drivePath: '', driveFileId: '' })
|
||||
setSourceUri ('')
|
||||
setDrivePath ('')
|
||||
setDriveFileId ('')
|
||||
toast ({ title: label ('suppressions.registered') })
|
||||
},
|
||||
onError: () => {
|
||||
@@ -93,7 +96,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
||||
{({ invalid }) => (
|
||||
<select
|
||||
value={sourceKind}
|
||||
onChange={e => setField ('sourceKind',
|
||||
onChange={e => setSourceKind (
|
||||
e.target.value as MaterialSyncSuppressionSourceKind)}
|
||||
className={inputClass (invalid)}>
|
||||
{Object.entries (SOURCE_KIND_LABELS).map (([value, key]) => (
|
||||
@@ -108,7 +111,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
||||
<input
|
||||
type="text"
|
||||
value={sourceUri}
|
||||
onChange={e => setField ('sourceUri', e.target.value)}
|
||||
onChange={e => setSourceUri (e.target.value)}
|
||||
className={inputClass (invalid)}/>)}
|
||||
</FormField>
|
||||
|
||||
@@ -117,7 +120,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
||||
<input
|
||||
type="text"
|
||||
value={drivePath}
|
||||
onChange={e => setField ('drivePath', e.target.value)}
|
||||
onChange={e => setDrivePath (e.target.value)}
|
||||
className={inputClass (invalid)}/>)}
|
||||
</FormField>
|
||||
|
||||
@@ -126,7 +129,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
||||
<input
|
||||
type="text"
|
||||
value={driveFileId}
|
||||
onChange={e => setField ('driveFileId', e.target.value)}
|
||||
onChange={e => setDriveFileId (e.target.value)}
|
||||
className={inputClass (invalid)}/>)}
|
||||
</FormField>
|
||||
|
||||
@@ -134,7 +137,7 @@ const MaterialSyncSuppressionsPage: FC = () => {
|
||||
{({ invalid }) => (
|
||||
<select
|
||||
value={reason}
|
||||
onChange={e => setField ('reason', e.target.value as MaterialSyncSuppressionReason)}
|
||||
onChange={e => setReason (e.target.value as MaterialSyncSuppressionReason)}
|
||||
className={inputClass (invalid)}>
|
||||
{REASONS.map (value => (
|
||||
<option key={value} value={value}
|
||||
|
||||
@@ -2,8 +2,6 @@ import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { motion } from 'framer-motion'
|
||||
import { useEffect, useRef } from 'react'
|
||||
import { useParams } from 'react-router-dom'
|
||||
|
||||
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import PostEditForm from '@/components/PostEditForm'
|
||||
import PostEmbed from '@/components/PostEmbed'
|
||||
@@ -35,7 +33,6 @@ const PostDetailPage: FC<Props> = ({ user }) => {
|
||||
const locale = useLocale ()
|
||||
const { message, label } = useUITranslation ('posts')
|
||||
const editable = canEditContent (user)
|
||||
const { confirmNavigation } = useUnsavedChangesGuard ()
|
||||
const behaviourSettings = useClientBehaviourSettings ()
|
||||
const thumbnailMode = behaviourSettings.thumbnailMode ?? 'normal'
|
||||
const animationMode = behaviourSettings.animation ?? 'normal'
|
||||
@@ -166,7 +163,7 @@ const PostDetailPage: FC<Props> = ({ user }) => {
|
||||
className={cn ('text-white', viewedClass)}>
|
||||
{label (post.viewed ? 'detail.viewed' : 'detail.unviewed')}
|
||||
</Button>
|
||||
<TabGroup onBeforeChange={confirmNavigation}>
|
||||
<TabGroup>
|
||||
<Tab name={label ('shared:labels.relations')}>
|
||||
{post.related.length > 0
|
||||
? <PostList posts={post.related}/>
|
||||
|
||||
@@ -42,14 +42,13 @@ import {
|
||||
} from '@/lib/postImportRows'
|
||||
import { clearPostImportSourceDraft } from '@/lib/postImportStorage'
|
||||
import { useClientBehaviourSettings } from '@/lib/useClientBehaviourSettings'
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
||||
import { cn } from '@/lib/utils'
|
||||
import { canEditContent } from '@/lib/users'
|
||||
import Forbidden from '@/pages/Forbidden'
|
||||
|
||||
import type { FC } from 'react'
|
||||
|
||||
import type { DialogueFormControls } from '@/lib/dialogues/useDialogue'
|
||||
import type {
|
||||
PostImportDisplayTag,
|
||||
PostImportEditableDraft,
|
||||
@@ -579,6 +578,26 @@ const ExistingSkippedRows: FC<ExistingSkippedRowsProps> = ({ id, rows }) => {
|
||||
}
|
||||
|
||||
|
||||
const editableRowDirty = (row: PostImportRow): boolean =>
|
||||
row.skipReason === 'manual'
|
||||
|| row.url !== row.resetSnapshot.url
|
||||
|| String (row.attributes.title ?? '')
|
||||
!== String (row.resetSnapshot.attributes.title ?? '')
|
||||
|| String (row.attributes.thumbnailBase ?? '')
|
||||
!== String (row.resetSnapshot.attributes.thumbnailBase ?? '')
|
||||
|| String (row.attributes.originalCreatedFrom ?? '')
|
||||
!== String (row.resetSnapshot.attributes.originalCreatedFrom ?? '')
|
||||
|| String (row.attributes.originalCreatedBefore ?? '')
|
||||
!== String (row.resetSnapshot.attributes.originalCreatedBefore ?? '')
|
||||
|| String (row.attributes.duration ?? '')
|
||||
!== String (row.resetSnapshot.attributes.duration ?? '')
|
||||
|| String (row.attributes.tags ?? '')
|
||||
!== String (row.resetSnapshot.attributes.tags ?? '')
|
||||
|| String (row.attributes.parentPostIds ?? '')
|
||||
!== String (row.resetSnapshot.attributes.parentPostIds ?? '')
|
||||
|| row.thumbnailFile != null
|
||||
|
||||
|
||||
const PostImportReviewPage: FC<Props> = ({ user }) => {
|
||||
const locale = useLocale ()
|
||||
const { message, label } = useUITranslation ('imports')
|
||||
@@ -595,13 +614,8 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
|
||||
? { duration: .08, ease: 'linear' as const }
|
||||
: { duration: .2, ease: 'easeOut' as const }
|
||||
|
||||
const { draft: rows, setDraft: setRows, clearDraft, allowNextNavigation, ready } =
|
||||
useSessionDraft (`post-import:review:${location.search}`,
|
||||
buildInitialRows (parsePostNewReviewUrls (location.search)), editable,
|
||||
value => value.some (row => row.importStatus !== 'created'
|
||||
&& row.skipReason !== 'existing'))
|
||||
const { clearDraft: clearSourceDraft } =
|
||||
useSessionDraft ('post-import:source', '', editable)
|
||||
const [rows, setRows] = useState<PostImportRow[] | null> (
|
||||
() => buildInitialRows (parsePostNewReviewUrls (location.search)))
|
||||
const [metadataLoading, setMetadataLoading] = useState (false)
|
||||
const [submitting, setSubmitting] = useState (false)
|
||||
const [busyRowIds, setBusyRowIds] = useState<Set<number>> (new Set ())
|
||||
@@ -609,13 +623,22 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
|
||||
const [showExistingRows, setShowExistingRows] = useState (false)
|
||||
const rowsRef = useRef<PostImportRow[]> ([])
|
||||
const metadataSequenceRef = useRef (0)
|
||||
rowsRef.current = rows
|
||||
const discardChanges = useCallback (() => undefined, [])
|
||||
|
||||
const dirty = useMemo (
|
||||
() => rows?.some (row => editableRowDirty (row)) ?? false,
|
||||
[rows],
|
||||
)
|
||||
const { allowNextNavigation } = useUnsavedChangesGuard ({
|
||||
dirty,
|
||||
onDiscard: discardChanges,
|
||||
})
|
||||
|
||||
const commitRows = useCallback ((nextRows: PostImportRow[]) => {
|
||||
rowsRef.current = nextRows
|
||||
setRows (nextRows)
|
||||
return nextRows
|
||||
}, [setRows])
|
||||
}, [])
|
||||
|
||||
const updateRows = useCallback ((
|
||||
updater: (currentRows: PostImportRow[]) => PostImportRow[],
|
||||
@@ -631,18 +654,17 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
|
||||
[])
|
||||
|
||||
const finishImport = useCallback (() => {
|
||||
clearDraft ()
|
||||
clearSourceDraft ('')
|
||||
allowNextNavigation ()
|
||||
clearPostImportSourceDraft (message =>
|
||||
toast ({ title: label ('review.clearFailed'),
|
||||
description: renderPostImportMessage (message, locale) }))
|
||||
allowNextNavigation ()
|
||||
navigate ('/posts')
|
||||
}, [allowNextNavigation, clearDraft, clearSourceDraft, navigate, label, locale])
|
||||
}, [allowNextNavigation, navigate, label, locale])
|
||||
|
||||
useEffect (() => {
|
||||
if (!ready) return
|
||||
const initialRows = rowsRef.current
|
||||
const urls = parsePostNewReviewUrls (location.search)
|
||||
const initialRows = buildInitialRows (urls)
|
||||
commitRows (initialRows)
|
||||
|
||||
let active = true
|
||||
const sequence = ++metadataSequenceRef.current
|
||||
@@ -756,7 +778,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
|
||||
active = false
|
||||
controllers.forEach (controller => controller.abort ())
|
||||
}
|
||||
}, [currentRowBySource, location.search, updateRows, locale, ready])
|
||||
}, [commitRows, currentRowBySource, location.search, updateRows, locale])
|
||||
|
||||
useEffect (() => {
|
||||
if (editingRow == null || resultRepairMode (rowsRef.current) !== 'failed')
|
||||
@@ -902,9 +924,6 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
|
||||
}
|
||||
|
||||
const openEditingDialogue = async (row: PostImportRow) => {
|
||||
const draftState = { dirty: false, discard: () => { },
|
||||
confirm: null as null | DialogueFormControls['confirm'] }
|
||||
|
||||
const saveRowDraft = (
|
||||
{ draft, resetRequested }: {
|
||||
draft: PostImportEditableDraft
|
||||
@@ -915,23 +934,12 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
|
||||
await dialogue.form ({
|
||||
title: label ('review.editPost'),
|
||||
cancelText: label ('shared:actions.cancel'),
|
||||
onCancel: async () => !draftState.dirty
|
||||
|| (await draftState.confirm?.({
|
||||
title: label ('settings:unsaved.leavePage'),
|
||||
confirmText: label ('settings:unsaved.discardAndMove'),
|
||||
cancelText: label ('shared:actions.cancel'), variant: 'danger' })) === true,
|
||||
size: 'large',
|
||||
body: controls => (
|
||||
<PostImportRowForm
|
||||
row={row}
|
||||
controls={controls}
|
||||
onDirtyStateChange={(dirty, discard) => {
|
||||
draftState.dirty = dirty
|
||||
draftState.discard = discard
|
||||
draftState.confirm = controls.confirm
|
||||
}}
|
||||
onSave={saveRowDraft}/>) })
|
||||
draftState.discard ()
|
||||
}
|
||||
|
||||
const editRow = async (row: PostImportRow) => {
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
import { useState } from 'react'
|
||||
import { useEffect, useRef, useState } from 'react'
|
||||
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
|
||||
import { useUITranslation } from '@/lib/useUITranslation'
|
||||
import { renderPostImportMessage } from '@/components/posts/import/postImportRowStatus'
|
||||
@@ -23,6 +22,10 @@ import {
|
||||
extractImportSourceUrls,
|
||||
validateImportSource,
|
||||
} from '@/lib/postImportSourceValidation'
|
||||
import {
|
||||
loadPostImportSourceDraft,
|
||||
savePostImportSourceDraft,
|
||||
} from '@/lib/postImportStorage'
|
||||
import { canEditContent } from '@/lib/users'
|
||||
import Forbidden from '@/pages/Forbidden'
|
||||
|
||||
@@ -42,11 +45,12 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
|
||||
const { message: uiMessage, label } = useUITranslation ('imports')
|
||||
const editable = canEditContent (user)
|
||||
const navigate = useLocaleNavigate ()
|
||||
const { draft: source, setDraft: setSource, allowNextNavigation } =
|
||||
useSessionDraft ('post-import:source', '', editable)
|
||||
const [source, setSource] = useState ('')
|
||||
const [loading, setLoading] = useState (false)
|
||||
const [sourceIssues, setSourceIssues] = useState<ReturnType<typeof validateImportSource>> ([])
|
||||
const [sourceError, setSourceError] = useState<string | null> (null)
|
||||
const saveTimer = useRef<number | null> (null)
|
||||
const editedRef = useRef (false)
|
||||
|
||||
const lineCount = countImportSourceLines (source)
|
||||
const sourceUrls = extractImportSourceUrls (source)
|
||||
@@ -58,6 +62,36 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
|
||||
.filter (value => value != null)
|
||||
.join (' ')
|
||||
|
||||
useEffect (() => {
|
||||
const draft = loadPostImportSourceDraft (message =>
|
||||
toast ({ title: label ('source.restoreFailed'),
|
||||
description: renderPostImportMessage (message, locale) }))
|
||||
|
||||
if (!(editedRef.current))
|
||||
{
|
||||
setSource (current =>
|
||||
current === ''
|
||||
? draft.source
|
||||
: current)
|
||||
}
|
||||
}, [label, locale])
|
||||
|
||||
useEffect (() => {
|
||||
if (saveTimer.current != null)
|
||||
window.clearTimeout (saveTimer.current)
|
||||
|
||||
saveTimer.current = window.setTimeout (() => {
|
||||
savePostImportSourceDraft (source, message =>
|
||||
toast ({ title: label ('source.saveFailed'),
|
||||
description: renderPostImportMessage (message, locale) }))
|
||||
}, 300)
|
||||
|
||||
return () => {
|
||||
if (saveTimer.current != null)
|
||||
window.clearTimeout (saveTimer.current)
|
||||
}
|
||||
}, [source, label, locale])
|
||||
|
||||
const preview = async () => {
|
||||
if (lineCount === 0)
|
||||
{
|
||||
@@ -81,7 +115,6 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
|
||||
setSourceError (null)
|
||||
try
|
||||
{
|
||||
allowNextNavigation ()
|
||||
navigate (buildPostNewReviewPath (sourceUrls))
|
||||
}
|
||||
finally
|
||||
@@ -114,6 +147,7 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
|
||||
description: renderPostImportMessage (message, locale) }))
|
||||
}}
|
||||
onChange={ev => {
|
||||
editedRef.current = true
|
||||
setSource (ev.target.value)
|
||||
setSourceError (null)
|
||||
setSourceIssues ([])
|
||||
|
||||
@@ -3,7 +3,6 @@ import { Check, LoaderCircle, Pencil, X } from 'lucide-react'
|
||||
import { Fragment, useEffect, useMemo, useState } from 'react'
|
||||
import { useLocation } from 'react-router-dom'
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
|
||||
import TagLink from '@/components/TagLink'
|
||||
import SortHeader from '@/components/SortHeader'
|
||||
@@ -28,7 +27,7 @@ import { useUITranslation } from '@/lib/useUITranslation'
|
||||
import { translateUIMessage } from '@/lib/i18n'
|
||||
import { canEditContent } from '@/lib/users'
|
||||
|
||||
import type { FC, FormEvent, SetStateAction } from 'react'
|
||||
import type { FC, FormEvent } from 'react'
|
||||
|
||||
import type { FetchNicoTagsOrder, FetchNicoTagsOrderField, NicoTag, Tag, User } from '@/types'
|
||||
|
||||
@@ -62,10 +61,12 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
|
||||
const qLinkStatus = (query.get ('link_status') || 'all') as LinkStatus
|
||||
const order = (query.get ('order') || 'updated_at:desc') as FetchNicoTagsOrder
|
||||
|
||||
const [editingId, setEditingId] = useState<number | null> (null)
|
||||
const [errorsByTagId, setErrorsByTagId] = useState<Record<number, string[]>> ({ })
|
||||
const [linkStatus, setLinkStatus] = useState<LinkStatus> ('all')
|
||||
const [linkedTag, setLinkedTag] = useState ('')
|
||||
const [name, setName] = useState ('')
|
||||
const [rawTags, setRawTags] = useState<Record<number, string>> ({ })
|
||||
const [savingId, setSavingId] = useState<number | null> (null)
|
||||
|
||||
const keys = {
|
||||
@@ -78,19 +79,6 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
|
||||
|
||||
const editable = canEditContent (user)
|
||||
const totalPages = Math.ceil (count / limit)
|
||||
const { draft, setField, clearDraft } = useSessionDraft (
|
||||
`nico-links:${locale}:${location.search}`,
|
||||
{ editingId: null as number | null, rawTags: { } as Record<number, string> },
|
||||
editable && data != null, value => {
|
||||
const tag = nicoTags.find (tag => tag.id === value.editingId)
|
||||
return tag != null
|
||||
&& value.rawTags[tag.id] !== tag.linkedTags.map (entry => entry.name).join (' ')
|
||||
})
|
||||
const { editingId, rawTags } = draft
|
||||
const setEditingId = (value: number | null) => setField ('editingId', value)
|
||||
const setRawTags = (value: SetStateAction<Record<number, string>>) =>
|
||||
setField ('rawTags', value)
|
||||
|
||||
|
||||
const handleSearch = (e: FormEvent) => {
|
||||
e.preventDefault ()
|
||||
@@ -123,14 +111,18 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
|
||||
variant: 'danger'})))
|
||||
return
|
||||
|
||||
clearDraft ({ editingId: null, rawTags: { } })
|
||||
setEditingId (tag.id)
|
||||
setRawTags ({ [tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ') })
|
||||
setRawTags (rawTags => ({
|
||||
...rawTags,
|
||||
[tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')}))
|
||||
setErrorsByTagId (errors => ({ ...errors, [tag.id]: [] }))
|
||||
}
|
||||
|
||||
const cancelEdit = (tag: NicoTag) => {
|
||||
clearDraft ({ editingId: null, rawTags: { } })
|
||||
setEditingId (null)
|
||||
setRawTags (rawTags => ({
|
||||
...rawTags,
|
||||
[tag.id]: tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')}))
|
||||
setErrorsByTagId (errors => ({ ...errors, [tag.id]: [] }))
|
||||
}
|
||||
|
||||
@@ -144,7 +136,7 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
|
||||
await apiPut<Tag[]> (`/tags/nico/${ id }`, formData,
|
||||
{ locale, headers: { 'Content-Type': 'multipart/form-data' } })
|
||||
setErrorsByTagId (errors => ({ ...errors, [id]: [] }))
|
||||
clearDraft ({ editingId: null, rawTags: { } })
|
||||
setEditingId (null)
|
||||
await queryClient.invalidateQueries ({ queryKey: tagsKeys.nicoRoot })
|
||||
toast ({ description: label ('nico.updated') })
|
||||
}
|
||||
@@ -169,11 +161,21 @@ const NicoTagListPage: FC<Props> = ({ user }) => {
|
||||
setName (qName)
|
||||
setLinkedTag (qLinkedTag)
|
||||
setLinkStatus (qLinkStatus)
|
||||
setEditingId (null)
|
||||
|
||||
document.querySelector ('table')?.scrollIntoView ({
|
||||
behavior: clientScrollBehaviour (animationMode) })
|
||||
}, [animationMode, location.search, qLinkedTag, qLinkStatus, qName])
|
||||
|
||||
useEffect (() => {
|
||||
if (!(data))
|
||||
return
|
||||
|
||||
setRawTags (Object.fromEntries (data.tags.map (tag => [
|
||||
tag.id,
|
||||
tag.linkedTags.map (linkedTag => linkedTag.name).join (' ')])))
|
||||
}, [data])
|
||||
|
||||
useEffect (() => {
|
||||
if (isError)
|
||||
{
|
||||
|
||||
@@ -2,7 +2,6 @@ import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import { useEffect, useState } from 'react'
|
||||
import { useParams } from 'react-router-dom'
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import TagLink from '@/components/TagLink'
|
||||
import FieldError from '@/components/common/FieldError'
|
||||
@@ -43,12 +42,12 @@ const TagDetailPage: FC = () => {
|
||||
queryKey: tagKey,
|
||||
queryFn: () => fetchTag (tagId, locale) })
|
||||
|
||||
const { draft, setField, clearDraft } = useSessionDraft (`tag:${tagId}:${locale}`, {
|
||||
name: tag?.name ?? '', category: (tag?.category ?? 'general') as Category,
|
||||
aliases: tag?.aliases.join (' ') ?? '',
|
||||
parentTags: tag?.parents.map (entry => entry.name).join (' ') ?? '',
|
||||
deprecated: tag?.deprecatedAt != null }, tag != null && tag.category !== 'nico')
|
||||
const { name, category, aliases, parentTags, deprecated } = draft
|
||||
const [name, setName] = useState (tag?.name ?? '')
|
||||
const [category, setCategory] = useState<Category> (tag?.category ?? 'general')
|
||||
const [aliases, setAliases] = useState (tag?.aliases.join (' ') ?? '')
|
||||
const [parentTags, setParentTags] = useState (tag?.parents.map (entry => entry.name).join (' ')
|
||||
?? '')
|
||||
const [deprecated, setDeprecated] = useState (tag?.deprecatedAt != null)
|
||||
const [disabled, setDisabled] = useState (tag == null || tag.category === 'nico')
|
||||
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
|
||||
useValidationErrors<TagFormField> ()
|
||||
@@ -70,10 +69,11 @@ const TagDetailPage: FC = () => {
|
||||
{
|
||||
const data = await apiPut<Tag> (`/tags/${ id }`, formData, { locale })
|
||||
|
||||
clearDraft ({ name: data.name, category: data.category as Category,
|
||||
aliases: data.aliases.join (' '),
|
||||
parentTags: data.parents.map (entry => entry.name).join (' '),
|
||||
deprecated: data.deprecatedAt != null })
|
||||
setName (data.name)
|
||||
setCategory (data.category as Category)
|
||||
setAliases (data.aliases.join (' '))
|
||||
setParentTags (data.parents.map (t => t.name).join (' '))
|
||||
setDeprecated (Boolean (data.deprecatedAt))
|
||||
|
||||
qc.invalidateQueries ({ queryKey: postsKeys.root })
|
||||
qc.invalidateQueries ({ queryKey: tagsKeys.root })
|
||||
@@ -94,6 +94,11 @@ const TagDetailPage: FC = () => {
|
||||
return
|
||||
}
|
||||
|
||||
setName (tag.name)
|
||||
setCategory (tag.category as Category)
|
||||
setAliases (tag.aliases.join (' '))
|
||||
setParentTags (tag.parents.map (t => t.name).join (' '))
|
||||
setDeprecated (Boolean (tag.deprecatedAt))
|
||||
setDisabled (tag.category === 'nico')
|
||||
}, [tag])
|
||||
|
||||
@@ -124,7 +129,7 @@ const TagDetailPage: FC = () => {
|
||||
type="text"
|
||||
disabled={disabled}
|
||||
value={name}
|
||||
onChange={e => setField ('name', e.target.value)}
|
||||
onChange={e => setName (e.target.value)}
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}
|
||||
className={inputClass (invalid)}/>
|
||||
@@ -137,7 +142,7 @@ const TagDetailPage: FC = () => {
|
||||
<select
|
||||
disabled={disabled}
|
||||
value={category ?? ''}
|
||||
onChange={e => setField ('category', e.target.value as Category)}
|
||||
onChange={e => setCategory(e.target.value as Category)}
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}
|
||||
className={inputClass (invalid)}>
|
||||
@@ -159,7 +164,7 @@ const TagDetailPage: FC = () => {
|
||||
type="text"
|
||||
disabled={disabled}
|
||||
value={aliases}
|
||||
onChange={e => setField ('aliases', e.target.value)}
|
||||
onChange={e => setAliases (e.target.value)}
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}
|
||||
className={inputClass (invalid)}/>
|
||||
@@ -175,7 +180,7 @@ const TagDetailPage: FC = () => {
|
||||
type="text"
|
||||
disabled={disabled}
|
||||
value={parentTags}
|
||||
onChange={e => setField ('parentTags', e.target.value)}
|
||||
onChange={e => setParentTags (e.target.value)}
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}
|
||||
className={inputClass (invalid)}/>
|
||||
@@ -188,7 +193,7 @@ const TagDetailPage: FC = () => {
|
||||
type="checkbox"
|
||||
disabled={disabled}
|
||||
checked={deprecated}
|
||||
onChange={e => setField ('deprecated', e.target.checked)}
|
||||
onChange={e => setDeprecated (e.target.checked)}
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}/>)}
|
||||
</FormField>
|
||||
|
||||
@@ -3,7 +3,6 @@ import { useQuery } from '@tanstack/react-query'
|
||||
import { useCallback, useEffect, useMemo, useRef, useState } from 'react'
|
||||
import { useParams } from 'react-router-dom'
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale } from '@/lib/useLocale'
|
||||
import ErrorScreen from '@/components/ErrorScreen'
|
||||
import PostEditForm from '@/components/PostEditForm'
|
||||
@@ -239,8 +238,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
||||
const [rightSidebarWidth, setRightSidebarWidth] = useState (256)
|
||||
const [sidebarContainerWidth, setSidebarContainerWidth] = useState (0)
|
||||
const [comments, setComments] = useState<TheatreComment[]> ([])
|
||||
const { draft: content, setDraft: setContent, clearDraft } =
|
||||
useSessionDraft (`theatre:${id}:comment:${locale}`, '')
|
||||
const [content, setContent] = useState ('')
|
||||
const [editingPost, setEditingPost] = useState<Post | null> (null)
|
||||
const [loading, setLoading] = useState (false)
|
||||
const { data: initialTheatre, error: theatreError } = useQuery ({
|
||||
@@ -622,7 +620,7 @@ const TheatreDetailPage: FC<Props> = ({ user }: Props) => {
|
||||
setSending (true)
|
||||
clearValidationErrors ()
|
||||
await apiPost (`/theatres/${ id }/comments`, { content }, { locale })
|
||||
clearDraft ('')
|
||||
setContent ('')
|
||||
commentsRef.current?.scrollTo ({
|
||||
top: 0,
|
||||
behavior: clientScrollBehaviour (animationMode) })
|
||||
|
||||
@@ -38,7 +38,6 @@ import {
|
||||
upsertUserThemeSlot,
|
||||
USER_THEME_SLOT_SELECTIONS,
|
||||
} from '@/lib/settings'
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useUnsavedChangesGuard } from '@/lib/useUnsavedChangesGuard'
|
||||
import { useKeyboardShortcutSettings, useKeyboardShortcuts } from '@/lib/useKeyboardShortcuts'
|
||||
import { cn, inputClass } from '@/lib/utils'
|
||||
@@ -673,13 +672,11 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
|
||||
const location = useLocation ()
|
||||
const navigate = useLocaleNavigate ()
|
||||
const dialogue = useDialogue ()
|
||||
const { registerUnsavedChangesSource, allowNextNavigation } = useUnsavedChangesGuard ()
|
||||
const { registerUnsavedChangesSource } = useUnsavedChangesGuard ()
|
||||
|
||||
const [inheritVsbl, setInheritVsbl] = useState (false)
|
||||
const [loading, setLoading] = useState (initialSettings == null)
|
||||
const { draft: name, setDraft: setName, clearDraft: clearNameDraft,
|
||||
discardDraft: discardNameDraft } =
|
||||
useSessionDraft ('settings:account', user?.name ?? '', user != null)
|
||||
const [name, setName] = useState (user?.name ?? '')
|
||||
const [settingsError, setSettingsError] = useState<string | null> (null)
|
||||
const [savedThemeMode, setSavedThemeMode] =
|
||||
useState<ClientThemeMode> (initialSettings?.theme ?? 'system')
|
||||
@@ -696,9 +693,9 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
|
||||
const [savedThemeSlots, setSavedThemeSlots] =
|
||||
useState<UserThemeSlotMap> (() => ensureCompleteThemeSlots (
|
||||
normaliseUserThemeSlots (initialThemeSlots ?? [])))
|
||||
const { draft: draftThemeSlots, setDraft: setDraftThemeSlots,
|
||||
clearDraft: clearThemeDraft } =
|
||||
useSessionDraft ('settings:theme-slots', savedThemeSlots, user != null && !loading)
|
||||
const [draftThemeSlots, setDraftThemeSlots] =
|
||||
useState<UserThemeSlotMap> (() => ensureCompleteThemeSlots (
|
||||
normaliseUserThemeSlots (initialThemeSlots ?? [])))
|
||||
const [dirtyStates, setDirtyStates] =
|
||||
useState<Partial<Record<SettingsTab, SettingsTabDirtyState>>> ({ })
|
||||
const [userCodeVsbl, setUserCodeVsbl] = useState (false)
|
||||
@@ -822,7 +819,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
|
||||
}
|
||||
|
||||
const discardAccountChanges = () => {
|
||||
discardNameDraft ()
|
||||
setName (savedName)
|
||||
clearUserValidationErrors ()
|
||||
}
|
||||
|
||||
@@ -901,7 +898,6 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
|
||||
return
|
||||
|
||||
await discardCurrentTabChanges ()
|
||||
allowNextNavigation ()
|
||||
applyActiveTab (nextTab)
|
||||
}
|
||||
|
||||
@@ -1061,7 +1057,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
|
||||
`/users/${ user.id }`, formData,
|
||||
{ headers: { 'Content-Type': 'multipart/form-data' } })
|
||||
setUser (currentUser => ({ ...currentUser, ...data }))
|
||||
clearNameDraft (data.name ?? '')
|
||||
setName (data.name ?? '')
|
||||
toast ({ title: label ('account.nameSaved') })
|
||||
}
|
||||
catch (submitError)
|
||||
@@ -1095,7 +1091,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
|
||||
const completeThemeSlots = ensureCompleteThemeSlots (nextSavedThemeSlots)
|
||||
|
||||
setSavedThemeSlots (completeThemeSlots)
|
||||
clearThemeDraft (completeThemeSlots)
|
||||
setDraftThemeSlots (completeThemeSlots)
|
||||
setCachedUserThemeSlots (completeThemeSlots)
|
||||
applyClientAppearance (completeThemeSlots)
|
||||
toast ({ title: label ('theme.saved') })
|
||||
@@ -1111,6 +1107,13 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
|
||||
discardThemeChanges ()
|
||||
}
|
||||
|
||||
useEffect (() => {
|
||||
if (!user)
|
||||
return
|
||||
|
||||
setName (user.name ?? '')
|
||||
}, [user])
|
||||
|
||||
useEffect (() => {
|
||||
if (!(user))
|
||||
return
|
||||
@@ -1143,6 +1146,7 @@ const SettingPage: FC<Props> = ({ user, setUser }) => {
|
||||
setSavedActiveDarkThemeSlotNo (activeDarkThemeSlotNo)
|
||||
setDraftActiveDarkThemeSlotNo (activeDarkThemeSlotNo)
|
||||
setSavedThemeSlots (completeThemeSlots)
|
||||
setDraftThemeSlots (completeThemeSlots)
|
||||
setCachedUserThemeSlots (completeThemeSlots)
|
||||
applyThemeAppearanceState ({ themeMode,
|
||||
activeLightThemeSlotNo,
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import { fireEvent, screen, waitFor } from '@testing-library/react'
|
||||
import { Route, Routes } from 'react-router-dom'
|
||||
import { beforeEach, describe, expect, it, vi } from 'vitest'
|
||||
import { describe, expect, it, vi } from 'vitest'
|
||||
|
||||
import { textContentOf } from '@/test/text'
|
||||
import WikiEditPage from '@/pages/wiki/WikiEditPage'
|
||||
@@ -10,7 +10,6 @@ import { renderWithProviders } from '@/test/render'
|
||||
const api = vi.hoisted (() => ({
|
||||
apiGet: vi.fn (),
|
||||
apiPut: vi.fn (),
|
||||
isApiError: vi.fn (() => false),
|
||||
}))
|
||||
|
||||
const toastApi = vi.hoisted (() => ({
|
||||
@@ -40,34 +39,6 @@ const renderPage = (user = buildUser ({ role: 'member' })) =>
|
||||
)
|
||||
|
||||
describe ('WikiEditPage', () => {
|
||||
beforeEach (() => vi.clearAllMocks ())
|
||||
|
||||
it ('restores a draft after the server baseline arrives', async () => {
|
||||
sessionStorage.setItem ('session-draft:1:anonymous:wiki:ja:9', JSON.stringify ({
|
||||
title: '入力中の表題', body: '入力中の本文' }))
|
||||
api.apiGet.mockResolvedValueOnce (buildWikiPage ({ title: '既存', body: '本文' }))
|
||||
|
||||
renderPage ()
|
||||
|
||||
expect (await screen.findByDisplayValue ('入力中の表題')).toBeInTheDocument ()
|
||||
expect (screen.getByLabelText ('本文エディタ')).toHaveValue ('入力中の本文')
|
||||
})
|
||||
|
||||
it ('keeps the draft after a rejected submission', async () => {
|
||||
api.apiGet.mockResolvedValueOnce (buildWikiPage ({ title: '既存', body: '本文' }))
|
||||
api.apiPut.mockRejectedValueOnce (new Error ('unavailable'))
|
||||
renderPage ()
|
||||
|
||||
fireEvent.change (await screen.findByDisplayValue ('既存'), {
|
||||
target: { value: '未送信の表題' } })
|
||||
fireEvent.click (screen.getByRole ('button', { name: '編輯' }))
|
||||
|
||||
await waitFor (() => expect (api.apiPut).toHaveBeenCalled ())
|
||||
expect (screen.getByDisplayValue ('未送信の表題')).toBeInTheDocument ()
|
||||
expect (sessionStorage.getItem ('session-draft:1:anonymous:wiki:ja:9'))
|
||||
.toContain ('未送信の表題')
|
||||
})
|
||||
|
||||
it ('blocks guests', () => {
|
||||
renderPage (buildUser ({ role: 'guest' }))
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import { useQuery, useQueryClient } from '@tanstack/react-query'
|
||||
import MarkdownIt from 'markdown-it'
|
||||
import { useEffect, useState } from 'react'
|
||||
import MdEditor from 'react-markdown-editor-lite'
|
||||
import { useParams } from 'react-router-dom'
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
|
||||
import { useUITranslation } from '@/lib/useUITranslation'
|
||||
import FieldError from '@/components/common/FieldError'
|
||||
@@ -52,11 +52,10 @@ const WikiEditPage: FC<Props> = ({ user }) => {
|
||||
queryKey: wikiKeys.show (id ?? '', { }, locale),
|
||||
queryFn: () => apiGet<WikiPage> (`/wiki/${ encodeURIComponent (id ?? '') }`, { locale }),
|
||||
enabled: editable })
|
||||
const { draft, setField, clearDraft, allowNextNavigation } =
|
||||
useSessionDraft (`wiki:${source}`, { title: wiki?.title ?? '', body: wiki?.body ?? '' },
|
||||
editable && wiki != null)
|
||||
const { title, body } = draft
|
||||
const pending = loading
|
||||
const [body, setBody] = useState (wiki?.body ?? '')
|
||||
const [loadedSource, setLoadedSource] = useState (wiki == null ? '' : source)
|
||||
const pending = loading || loadedSource !== source
|
||||
const [title, setTitle] = useState (wiki?.title ?? '')
|
||||
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
|
||||
useValidationErrors<WikiFormField> ()
|
||||
|
||||
@@ -78,8 +77,6 @@ const WikiEditPage: FC<Props> = ({ user }) => {
|
||||
prev == null ? prev : { ...prev, title, body })
|
||||
qc.invalidateQueries ({ queryKey: wikiKeys.root })
|
||||
toast ({ title: label ('shared:messages.postSuccess') })
|
||||
clearDraft ()
|
||||
allowNextNavigation ()
|
||||
navigate (`/wiki/${ encodeURIComponent (title) }`)
|
||||
}
|
||||
catch (e)
|
||||
@@ -90,6 +87,14 @@ const WikiEditPage: FC<Props> = ({ user }) => {
|
||||
}
|
||||
}
|
||||
|
||||
useEffect (() => {
|
||||
if (!(editable) || wiki == null)
|
||||
return
|
||||
setTitle (wiki.title)
|
||||
setBody (wiki.body)
|
||||
setLoadedSource (source)
|
||||
}, [editable, source, wiki])
|
||||
|
||||
if (!(editable))
|
||||
return <Forbidden/>
|
||||
|
||||
@@ -109,7 +114,7 @@ const WikiEditPage: FC<Props> = ({ user }) => {
|
||||
{({ describedBy, invalid }) => (
|
||||
<input type="text"
|
||||
value={title}
|
||||
onChange={e => setField ('title', e.target.value)}
|
||||
onChange={e => setTitle (e.target.value)}
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}
|
||||
className={inputClass (invalid)}/>)}
|
||||
@@ -122,7 +127,7 @@ const WikiEditPage: FC<Props> = ({ user }) => {
|
||||
style={{ height: '500px' }}
|
||||
config={{ view: FIXED_WIKI_EDITOR_VIEW }}
|
||||
renderHTML={text => mdParser.render (text)}
|
||||
onChange={({ text }) => setField ('body', text)}/>)}
|
||||
onChange={({ text }) => setBody (text)}/>)}
|
||||
</FormField>
|
||||
|
||||
{/* 送信 */}
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
import { useQueryClient } from '@tanstack/react-query'
|
||||
import MarkdownIt from 'markdown-it'
|
||||
import { useState } from 'react'
|
||||
import MdEditor from 'react-markdown-editor-lite'
|
||||
import { useLocation } from 'react-router-dom'
|
||||
import 'react-markdown-editor-lite/lib/index.css'
|
||||
|
||||
import { useSessionDraft } from '@/lib/useSessionDraft'
|
||||
import { useLocale, useLocaleNavigate } from '@/lib/useLocale'
|
||||
import { useUITranslation } from '@/lib/useUITranslation'
|
||||
import FieldError from '@/components/common/FieldError'
|
||||
@@ -47,9 +47,8 @@ const WikiNewPage: FC<Props> = ({ user }) => {
|
||||
const query = new URLSearchParams (location.search)
|
||||
const titleQuery = query.get ('title') ?? ''
|
||||
|
||||
const { draft, setField, clearDraft, allowNextNavigation } =
|
||||
useSessionDraft (`wiki:new:${locale}`, { title: titleQuery, body: '' }, editable)
|
||||
const { title, body } = draft
|
||||
const [title, setTitle] = useState (titleQuery)
|
||||
const [body, setBody] = useState ('')
|
||||
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
|
||||
useValidationErrors<WikiFormField> ()
|
||||
|
||||
@@ -70,8 +69,6 @@ const WikiNewPage: FC<Props> = ({ user }) => {
|
||||
qc.invalidateQueries ({ queryKey: wikiKeys.root }),
|
||||
qc.invalidateQueries ({ queryKey: tagsKeys.root })])
|
||||
toast ({ title: label ('shared:messages.postSuccess') })
|
||||
clearDraft ()
|
||||
allowNextNavigation ()
|
||||
navigate (`/wiki/${ encodeURIComponent (data.title) }`)
|
||||
}
|
||||
catch (e)
|
||||
@@ -98,7 +95,7 @@ const WikiNewPage: FC<Props> = ({ user }) => {
|
||||
{({ describedBy, invalid }) => (
|
||||
<input type="text"
|
||||
value={title}
|
||||
onChange={e => setField ('title', e.target.value)}
|
||||
onChange={e => setTitle (e.target.value)}
|
||||
aria-describedby={describedBy}
|
||||
aria-invalid={invalid}
|
||||
className={inputClass (invalid)}/>)}
|
||||
@@ -111,7 +108,7 @@ const WikiNewPage: FC<Props> = ({ user }) => {
|
||||
style={{ height: '500px' }}
|
||||
config={{ view: FIXED_WIKI_EDITOR_VIEW }}
|
||||
renderHTML={text => mdParser.render (text)}
|
||||
onChange={({ text }) => setField ('body', text)}/>)}
|
||||
onChange={({ text }) => setBody (text)}/>)}
|
||||
</FormField>
|
||||
|
||||
{/* 送信 */}
|
||||
|
||||
@@ -12,18 +12,17 @@ import type { ReactElement, ReactNode } from 'react'
|
||||
|
||||
type Options = {
|
||||
route?: string
|
||||
queryClient?: QueryClient
|
||||
draftScope?: string }
|
||||
queryClient?: QueryClient }
|
||||
|
||||
const TestContentContext = createContext<ReactNode> (null)
|
||||
|
||||
|
||||
const TestRoute = ({ draftScope }: { draftScope?: string }) => {
|
||||
const TestRoute = () => {
|
||||
const children = useContext (TestContentContext)
|
||||
|
||||
return (
|
||||
<DialogueProvider>
|
||||
<UnsavedChangesGuardProvider draftScope={draftScope}>
|
||||
<UnsavedChangesGuardProvider>
|
||||
<KeyboardShortcutsProvider>
|
||||
{children}
|
||||
</KeyboardShortcutsProvider>
|
||||
@@ -41,7 +40,7 @@ export const renderWithProviders = (
|
||||
const Wrapper = ({ children }: { children: ReactNode }) => {
|
||||
const [router] = useState (() => createMemoryRouter ([{
|
||||
path: '*',
|
||||
element: <TestRoute draftScope={options.draftScope}/> }], {
|
||||
element: <TestRoute/> }], {
|
||||
initialEntries: [options.route ?? '/'] }))
|
||||
|
||||
return (
|
||||
|
||||
@@ -9,7 +9,6 @@ beforeEach (() => {
|
||||
afterEach (() => {
|
||||
cleanup ()
|
||||
localStorage.clear ()
|
||||
sessionStorage.clear ()
|
||||
vi.restoreAllMocks ()
|
||||
})
|
||||
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする