Fixxed MultipleUploadRequest Bug

Author: JadnK

src/main/java/de/jadenk/springcloud/controller/DashboardController.java

@@ -26,7 +26,9 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import java.security.Principal;
+import java.time.Instant;
 import java.util.*;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.stream.Collectors;
 
 @Controller
@@ -140,6 +142,8 @@ public String dashboard(@RequestParam(value = "error", required = false) String
         // Fehlermeldungen beim Upload
         if ("uploadError".equals(error)) {
             model.addAttribute("error", "There was an Error while Uploading. Try again later.");
+        } else if ("uploadInProgress".equals(error)) {
+            model.addAttribute("error", "There is an current Upload in Progress.");
         } else if (error != null) {
             model.addAttribute("error", "An Error occurred.");
         }
@@ -203,24 +207,29 @@ public String deleteFolder(@RequestParam Long folderId, Principal principal) {
     public String handleUpload(@RequestParam("file") MultipartFile[] files,
                                @RequestParam(required = false) Long folderId,
                                Principal principal) {
-        User currentUser = userRepository.findByUsername(principal.getName()).orElseThrow();
 
-        Folder folder = null;
-        if (folderId != null) {
-            folder = folderRepository.findById(folderId).orElseThrow();
-        }
+        String username = principal.getName();
+
+        try {
+//            System.out.println("DashboardController >> L_214");
+            User currentUser = userRepository.findByUsername(username).orElseThrow();
+            Folder folder = null;
+            if (folderId != null) {
+                folder = folderRepository.findById(folderId).orElseThrow();
+            }
 
-        for (MultipartFile file : files) {
-            if (!file.isEmpty()) {
-                try {
+            for (MultipartFile file : files) {
+                if (!file.isEmpty()) {
                     fileUploadService.uploadFile(file, currentUser, folder);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                    return "redirect:/dashboard?error=uploadError";
                 }
             }
+        } catch (Exception e) {
+            e.printStackTrace();
+            return "redirect:/dashboard?error=uploadError";
         }
-        return "redirect:/dashboard" + (folderId != null ? "?folderId=" + folderId : "");
+
+        return "redirect:/dashboard";
+        //return "redirect:/dashboard" + (folderId != null ? "?folderId=" + folderId : "");
     }
 
     // =========================

src/main/java/de/jadenk/springcloud/service/FileUploadProgressListener.java

@@ -20,7 +20,7 @@ public void updateProgress(long bytesRead) {
         this.bytesRead = bytesRead;
         this.progress = (double) bytesRead / totalBytes * 100;
 
-        // System.out.println("Uploading Progress: " + (bytesRead * 100 / totalBytes) + "%");
+         // System.out.println("Uploading Progress: " + (bytesRead * 100 / totalBytes) + "%");
     }
 
     public double getProgress() {

src/main/resources/static/js/dashboard.js

@@ -217,4 +217,5 @@ function closeDeleteFolderPopup() {
     document.getElementById('deleteFolderPopup').classList.add('hidden');
 }
 
+
 showPage(1);

src/main/resources/templates/dashboard.html

@@ -266,7 +266,7 @@ <h2 class="text-xl font-bold text-[var(--color-primary)]">Really delete this fol
 <div id="uploadPopup" class="hidden popup-overlay">
     <div class="popup-container">
         <h2 class="text-xl font-bold text-[var(--color-primary)]">Upload Your Files</h2>
-        <form id="uploadForm" th:action="@{/upload}" method="post" enctype="multipart/form-data" class="flex flex-col gap-4" onsubmit="showLoadingBar()">
+        <form id="uploadForm" th:action="@{/upload}" method="post" enctype="multipart/form-data" class="flex flex-col gap-4">
             <input type="hidden" th:name="${_csrf.parameterName}" th:value="${_csrf.token}" />
             <div id="dropArea" class="border-2 border-dashed border-gray-600 rounded-xl p-6 text-center cursor-pointer">
                 Drag & Drop files here or click to select
@@ -314,20 +314,9 @@ <h2 class="text-xl font-bold text-[var(--color-primary)]">Upload Your Files</h2>
                 }
 
                 document.getElementById('uploadForm').addEventListener('submit', function(e){
-                    if(selectedFiles.length > 0){
-                        const formData = new FormData(this);
-                        selectedFiles.forEach(file => formData.append('file', file));
-
-                        fetch(this.action, {
-                            method: this.method,
-                            body: formData
-                        }).then(res => {
-                            location.reload();
-                        }).catch(err => console.error(err));
-
-                        e.preventDefault();
-                    }
+                    closeUploadPopup(); // nach fetch aufrufen
                 });
+
             </script>
             <div>
                 <label for="folderSelect" class="block text-[var(--color-text)] font-semibold mb-2">Upload to folder</label>