#399

frontend/src/pages/posts/PostImportReviewPage.tsx

@@ -1,8 +1,6 @@
 import { useEffect, useMemo, useState } from 'react'
 import { Helmet } from 'react-helmet-async'
-import { useNavigate,
+import { useNavigate, useParams, useSearchParams } from 'react-router-dom'
-	 useParams,
-	 useSearchParams } from 'react-router-dom'
 
 import PageTitle from '@/components/common/PageTitle'
 import MainArea from '@/components/layout/MainArea'
@@ -20,14 +18,14 @@ import { loadPostImportSession,
 	 mergeValidatedImportRows,
 	 processableImportRows,
 	 reviewSummaryCounts,
-	 savePostImportSession,
+	 savePostImportSession } from '@/lib/postImportSession'
-	 type PostImportResultRow,
-	 type PostImportRow,
-	 type PostImportSession } from '@/lib/postImportSession'
 import Forbidden from '@/pages/Forbidden'
 
 import type { FC } from 'react'
 
+import type { PostImportResultRow,
+	      PostImportRow,
+	      PostImportSession } from '@/lib/postImportSession'
 import type { User } from '@/types'
 
 type Props = { user: User | null }
@@ -88,11 +86,12 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
       [rows])
   const reviewRows =
       session?.repairMode === 'failed'
