fix for new appeal and reps updates

This commit is contained in:
2024-12-04 19:30:18 +00:00
parent 47c2c68ed0
commit b668f323fe
15 changed files with 951 additions and 854 deletions
+10 -62
View File
@@ -178,22 +178,7 @@ const RenderRadio = ({
...custom
}) => {
let { t } = useTranslation();
const required = (value) => {
// Check for the required field
if (!value) {
errors = "This field is required";
}
// Check for emojis using a regular expression
const emojiRegex =
/[\u{1F600}-\u{1F64F}\u{1F300}-\u{1F5FF}\u{1F680}-\u{1F6FF}\u{1F700}-\u{1F77F}\u{1F780}-\u{1F7FF}\u{1F800}-\u{1F8FF}\u{1F900}-\u{1F9FF}\u{1FA00}-\u{1FA6F}\u{1FA70}-\u{1FAFF}\u{2600}-\u{26FF}\u{2700}-\u{27BF}\u{2300}-\u{23FF}\u{2B50}\u{1F004}-\u{1F0CF}\u{1F0A0}-\u{1F0A5}\u{1F170}-\u{1F251}]/gu;
if (emojiRegex.test(value)) {
errors = "Emojis are not allowed";
}
return errors;
};
const required = (value) => (value ? undefined : "Required");
return (
<>
<div
@@ -316,24 +301,7 @@ function Radiofield(props) {
} = props;
const router = useRouter();
const required = (value) => {
let errors = {};
// Check for the required field
if (!value) {
errors = "This field is required";
}
// Check for emojis using a regular expression
const emojiRegex =
/[\u{1F600}-\u{1F64F}\u{1F300}-\u{1F5FF}\u{1F680}-\u{1F6FF}\u{1F700}-\u{1F77F}\u{1F780}-\u{1F7FF}\u{1F800}-\u{1F8FF}\u{1F900}-\u{1F9FF}\u{1FA00}-\u{1FA6F}\u{1FA70}-\u{1FAFF}\u{2600}-\u{26FF}\u{2700}-\u{27BF}\u{2300}-\u{23FF}\u{2B50}\u{1F004}-\u{1F0CF}\u{1F0A0}-\u{1F0A5}\u{1F170}-\u{1F251}]/gu;
if (emojiRegex.test(value)) {
errors = "Emojis are not allowed";
}
return errors;
};
const required = (value) => (value ? undefined : "Required");
//console.log(props.options);
const fieldOptions = props.options
@@ -417,24 +385,7 @@ const RenderCheckBox = ({
...custom
}) => {
let { t } = useTranslation();
const required = (value) => {
let errors = {};
// Check for the required field
if (!value) {
errors = "This field is required";
}
// Check for emojis using a regular expression
const emojiRegex =
/[\u{1F600}-\u{1F64F}\u{1F300}-\u{1F5FF}\u{1F680}-\u{1F6FF}\u{1F700}-\u{1F77F}\u{1F780}-\u{1F7FF}\u{1F800}-\u{1F8FF}\u{1F900}-\u{1F9FF}\u{1FA00}-\u{1FA6F}\u{1FA70}-\u{1FAFF}\u{2600}-\u{26FF}\u{2700}-\u{27BF}\u{2300}-\u{23FF}\u{2B50}\u{1F004}-\u{1F0CF}\u{1F0A0}-\u{1F0A5}\u{1F170}-\u{1F251}]/gu;
if (emojiRegex.test(value)) {
errors = "Emojis are not allowed";
}
return errors;
};
const required = (value) => (value ? undefined : "Required");
return (
<>
@@ -504,13 +455,10 @@ let AboutYou = (props) => {
const contactPref =
router.locale == "cy" ? ["Ebost", "Post"] : ["Email", "Post"];
const required = (value) => {
let errors = {};
const required = (value) => (value ? undefined : "Is required");
// Check for the required field
if (!value) {
errors = "This field is required";
}
const emojicheck = (value) => {
let errors;
// Check for emojis using a regular expression
const emojiRegex =
@@ -592,7 +540,7 @@ let AboutYou = (props) => {
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
validate={[required]}
validate={[required, emojicheck]}
label={t("newappeal:about-you-on-behalf-label")}
maxFieldLength="200"
/>
@@ -630,7 +578,7 @@ let AboutYou = (props) => {
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
validate={[required]}
validate={[required, emojicheck]}
label={t(
"newappeal:about-you-appellant-contact-details-firstname-label"
)}
@@ -642,7 +590,7 @@ let AboutYou = (props) => {
component={RenderTextfield}
type="text"
className="govuk-input govuk-input--width-20"
validate={[required]}
validate={[required, emojicheck]}
label={t(
"newappeal:about-you-appellant-contact-details-lastname-label"
)}
@@ -654,7 +602,7 @@ let AboutYou = (props) => {
component={RenderMultiline}
type="textarea"
className="govuk-textarea govuk-input--width-20"
validate={[required]}
validate={[required, emojicheck]}
label={t(
"newappeal:about-you-appellant-contact-details-address-label"
)}