feat: Display 'File not supported' error message when inserting an un…

…supported file - EXO-75991 - Meeds-io/MIPs#145 (#1251)
Meeds-io · Dec 13, 2024 · 20fa398 · 20fa398
1 parent c5ada87
commit 20fa398
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/insertImage/lang/en.js b/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/insertImage/lang/en.js
@@ -1,5 +1,6 @@
 CKEDITOR.plugins.setLang('insertImage', 'en',
   {
     buttonTooltip: 'Insert image',
-    imageError: 'An error occurred while loading the image. Please try again'
+    imageError: 'An error occurred while loading the image. Please try again',
+    imageNotSupported: 'File not supported'
   });
diff --git a/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/insertImage/lang/fr.js b/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/insertImage/lang/fr.js
@@ -1,5 +1,6 @@
 CKEDITOR.plugins.setLang('insertImage', 'fr',
   {
     buttonTooltip: 'Insérer une image',
-    imageError: 'Une erreur est survenue lors du chargement de l\u2019image. Veuillez essayer de nouveau.'
+    imageError: 'Une erreur est survenue lors du chargement de l\u2019image. Veuillez essayer de nouveau.',
+    imageNotSupported: 'Format de fichier non supporté'
   });
diff --git a/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/insertImage/plugin.js b/notes-webapp/src/main/webapp/javascript/eXo/wiki/ckeditor/plugins/insertImage/plugin.js
@@ -43,6 +43,8 @@
                 document.dispatchEvent(new CustomEvent('notes-editor-upload-done'));
                 editor.fire('change');
               });
+            } else {
+              displayImageNotSupportedAlert();
             }
           };
         }
@@ -55,6 +57,12 @@
           return false;
         }
       }
+      function displayImageNotSupportedAlert() {
+        document.dispatchEvent(new CustomEvent('alert-message-html', {detail: {
+          alertType: 'error',
+          alertMessage: editor.lang.insertImage.imageNotSupported
+        }}));
+      }
       function moveSelectionToDropPosition(editor, dropEvt) {
         const $evt = dropEvt,
           range = editor.createRange();
@@ -95,8 +103,7 @@
             return;
           }
           event.preventDefault();
-          let files = Array.from(event.dataTransfer.files);
-          files = files.filter((file) => file.type.startsWith('image/'));
+          const files = Array.from(event.dataTransfer.files);
           const dropSequentially = async () => {
             document.dispatchEvent(new CustomEvent('notes-editor-upload-progress'));
             for (let index = 0; index < files.length; index++) {
@@ -105,6 +112,8 @@
               if (isSupportedType(file?.type)) {
                 // eslint-disable-next-line
                 await handleFileUpload(file, !isLast);
+              } else {
+                displayImageNotSupportedAlert();
               }
             }
           };
@@ -258,7 +267,6 @@
               // eslint-disable-next-line
               await handleFileUpload(file, !isLast);
             }
-
           }
         };
         if (files.length > 0) {