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

Adds validation to fix email addresses. #1075

Merged
merged 2 commits into from
Sep 17, 2024
Merged

Adds validation to fix email addresses. #1075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77460f6
Adds validation to fix email addresses.
wjames111 Sep 16, 2024
a09be93
PR review edits.
wjames111 Sep 17, 2024
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
309 changes: 180 additions & 129 deletions src/components/Tool/FixEmailAddresses/FixEmailAddressPerson/FixEmailAddressPerson.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, { Fragment, useMemo } from 'react';
import React, { Fragment, ReactElement, useMemo } from 'react';
import { mdiCheckboxMarkedCircle, mdiDelete, mdiLock } from '@mdi/js';
import { Icon } from '@mdi/react';
import StarIcon from '@mui/icons-material/Star';
Expand All @@ -11,6 +11,7 @@ import {
CardContent,
CardHeader,
FormControl,
FormHelperText,
Grid,
Hidden,
Link,
Expand All @@ -20,15 +21,18 @@ import {
Typography,
} from '@mui/material';
import clsx from 'clsx';
import { Formik } from 'formik';
import { DateTime } from 'luxon';
import { useSnackbar } from 'notistack';
import { useTranslation } from 'react-i18next';
import { makeStyles } from 'tss-react/mui';
import * as yup from 'yup';
import { SetContactFocus } from 'pages/accountLists/[accountListId]/tools/useToolsHelper';
import { useUpdateEmailAddressesMutation } from 'src/components/Tool/FixEmailAddresses/FixEmailAddresses.generated';
import { Confirmation } from 'src/components/common/Modal/Confirmation/Confirmation';
import useGetAppSettings from 'src/hooks/useGetAppSettings';
import { useLocale } from 'src/hooks/useLocale';
import i18n from 'src/lib/i18n';
import { dateFormatShort } from 'src/lib/intlFormat';
import theme from 'src/theme';
import EmailValidationForm from '../EmailValidationForm';
Expand Down Expand Up @@ -100,7 +104,7 @@ export interface FixEmailAddressPersonProps {
handleChange: (
personId: string,
numberIndex: number,
event: React.ChangeEvent<HTMLInputElement>,
newEmail: string,
) => void;
handleChangePrimary: (personId: string, emailIndex: number) => void;
handleSingleConfirm: (
Expand All @@ -127,6 +131,13 @@ interface EmailToDelete {
email: Email;
}

const validationSchema = yup.object({
newEmail: yup
.string()
.email(i18n.t('Invalid Email Address Format'))
.required(i18n.t('Please enter a valid email address')),
});

export const FixEmailAddressPerson: React.FC<FixEmailAddressPersonProps> = ({
person,
dataState,
Expand Down Expand Up @@ -308,61 +319,36 @@ export const FixEmailAddressPerson: React.FC<FixEmailAddressPersonProps> = ({
</Grid>
</Hidden>
{emails.map((email, index) => (
<Fragment key={email.id}>
<Grid item xs={6} sm={4} className={classes.paddingB2}>
<Box
display="flex"
justifyContent="space-between"
className={classes.paddingX}
>
<Box>
<Hidden smUp>
<Typography
display="inline"
variant="body2"
fontWeight="bold"
>
{t('Source')}:
</Typography>
</Hidden>
<Typography display="inline" variant="body2">
{`${email.source} (${dateFormatShort(
DateTime.fromISO(email.updatedAt),
locale,
)})`}
</Typography>
</Box>
</Box>
</Grid>

<Grid item xs={6} sm={2} className={classes.paddingB2}>
<Box
display="flex"
justifyContent="center"
className={classes.paddingX}
>
<Typography display="flex" alignItems="center">
{email.isPrimary ? (
<>
<Hidden smUp>
<Typography
display="inline"
variant="body2"
fontWeight="bold"
>
{t('Source')}:
</Typography>
</Hidden>
<StarIcon
data-testid={`starIcon-${id}-${index}`}
className={classes.hoverHighlight}
onClick={() =>
handleChangePrimary(id, index)
}
/>
</>
) : (
<>
<Formik
key={index}
enableReinitialize={true}
initialValues={{
newEmail: email.email,
}}
validationSchema={validationSchema}
onSubmit={(values) => {
handleChange(id, index, values.newEmail);
}}
>
{({
values: { newEmail },
setFieldValue,
handleSubmit,
errors,
}): ReactElement => (
<Fragment>
<Grid
item
xs={6}
sm={4}
className={classes.paddingB2}
>
<Box
display="flex"
justifyContent="space-between"
className={classes.paddingX}
>
<Box>
<Hidden smUp>
<Typography
display="inline"
Expand All @@ -372,88 +358,153 @@ export const FixEmailAddressPerson: React.FC<FixEmailAddressPersonProps> = ({
{t('Source')}:
</Typography>
</Hidden>
<Tooltip
title={t('Set as Primary')}
placement="left"
>
<StarOutlineIcon
data-testid={`starOutlineIcon-${id}-${index}`}
className={classes.hoverHighlight}
onClick={() =>
handleChangePrimary(id, index)
}
/>
</Tooltip>
</>
)}
</Typography>
</Box>
</Grid>
<Grid item xs={12} sm={6} className={classes.paddingB2}>
<Box
display="flex"
justifyContent="flex-start"
className={clsx(
classes.responsiveBorder,
classes.paddingX,
)}
>
<FormControl fullWidth>
<TextField
style={{ width: '100%' }}
size="small"
inputProps={{
'data-testid': `textfield-${id}-${index}`,
}}
onChange={(
event: React.ChangeEvent<HTMLInputElement>,
) => handleChange(id, index, event)}
value={email.email}
disabled={email.source !== appName}
/>
</FormControl>

{email.source === appName ? (
<Typography display="inline" variant="body2">
{`${email.source} (${dateFormatShort(
DateTime.fromISO(email.updatedAt),
locale,
)})`}
</Typography>
</Box>
</Box>
</Grid>
<Grid
item
xs={6}
sm={2}
className={classes.paddingB2}
>
<Box
display="flex"
alignItems="center"
data-testid={`delete-${id}-${index}`}
onClick={() =>
handleDeleteEmailOpen({ id, email })
}
justifyContent="center"
className={classes.paddingX}
>
<Tooltip
title={t('Delete Email')}
placement="left"
>
<Icon
path={mdiDelete}
size={1}
className={classes.hoverHighlight}
/>
</Tooltip>
<Typography display="flex" alignItems="center">
{email.isPrimary ? (
<>
<Hidden smUp>
<Typography
display="inline"
variant="body2"
fontWeight="bold"
>
{t('Source')}:
</Typography>
</Hidden>
<StarIcon
data-testid={`starIcon-${id}-${index}`}
className={classes.hoverHighlight}
onClick={() =>
handleChangePrimary(id, index)
}
/>
</>
) : (
<>
<Hidden smUp>
<Typography
display="inline"
variant="body2"
fontWeight="bold"
>
{t('Source')}:
</Typography>
</Hidden>
<Tooltip
title={t('Set as Primary')}
placement="left"
>
<StarOutlineIcon
data-testid={`starOutlineIcon-${id}-${index}`}
className={classes.hoverHighlight}
onClick={() =>
handleChangePrimary(id, index)
}
/>
</Tooltip>
</>
)}
</Typography>
</Box>
) : (
</Grid>
<Grid
item
xs={12}
sm={6}
className={classes.paddingB2}
>
<Box
display="flex"
alignItems="center"
className={classes.paddingX}
justifyContent="flex-start"
className={clsx(
classes.responsiveBorder,
classes.paddingX,
)}
>
<Icon
path={mdiLock}
size={1}
style={{
color: theme.palette.cruGrayMedium.main,
}}
/>
<FormControl fullWidth>
<TextField
style={{ width: '100%' }}
size="small"
inputProps={{
'data-testid': `textfield-${id}-${index}`,
}}
name="newEmail"
value={newEmail}
onChange={(e) => {
setFieldValue('newEmail', e.target.value);
handleSubmit();
}}
disabled={email.source !== appName}
/>
<FormHelperText
error={true}
data-testid="statusSelectError"
>
{errors.newEmail}
</FormHelperText>
</FormControl>

{email.source === appName ? (
<Box
display="flex"
alignItems="center"
data-testid={`delete-${id}-${index}`}
onClick={() =>
handleDeleteEmailOpen({ id, email })
}
className={classes.paddingX}
>
<Tooltip
title={t('Delete Email')}
placement="left"
>
<Icon
path={mdiDelete}
size={1}
className={classes.hoverHighlight}
/>
</Tooltip>
</Box>
) : (
<Box
display="flex"
alignItems="center"
className={classes.paddingX}
>
<Icon
path={mdiLock}
size={1}
style={{
color: theme.palette.cruGrayMedium.main,
}}
/>
</Box>
)}
</Box>
)}
</Box>
</Grid>
</Fragment>
</Grid>
</Fragment>
)}
</Formik>
))}

<Grid item xs={12} sm={6} className={classes.paddingB2}>
<Box
display="flex"
Expand Down
4 changes: 2 additions & 2 deletions src/components/Tool/FixEmailAddresses/FixEmailAddresses.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,10 +183,10 @@ export const FixEmailAddresses: React.FC<FixEmailAddressesProps> = ({
const handleChange = (
personId: string,
numberIndex: number,
event: React.ChangeEvent<HTMLInputElement>,
newEmail: string,
): void => {
const temp = { ...dataState };
dataState[personId].emailAddresses[numberIndex].email = event.target.value;
dataState[personId].emailAddresses[numberIndex].email = newEmail;
setDataState(temp);
};

Expand Down
Loading