fix: handle processFile rejection and improve test fixture

Author: lh01217311

src/AjaxUploader.tsx

@@ -179,17 +179,21 @@ class AjaxUploader extends Component<UploadProps> {
     });
 
     // Batch upload files
-    Promise.all(postFiles).then(fileList => {
-      const { onBatchStart } = this.props;
-
-      onBatchStart?.(fileList.map(({ origin, parsedFile }) => ({ file: origin, parsedFile })));
-
-      fileList
-        .filter(file => file.parsedFile !== null)
-        .forEach(file => {
-          this.post(file);
-        });
-    });
+    Promise.all(postFiles)
+      .then(fileList => {
+        const { onBatchStart } = this.props;
+
+        onBatchStart?.(fileList.map(({ origin, parsedFile }) => ({ file: origin, parsedFile })));
+
+        fileList
+          .filter(file => file.parsedFile !== null)
+          .forEach(file => {
+            this.post(file);
+          });
+      })
+      .catch(() => {
+        // Error already handled in processFile, this catch is to prevent unhandled rejection
+      });
   };
 
   /**
@@ -220,20 +224,48 @@ class AjaxUploader extends Component<UploadProps> {
     const { action } = this.props;
     let mergedAction: string;
     if (typeof action === 'function') {
-      mergedAction = await action(file);
+      try {
+        mergedAction = await action(file);
+      } catch {
+        transformedFile = false;
+      }
     } else {
       mergedAction = action;
     }
 
+    // Early return if action rejected
+    if (transformedFile === false) {
+      return {
+        origin: file,
+        parsedFile: null,
+        action: null,
+        data: null,
+      };
+    }
+
     // Get latest data
     const { data } = this.props;
     let mergedData: Record<string, unknown>;
     if (typeof data === 'function') {
-      mergedData = await data(file);
+      try {
+        mergedData = await data(file);
+      } catch {
+        transformedFile = false;
+      }
     } else {
       mergedData = data;
     }
 
+    // Early return if data rejected
+    if (transformedFile === false) {
+      return {
+        origin: file,
+        parsedFile: null,
+        action: null,
+        data: null,
+      };
+    }
+
     const parsedData =
       // string type is from legacy `transformFile`.
       // Not sure if this will work since no related test case works with it
@@ -302,11 +334,15 @@ class AjaxUploader extends Component<UploadProps> {
   }
 
   retryUpload = (originFile: RcFile) => {
-    this.processFile(originFile, [originFile]).then(fileInfo => {
-      if (fileInfo.parsedFile !== null) {
-        this.post(fileInfo);
-      }
-    });
+    this.processFile(originFile, [originFile])
+      .then(fileInfo => {
+        if (fileInfo.parsedFile) {
+          this.post(fileInfo);
+        }
+      })
+      .catch(() => {
+        // Error already handled in processFile for action/data rejection
+      });
   };
 
   reset() {

tests/uploader.spec.tsx

@@ -3,7 +3,7 @@ import { fireEvent, render } from '@testing-library/react';
 import React from 'react';
 import sinon from 'sinon';
 import { format } from 'util';
-import Upload, { type UploadProps } from '../src';
+import Upload, { type UploadProps, type RcFile } from '../src';
 
 const sleep = (timeout = 500) => new Promise(resolve => setTimeout(resolve, timeout));
 
@@ -258,6 +258,7 @@ describe('uploader', () => {
       render(<Upload ref={uploadRef} action="/test" />);
 
       const file = {
+        uid: 'rc-upload-retry-test',
         name: 'retry.png',
         toString() {
           return this.name;
@@ -268,10 +269,73 @@ describe('uploader', () => {
 
       const initialRequestCount = requests.length;
 
-      uploadRef.current.retryUpload(file as any);
+      uploadRef.current.retryUpload(file as RcFile);
 
       setTimeout(() => {
         expect(requests.length).toBe(initialRequestCount + 1);
+        // Verify the request uses the correct file uid
+        expect(requests[initialRequestCount].url).toBe('/test');
+        done();
+      }, 100);
+    });
+
+    it('retryUpload should not make request when async action rejects', done => {
+      const uploadRef = React.createRef<any>();
+      render(
+        <Upload
+          ref={uploadRef}
+          action={async () => {
+            throw new Error('action error');
+          }}
+        />,
+      );
+
+      const file = {
+        uid: 'rc-upload-retry-action-reject',
+        name: 'retry.png',
+        toString() {
+          return this.name;
+        },
+      };
+
+      const initialRequestCount = requests.length;
+
+      uploadRef.current.retryUpload(file as RcFile);
+
+      setTimeout(() => {
+        // Should not make a new request when action rejects
+        expect(requests.length).toBe(initialRequestCount);
+        done();
+      }, 100);
+    });
+
+    it('retryUpload should not make request when async data rejects', done => {
+      const uploadRef = React.createRef<any>();
+      render(
+        <Upload
+          ref={uploadRef}
+          action="/test"
+          data={() => {
+            throw new Error('data error');
+          }}
+        />,
+      );
+
+      const file = {
+        uid: 'rc-upload-retry-data-reject',
+        name: 'retry.png',
+        toString() {
+          return this.name;
+        },
+      };
+
+      const initialRequestCount = requests.length;
+
+      uploadRef.current.retryUpload(file as RcFile);
+
+      setTimeout(() => {
+        // Should not make a new request when data rejects
+        expect(requests.length).toBe(initialRequestCount);
         done();
       }, 100);
     });