REmoving MPDX name and padding/margin

Allow for TNT (DataServer) data to be edited in MPDX as it's imported once and not updated in third party software. Only MPDX, TNT and manually address are now editable Fixing failing test due to new changes with what source can be edited
CruGlobal · Jun 17, 2024 · 7893bf6 · 7893bf6
1 parent 6041662
commit 7893bf6
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 12 deletions.
diff --git a/...etails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.test.tsx b/...etails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.test.tsx
@@ -43,6 +43,7 @@ const mockContact: ContactMailingFragment = {
         historic: true,
         street: '123 Cool Street',
         primaryMailingAddress: false,
+        source: 'MPDX',
       },
     ],
   },

diff --git a/...tactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.tsx b/...tactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal.tsx
@@ -65,6 +65,8 @@ const LoadingIndicator = styled(CircularProgress)(({ theme }) => ({
   margin: theme.spacing(0, 1, 0, 0),
 }));
 
+export const editableSources = ['MPDX', 'manual', 'TntImport'];
+
 interface EditContactAddressModalProps {
   accountListId: string;
   address: ContactMailingFragment['addresses']['nodes'][0];
@@ -169,8 +171,7 @@ export const EditContactAddressModal: React.FC<
     handleClose();
   };
 
-  const editingDisabled =
-    address.source === 'Siebel' || address.source === 'DataServer';
+  const editingDisabled = editableSources.indexOf(address.source) === -1;
   const { data: emailData } = useDonationServicesEmailQuery({
     variables: {
       accountListId,

diff --git a/src/components/Tool/FixMailingAddresses/Contact.tsx b/src/components/Tool/FixMailingAddresses/Contact.tsx
@@ -20,6 +20,7 @@ import clsx from 'clsx';
 import { DateTime } from 'luxon';
 import { useTranslation } from 'react-i18next';
 import { makeStyles } from 'tss-react/mui';
+import { editableSources } from 'src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/EditContactAddressModal';
 import {
   AddButton,
   AddIcon,
@@ -105,6 +106,7 @@ interface Props {
   name: string;
   status: string;
   addresses: ContactAddressFragment[];
+  appName: string;
   openEditAddressModal: (address: ContactAddressFragment, id: string) => void;
   openNewAddressModal: (address: ContactAddressFragment, id: string) => void;
 }
@@ -114,6 +116,7 @@ const Contact: React.FC<Props> = ({
   name,
   status,
   addresses,
+  appName,
   openEditAddressModal,
   openNewAddressModal,
 }) => {
@@ -219,7 +222,11 @@ const Contact: React.FC<Props> = ({
                     </Box>
 
                     <ContactIconContainer aria-label={t('Edit Icon')}>
-                      {address.source === 'MPDX' ? <EditIcon /> : <LockIcon />}
+                      {editableSources.indexOf(address.source) > -1 ? (
+                        <EditIcon />
+                      ) : (
+                        <LockIcon />
+                      )}
                     </ContactIconContainer>
                   </Box>
                 </Grid>
@@ -233,7 +240,9 @@ const Contact: React.FC<Props> = ({
                       <strong>{t('Source')}: </strong>
                     </Typography>
                   </Hidden>
-                  <Typography display="inline">MPDX</Typography>
+                  <Typography display="inline">
+                    {t('{{appName}}', { appName })}
+                  </Typography>
                 </Box>
               </Box>
             </Grid>
@@ -243,7 +252,6 @@ const Contact: React.FC<Props> = ({
                 justifyContent="flex-start"
                 className={clsx(
                   classes.responsiveBorder,
-                  classes.paddingX,
                   classes.hoverHighlight,
                 )}
               >

diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
@@ -92,9 +92,11 @@ const useStyles = makeStyles()(() => ({
   },
 }));
 
+const appName = process.env.APP_NAME || 'MPDX';
+
 export const emptyAddress: ContactAddressFragment = {
   id: 'new',
-  source: 'MPDX',
+  source: appName,
   street: '',
   region: '',
   location: '',
@@ -114,7 +116,7 @@ enum ModalEnum {
   Edit = 'Edit',
 }
 
-const sourceOptions = ['MPDX', 'DataServer'];
+const sourceOptions = [appName, 'DataServer'];
 
 const FixSendNewsletter: React.FC<Props> = ({ accountListId }: Props) => {
   const { classes } = useStyles();
@@ -123,7 +125,7 @@ const FixSendNewsletter: React.FC<Props> = ({ accountListId }: Props) => {
   const [showNewAddressModal, setShowNewAddressModal] = useState(false);
   const [selectedAddress, setSelectedAddress] = useState(emptyAddress);
   const [selectedContactId, setSelectedContactId] = useState('');
-  const [defaultSource, setDefaultSource] = useState('MPDX');
+  const [defaultSource, setDefaultSource] = useState(appName);
   const { data, loading } = useInvalidAddressesQuery({
     variables: { accountListId },
   });
@@ -218,10 +220,12 @@ const FixSendNewsletter: React.FC<Props> = ({ accountListId }: Props) => {
           </Grid>
 
           {loading && !data && (
-            <CircularProgress
-              data-testid="loading"
-              style={{ marginTop: theme.spacing(3) }}
-            />
+            <Box className={classes.outer}>
+              <CircularProgress
+                data-testid="loading"
+                style={{ marginTop: theme.spacing(3) }}
+              />
+            </Box>
           )}
 
           {!loading && data && (
@@ -286,6 +290,7 @@ const FixSendNewsletter: React.FC<Props> = ({ accountListId }: Props) => {
                         status={contact.status || ''}
                         key={contact.id}
                         addresses={contact.addresses.nodes}
+                        appName={appName}
                         openEditAddressModal={(address, contactId) =>
                           handleModalOpen(ModalEnum.Edit, address, contactId)
                         }