misc. bug fixing and error naming mistakes

CruGlobal · Jun 17, 2024 · 30c396c · 30c396c
1 parent 6794ce4
commit 30c396c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 9 deletions.
diff --git a/src/components/Tool/FixEmailAddresses/FixEmailAddressPerson.test.tsx b/src/components/Tool/FixEmailAddresses/FixEmailAddressPerson.test.tsx
@@ -41,7 +41,12 @@ describe('FixEmailAddresses-Contact', () => {
             name={testData.name}
             key={testData.name}
             personId={testData.id}
-            emails={testData.emails}
+            email={testData.emails.map((email) => ({
+              ...email,
+              isValid: false,
+              personId: testData.id,
+              isPrimary: email.primary,
+            }))}
             handleChange={handleChangeMock}
             handleDelete={handleDeleteModalOpenMock}
             handleAdd={handleAddMock}
@@ -74,7 +79,12 @@ describe('FixEmailAddresses-Contact', () => {
             name={testData.name}
             key={testData.name}
             personId={testData.id}
-            emails={testData.emails}
+            email={testData.emails.map((email) => ({
+              ...email,
+              isValid: false,
+              personId: testData.id,
+              isPrimary: email.primary,
+            }))}
             handleChange={handleChangeMock}
             handleDelete={handleDeleteModalOpenMock}
             handleAdd={handleAddMock}

diff --git a/src/components/Tool/FixEmailAddresses/FixEmailAddressPerson.tsx b/src/components/Tool/FixEmailAddresses/FixEmailAddressPerson.tsx
@@ -23,7 +23,6 @@ import { useLocale } from 'src/hooks/useLocale';
 import { dateFormatShort } from 'src/lib/intlFormat';
 import theme from '../../../theme';
 import { ConfirmButtonIcon } from '../ConfirmButtonIcon';
-import { EmailAddressData } from './FixEmailAddresses';
 
 const PersonCard = styled(Box)(({ theme }) => ({
   [theme.breakpoints.up('md')]: {
@@ -109,10 +108,11 @@ interface FixEmailAddressPersonProps {
 
 interface EmailAddressData {
   email: string;
-  isValid: boolean;
+  isPrimary: boolean;
   updatedAt: string;
   source: string;
   personId: string; // Add the 'personId' property
+  isValid: boolean;
 }
 
 // const onSubmit = (values: EmailAddressData, validationSchema) => {
@@ -122,6 +122,7 @@ interface EmailAddressData {
 const EmailValidationForm = ({
   email: initialEmail = {
     email: '',
+    isPrimary: false,
     updatedAt: '',
     source: '',
     personId: '',
@@ -138,13 +139,14 @@ const EmailValidationForm = ({
     <Formik
       initialValues={{
         email: initialEmail.email,
+        isPrimary: initialEmail.isPrimary,
         updatedAt: '',
         source: '',
         personId: '',
         isValid: false,
       }}
       validationSchema={validationSchema}
-      onSubmit={onSubmit}
+      // onSubmit={onSubmit}
     >
       {({ isValid }) => (
         <Form>
@@ -177,7 +179,7 @@ const EmailValidationForm = ({
 
 export const FixEmailAddressPerson: React.FC<FixEmailAddressPersonProps> = ({
   name,
-  emails,
+  email,
   personId,
   handleChange,
   handleDelete,
@@ -244,7 +246,7 @@ export const FixEmailAddressPerson: React.FC<FixEmailAddressPersonProps> = ({
                       </Box>
                     </ColumnHeaderWrapper>
                   </Hidden>
-                  {emails.map((email, index) => (
+                  {email.map((email, index) => (
                     <Fragment key={index}>
                       <RowWrapper item xs={12} sm={6}>
                         <Box
@@ -266,7 +268,7 @@ export const FixEmailAddressPerson: React.FC<FixEmailAddressPersonProps> = ({
                             </Typography>
                           </Box>
                           <Typography>
-                            {email.primary ? (
+                            {email.isPrimary ? (
                               <Box
                                 data-testid={`starIcon-${personId}-${index}`}
                               >

diff --git a/src/components/Tool/FixEmailAddresses/FixEmailAddresses.tsx b/src/components/Tool/FixEmailAddresses/FixEmailAddresses.tsx
@@ -288,7 +288,14 @@ export const FixEmailAddresses: React.FC<FixEmailAddressesProps> = ({
                     name={`${person.firstName} ${person.lastName}`}
                     key={person.id}
                     personId={person.id}
-                    emails={dataState[person.id]?.emailAddresses || []}
+                    email={
+                      dataState[person.id]?.emailAddresses.map((email) => ({
+                        ...email,
+                        isValid: false,
+                        personId: person.id,
+                        isPrimary: email.primary,
+                      })) || []
+                    }
                     toDelete={dataState[person.id]?.toDelete}
                     handleChange={handleChange}
                     handleDelete={handleDeleteModalOpen}