#399

frontend/src/pages/posts/PostImportReviewPage.tsx

@@ -13,6 +13,7 @@ import { apiPost } from '@/lib/api'
 import useDialogue from '@/lib/dialogues/useDialogue'
 import { canEditContent } from '@/lib/users'
 import { loadPostImportSession,
+	 buildNextEditedRow,
 	 canEditReviewRow,
 	 creatableImportRows,
 	 hasExactSourceRows,
@@ -145,7 +146,8 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
 			      metadataUrl: row.metadataUrl })),
 	  changed_row: urlChanged ? baseRow.sourceRow : -1 })
       const validatedRows = initialisePreviewRows (validated.rows)
-      const target = validatedRows.find (_1 => _1.sourceRow === baseRow.sourceRow)
+      const target = validatedRows.find (
+          validatedRow => validatedRow.sourceRow === baseRow.sourceRow)
       const latestSession = sessionRef.current
       if (latestSession == null)
         return { saved: false, row: null }
@@ -161,14 +163,17 @@ const PostImportReviewPage: FC<Props> = ({ user }) => {
           toast ({ title: '行の再検証結果が不完全でした' })
           return { saved: false, row: null }
         }
-      const rows = mergeValidatedImportRow (latestSession.rows, target)
+      const editedRows = replaceImportRow (latestSession.rows, nextRow)
+      const rows = mergeValidatedImportRow (editedRows, target)
       const nextSession = {
           ...latestSession,
           rows,
           repairMode: resultRepairMode (rows) }
       sessionRef.current = nextSession
       setSession (nextSession)
-      const mergedTarget = rows.find (_1 => _1.sourceRow === baseRow.sourceRow) ?? target
+      const mergedTarget =
+          rows.find (mergedRow => mergedRow.sourceRow === baseRow.sourceRow)
+          ?? target
       if (Object.keys (mergedTarget.validationErrors).length > 0)
         return { saved: false, row: mergedTarget }
       return { saved: true, row: null }
@@ -411,52 +416,4 @@ const PostImportFooter = (
       </div>
     </div>)
 
-const buildNextEditedRow = (
-    editingRow:  PostImportRow,
-    draft:       PostImportRowDraft,
-    urlChanged:  boolean,
-): PostImportRow => {
-    const nextProvenance = { ...editingRow.provenance }
-    const nextAttributes = { ...editingRow.attributes }
-    const nextTagSources = {
-	automatic: editingRow.tagSources?.automatic ?? '',
-	manual: editingRow.tagSources?.manual ?? '' }
-    const draftFields = [
-	['title', draft.title],
-	['thumbnailBase', draft.thumbnailBase],
-	['originalCreatedFrom', draft.originalCreatedFrom],
-	['originalCreatedBefore', draft.originalCreatedBefore],
-	['duration', draft.duration],
-	['parentPostIds', draft.parentPostIds]] as const
-    draftFields.forEach (([field, value]) => {
-	nextAttributes[field] = value
-	nextProvenance[field] =
-	    value !== String (editingRow.attributes[field] ?? '')
-	    ? 'manual'
-	    : (editingRow.provenance[field] ?? 'automatic')
-    })
-    nextAttributes.tags = draft.tags
-    if (draft.tags !== String (editingRow.attributes.tags ?? ''))
-      {
-	nextProvenance.tags = 'manual'
-	nextTagSources.manual = draft.tags
-      }
-    else
-      {
-	nextProvenance.tags = editingRow.provenance.tags ?? 'automatic'
-	nextTagSources.manual = editingRow.tagSources?.manual ?? ''
-      }
-
-    return {
-	...editingRow,
-	url: draft.url,
-	attributes: nextAttributes,
-	provenance: {
-	    ...nextProvenance,
-	    url: urlChanged ? 'manual' : (editingRow.provenance.url ?? 'manual') },
-	tagSources: nextTagSources,
-	importStatus: editingRow.importStatus === 'created' ? 'created' : 'pending',
-	importErrors: undefined }
-}
-
 export default PostImportReviewPage