diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx
index a6799ad..fd85461 100644
--- a/frontend/src/App.tsx
+++ b/frontend/src/App.tsx
@@ -379,7 +379,8 @@ const RoutedApp = ({ locales }: { locales: AvailableLocale[] }) => {
{robots != null && }
-
+
({
}))
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 ()
+
+ 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 ({
diff --git a/frontend/src/components/PostEditForm.tsx b/frontend/src/components/PostEditForm.tsx
index 99039d9..a32a391 100644
--- a/frontend/src/components/PostEditForm.tsx
+++ b/frontend/src/components/PostEditForm.tsx
@@ -1,5 +1,6 @@
-import { useEffect, useMemo, useState } from 'react'
+import { useMemo, useState } from 'react'
+import { useSessionDraft } from '@/lib/useSessionDraft'
import { useLocale } from '@/lib/useLocale'
import PostOriginalCreatedTimeField from '@/components/PostOriginalCreatedTimeField'
import FieldError from '@/components/common/FieldError'
@@ -56,17 +57,17 @@ const PostEditForm: FC = ({ post, onSave }) => {
const locale = useLocale ()
const { label } = useUITranslation ('posts')
const [disabled, setDisabled] = useState (false)
- const [duration, setDuration] = useState (videoMsToDurationValue (post.videoMs))
const { baseErrors, fieldErrors, clearValidationErrors, applyValidationError } =
useValidationErrors ()
- const [originalCreatedBefore, setOriginalCreatedBefore] =
- useState (post.originalCreatedBefore)
- const [originalCreatedFrom, setOriginalCreatedFrom] =
- useState (post.originalCreatedFrom)
- const [parentPostIds, setParentPostIds] =
- useState ((post.parentPosts ?? []).map (p => p.id).join (' '))
- const [tags, setTags] = useState (() => tagsToStr (post.tags))
- const [title, setTitle] = useState (post.title)
+ const { draft, setField, clearDraft } = useSessionDraft (`post:${post.id}:${locale}`, {
+ baseVersionNo: post.versionNo,
+ duration: videoMsToDurationValue (post.videoMs),
+ originalCreatedBefore: post.originalCreatedBefore,
+ originalCreatedFrom: post.originalCreatedFrom,
+ parentPostIds: (post.parentPosts ?? []).map (entry => entry.id).join (' '),
+ tags: tagsToStr (post.tags), title: post.title })
+ const { baseVersionNo, duration, originalCreatedBefore, originalCreatedFrom,
+ parentPostIds, tags, title } = draft
const videoFlg =
useMemo (() => tags.split (/\s+/).some (tag => tag.replace (/\[.*\]$/, '') === '動画'),
@@ -83,6 +84,7 @@ const PostEditForm: FC = ({ post, onSave }) => {
try
{
const data = await updatePost (postData, options, locale)
+ clearDraft ({ ...draft, baseVersionNo: data.versionNo })
onSave ({ ...post,
versionNo: data.versionNo,
title: data.title,
@@ -132,7 +134,7 @@ const PostEditForm: FC = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore },
- { baseVersionNo: post.versionNo, merge: true })
+ { baseVersionNo, merge: true })
return
}
@@ -141,7 +143,7 @@ const PostEditForm: FC = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore },
- { baseVersionNo: post.versionNo, force: true })
+ { baseVersionNo, force: true })
return
}
}
@@ -156,7 +158,7 @@ const PostEditForm: FC = ({ post, onSave }) => {
await update ({ id: post.id, title, tags, parentPostIds,
duration: videoFlg ? duration : null,
originalCreatedFrom, originalCreatedBefore },
- { baseVersionNo: post.versionNo })
+ { baseVersionNo })
}
finally
{
@@ -164,11 +166,6 @@ const PostEditForm: FC = ({ post, onSave }) => {
}
}
- useEffect (() => {
- setTags (tagsToStr (post.tags))
- setDuration (videoMsToDurationValue (post.videoMs))
- }, [post])
-
return (