From 099921ce8519ffddbd9a075632a679f7041a7749 Mon Sep 17 00:00:00 2001 From: Jose Manuel Serrano Amaut <a20122128@pucp.pe> Date: Fri, 3 Mar 2023 00:16:54 -0500 Subject: [PATCH] [REF]: Refactor Dropzone component for handling changes in upload changes --- .../dropzone/components/dropzone/Dropzone.tsx | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx b/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx index bf3d543..19e38af 100644 --- a/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx +++ b/src/files-ui/components/dropzone/components/dropzone/Dropzone.tsx @@ -325,7 +325,7 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => { } serverResponses.push(uploadResponse); - }else{ + } else { handleFilesChange(sanitizeArrExtFile(arrOfExtFilesInstances), true); } } @@ -350,12 +350,15 @@ const Dropzone: React.FC<DropzoneProps> = (props: DropzoneProps) => { if (!listExtFileLocal) return; listExtFileLocal.forEach((extFileInstance: ExtFileInstance) => { - if (extFileInstance.uploadStatus === "uploading") { + if ( + extFileInstance.uploadStatus === "uploading" || + extFileInstance.uploadStatus === "preparing" + ) { if (extFileInstance.xhr !== null && extFileInstance.xhr !== undefined) extFileInstance.xhr.abort(); + extFileInstance.uploadStatus = "aborted"; + extFileInstance.uploadMessage = "Upload was aborted by user"; } - extFileInstance.uploadStatus = "aborted"; - //console.log("Aborting extFileInstance", extFileInstance.xhr); }); }; -- GitLab