#399

frontend/src/lib/postImportRows.test.ts

@@ -1,6 +1,7 @@
 import { describe, expect, it } from 'vitest'
 
 import { creatableImportRows,
+	 buildNextEditedRow,
 	 canEditResultRow,
 	 canEditReviewRow,
 	 canRetryResultRow,
@@ -250,4 +251,38 @@ describe ('post import row state', () => {
     expect (initialised.resetSnapshot.attributes.title).toBe ('')
     expect (initialised.resetSnapshot.fieldWarnings.title).toEqual (['warning'])
   })
+
+  it ('builds the next edited row with shared repair semantics', () => {
+    const row = buildPostImportRow ({
+      url: 'https://example.com/original',
+      importStatus: 'failed',
+      recoverable: true,
+      importErrors: { base: ['failed'] },
+      attributes: { title: 'old title', tags: 'old-tag', duration: '2' },
+      provenance: { title: 'automatic', tags: 'automatic', url: 'manual' },
+      tagSources: { automatic: 'old-tag', manual: '' } })
+
+    const nextRow = buildNextEditedRow (
+        row,
+        {
+          url: 'https://example.com/edited',
+          title: 'edited title',
+          thumbnailBase: '',
+          originalCreatedFrom: '',
+          originalCreatedBefore: '',
+          duration: '2.5',
+          tags: 'edited-tag',
+          parentPostIds: '' },
+        true)
+
+    expect (nextRow.importStatus).toBe ('pending')
+    expect (nextRow.importErrors).toBeUndefined ()
+    expect (nextRow.url).toBe ('https://example.com/edited')
+    expect (nextRow.attributes.title).toBe ('edited title')
+    expect (nextRow.attributes.duration).toBe ('2.5')
+    expect (nextRow.attributes.tags).toBe ('edited-tag')
+    expect (nextRow.provenance.title).toBe ('manual')
+    expect (nextRow.provenance.url).toBe ('manual')
+    expect (nextRow.tagSources?.manual).toBe ('edited-tag')
+  })
 })

frontend/src/lib/postImportRows.ts

@@ -1,4 +1,5 @@
-import type { PostImportResultRow,
+import type { PostImportEditableDraft,
+	      PostImportResultRow,
 	      PostImportRow } from '@/lib/postImportTypes'
 
 const hasSkipReason = (row: PostImportRow): boolean =>
@@ -112,6 +113,54 @@ export const resultRowWarnings = (row: PostImportRow): string[] =>
         ...Object.values (row.fieldWarnings ?? { }).flat (),
         ...row.baseWarnings])]
 
+export const buildNextEditedRow = (
+    editingRow:  PostImportRow,
+    draft:       PostImportEditableDraft,
+    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 const hasExactSourceRows = (
     expected: number[],
@@ -121,7 +170,7 @@ export const hasExactSourceRows = (
       return false
 
     const expectedSorted = [...expected].sort ((a, b) => a - b)
-    const actualSorted = actual.map (_1 => _1.sourceRow).sort ((a, b) => a - b)
+    const actualSorted = actual.map (row => row.sourceRow).sort ((a, b) => a - b)
     return expectedSorted.every ((value, index) => value === actualSorted[index])
 }
 

frontend/src/lib/postImportSourceValidation.ts

@@ -40,8 +40,8 @@ const normaliseImportUrl = (value: string): string | null => {
 export const countImportSourceLines = (source: string): number =>
     source
         .split (/\r\n|\n|\r/)
-        .map (_1 => _1.trim ())
-        .filter (_1 => _1 !== '')
+        .map (line => line.trim ())
+        .filter (line => line !== '')
         .length
 
 

frontend/src/lib/postImportStorage.ts

@@ -96,7 +96,7 @@ const ensureStringListRecord = (value: unknown): Record<string, string[]> | null
     const result: Record<string, string[]> = { }
     for (const [key, entry] of Object.entries (value))
       {
-        if (!(Array.isArray (entry)) || !(entry.every (_1 => typeof _1 === 'string')))
+        if (!(Array.isArray (entry)) || !(entry.every (item => typeof item === 'string')))
           return null
         result[key] = entry
       }
@@ -161,7 +161,7 @@ const sanitiseResetSnapshot = (value: unknown): PostImportResetSnapshot | null =
       return null
     if (!(hasOnlyKeys (value.tagSources, TAG_SOURCE_KEYS)))
       return null
-    if (!(Object.values (value.tagSources).every (_1 => typeof _1 === 'string')))
+    if (!(Object.values (value.tagSources).every (entry => typeof entry === 'string')))
       return null
     const fieldWarnings = ensureStringListRecord (value.fieldWarnings)
     if (fieldWarnings == null)
@@ -169,7 +169,7 @@ const sanitiseResetSnapshot = (value: unknown): PostImportResetSnapshot | null =
     if (!(hasOnlyKeys (fieldWarnings, WARNING_KEYS)))
       return null
     if (!(Array.isArray (value.baseWarnings))
-        || !(value.baseWarnings.every (_1 => typeof _1 === 'string')))
+        || !(value.baseWarnings.every (warning => typeof warning === 'string')))
       return null
     if (value.metadataUrl != null && typeof value.metadataUrl !== 'string')
       return null
@@ -235,7 +235,7 @@ const sanitiseRow = (value: unknown): PostImportRow | null => {
     if (importErrors === null)
       return null
     if (!(Array.isArray (value.baseWarnings))
-        || !(value.baseWarnings.every (_1 => typeof _1 === 'string')))
+        || !(value.baseWarnings.every (warning => typeof warning === 'string')))
       return null
 
     const provenanceEntries = Object.entries (value.provenance)
@@ -255,7 +255,7 @@ const sanitiseRow = (value: unknown): PostImportRow | null => {
           return null
         if (!(hasOnlyKeys (value.tagSources, TAG_SOURCE_KEYS)))
           return null
-        if (!(Object.values (value.tagSources).every (_1 => typeof _1 === 'string')))
+        if (!(Object.values (value.tagSources).every (entry => typeof entry === 'string')))
           return null
       }
 
@@ -401,7 +401,7 @@ export const loadPostImportSession = (
         }
 
       const rows = value.rows.map (sanitiseRow)
-      if (rows.some (_1 => _1 == null))
+      if (rows.some (row => row == null))
         return null
 
       return {

frontend/src/lib/postImportTypes.ts

@@ -72,4 +72,14 @@ export type PostImportSourceIssue = {
     message:   string
     url:       string }
 
+export type PostImportEditableDraft = {
+    url:                   string
+    title:                 string
+    thumbnailBase:         string
+    originalCreatedFrom:   string
+    originalCreatedBefore: string
+    duration:              string
+    tags:                  string
+    parentPostIds:         string }
+
 export type StorageErrorHandler = (message: string) => void