#399

frontend/src/pages/posts/PostImportSourcePage.tsx

@@ -15,8 +15,9 @@ import { apiPost, isApiError } from '@/lib/api'
 import { canEditContent } from '@/lib/users'
 import { countImportSourceLines,
 	 cleanupExpiredPostImportSessions,
-	 createPostImportSessionId,
+	 clearPostImportSession,
 	 initialisePreviewRows,
+	 loadPostImportSession,
 	 loadPostImportSourceDraft,
 	 savePostImportSession,
 	 savePostImportSourceDraft,
@@ -67,11 +68,18 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
     cleanupExpiredPostImportSessions (message =>
 	toast ({ title: '保存済みデータを整理できませんでした', description: message }))
 
+    const currentSession = loadPostImportSession (message =>
+	toast ({ title: '保存済み入力を復元できませんでした', description: message }))
     const draft = loadPostImportSourceDraft (message =>
 	toast ({ title: '保存済み入力を復元できませんでした', description: message }))
 
     if (!(editedRef.current))
-      setSource (current => current === '' ? draft.source : current)
+      {
+	setSource (current =>
+	    current === ''
+	    ? (currentSession?.source || draft.source)
+	    : current)
+      }
   }, [])
 
   useEffect (() => {
@@ -117,16 +125,16 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
 	  setSourceIssues (urlIssues)
 	  return
 	}
-      const sessionId = createPostImportSessionId ()
+      clearPostImportSession (message =>
+	  toast ({ title: '取込状態を保存できませんでした', description: message }))
       const saved = savePostImportSession (
-	  sessionId,
 	  { source,
 	    rows: initialisePreviewRows (data.rows),
 	    repairMode: 'all' },
 	  message => toast ({ title: '取込状態を保存できませんでした', description: message }))
       if (!(saved))
 	return
-      navigate (`/posts/import/${ sessionId }/review`)
+      navigate ('/posts/new/review')
     }
     catch (requestError)
     {