Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added name and message validations #1438

Merged
merged 3 commits into from
Feb 8, 2023
Merged

added name and message validations #1438

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2897892
added name and message validations
chencc33 Jan 24, 2023
b219024
update name & message contact form validations
chencc33 Feb 1, 2023
3cc661f
Merge branch 'dev' into 1335-contact-form-validation
edwinjue Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 33 additions & 12 deletions client/components/contact/ContactForm.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,13 @@ const initialFormValues = {
message: '',
errors: {
missingFirstName: false,
invalidFirstName: false,
missingLastName: false,
invalidLastName: false,
missingEmail: false,
invalidEmail: false,
missingMessage: false,
invalidMessage: false,
},
loading: false,
};
Expand Down Expand Up @@ -86,28 +89,43 @@ const ContactForm = () => {
return VALID_EMAIL_FORMAT_REGEX.test(emailAddress);
}

function validateName(name) {
// A regular expression checking for valid names (first and last).
const NAME_REGEX = /^[a-zA-Z]+$/;
return NAME_REGEX.test(name);
}

const clearErrors = useCallback(() => {
setFormValues(prevState => ({
...prevState,
...{
errors: {
missingFirstName: false,
invalidFirstName: false,
missingLastName: false,
invalidLastName: false,
missingEmail: false,
invalidEmail: false,
missingMessage: false,
invalidMessage: false,
},
},
}));
}, []);

const validateForm = useCallback(() => {
const noFirstName = formValues.firstName.trim().length === 0;
const notValidFirstName = !validateName(formValues.firstName.trim());
const noLastName = formValues.lastName.trim().length === 0;
const notValidLastName = !validateName(formValues.lastName.trim());
const noEmail = formValues.email.trim().length === 0;
const noMessage = formValues.message.trim().length === 0;
const incompleteEmail = (!noEmail && !validateEmail(formValues.email));
if (!noFirstName && !noLastName && !noEmail && !noMessage && !incompleteEmail) {
const invalidMessageLength = formValues.message.trim().length < 6
|| formValues.message.trim().length > 1000;
if (!noFirstName && !noLastName && !notValidFirstName && !notValidLastName
&& !noEmail && !incompleteEmail
&& !noMessage && invalidMessageLength) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should this be !invalidMessageLength?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! I have updated the code.

return true;
}

Expand All @@ -116,10 +134,13 @@ const ContactForm = () => {
...{
errors: {
missingFirstName: noFirstName,
invalidFirstName: notValidFirstName,
missingLastName: noLastName,
invalidLastName: notValidLastName,
missingEmail: noEmail,
invalidEmail: incompleteEmail,
missingMessage: noMessage,
invalidMessage: invalidMessageLength,
},
},
}));
Expand All @@ -140,11 +161,11 @@ const ContactForm = () => {
}

const body = [
`First name: ${formValues.firstName.trim()}`,
`Last name: ${formValues.lastName.trim()}`,
`Email: ${formValues.email.trim()}`,
`Association: ${formValues.association.trim() || 'Not provided'}`,
`Message: ${formValues.message.trim()}`,
`First name: ${formValues.firstName.trim()}`,
`Last name: ${formValues.lastName.trim()}`,
`Email: ${formValues.email.trim()}`,
`Association: ${formValues.association.trim() || 'Not provided'}`,
`Message: ${formValues.message.trim()}`,
].join('\n');

setLoading(true);
Expand Down Expand Up @@ -173,8 +194,8 @@ const ContactForm = () => {
value={formValues.firstName}
onChange={onInputChange}
onFocus={clearErrors}
error={formValues.errors.missingFirstName}
helperText={formValues.errors.missingFirstName ? 'Please provide a first name.' : ''}
error={formValues.errors.missingFirstName || formValues.errors.invalidFirstName}
helperText={formValues.errors.missingFirstName || formValues.errors.invalidFirstName ? 'Please provide a first name.' : ''}
fullWidth
/>
</Grid>
Expand All @@ -188,8 +209,8 @@ const ContactForm = () => {
value={formValues.lastName}
onChange={onInputChange}
onFocus={clearErrors}
error={formValues.errors.missingLastName}
helperText={formValues.errors.missingLastName ? 'Please provide a last name.' : ''}
error={formValues.errors.missingLastName || formValues.errors.invalidLastName}
helperText={formValues.errors.missingLastName || formValues.errors.invalidLastName ? 'Please provide a valid last name.' : ''}
fullWidth
/>
</Grid>
Expand Down Expand Up @@ -234,8 +255,8 @@ const ContactForm = () => {
value={formValues.message}
onChange={onInputChange}
onFocus={clearErrors}
error={formValues.errors.missingMessage}
helperText={formValues.errors.missingMessage ? 'Please provide a message.' : ''}
error={formValues.errors.missingMessage || formValues.errors.invalidMessage}
helperText={formValues.errors.missingMessage || formValues.errors.invalidMessage ? 'Please provide a message (6-1000 characters).' : ''}
fullWidth
multiline
/>
Expand Down
Loading