IBX-2020: Fixed error message (#380)

ibexa · Apr 7, 2022 · f21297a · f21297a
1 parent a313d6f
commit f21297a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 55 deletions.
diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezbinaryfile.js b/src/bundle/Resources/public/js/scripts/fieldType/ezbinaryfile.js
@@ -1,6 +1,5 @@
 (function (global, doc, ibexa) {
     const SELECTOR_FIELD = '.ibexa-field-edit--ezbinaryfile';
-    const SELECTOR_FILESIZE_NOTICE = '.ibexa-data-source__message--filesize';
 
     class EzBinaryFilePreviewField extends ibexa.BasePreviewField {
         /**
@@ -24,18 +23,8 @@
         }
     }
 
-    class EzBinaryFileFieldValidator extends ibexa.BaseFileFieldValidator {
-        validateFileSize(event) {
-            event.currentTarget.dispatchEvent(new CustomEvent('ibexa-invalid-file-size'));
-
-            return {
-                isError: false,
-            };
-        }
-    }
-
     doc.querySelectorAll(SELECTOR_FIELD).forEach((fieldContainer) => {
-        const validator = new EzBinaryFileFieldValidator({
+        const validator = new ibexa.BaseFileFieldValidator({
             classInvalid: 'is-invalid',
             fieldContainer,
             eventsMap: [
@@ -50,7 +39,7 @@
                     selector: `input[type="file"]`,
                     eventName: 'ibexa-invalid-file-size',
                     callback: 'showFileSizeError',
-                    errorNodeSelectors: [SELECTOR_FILESIZE_NOTICE],
+                    errorNodeSelectors: ['.ibexa-form-error'],
                 },
             ],
         });

diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezimage.js b/src/bundle/Resources/public/js/scripts/fieldType/ezimage.js
@@ -1,7 +1,6 @@
 (function (global, doc, ibexa, Translator) {
     const SELECTOR_FIELD = '.ibexa-field-edit--ezimage';
     const SELECTOR_INPUT_FILE = 'input[type="file"]';
-    const SELECTOR_FILESIZE_NOTICE = '.ibexa-data-source__message--filesize';
     const SELECTOR_ALT_WRAPPER = '.ibexa-field-edit-preview__image-alt';
     const SELECTOR_INPUT_ALT = '.ibexa-field-edit-preview__image-alt .ibexa-data-source__input';
     const EVENT_CANCEL_ERROR = 'ibexa-cancel-errors';
@@ -72,23 +71,6 @@
     }
 
     class EzImageFieldValidator extends ibexa.BaseFileFieldValidator {
-        toggleInvalidState(isError, config, input) {
-            super.toggleInvalidState(isError, config, input);
-
-            const container = this.getFieldTypeContainer(input.closest(this.fieldSelector));
-            const method = !!container.querySelector(`.${this.classInvalid}`) ? 'add' : 'remove';
-
-            container.classList[method](this.classInvalid);
-        }
-
-        validateFileSize(event) {
-            event.currentTarget.dispatchEvent(new CustomEvent('ibexa-invalid-file-size'));
-
-            return {
-                isError: false,
-            };
-        }
-
         /**
          * Validates the alternative text input
          *
@@ -138,7 +120,7 @@
                     selector: `${SELECTOR_INPUT_FILE}`,
                     eventName: 'ibexa-invalid-file-size',
                     callback: 'showFileSizeError',
-                    errorNodeSelectors: [SELECTOR_FILESIZE_NOTICE],
+                    errorNodeSelectors: ['.ibexa-form-error'],
                 },
                 {
                     isValueValidator: false,

diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezimageasset.js b/src/bundle/Resources/public/js/scripts/fieldType/ezimageasset.js
@@ -2,7 +2,6 @@
     const SELECTOR_FIELD = '.ibexa-field-edit--ezimageasset';
     const SELECTOR_INPUT_FILE = 'input[type="file"]';
     const SELECTOR_INPUT_DESTINATION_CONTENT_ID = '.ibexa-data-source__destination-content-id';
-    const SELECTOR_FILESIZE_NOTICE = '.ibexa-data-source__message--filesize';
     const token = doc.querySelector('meta[name="CSRF-Token"]').content;
     const { showErrorNotification } = ibexa.helpers.notification;
     const { showSuccessNotification } = ibexa.helpers.notification;
@@ -227,18 +226,8 @@
         }
     }
 
-    class EzImageAssetFieldValidator extends ibexa.BaseFileFieldValidator {
-        validateFileSize(event) {
-            event.currentTarget.dispatchEvent(new CustomEvent('ibexa-invalid-file-size'));
-
-            return {
-                isError: false,
-            };
-        }
-    }
-
     doc.querySelectorAll(SELECTOR_FIELD).forEach((fieldContainer) => {
-        const validator = new EzImageAssetFieldValidator({
+        const validator = new ibexa.BaseFileFieldValidator({
             classInvalid: 'is-invalid',
             fieldContainer,
             eventsMap: [
@@ -253,7 +242,7 @@
                     selector: `${SELECTOR_INPUT_FILE}`,
                     eventName: 'ibexa-invalid-file-size',
                     callback: 'showFileSizeError',
-                    errorNodeSelectors: [SELECTOR_FILESIZE_NOTICE],
+                    errorNodeSelectors: ['.ibexa-form-error'],
                 },
             ],
         });

diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezmedia.js b/src/bundle/Resources/public/js/scripts/fieldType/ezmedia.js
@@ -6,17 +6,8 @@
     const SELECTOR_MEDIA_WRAPPER = '.ibexa-field-edit-preview__media-wrapper';
     const SELECTOR_INPUT_FILE = 'input[type="file"]';
     const CLASS_MEDIA_WRAPPER_LOADING = 'ibexa-field-edit-preview__media-wrapper--loading';
-    const SELECTOR_FILESIZE_NOTICE = '.ibexa-data-source__message--filesize';
 
     class EzMediaValidator extends ibexa.BaseFileFieldValidator {
-        validateFileSize(event) {
-            event.currentTarget.dispatchEvent(new CustomEvent('ibexa-invalid-file-size'));
-
-            return {
-                isError: false,
-            };
-        }
-
         /**
          * Validates the dimensions inputs
          *
@@ -146,7 +137,7 @@
                     selector: SELECTOR_INPUT_FILE,
                     eventName: 'ibexa-invalid-file-size',
                     callback: 'showFileSizeError',
-                    errorNodeSelectors: [SELECTOR_FILESIZE_NOTICE],
+                    errorNodeSelectors: ['.ibexa-field-edit--ezmedia .ibexa-form-error'],
                 },
                 {
                     selector: '.ibexa-field-edit-preview__dimensions .form-control',