From 77c6e300aadc9fd9789716b496ee41bee08cb29d Mon Sep 17 00:00:00 2001 From: Ryan Lee Date: Sun, 7 Sep 2025 20:54:59 +0100 Subject: [PATCH] IBX-10375 - Fix problematic validator names --- src/bundle/Resources/public/js/scripts/admin.content.edit.js | 2 +- .../Resources/public/js/scripts/fieldType/base/base-field.js | 4 ++++ .../public/js/scripts/fieldType/base/multi-input-field.js | 4 ++++ src/bundle/Resources/public/js/scripts/fieldType/ezboolean.js | 4 ++++ src/bundle/Resources/public/js/scripts/fieldType/ezcountry.js | 4 ++++ src/bundle/Resources/public/js/scripts/fieldType/ezdate.js | 4 ++++ .../Resources/public/js/scripts/fieldType/ezdatetime.js | 4 ++++ src/bundle/Resources/public/js/scripts/fieldType/ezemail.js | 3 +++ src/bundle/Resources/public/js/scripts/fieldType/ezfloat.js | 3 +++ .../Resources/public/js/scripts/fieldType/ezgmaplocation.js | 3 +++ src/bundle/Resources/public/js/scripts/fieldType/ezinteger.js | 3 +++ src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js | 3 +++ .../public/js/scripts/fieldType/ezobjectrelationlist.js | 3 +++ .../Resources/public/js/scripts/fieldType/ezselection.js | 3 +++ src/bundle/Resources/public/js/scripts/fieldType/ezstring.js | 3 +++ src/bundle/Resources/public/js/scripts/fieldType/eztext.js | 3 +++ src/bundle/Resources/public/js/scripts/fieldType/eztime.js | 3 +++ src/bundle/Resources/public/js/scripts/fieldType/ezurl.js | 4 ++++ src/bundle/Resources/public/js/scripts/fieldType/ezuser.js | 3 +++ .../js/scripts/fieldType/validator/richtext-validator.js | 4 ++++ 20 files changed, 66 insertions(+), 1 deletion(-) diff --git a/src/bundle/Resources/public/js/scripts/admin.content.edit.js b/src/bundle/Resources/public/js/scripts/admin.content.edit.js index 665ab83a19..f3f20e5187 100644 --- a/src/bundle/Resources/public/js/scripts/admin.content.edit.js +++ b/src/bundle/Resources/public/js/scripts/admin.content.edit.js @@ -32,7 +32,7 @@ const fields = doc.querySelectorAll('.ibexa-field-edit'); const getValidationResults = (validator) => { const isValid = validator.isValid(); - const validatorName = validator.constructor.name; + const validatorName = validator.getValidatorName(); const result = { isValid, validatorName }; return result; diff --git a/src/bundle/Resources/public/js/scripts/fieldType/base/base-field.js b/src/bundle/Resources/public/js/scripts/fieldType/base/base-field.js index 6dc6eb8480..6df2157044 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/base/base-field.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/base/base-field.js @@ -13,6 +13,10 @@ return this.fieldContainer ? this.fieldContainer : fallback; } + getValidatorName() { + return 'BaseFieldValidator'; + } + /** * Attaches event to elements found with a selector provided by field config * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/base/multi-input-field.js b/src/bundle/Resources/public/js/scripts/fieldType/base/multi-input-field.js index 7b0054a74b..50d6026b2d 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/base/multi-input-field.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/base/multi-input-field.js @@ -6,6 +6,10 @@ this.containerSelectors = containerSelectors; } + getValidatorName() { + return 'MultiInputFieldValidator'; + } + toggleInvalidState(isError, config, input) { super.toggleInvalidState(isError, config, input); diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezboolean.js b/src/bundle/Resources/public/js/scripts/fieldType/ezboolean.js index cfabda9083..459820ad9d 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezboolean.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezboolean.js @@ -3,6 +3,10 @@ const SELECTOR_ERROR_NODE = '.ibexa-form-error'; class EzBooleanValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzBooleanValidator'; + } + /** * Validates the input field value * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezcountry.js b/src/bundle/Resources/public/js/scripts/fieldType/ezcountry.js index 1568149bd0..f41bd2f7ad 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezcountry.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezcountry.js @@ -5,6 +5,10 @@ const SELECTOR_ERROR_NODE = '.ibexa-form-error'; class EzCountryValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzCountryValidator'; + } + /** * Validates the country field value * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezdate.js b/src/bundle/Resources/public/js/scripts/fieldType/ezdate.js index aad278e06e..c2c5460bec 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezdate.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezdate.js @@ -6,6 +6,10 @@ const SELECTOR_ERROR_NODE = '.ibexa-form-error'; class EzDateValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzDateValidator'; + } + /** * Validates the input * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezdatetime.js b/src/bundle/Resources/public/js/scripts/fieldType/ezdatetime.js index 0f7d07e6ea..394f832ffc 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezdatetime.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezdatetime.js @@ -7,6 +7,10 @@ const { convertDateToTimezone } = ibexa.helpers.timezone; class EzDateTimeValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzDateTimeValidator'; + } + /** * Validates the input * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezemail.js b/src/bundle/Resources/public/js/scripts/fieldType/ezemail.js index 4d2749842d..f589741991 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezemail.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezemail.js @@ -3,6 +3,9 @@ const SELECTOR_ERROR_NODE = '.ibexa-form-error'; class EzEmailValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzEmailValidator'; + } /** * Validates the input * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezfloat.js b/src/bundle/Resources/public/js/scripts/fieldType/ezfloat.js index 11d66b6b00..439c5fd69f 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezfloat.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezfloat.js @@ -3,6 +3,9 @@ const SELECTOR_ERROR_NODE = `${SELECTOR_FIELD} .ibexa-form-error`; class EzFloatValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzFloatValidator'; + } /** * Validates the input * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js b/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js index e69f330dd4..7bbbb1767f 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezgmaplocation.js @@ -20,6 +20,9 @@ const maps = []; class EzGMapLocationValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzGMapLocationValidator'; + } /** * Validates latitude/longitude input value * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezinteger.js b/src/bundle/Resources/public/js/scripts/fieldType/ezinteger.js index 9971c38cfe..b939bb709b 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezinteger.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezinteger.js @@ -3,6 +3,9 @@ const SELECTOR_ERROR_NODE = `${SELECTOR_FIELD} .ibexa-form-error`; class EzIntegerValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzIntegerValidator'; + } /** * Validates the input * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js b/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js index cd8123aa9e..b6242af2b3 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezkeyword.js @@ -5,6 +5,9 @@ const SELECTOR_ERROR_NODE = '.ibexa-form-error'; class EzKeywordValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzKeywordValidator'; + } /** * Validates the keywords input * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js b/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js index 5bcc818ad4..9cc00212ba 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezobjectrelationlist.js @@ -11,6 +11,9 @@ const EVENT_CUSTOM = 'validateInput'; class EzObjectRelationListValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzObjectRelationListValidator'; + } /** * Validates the input * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezselection.js b/src/bundle/Resources/public/js/scripts/fieldType/ezselection.js index 2caf3571cd..222827dadc 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezselection.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezselection.js @@ -5,6 +5,9 @@ const EVENT_VALUE_CHANGED = 'change'; class EzSelectionValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzSelectionValidator'; + } /** * Validates the textarea field value * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezstring.js b/src/bundle/Resources/public/js/scripts/fieldType/ezstring.js index cbc3e1fe52..134b93f065 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezstring.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezstring.js @@ -3,6 +3,9 @@ const SELECTOR_SOURCE_INPUT = '.ibexa-data-source__input'; class EzStringValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzStringValidator'; + } /** * Validates the input * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/eztext.js b/src/bundle/Resources/public/js/scripts/fieldType/eztext.js index d0c80f124d..1b984c00bf 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/eztext.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/eztext.js @@ -2,6 +2,9 @@ const SELECTOR_FIELD = '.ibexa-field-edit--eztext'; class EzTextValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzTextValidator'; + } /** * Validates the textarea field value * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/eztime.js b/src/bundle/Resources/public/js/scripts/fieldType/eztime.js index eac669c346..9c34e87413 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/eztime.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/eztime.js @@ -6,6 +6,9 @@ const EVENT_VALUE_CHANGED = 'change'; class EzTimeValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzTimeValidator'; + } /** * Validates the input * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezurl.js b/src/bundle/Resources/public/js/scripts/fieldType/ezurl.js index 9ef70b12c3..cebfe0ffea 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezurl.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezurl.js @@ -6,6 +6,10 @@ const SELECTOR_ERROR_NODE = '.ibexa-data-source__field--link .ibexa-form-error'; class EzUrlValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzUrlValidator'; + } + validateUrl(event) { const result = { isError: false, diff --git a/src/bundle/Resources/public/js/scripts/fieldType/ezuser.js b/src/bundle/Resources/public/js/scripts/fieldType/ezuser.js index c5eb354aa2..041617602d 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/ezuser.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/ezuser.js @@ -10,6 +10,9 @@ const SELECTOR_ERROR_WRAPPER = '.ibexa-form-error'; class EzUserValidator extends ibexa.BaseFieldValidator { + getValidatorName() { + return 'EzUserValidator'; + } /** * Validates the input field value * diff --git a/src/bundle/Resources/public/js/scripts/fieldType/validator/richtext-validator.js b/src/bundle/Resources/public/js/scripts/fieldType/validator/richtext-validator.js index 98b426478d..2304ae2622 100644 --- a/src/bundle/Resources/public/js/scripts/fieldType/validator/richtext-validator.js +++ b/src/bundle/Resources/public/js/scripts/fieldType/validator/richtext-validator.js @@ -11,6 +11,10 @@ class RichTextValidator extends ibexa.BaseFieldValidator { this.labelSelector = labelSelector; } + getValidatorName() { + return 'RichTextValidator'; + } + /** * Validates the input *