#399

frontend/src/pages/posts/PostImportSourcePage.tsx

@@ -12,14 +12,12 @@ import { Button } from '@/components/ui/button'
 import { toast } from '@/components/ui/use-toast'
 import { SITE_TITLE } from '@/config'
 import { apiPost, isApiError } from '@/lib/api'
+import { serialisePostNewState } from '@/lib/postNewQueryState'
 import { canEditContent } from '@/lib/users'
 import { countImportSourceLines,
 	 cleanupExpiredPostImportSessions,
-	 clearPostImportSession,
 	 initialisePreviewRows,
-	 loadPostImportSession,
 	 loadPostImportSourceDraft,
-	 savePostImportSession,
 	 savePostImportSourceDraft,
 	 validateImportSource } from '@/lib/postImportSession'
 import Forbidden from '@/pages/Forbidden'
@@ -68,8 +66,6 @@ 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 }))
 
@@ -77,7 +73,7 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
       {
 	setSource (current =>
 	    current === ''
-	    ? (currentSession?.source || draft.source)
+	    ? draft.source
 	    : current)
       }
   }, [])
@@ -125,16 +121,8 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
 	  setSourceIssues (urlIssues)
 	  return
 	}
-      clearPostImportSession (message =>
-	  toast ({ title: '取込状態を保存できませんでした', description: message }))
-      const saved = savePostImportSession (
-	  { source,
-	    rows: initialisePreviewRows (data.rows),
-	    repairMode: 'all' },
-	  message => toast ({ title: '取込状態を保存できませんでした', description: message }))
-      if (!(saved))
-	return
-      navigate ('/posts/new/review')
+      const nextRows = initialisePreviewRows (data.rows)
+      navigate (serialisePostNewState (nextRows))
     }
     catch (requestError)
     {