Merge pull request #1245 from habx/feature/addPrevValToValidate

APP-26556: add `prevVal` prop for validation

Author: habx-auto-merge[bot]

src/imex/imex.interface.ts

@@ -78,7 +78,7 @@ export interface IMEXOptions {
   format?: (value: any, row: any[]) => any
   parse?: (value: any, row: any[]) => any
   width?: number
-  validate?: (value: any, row: any[]) => string | boolean | null
+  validate?: (value: any, row: any[], prevVal?: any) => string | boolean | null
   dataValidation?: Excel.DataValidation
   hidden?: boolean
   note?: string | Excel.Comment

src/imex/import/useImportTable.utils.ts

@@ -176,10 +176,10 @@ export const parseRawData = async <D extends { id?: string | number }>(
       errors: {},
       isIgnored: false,
     }
-
     const importedRowValue: Partial<D> = {}
 
     const rawRowValues = Object.values(row)
+
     for (let index = 0; index < rawRowValues.length; index++) {
       const rawCell = rawRowValues[index]
       const currentColumn = orderedColumns[index]
@@ -199,6 +199,22 @@ export const parseRawData = async <D extends { id?: string | number }>(
 
       const ignoreEmpty = currentColumn.imex?.ignoreEmpty ?? true
 
+      /**
+       * Previous value
+       */
+      const prevValIdentifier = get(importedRowValue, getPath(identifierColumn))
+      const prevValIndex = originalData.findIndex((originalRow) => {
+        if (options.findPrevValPredicate) {
+          return options.findPrevValPredicate(originalRow, importedRowValue)
+        }
+        return (
+          get(originalRow, getPath(identifierColumn)) ===
+          prevValIdentifier
+        )
+      })
+
+      importedRowMeta.prevVal = originalData[prevValIndex]
+
       try {
         newCellValue = parseCell(
           rawCell,
@@ -216,7 +232,12 @@ export const parseRawData = async <D extends { id?: string | number }>(
         }
 
         const validate = currentColumn.imex?.validate ?? (() => true)
-        const validateResponse = validate(newCellValue, row)
+        const validateResponse = validate(
+          newCellValue,
+          row,
+          importedRowMeta.prevVal
+        )
+
         const isValid =
           typeof validateResponse === 'string'
             ? !validateResponse.length
@@ -245,26 +266,6 @@ export const parseRawData = async <D extends { id?: string | number }>(
       set(importedRowValue, columnDataPath, newCellValue)
     }
 
-    /**
-     * Previous value
-     */
-    const prevValIdentifier = get(
-      importedRowValue,
-      identifierColumn.accessor as string
-    )
-    const prevValIndex = originalData.findIndex((originalRow) => {
-      if (options.findPrevValPredicate) {
-        return options.findPrevValPredicate(originalRow, importedRowValue)
-      }
-      return (
-        get(originalRow, identifierColumn.accessor as string) ===
-        prevValIdentifier
-      )
-    })
-
-    importedRowMeta.prevVal = originalData[prevValIndex]
-    originalData.splice(prevValIndex, 1) // remove from original array
-
     /**
      * Diff
      */