#399

frontend/src/pages/posts/PostImportReviewPage.tsx

@@ -19,7 +19,6 @@ import { loadPostImportSession,
 	 mergeImportResults,
 	 mergeValidatedImportRows,
 	 reviewSummaryCounts,
-	 rowMessages,
 	 savePostImportSession,
 	 submittableImportRows,
 	 type PostImportResultRow,
@@ -59,7 +58,8 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 	if (!(sessionId))
 	  return
 
-	const loaded = loadPostImportSession (sessionId)
+	const loaded = loadPostImportSession (sessionId, message =>
+	    toast ({ title: '取込状態を復元できませんでした', description: message }))
 	setSession (loaded)
 	setMissing (loaded == null)
     }, [sessionId])
@@ -68,7 +68,8 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 	if (!(sessionId) || !(session))
 	  return
 
-	savePostImportSession (sessionId, session)
+	savePostImportSession (sessionId, session, message =>
+	    toast ({ title: '取込状態を保存できませんでした', description: message }))
     }, [session, sessionId])
 
     const rows = session?.rows ?? []
@@ -160,8 +161,15 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 	try
 	{
 	    const validated = await apiPost<{ rows: PostImportRow[] }> ('/posts/import/validate', {
-		rows: nextRows.filter (row => row.importStatus !== 'created'),
-		existing: session.existing,
+		rows: nextRows
+		    .filter (row => row.importStatus !== 'created')
+		    .map (row => ({
+			sourceRow: row.sourceRow,
+			url: row.url,
+			attributes: row.attributes,
+			provenance: row.provenance,
+			tagSources: row.tagSources,
+			metadataUrl: row.metadataUrl })),
 		changed_row: urlChanged ? editingRow.sourceRow : -1 })
 	    updateSessionRows (mergeValidatedImportRows (nextRows, validated.rows))
 	    setSearchParams ({ })
@@ -178,33 +186,6 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 	}
     }
 
-    const updateExisting = async (value: 'skip' | 'error') => {
-	if (!(session))
-	  return
-
-	const pendingRows = session.rows.map (row =>
-	    row.importStatus === 'created'
-	    ? row
-	    : {
-		...row,
-		importStatus: 'pending' as const,
-		importErrors: undefined })
-	setSession ({ ...session, existing: value, rows: pendingRows })
-	setLoading (true)
-	try
-	{
-	    const validated = await apiPost<{ rows: PostImportRow[] }> ('/posts/import/validate', {
-		rows: pendingRows.filter (row => row.importStatus !== 'created'),
-		existing: value,
-		changed_row: -1 })
-	    updateSessionRows (mergeValidatedImportRows (pendingRows, validated.rows))
-	}
-	finally
-	{
-	    setLoading (false)
-	}
-    }
-
     const submit = async () => {
 	if (!(sessionId) || !(session) || submittable.length === 0)
 	  return
@@ -223,12 +204,14 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 			attributes: row.attributes,
 			provenance: row.provenance,
 			tagSources: row.tagSources,
-			metadataUrl: row.metadataUrl })),
-		    existing: session.existing })
+			metadataUrl: row.metadataUrl })) })
 	    const nextRows = mergeImportResults (session.rows, result.rows)
 	    const nextSession = { ...session, rows: nextRows, repairMode: 'all' as const }
 	    setSession (nextSession)
-	    savePostImportSession (sessionId, nextSession)
+	    const saved = savePostImportSession (sessionId, nextSession, message =>
+		toast ({ title: '取込状態を保存できませんでした', description: message }))
+	    if (!(saved))
+	      return
 	    navigate (`/posts/import/${ sessionId }/result`)
 	}
 	catch
@@ -264,7 +247,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 	    <title>{`投稿インポート確認 | ${ SITE_TITLE }`}</title>
 	  </Helmet>
 
-	  <div className="mx-auto max-w-6xl space-y-4 p-4 pb-28">
+	  <div className="mx-auto flex max-w-6xl flex-col gap-4 p-4 pb-8">
 	    <PageTitle>投稿情報の確認</PageTitle>
 
 	    <div className="rounded-lg border bg-white p-4 dark:border-neutral-700
@@ -279,26 +262,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 	      </div>
 	    </div>
 
-	    <div className="rounded-lg border bg-white p-4 dark:border-neutral-700
-			    dark:bg-neutral-900">
-	      <div className="flex flex-wrap items-center justify-between gap-3">
-		<div className="text-sm text-neutral-600 dark:text-neutral-300">
-		  URL {rows.length} 件
-		</div>
-		<label className="flex items-center gap-2 text-sm">
-		  <span>既存投稿</span>
-		  <select
-		      value={session.existing}
-		      onChange={ev => updateExisting (ev.target.value as 'skip' | 'error')}
-		      className="rounded border border-border bg-background px-3 py-2">
-		    <option value="skip">スキップ</option>
-		    <option value="error">エラー</option>
-		  </select>
-		</label>
-	      </div>
-	    </div>
-
-	    <div className="space-y-3">
+	    <div className="flex-1 space-y-3 pb-24">
 	      {reviewRows.map (row => (
 		  <div key={row.sourceRow} id={`post-import-row-${ row.sourceRow }`}>
 		    <PostImportRowSummary
@@ -306,16 +270,12 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 			onEdit={() => {
 			    setSearchParams ({ edit: String (row.sourceRow) })
 			}}/>
-		    {rowMessages (row).length > 0 && (
-			<div className="mt-2 md:max-w-3xl">
-			  <FieldError messages={rowMessages (row)}/>
-			</div>)}
 		  </div>))}
 	    </div>
 	  </div>
 
 	  <div
-	      className="fixed inset-x-0 bottom-0 border-t bg-white/95 p-4 backdrop-blur
+	      className="sticky bottom-0 border-t bg-white/95 p-4 backdrop-blur
 			 dark:border-neutral-700 dark:bg-neutral-950/95">
 	    <div className="mx-auto flex max-w-6xl flex-col gap-3 md:flex-row
 			    md:items-center md:justify-between">