From 537697a6e9757f118d09d9e76362ba1ff617e2c6 Mon Sep 17 00:00:00 2001 From: Markus Hatvan Date: Mon, 13 Sep 2021 14:45:46 +0200 Subject: chore: upgrade intl dependencies (#1920) --- src/helpers/validation-helpers.js | 50 +++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 13 deletions(-) (limited to 'src/helpers') diff --git a/src/helpers/validation-helpers.js b/src/helpers/validation-helpers.js index 116f19905..569b13bb0 100644 --- a/src/helpers/validation-helpers.js +++ b/src/helpers/validation-helpers.js @@ -4,35 +4,41 @@ import isEmail from 'validator/lib/isEmail'; const messages = defineMessages({ required: { id: 'validation.required', - defaultMessage: '!!!Field is required', + defaultMessage: 'Field is required', }, email: { id: 'validation.email', - defaultMessage: '!!!Email not valid', + defaultMessage: 'Email not valid', }, url: { id: 'validation.url', - defaultMessage: '!!!Not a valid URL', + defaultMessage: 'Not a valid URL', }, minLength: { id: 'validation.minLength', - defaultMessage: '!!!Too few characters', + defaultMessage: 'Too few characters', }, oneRequired: { id: 'validation.oneRequired', - defaultMessage: '!!!At least one is required', + defaultMessage: 'At least one is required', }, }); export function required({ field }) { - const isValid = (field.value.trim() !== ''); - return [isValid, window.ferdi.intl.formatMessage(messages.required, { field: field.label })]; + const isValid = field.value.trim() !== ''; + return [ + isValid, + window.ferdi.intl.formatMessage(messages.required, { field: field.label }), + ]; } export function email({ field }) { const value = field.value.trim(); const isValid = isEmail(value); - return [isValid, window.ferdi.intl.formatMessage(messages.email, { field: field.label })]; + return [ + isValid, + window.ferdi.intl.formatMessage(messages.email, { field: field.label }), + ]; } export function url({ field }) { @@ -41,12 +47,19 @@ export function url({ field }) { if (value !== '') { // eslint-disable-next-line - isValid = Boolean(value.match(/(^|[\s.:;?\-\]<(])(https?:\/\/[-\w;/?:@&=+$|_.!~*|'()[\]%#,☺]+[\w/#](\(\))?)(?=$|[\s',|().:;?\-[\]>)])/i)); + isValid = Boolean( + value.match( + /(^|[\s.:;?\-\]<(])(https?:\/\/[-\w;/?:@&=+$|_.!~*|'()[\]%#,☺]+[\w/#](\(\))?)(?=$|[\s',|().:;?\-[\]>)])/i, + ), + ); } else { isValid = true; } - return [isValid, window.ferdi.intl.formatMessage(messages.url, { field: field.label })]; + return [ + isValid, + window.ferdi.intl.formatMessage(messages.url, { field: field.label }), + ]; } export function minLength(length) { @@ -55,13 +68,24 @@ export function minLength(length) { if (field.touched) { isValid = field.value.length >= length; } - return [isValid, window.ferdi.intl.formatMessage(messages.minLength, { field: field.label, length })]; + return [ + isValid, + window.ferdi.intl.formatMessage(messages.minLength, { + field: field.label, + length, + }), + ]; }; } export function oneRequired(targets) { return ({ field, form }) => { - const invalidFields = targets.filter((target) => form.$(target).value === ''); - return [targets.length !== invalidFields.length, window.ferdi.intl.formatMessage(messages.required, { field: field.label })]; + const invalidFields = targets.filter(target => form.$(target).value === ''); + return [ + targets.length !== invalidFields.length, + window.ferdi.intl.formatMessage(messages.required, { + field: field.label, + }), + ]; }; } -- cgit v1.2.3-54-g00ecf