-	? [...rows].sort ((a, b) => {
+      ? (
+	  [...rows].sort ((a, b) => {
 	    const aFailed = a.importStatus === 'failed' ? 0 : 1
 	    const bFailed = b.importStatus === 'failed' ? 0 : 1
 	    return aFailed - bFailed || a.sourceRow - b.sourceRow
-	})
+	  }))
       : rows
 
   useEffect (() => {
@@ -125,13 +124,13 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
   ): Promise<boolean> => {
     if (session == null)
       return false
+
     if (editingRow == null)
       return false
 
     const baseRow =
 	resetRequested
-	    ? {
+	? { ...editingRow,
-		...editingRow,
 	    url: resetSnapshot.url,
 	    attributes: { ...resetSnapshot.attributes },
 	    provenance: { ...resetSnapshot.provenance },
@@ -153,10 +152,10 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
     try
     {
       const validated = await apiPost<{ rows: PostImportRow[] }> ('/posts/import/validate', {
-		rows: nextRows
+	  rows:
+	      nextRows
 	      .filter (row => row.importStatus !== 'created')
-		    .map (row => ({
+	      .map (row => ({ sourceRow: row.sourceRow,
-			sourceRow: row.sourceRow,
 			      url: row.url,
 			      attributes: row.attributes,
 			      provenance: row.provenance,
@@ -194,10 +193,10 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
     try
     {
       const validated = await apiPost<{ rows: PostImportRow[] }> ('/posts/import/validate', {
-		rows: session.rows
+	  rows:
+	      session.rows
 	      .filter (row => row.importStatus !== 'created')
-		    .map (row => ({
+	      .map (row => ({ sourceRow: row.sourceRow,
-			sourceRow: row.sourceRow,
 			      url: row.url,
 			      attributes: row.attributes,
 			      provenance: row.provenance,
@@ -233,7 +232,7 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 	  && row.recoverable
 	  && Object.keys (row.errors ?? { }).length > 0)
       const nextRows = mergedResults.map (row => {
-		const recoverable = recoverableRows.find (_1 => _1.sourceRow === row.sourceRow)
+	const recoverable = recoverableRows.find (rr => rr.sourceRow === row.sourceRow)
 	if (recoverable == null)
 	  return row
 	return {
@@ -343,8 +342,7 @@ const PostImportFooter = (
       creatableCount,
       skipPlannedCount,
       onBack,
-      onSubmit }: {
+      onSubmit }: { loading:            boolean
-	loading:            boolean
 		    processableCount:   number
 		    creatableCount:     number
 		    skipPlannedCount:   number

frontend/src/pages/posts/PostImportSourcePage.tsx

@@ -20,12 +20,12 @@ import { countImportSourceLines,
 	 loadPostImportSourceDraft,
 	 savePostImportSession,
 	 savePostImportSourceDraft,
-	 validateImportSource,
+	 validateImportSource } from '@/lib/postImportSession'
-	 type PostImportRow } from '@/lib/postImportSession'
 import Forbidden from '@/pages/Forbidden'
 
 import type { FC } from 'react'
 
+import type { PostImportRow } from '@/lib/postImportSeession'
 import type { User } from '@/types'
 
 type Props = { user: User | null }
@@ -57,8 +57,8 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
 
   const lineCount = countImportSourceLines (source)
   const messages = sourceError != null ? [sourceError] : []
-    const sourceDescribedBy = [
+  const sourceDescribedBy =
-	sourceError != null ? SOURCE_ERROR_ID : null,
+      [sourceError != null ? SOURCE_ERROR_ID : null,
        sourceIssues.length > 0 ? SOURCE_ISSUES_ID : null]
       .filter (_1 => _1 != null)
       .join (' ')
@@ -69,19 +69,20 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
 
     const draft = loadPostImportSourceDraft (message =>
 	toast ({ title: '保存済み入力を復元できませんでした', description: message }))
+
     if (!(editedRef.current))
-	  {
       setSource (current => current === '' ? draft.source : current)
-	  }
   }, [])
 
   useEffect (() => {
     if (saveTimer.current != null)
       window.clearTimeout (saveTimer.current)
+
     saveTimer.current = window.setTimeout (() => {
       savePostImportSourceDraft (source, message =>
 	  toast ({ title: '入力内容を保存できませんでした', description: message }))
     }, 300)
+
     return () => {
       if (saveTimer.current != null)
 	window.clearTimeout (saveTimer.current)
@@ -109,8 +110,7 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
     setSourceError (null)
     try
     {
-	    const data = await apiPost<{ rows: PostImportRow[] }> ('/posts/import/preview', {
+      const data = await apiPost<{ rows: PostImportRow[] }> ('/posts/import/preview', { source })
-		source })
       const urlIssues = urlIssuesFromRows (data.rows, source)
       if (urlIssues.length > 0)
 	{
@@ -118,11 +118,12 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
 	  return
 	}
       const sessionId = createPostImportSessionId ()
-	    const saved = savePostImportSession (sessionId, {
+      const saved = savePostImportSession (
-		source,
+	  sessionId,
+	  { source,
 	    rows: initialisePreviewRows (data.rows),
-		repairMode: 'all' }, message =>
+	    repairMode: 'all' },
-		toast ({ title: '取込状態を保存できませんでした', description: message }))
+	  message => toast ({ title: '取込状態を保存できませんでした', description: message }))
       if (!(saved))
 	return
       navigate (`/posts/import/${ sessionId }/review`)
@@ -131,12 +132,11 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
     {
       const message =
 	  isApiError<{ message?: string, baseErrors?: string[] }> (requestError)
-		? requestError.response?.data?.message
+	  ? (requestError.response?.data?.message
-		    ?? requestError.response?.data?.baseErrors?.[0]
+	     ?? requestError.response?.data?.baseErrors?.[0])
 	  : undefined
       setSourceError (message ?? '入力を確認してください．')
-	    toast ({
+      toast ({ title: '投稿情報の取得に失敗しました',
-		title: '投稿情報の取得に失敗しました',
 	       description: message ?? '入力を確認してください．' })
     }
     finally
@@ -168,8 +168,7 @@ const PostImportSourcePage: FC<Props> = ({ user }) => {
 			'font-mono text-sm')}
 		    onBlur={() => {
 		      savePostImportSourceDraft (source, message =>
-			      toast ({
+			  toast ({ title: '入力内容を保存できませんでした',
-				  title: '入力内容を保存できませんでした',
 				   description: message }))
 		    }}
 		    onChange={ev => {