Merge branch 'main' into bug/fix-multitool-drag

src/main/resources/static/3rdPartyLicenses.json

@@ -434,7 +434,7 @@
         {
             "moduleName": "io.github.pixee:java-security-toolkit",
             "moduleUrl": "https://github.com/pixee/java-security-toolkit",
-            "moduleVersion": "1.2.0",
+            "moduleVersion": "1.2.1",
             "moduleLicense": "MIT License",
             "moduleLicenseUrl": "http://www.opensource.org/licenses/mit-license.php"
         },
@@ -448,7 +448,7 @@
         {
             "moduleName": "io.micrometer:micrometer-core",
             "moduleUrl": "https://github.com/micrometer-metrics/micrometer",
-            "moduleVersion": "1.14.1",
+            "moduleVersion": "1.14.2",
             "moduleLicense": "The Apache Software License, Version 2.0",
             "moduleLicenseUrl": "http://www.apache.org/licenses/LICENSE-2.0.txt"
         },
@@ -1441,7 +1441,7 @@
         {
             "moduleName": "org.springframework.security:spring-security-saml2-service-provider",
             "moduleUrl": "https://spring.io/projects/spring-security",
-            "moduleVersion": "6.4.1",
+            "moduleVersion": "6.4.2",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },
@@ -1539,7 +1539,7 @@
         {
             "moduleName": "org.springframework:spring-webmvc",
             "moduleUrl": "https://github.com/spring-projects/spring-framework",
-            "moduleVersion": "6.2.0",
+            "moduleVersion": "6.2.1",
             "moduleLicense": "Apache License, Version 2.0",
             "moduleLicenseUrl": "https://www.apache.org/licenses/LICENSE-2.0"
         },

src/main/resources/static/js/downloader.js

@@ -75,9 +75,10 @@
           // Check if any PDF files are encrypted and handle decryption if necessary
           const decryptedFiles = await checkAndDecryptFiles(url, files);
           files = decryptedFiles;
+          formData.delete('fileInput'); // Reset fileInput and Append
           // Append decrypted files to formData
           decryptedFiles.forEach((file, index) => {
-            formData.set(`fileInput`, file);
+            formData.append(`fileInput`, file);
           });
         }
 

src/main/resources/static/js/draggable.js

@@ -1,36 +0,0 @@
-const draggableElement = document.querySelector('.draggable-canvas');
-
-// Variables to store the current position of the draggable element
-let offsetX, offsetY, isDragging = false;
-
-draggableElement.addEventListener('mousedown', (e) => {
-  // Get the offset when the mouse is clicked inside the element
-  offsetX = e.clientX - draggableElement.getBoundingClientRect().left;
-  offsetY = e.clientY - draggableElement.getBoundingClientRect().top;
-
-  // Set isDragging to true
-  isDragging = true;
-
-  // Add event listeners for mouse movement and release
-  document.addEventListener('mousemove', onMouseMove);
-  document.addEventListener('mouseup', onMouseUp);
-});
-
-function onMouseMove(e) {
-  if (isDragging) {
-    // Calculate the new position of the element
-    const left = e.clientX - offsetX;
-    const top = e.clientY - offsetY;
-
-    // Move the element by setting its style
-    draggableElement.style.left = `${left}px`;
-    draggableElement.style.top = `${top}px`;
-  }
-}
-
-function onMouseUp() {
-  // Stop dragging and remove event listeners
-  isDragging = false;
-  document.removeEventListener('mousemove', onMouseMove);
-  document.removeEventListener('mouseup', onMouseUp);
-}