fix an issue where overwriting uploads would fail

cybex-gmbh · Aug 7, 2024 · 9493daa · 9493daa
1 parent 96e0a45
commit 9493daa
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 25 deletions.
diff --git a/amigor/composer.lock b/amigor/composer.lock
diff --git a/amigor/public/vendor/transmorpher/mix-manifest.json b/amigor/public/vendor/transmorpher/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/transmorpher.js": "/transmorpher.js?id=69ad22117fc232ba4481bd6dcd6e1dab",
+    "/transmorpher.js": "/transmorpher.js?id=11f6f29bb862b425522436cc28849352",
     "/transmorpher.css": "/transmorpher.css?id=56dbb0cba726c3e63f1c109f6b9a6f1b",
     "/icons/delete.svg": "/icons/delete.svg?id=f88179ccc3649c47f2264315be6c0421",
     "/icons/enlargen.svg": "/icons/enlargen.svg?id=9f560ce3f022646dbb826a066715a343",

diff --git a/amigor/public/vendor/transmorpher/transmorpher.js b/amigor/public/vendor/transmorpher/transmorpher.js
diff --git a/dist/mix-manifest.json b/dist/mix-manifest.json
@@ -1,5 +1,5 @@
 {
-    "/transmorpher.js": "/transmorpher.js?id=69ad22117fc232ba4481bd6dcd6e1dab",
+    "/transmorpher.js": "/transmorpher.js?id=11f6f29bb862b425522436cc28849352",
     "/transmorpher.css": "/transmorpher.css?id=56dbb0cba726c3e63f1c109f6b9a6f1b",
     "/icons/delete.svg": "/icons/delete.svg?id=f88179ccc3649c47f2264315be6c0421",
     "/icons/enlargen.svg": "/icons/enlargen.svg?id=9f560ce3f022646dbb826a066715a343",

diff --git a/dist/transmorpher.js b/dist/transmorpher.js
diff --git a/src/lang/en/dropzone.php b/src/lang/en/dropzone.php
@@ -19,6 +19,7 @@
     'success' => 'Success',
     'uploading' => 'Uploading',
     'upload_canceled' => 'Upload canceled',
+    'upload_already_finished' => 'Please try again, uploading has already finished.',
     'validation_error' => 'There was an error when trying to validate media dimensions.',
     'video_in_process' => 'A video is currently uploading or processing, do you want to overwrite it?',
     'html_video_not_supported' => 'Your browser doesn\'t support HTML video. Here is a link to the video instead.'

diff --git a/src/resources/js/transmorpher.js b/src/resources/js/transmorpher.js
@@ -89,7 +89,8 @@ if (!window.transmorpherScriptLoaded) {
                             if (uploadingStateResponse.state === 'uploading' || uploadingStateResponse.state === 'processing') {
                                 openUploadConfirmModal(
                                     transmorpherIdentifier,
-                                    createCallbackWithArguments(reserveUploadSlot, transmorpherIdentifier, file.done)
+                                    createCallbackWithArguments(reserveUploadSlot, transmorpherIdentifier, file.done),
+                                    uploadingStateResponse.state
                                 );
                             } else {
                                 reserveUploadSlot(transmorpherIdentifier, file.done);
@@ -282,6 +283,8 @@ if (!window.transmorpherScriptLoaded) {
         } else {
             displayUploadResult(response, transmorpherIdentifier, uploadToken);
         }
+
+        document.querySelector(`#dz-${transmorpherIdentifier}`).dropzone.removeAllFiles();
     }
 
     window.displayUploadResult = function (uploadResult, transmorpherIdentifier, uploadToken) {
@@ -416,7 +419,7 @@ if (!window.transmorpherScriptLoaded) {
     window.setVersion = function (transmorpherIdentifier, version) {
         getState(transmorpherIdentifier).then(uploadingStateResponse => {
             if (uploadingStateResponse.state === 'uploading' || uploadingStateResponse.state === 'processing') {
-                openUploadConfirmModal(transmorpherIdentifier, createCallbackWithArguments(makeSetVersionCall, transmorpherIdentifier, version));
+                openUploadConfirmModal(transmorpherIdentifier, createCallbackWithArguments(makeSetVersionCall, transmorpherIdentifier, version), uploadingStateResponse.state);
             } else {
                 makeSetVersionCall(transmorpherIdentifier, version);
             }
@@ -636,7 +639,7 @@ if (!window.transmorpherScriptLoaded) {
         return date.toLocaleString();
     }
 
-    window.openUploadConfirmModal = function (transmorpherIdentifier, callback) {
+    window.openUploadConfirmModal = function (transmorpherIdentifier, callback, uploadState) {
         let modal = document.querySelector(`#modal-uc-${transmorpherIdentifier}`);
         let dropzone = document.querySelector(`#dz-${transmorpherIdentifier}`).dropzone;
         let previewElement = document.querySelector(`#dz-${transmorpherIdentifier} .dz-preview ~ .dz-preview`);
@@ -645,12 +648,16 @@ if (!window.transmorpherScriptLoaded) {
         previewElement ? previewElement.style.display = 'none' : null;
 
         modal.querySelector('.badge-error').onclick = function () {
+            previewElement ? previewElement.style.display = 'block' : null;
+            document.querySelector(`#modal-uc-${transmorpherIdentifier}`).classList.remove('d-flex');
+
             if (dropzone.files[1] != null) {
                 dropzone.removeFile(dropzone.files[0]);
+            } else if (uploadState !== 'processing') {
+                displayState(transmorpherIdentifier, 'error', media[transmorpherIdentifier].translations['upload_already_finished']);
+                return;
             }
 
-            previewElement ? previewElement.style.display = 'block' : null;
-            document.querySelector(`#modal-uc-${transmorpherIdentifier}`).classList.remove('d-flex');
             callback();
         }
     }