#399

frontend/src/lib/postImportSession.ts

@@ -193,6 +193,9 @@ const isValidSkipReason = (
 ): value is PostImportSkipReason =>
     value === 'existing'
 
+const isPositiveInteger = (value: unknown): value is number =>
+    Number.isInteger (value) && Number (value) > 0
+
 
 const sanitiseRow = (value: unknown): PostImportRow | null => {
     if (!(isPlainObject (value)))
@@ -211,6 +214,12 @@ const sanitiseRow = (value: unknown): PostImportRow | null => {
       return null
     if (value.skipReason != null && !(isValidSkipReason (value.skipReason)))
       return null
+    if (value.skipReason === 'existing' && !(isPositiveInteger (value.existingPostId)))
+      return null
+    if (value.skipReason !== 'existing' && value.existingPostId != null)
+      return null
+    if (value.createdPostId != null && !(isPositiveInteger (value.createdPostId)))
+      return null
 
     const validationErrors = ensureStringListRecord (value.validationErrors)
     const fieldWarnings = ensureStringListRecord (value.fieldWarnings)
@@ -250,13 +259,13 @@ const sanitiseRow = (value: unknown): PostImportRow | null => {
 	provenance: value.provenance as Record<string, PostImportOrigin>,
 	tagSources: value.tagSources as Record<PostImportOrigin, string> | undefined,
 	status: value.status,
-	skipReason: value.skipReason,
-	existingPostId:
-	    Number.isInteger (value.existingPostId) ? Number (value.existingPostId) : undefined,
-	metadataUrl: typeof value.metadataUrl === 'string' ? value.metadataUrl : undefined,
-	createdPostId:
-	    Number.isInteger (value.createdPostId) ? Number (value.createdPostId) : undefined,
-	importStatus: value.importStatus }
+	    skipReason: value.skipReason,
+	    existingPostId:
+	    isPositiveInteger (value.existingPostId) ? Number (value.existingPostId) : undefined,
+	    metadataUrl: typeof value.metadataUrl === 'string' ? value.metadataUrl : undefined,
+	    createdPostId:
+	    isPositiveInteger (value.createdPostId) ? Number (value.createdPostId) : undefined,
+	    importStatus: value.importStatus }
 }
 
 
@@ -605,6 +614,9 @@ export const validateImportSource = (
 const hasSkipReason = (row: PostImportRow): boolean =>
     row.skipReason === 'existing'
 
+const hasValidationErrors = (row: PostImportRow): boolean =>
+    Object.keys (row.validationErrors ?? { }).length > 0
+
 
 export const submittableImportRows = (rows: PostImportRow[]): PostImportRow[] =>
     rows.filter (row => {
@@ -612,10 +624,12 @@ export const submittableImportRows = (rows: PostImportRow[]): PostImportRow[] =>
 	  return false
 	if (row.importStatus === 'skipped')
 	  return false
-	if (hasSkipReason (row))
+	if (hasSkipReason (row) && !(hasValidationErrors (row)))
 	  return false
 	if (row.importStatus === 'failed')
 	  return false
+	if (hasValidationErrors (row))
+	  return false
 	return row.importStatus == null || row.importStatus === 'pending'
     })
 
@@ -624,9 +638,11 @@ export const reviewSummaryCounts = (rows: PostImportRow[]) => ({
     total: rows.length,
     submittable: rows.filter (row =>
 	submittableImportRows ([row]).length > 0
-	&& Object.keys (row.validationErrors ?? { }).length === 0).length,
-    invalid: rows.filter (row => Object.keys (row.validationErrors ?? { }).length > 0).length,
+	&& !(hasValidationErrors (row))).length,
+    invalid: rows.filter (row => hasValidationErrors (row)).length,
     skipPlanned: rows.filter (row =>
-	hasSkipReason (row) && row.importStatus !== 'created').length,
+	hasSkipReason (row)
+	&& !(hasValidationErrors (row))
+	&& row.importStatus !== 'created').length,
     created: rows.filter (row => row.importStatus === 'created').length,
     failed: rows.filter (row => row.importStatus === 'failed').length })