fix: add duplicate name checking

Availity · Feb 18, 2025 · 971fbd0 · 971fbd0
1 parent 6ba6348
commit 971fbd0
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 8 deletions.
diff --git a/packages/form-upload/src/FileList.js b/packages/form-upload/src/FileList.js
@@ -7,8 +7,8 @@ import FileRow from './FileRow';
 const FileList = ({ files, children, onRemoveFile, ...rest }) => {
   const list = useMemo(
     () =>
-      files.map((file) => (
-        <FileRow key={file.id} file={file} onRemove={onRemoveFile}>
+      files.map((file, index) => (
+        <FileRow key={file.id} file={file} onRemove={onRemoveFile} index={index}>
           {children}
         </FileRow>
       )),

diff --git a/packages/form-upload/src/FileRow.js b/packages/form-upload/src/FileRow.js
@@ -25,9 +25,9 @@ const fileTypeIconMap = {
   pdf: 'file-pdf',
 };
 
-const FileRow = ({ onRemove, children, file }) => {
+const FileRow = ({ onRemove, children, file, index }) => {
   const remove = () => {
-    onRemove(file.id);
+    onRemove(file.id, index);
   };
 
   const progressBar = () => <UploadProgressBar upload={file} />;
@@ -83,6 +83,7 @@ FileRow.propTypes = {
     }).isRequired,
     options: PropTypes.object,
   }),
+  index: PropTypes.number,
 };
 
 export default FileRow;
diff --git a/packages/form-upload/src/Upload.js b/packages/form-upload/src/Upload.js
@@ -115,7 +115,7 @@ const Upload = ({
       setFieldError,
       onDeliverySuccess,
       onDeliveryError,
-      isCloud
+      isCloud,
     ]
   );
 
@@ -149,8 +149,24 @@ const Upload = ({
     onFileUpload,
   ]);
 
-  const removeFile = (fileId) => {
-    const newFiles = fieldValue.filter((file) => file.id !== fileId);
+  const validator = useCallback(
+    (file) => {
+      const isDuplicate = fieldValue.some((prev) => prev.file.name === file.name);
+      if (isDuplicate) {
+        return {
+          code: 'duplicate-name',
+          message: 'A file with this name already exists',
+        };
+      }
+
+      return null;
+    },
+    [fieldValue]
+  );
+
+  const removeFile = (fileId, fileIndex) => {
+    const newFiles = fieldValue.filter((file, index) => file.id !== fileId || index !== fileIndex);
+
     if (newFiles.length !== fieldValue.length) {
       setFieldValue(name, newFiles, true);
       const removedFile = fieldValue.find((file) => file.id === fileId);
@@ -254,7 +270,13 @@ const Upload = ({
         <Input name={name} style={{ display: 'none' }} />
         <InputGroup disabled={disabled} className={classes}>
           <Suspense fallback={fallback}>
-            <Dropzone onDrop={onDrop} multiple={multiple} maxSize={maxSize} accept={allowedFileTypes}>
+            <Dropzone
+              onDrop={onDrop}
+              multiple={multiple}
+              maxSize={maxSize}
+              accept={allowedFileTypes}
+              validator={validator}
+            >
               {({ getRootProps, getInputProps, isDragActive }) => (
                 <section>
                   <div