Merge branch 'main' into import-tnt

CruGlobal · Jun 13, 2024 · d3b01f1 · d3b01f1
2 parents 4c57e3f + a9d552f
commit d3b01f1
Show file tree

Hide file tree

Showing 5 changed files with 367 additions and 741 deletions.
diff --git a/...tactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.tsx b/...tactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.tsx
@@ -68,7 +68,7 @@ interface EditContactAddressModalProps {
   accountListId: string;
   address: ContactMailingFragment['addresses']['nodes'][0];
   contactId: string;
-  handleClose: () => void;
+  handleClose: (deletedAddress: boolean) => void;
 }
 
 export const EditContactAddressModal: React.FC<
@@ -115,7 +115,7 @@ export const EditContactAddressModal: React.FC<
     enqueueSnackbar(t('Address updated successfully'), {
       variant: 'success',
     });
-    handleClose();
+    handleClose(false);
   };
 
   const deleteContactAddress = async (): Promise<void> => {
@@ -158,10 +158,11 @@ export const EditContactAddressModal: React.FC<
         },
       });
     }
-    handleClose();
+    handleClose(true);
   };
 
-  const editingDisabled = address.source === 'Siebel';
+  const editingDisabled =
+    address.source === 'Siebel' || address.source === 'DataServer';
   const { data: emailData } = useDonationServicesEmailQuery({
     variables: {
       accountListId,
@@ -171,7 +172,11 @@ export const EditContactAddressModal: React.FC<
   });
 
   return (
-    <Modal isOpen={true} title={t('Edit Address')} handleClose={handleClose}>
+    <Modal
+      isOpen={true}
+      title={t('Edit Address')}
+      handleClose={() => handleClose(false)}
+    >
       <Formik
         initialValues={{
           id: address.id,
@@ -213,29 +218,43 @@ export const EditContactAddressModal: React.FC<
               <ContactEditContainer>
                 {editingDisabled && (
                   <ContactInputWrapper>
-                    <Alert severity="info">
-                      <AlertTitle sx={{ fontWeight: 'bold' }}>
-                        {t('This address is provided by Donation Services')}
-                      </AlertTitle>
-                      <p>
-                        {t(
-                          'The address that syncs with Donation Services cannot be edited here. Please email Donation Services with the updated address, or you can create a new address and select it as your primary mailing address.',
+                    {address.source === 'Siebel' && (
+                      <Alert severity="info">
+                        <AlertTitle sx={{ fontWeight: 'bold' }}>
+                          {t('This address is provided by Donation Services')}
+                        </AlertTitle>
+                        <p>
+                          {t(
+                            'The address that syncs with Donation Services cannot be edited here. Please email Donation Services with the updated address, or you can create a new address and select it as your primary mailing address.',
+                          )}
+                        </p>
+                        {emailData && (
+                          <p>
+                            <Link
+                              href={`mailto:[email protected]?subject=Donor+address+change&body=${encodeURIComponent(
+                                generateEmailBody(emailData, address),
+                              )}`}
+                              underline="hover"
+                              sx={{ fontWeight: 'bold' }}
+                            >
+                              {t('Email Donation Services here')}
+                            </Link>
+                          </p>
                         )}
-                      </p>
-                      {emailData && (
+                      </Alert>
+                    )}
+                    {address.source === 'DataServer' && (
+                      <Alert severity="info">
+                        <AlertTitle sx={{ fontWeight: 'bold' }}>
+                          {t('This address is provided by your organization.')}
+                        </AlertTitle>
                         <p>
-                          <Link
-                            href={`mailto:[email protected]?subject=Donor+address+change&body=${encodeURIComponent(
-                              generateEmailBody(emailData, address),
-                            )}`}
-                            underline="hover"
-                            sx={{ fontWeight: 'bold' }}
-                          >
-                            {t('Email Donation Services here')}
-                          </Link>
+                          {t(
+                            'The address that syncs with your organization’s donations cannot be edited here. Please email your donation department with the updated address, or you can create a new address and select it as your primary mailing address.',
+                          )}
                         </p>
-                      )}
-                    </Alert>
+                      </Alert>
+                    )}
                   </ContactInputWrapper>
                 )}
                 <ContactInputWrapper>
@@ -391,8 +410,13 @@ export const EditContactAddressModal: React.FC<
               </ContactEditContainer>
             </DialogContent>
             <DialogActions>
-              {address && <DeleteButton onClick={deleteContactAddress} />}
-              <CancelButton onClick={handleClose} disabled={isSubmitting} />
+              {address && !editingDisabled && (
+                <DeleteButton onClick={deleteContactAddress} />
+              )}
+              <CancelButton
+                onClick={() => handleClose(false)}
+                disabled={isSubmitting}
+              />
               <SubmitButton disabled={!isValid || isSubmitting}>
                 {(updating || deleting || settingPrimaryAddress) && (
                   <LoadingIndicator color="primary" size={20} />

diff --git a/src/components/Contacts/ContactDetails/ContactDetailsTab/StyledComponents.ts b/src/components/Contacts/ContactDetails/ContactDetailsTab/StyledComponents.ts
@@ -1,5 +1,6 @@
 import Add from '@mui/icons-material/Add';
 import Create from '@mui/icons-material/Create';
+import Lock from '@mui/icons-material/Lock';
 import { Button, Typography } from '@mui/material';
 import { styled } from '@mui/material/styles';
 
@@ -23,3 +24,10 @@ export const AddText = styled(Typography)(({ theme }) => ({
   textTransform: 'uppercase',
   fontWeight: 'bold',
 }));
+
+export const LockIcon = styled(Lock)(({ theme }) => ({
+  width: '18px',
+  height: '18px',
+  margin: theme.spacing(0),
+  color: theme.palette.cruGrayMedium.main,
+}));