From 945772dc6db9c395c4713f0178f26d810ddc7ffd Mon Sep 17 00:00:00 2001
From: Daniel Bisgrove <daniel@bizz-websites.com>
Date: Tue, 25 Jun 2024 10:55:28 -0400
Subject: [PATCH 1/5] Confirm single contact's addresses

---
 .../Tool/FixMailingAddresses/Contact.tsx      | 19 +++++-
 .../FixMailingAddresses.tsx                   | 67 +++++++++++++++++++
 .../GetInvalidAddresses.graphql               | 23 +++++++
 3 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/src/components/Tool/FixMailingAddresses/Contact.tsx b/src/components/Tool/FixMailingAddresses/Contact.tsx
index adda7cef4..376b5db2b 100644
--- a/src/components/Tool/FixMailingAddresses/Contact.tsx
+++ b/src/components/Tool/FixMailingAddresses/Contact.tsx
@@ -38,7 +38,7 @@ import { useUpdateCache } from 'src/hooks/useUpdateCache';
 import { dateFormatShort } from 'src/lib/intlFormat';
 import { contactPartnershipStatus } from 'src/utils/contacts/contactPartnershipStatus';
 import theme from '../../../theme';
-import { emptyAddress } from './FixMailingAddresses';
+import { HandleSingleConfirmProps, emptyAddress } from './FixMailingAddresses';
 import { ContactAddressFragment } from './GetInvalidAddresses.generated';
 
 const ContactHeader = styled(CardHeader)(() => ({
@@ -117,6 +117,12 @@ interface Props {
   openEditAddressModal: (address: ContactAddressFragment, id: string) => void;
   openNewAddressModal: (address: ContactAddressFragment, id: string) => void;
   setContactFocus: SetContactFocus;
+  handleSingleConfirm: ({
+    addresses,
+    id,
+    name,
+    onlyErrorOnce,
+  }: HandleSingleConfirmProps) => void;
 }
 
 const Contact: React.FC<Props> = ({
@@ -128,6 +134,7 @@ const Contact: React.FC<Props> = ({
   openEditAddressModal,
   openNewAddressModal,
   setContactFocus,
+  handleSingleConfirm,
 }) => {
   const { t } = useTranslation();
   const locale = useLocale();
@@ -161,6 +168,10 @@ const Contact: React.FC<Props> = ({
     });
   };
 
+  const handleConfirm = () => {
+    handleSingleConfirm({ addresses, id, name });
+  };
+
   const handleContactNameClick = () => {
     setContactFocus(id);
   };
@@ -176,7 +187,11 @@ const Contact: React.FC<Props> = ({
           />
         }
         action={
-          <Button variant="contained" className={classes.confirmButon}>
+          <Button
+            variant="contained"
+            className={classes.confirmButon}
+            onClick={handleConfirm}
+          >
             <Icon path={mdiCheckboxMarkedCircle} size={0.8} />
             {t('Confirm')}
           </Button>
diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
index 086bc13ea..4dbb7857d 100644
--- a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
+++ b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
@@ -13,6 +13,7 @@ import {
   SelectChangeEvent,
   Typography,
 } from '@mui/material';
+import { useSnackbar } from 'notistack';
 import { Trans, useTranslation } from 'react-i18next';
 import { makeStyles } from 'tss-react/mui';
 import { SetContactFocus } from 'pages/accountLists/[accountListId]/tools/useToolsHelper';
@@ -26,8 +27,16 @@ import {
   InvalidAddressesDocument,
   InvalidAddressesQuery,
   useInvalidAddressesQuery,
+  useUpdateContactAddressMutation,
 } from './GetInvalidAddresses.generated';
 
+export type HandleSingleConfirmProps = {
+  addresses: ContactAddressFragment[];
+  id: string;
+  name: string;
+  onlyErrorOnce?: boolean;
+};
+
 const useStyles = makeStyles()(() => ({
   container: {
     padding: theme.spacing(3),
@@ -134,6 +143,63 @@ const FixSendNewsletter: React.FC<Props> = ({
   const { data, loading } = useInvalidAddressesQuery({
     variables: { accountListId },
   });
+  const [updateAddress] = useUpdateContactAddressMutation();
+  const { enqueueSnackbar } = useSnackbar();
+
+  const handleSingleConfirm = async ({
+    addresses,
+    id,
+    name,
+    onlyErrorOnce = false,
+  }: HandleSingleConfirmProps) => {
+    const errors: string[] = [];
+
+    for (let idx = 0; idx < addresses.length; idx++) {
+      const address = addresses[idx];
+
+      await updateAddress({
+        variables: {
+          accountListId,
+          attributes: {
+            id: address.id,
+            validValues: true,
+            // TODO: Fix the Graph QL Input
+            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+            // @ts-ignore
+            primaryMailingAddress: address.primaryMailingAddress,
+          },
+        },
+        update(cache) {
+          if (idx === addresses.length - 1 && !errors.length) {
+            cache.evict({ id: `Contact:${id}` });
+          }
+        },
+        onError(error) {
+          errors.push(
+            `${name} - ${t('Error while saving addresses.')} ${error.cause}`,
+          );
+        },
+      });
+    }
+
+    if (errors.length) {
+      if (onlyErrorOnce) {
+        enqueueSnackbar(t(`Error updating contact ${name}`), {
+          variant: 'error',
+          autoHideDuration: 7000,
+        });
+      } else {
+        errors.forEach((error) => {
+          enqueueSnackbar(error, { variant: 'error' });
+        });
+      }
+      return { success: false };
+    } else {
+      enqueueSnackbar(t(`Updated contact ${name}`), { variant: 'success' });
+      return { success: true };
+    }
+  };
+
 
   const handleUpdateCacheForDeleteAddress = useCallback(
     (cache: ApolloCache<unknown>, data) => {
@@ -303,6 +369,7 @@ const FixSendNewsletter: React.FC<Props> = ({
                           handleModalOpen(ModalEnum.New, address, contactId)
                         }
                         setContactFocus={setContactFocus}
+                        handleSingleConfirm={handleSingleConfirm}
                       />
                     ))}
                   </Grid>
diff --git a/src/components/Tool/FixMailingAddresses/GetInvalidAddresses.graphql b/src/components/Tool/FixMailingAddresses/GetInvalidAddresses.graphql
index 93d962087..5e11bb766 100644
--- a/src/components/Tool/FixMailingAddresses/GetInvalidAddresses.graphql
+++ b/src/components/Tool/FixMailingAddresses/GetInvalidAddresses.graphql
@@ -32,3 +32,26 @@ fragment ContactAddress on Address {
   createdAt
   historic
 }
+
+mutation UpdateContactAddress(
+  $accountListId: ID!
+  $attributes: AddressUpdateInput!
+) {
+  updateAddress(
+    input: { accountListId: $accountListId, attributes: $attributes }
+  ) {
+    address {
+      city
+      country
+      historic
+      id
+      location
+      metroArea
+      postalCode
+      primaryMailingAddress
+      region
+      state
+      street
+    }
+  }
+}

From 9ea79bffe7ad6842b5b46d06ad56d66db393b84c Mon Sep 17 00:00:00 2001
From: Daniel Bisgrove <daniel@bizz-websites.com>
Date: Tue, 25 Jun 2024 10:55:52 -0400
Subject: [PATCH 2/5] Confirm all contact's addresses

---
 .../FixMailingAddresses.tsx                   | 76 +++++++++++++++++++
 1 file changed, 76 insertions(+)

diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
index 4dbb7857d..0c5cf5e67 100644
--- a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
+++ b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
@@ -19,6 +19,7 @@ import { makeStyles } from 'tss-react/mui';
 import { SetContactFocus } from 'pages/accountLists/[accountListId]/tools/useToolsHelper';
 import { DynamicAddAddressModal } from 'src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/AddAddressModal/DynamicAddAddressModal';
 import { DynamicEditContactAddressModal } from 'src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/EditContactAddressModal/DynamicEditContactAddressModal';
+import { Confirmation } from 'src/components/common/Modal/Confirmation/Confirmation';
 import theme from '../../../theme';
 import NoData from '../NoData';
 import Contact from './Contact';
@@ -140,6 +141,8 @@ const FixSendNewsletter: React.FC<Props> = ({
   const [selectedAddress, setSelectedAddress] = useState(emptyAddress);
   const [selectedContactId, setSelectedContactId] = useState('');
   const [defaultSource, setDefaultSource] = useState(appName);
+  const [openBulkConfirmModal, setOpenBulkConfirmModal] = useState(false);
+
   const { data, loading } = useInvalidAddressesQuery({
     variables: { accountListId },
   });
@@ -200,6 +203,62 @@ const FixSendNewsletter: React.FC<Props> = ({
     }
   };
 
+  const handleBulkConfirm = async () => {
+    try {
+      const callsByContact: (() => Promise<{ success: boolean }>)[] = [];
+      data?.contacts?.nodes.forEach((contact) => {
+        const primaryAddress = contact.addresses.nodes.find(
+          (address) =>
+            address.source === defaultSource ||
+            (defaultSource === appName && address.source === 'MPDX'),
+        );
+        if (primaryAddress) {
+          const addresses: ContactAddressFragment[] = [];
+          contact.addresses.nodes.forEach((address) => {
+            addresses.push({
+              ...address,
+              primaryMailingAddress: address.id === primaryAddress?.id,
+            });
+          });
+          const callContactMutation = () =>
+            handleSingleConfirm({
+              addresses,
+              id: contact.id,
+              name: contact.name,
+              onlyErrorOnce: true,
+            });
+          callsByContact.push(callContactMutation);
+        }
+      });
+
+      if (callsByContact.length) {
+        const results = await Promise.all(callsByContact.map((call) => call()));
+
+        const failedUpdates = results.filter(
+          (result) => !result.success,
+        ).length;
+        const successfulUpdates = results.length - failedUpdates;
+
+        if (successfulUpdates) {
+          enqueueSnackbar(t(`Updated ${successfulUpdates} contact(s)`), {
+            variant: 'success',
+          });
+        }
+        if (failedUpdates) {
+          enqueueSnackbar(
+            t(`Error when updating ${failedUpdates} contact(s)`),
+            {
+              variant: 'error',
+            },
+          );
+        }
+      } else {
+        enqueueSnackbar(t(`No contacts were updated`), { variant: 'warning' });
+      }
+    } catch (error) {
+      enqueueSnackbar(t(`Error updating contacts`), { variant: 'error' });
+    }
+  };
 
   const handleUpdateCacheForDeleteAddress = useCallback(
     (cache: ApolloCache<unknown>, data) => {
@@ -279,6 +338,10 @@ const FixSendNewsletter: React.FC<Props> = ({
     setDefaultSource(event.target.value);
   };
 
+  const handleBulkConfirmModalClose = () => {
+    setOpenBulkConfirmModal(false);
+  };
+
   const totalContacts = data?.contacts?.nodes?.length || 0;
 
   return (
@@ -339,6 +402,7 @@ const FixSendNewsletter: React.FC<Props> = ({
                         <Button
                           variant="contained"
                           className={classes.confirmAllButton}
+                          onClick={() => setOpenBulkConfirmModal(true)}
                         >
                           <Icon
                             path={mdiCheckboxMarkedCircle}
@@ -408,6 +472,18 @@ const FixSendNewsletter: React.FC<Props> = ({
           handleUpdateCache={handleUpdateCacheForAddAddress}
         />
       )}
+      {openBulkConfirmModal && (
+        <Confirmation
+          isOpen={true}
+          title={t('Confirm')}
+          message={t(
+            `You are updating all contacts visible on this page, setting the first {{source}} address as the primary address. If no such address exists the contact will not be updated. Are you sure you want to do this?`,
+            { source: defaultSource },
+          )}
+          handleClose={handleBulkConfirmModalClose}
+          mutation={handleBulkConfirm}
+        />
+      )}
     </Box>
   );
 };

From a3ad428a5430811f13c0da05acf810ee3d99c1cd Mon Sep 17 00:00:00 2001
From: Daniel Bisgrove <daniel@bizz-websites.com>
Date: Tue, 25 Jun 2024 10:56:03 -0400
Subject: [PATCH 3/5] Adding testing

---
 .../FixMailingAddresses.test.tsx              | 130 ++++++++++++++++++
 1 file changed, 130 insertions(+)

diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx
index 9cb1362cd..46f00fa74 100644
--- a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx
+++ b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx
@@ -427,4 +427,134 @@ describe('FixSendNewsletter', () => {
       expect(setContactFocus).toHaveBeenCalledWith(contactId);
     });
   });
+
+  describe('handleSingleConfirm()', () => {
+    it('should fire handleSingleConfirm', async () => {
+      const { getAllByRole, getByText, queryByTestId } = render(
+        <Components
+          mocks={{
+            InvalidAddresses: {
+              ...mockInvalidAddressesResponse.InvalidAddresses,
+            },
+          }}
+        />,
+      );
+      await waitFor(() =>
+        expect(queryByTestId('loading')).not.toBeInTheDocument(),
+      );
+      userEvent.click(getAllByRole('button', { name: 'Confirm' })[0]);
+
+      const name = 'Baggins, Frodo';
+      await waitFor(() => expect(getByText(name)).toBeInTheDocument());
+
+      // TODO: Fix when GraphQL is fixed
+      await waitFor(() =>
+        expect(mockEnqueue).toHaveBeenCalledWith(
+          `${name} - Error while saving addresses. undefined`,
+          {
+            variant: 'error',
+          },
+        ),
+      );
+
+      // await waitFor(() =>
+      //   expect(queryByText(name)).not.toBeInTheDocument(),
+      // );
+    });
+  });
+
+  describe('handleBulkConfirm()', () => {
+    it('should fire handleSingleConfirm', async () => {
+      process.env.APP_NAME = 'MPDX';
+      const { getByRole, queryByTestId } = render(
+        <Components
+          mocks={{
+            InvalidAddresses: {
+              ...mockInvalidAddressesResponse.InvalidAddresses,
+            },
+          }}
+        />,
+      );
+      await waitFor(() =>
+        expect(queryByTestId('loading')).not.toBeInTheDocument(),
+      );
+      userEvent.click(getByRole('button', { name: 'Confirm 1 as MPDX' }));
+
+      await waitFor(() =>
+        expect(getByRole('heading', { name: 'Confirm' })).toBeInTheDocument(),
+      );
+
+      userEvent.click(getByRole('button', { name: 'Yes' }));
+
+      // TODO: Fix when GraphQL is fixed
+      const name = 'Baggins, Frodo';
+      await waitFor(() => {
+        expect(mockEnqueue).toHaveBeenCalledWith(
+          `Error updating contact ${name}`,
+          {
+            variant: 'error',
+            autoHideDuration: 7000,
+          },
+        );
+        expect(mockEnqueue).toHaveBeenCalledWith(
+          `Error when updating 1 contact(s)`,
+          {
+            variant: 'error',
+          },
+        );
+      });
+
+      // await waitFor(() =>
+      //   expect(queryByText(name)).not.toBeInTheDocument(),
+      // );
+    });
+  });
+
+  it('should fire handleSingleConfirm', async () => {
+    process.env.APP_NAME = 'MPDX';
+    const { getByRole, queryByTestId } = render(
+      <Components
+        mocks={{
+          InvalidAddresses: {
+            ...mockInvalidAddressesResponse.InvalidAddresses,
+          },
+        }}
+      />,
+    );
+    await waitFor(() =>
+      expect(queryByTestId('loading')).not.toBeInTheDocument(),
+    );
+    const name = 'Baggins, Frodo';
+    userEvent.click(getByRole('combobox'));
+    userEvent.click(getByRole('option', { name: 'DataServer' }));
+
+    userEvent.click(getByRole('button', { name: 'Confirm 1 as DataServer' }));
+
+    await waitFor(() =>
+      expect(getByRole('heading', { name: 'Confirm' })).toBeInTheDocument(),
+    );
+
+    userEvent.click(getByRole('button', { name: 'Yes' }));
+
+    // TODO: Fix when GraphQL is fixed
+    await waitFor(() => {
+      expect(mockEnqueue).toHaveBeenCalledWith(
+        `Error updating contact ${name}`,
+        {
+          variant: 'error',
+          autoHideDuration: 7000,
+        },
+      );
+      expect(mockEnqueue).toHaveBeenCalledWith(
+        `Error when updating 1 contact(s)`,
+        {
+          variant: 'error',
+        },
+      );
+    });
+
+    // await waitFor(() =>
+    //   expect(queryByText(name)).not.toBeInTheDocument(),
+    // );
+  });
 });

From 02e4111ea1d743cadc8241db6034ebb6721075a5 Mon Sep 17 00:00:00 2001
From: Daniel Bisgrove <daniel@bizz-websites.com>
Date: Fri, 28 Jun 2024 10:00:10 -0400
Subject: [PATCH 4/5] Adding test now GraphQl is fixed

---
 .../Tool/FixMailingAddresses/Contact.tsx      |   1 -
 .../FixMailingAddresses.test.tsx              | 100 ++++++++----------
 .../FixMailingAddresses.tsx                   |   3 -
 3 files changed, 45 insertions(+), 59 deletions(-)

diff --git a/src/components/Tool/FixMailingAddresses/Contact.tsx b/src/components/Tool/FixMailingAddresses/Contact.tsx
index 376b5db2b..1341fb177 100644
--- a/src/components/Tool/FixMailingAddresses/Contact.tsx
+++ b/src/components/Tool/FixMailingAddresses/Contact.tsx
@@ -42,7 +42,6 @@ import { HandleSingleConfirmProps, emptyAddress } from './FixMailingAddresses';
 import { ContactAddressFragment } from './GetInvalidAddresses.generated';
 
 const ContactHeader = styled(CardHeader)(() => ({
-  cursor: 'pointer',
   '.MuiCardHeader-action': {
     alignSelf: 'center',
   },
diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx
index 46f00fa74..c434631d5 100644
--- a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx
+++ b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx
@@ -430,7 +430,7 @@ describe('FixSendNewsletter', () => {
 
   describe('handleSingleConfirm()', () => {
     it('should fire handleSingleConfirm', async () => {
-      const { getAllByRole, getByText, queryByTestId } = render(
+      const { getAllByRole, getByText, queryByTestId, queryByText } = render(
         <Components
           mocks={{
             InvalidAddresses: {
@@ -447,30 +447,44 @@ describe('FixSendNewsletter', () => {
       const name = 'Baggins, Frodo';
       await waitFor(() => expect(getByText(name)).toBeInTheDocument());
 
-      // TODO: Fix when GraphQL is fixed
-      await waitFor(() =>
-        expect(mockEnqueue).toHaveBeenCalledWith(
-          `${name} - Error while saving addresses. undefined`,
-          {
-            variant: 'error',
-          },
-        ),
-      );
-
-      // await waitFor(() =>
-      //   expect(queryByText(name)).not.toBeInTheDocument(),
-      // );
+      await waitFor(() => {
+        expect(mockEnqueue).toHaveBeenCalledWith(`Updated contact ${name}`, {
+          variant: 'success',
+        });
+        expect(queryByText(name)).not.toBeInTheDocument();
+      });
     });
   });
 
   describe('handleBulkConfirm()', () => {
     it('should fire handleSingleConfirm', async () => {
       process.env.APP_NAME = 'MPDX';
-      const { getByRole, queryByTestId } = render(
+      const name1 = 'Baggins, Frodo';
+      const name2 = 'Gamgee, Samwise';
+      const { getByRole, queryByTestId, queryByText } = render(
         <Components
           mocks={{
             InvalidAddresses: {
-              ...mockInvalidAddressesResponse.InvalidAddresses,
+              contacts: {
+                nodes: [
+                  {
+                    id: 'contactId',
+                    name: name1,
+                    status: null,
+                    addresses: {
+                      nodes: [mpdxSourcedAddress, tntSourcedAddress],
+                    },
+                  },
+                  {
+                    id: 'contactId2',
+                    name: name2,
+                    status: null,
+                    addresses: {
+                      nodes: [mpdxSourcedAddress, tntSourcedAddress],
+                    },
+                  },
+                ],
+              },
             },
           }}
         />,
@@ -478,7 +492,7 @@ describe('FixSendNewsletter', () => {
       await waitFor(() =>
         expect(queryByTestId('loading')).not.toBeInTheDocument(),
       );
-      userEvent.click(getByRole('button', { name: 'Confirm 1 as MPDX' }));
+      userEvent.click(getByRole('button', { name: 'Confirm 2 as MPDX' }));
 
       await waitFor(() =>
         expect(getByRole('heading', { name: 'Confirm' })).toBeInTheDocument(),
@@ -486,33 +500,23 @@ describe('FixSendNewsletter', () => {
 
       userEvent.click(getByRole('button', { name: 'Yes' }));
 
-      // TODO: Fix when GraphQL is fixed
-      const name = 'Baggins, Frodo';
       await waitFor(() => {
-        expect(mockEnqueue).toHaveBeenCalledWith(
-          `Error updating contact ${name}`,
-          {
-            variant: 'error',
-            autoHideDuration: 7000,
-          },
-        );
-        expect(mockEnqueue).toHaveBeenCalledWith(
-          `Error when updating 1 contact(s)`,
-          {
-            variant: 'error',
-          },
-        );
-      });
+        expect(mockEnqueue).toHaveBeenCalledWith(`Updated contact ${name1}`, {
+          variant: 'success',
+        });
+        expect(mockEnqueue).toHaveBeenCalledWith(`Updated contact ${name2}`, {
+          variant: 'success',
+        });
 
-      // await waitFor(() =>
-      //   expect(queryByText(name)).not.toBeInTheDocument(),
-      // );
+        expect(queryByText(name1)).not.toBeInTheDocument();
+        expect(queryByText(name2)).not.toBeInTheDocument();
+      });
     });
   });
 
   it('should fire handleSingleConfirm', async () => {
     process.env.APP_NAME = 'MPDX';
-    const { getByRole, queryByTestId } = render(
+    const { getByRole, queryByTestId, queryByText } = render(
       <Components
         mocks={{
           InvalidAddresses: {
@@ -536,25 +540,11 @@ describe('FixSendNewsletter', () => {
 
     userEvent.click(getByRole('button', { name: 'Yes' }));
 
-    // TODO: Fix when GraphQL is fixed
     await waitFor(() => {
-      expect(mockEnqueue).toHaveBeenCalledWith(
-        `Error updating contact ${name}`,
-        {
-          variant: 'error',
-          autoHideDuration: 7000,
-        },
-      );
-      expect(mockEnqueue).toHaveBeenCalledWith(
-        `Error when updating 1 contact(s)`,
-        {
-          variant: 'error',
-        },
-      );
+      expect(mockEnqueue).toHaveBeenCalledWith(`Updated contact ${name}`, {
+        variant: 'success',
+      });
+      expect(queryByText(name)).not.toBeInTheDocument();
     });
-
-    // await waitFor(() =>
-    //   expect(queryByText(name)).not.toBeInTheDocument(),
-    // );
   });
 });
diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
index 0c5cf5e67..e738f529d 100644
--- a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
+++ b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
@@ -166,9 +166,6 @@ const FixSendNewsletter: React.FC<Props> = ({
           attributes: {
             id: address.id,
             validValues: true,
-            // TODO: Fix the Graph QL Input
-            // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-            // @ts-ignore
             primaryMailingAddress: address.primaryMailingAddress,
           },
         },

From f4ed6638233469f4cfd86ca6f5d2866ddb35384a Mon Sep 17 00:00:00 2001
From: Daniel Bisgrove <daniel@bizz-websites.com>
Date: Fri, 28 Jun 2024 11:42:19 -0400
Subject: [PATCH 5/5] Adding test for errors during single or bulk mutations

---
 .../Tool/FixMailingAddresses/Contact.tsx      |   1 -
 .../FixMailingAddresses.test.tsx              | 128 ++++++++++++++++--
 .../FixMailingAddresses.tsx                   |  28 ++--
 3 files changed, 126 insertions(+), 31 deletions(-)

diff --git a/src/components/Tool/FixMailingAddresses/Contact.tsx b/src/components/Tool/FixMailingAddresses/Contact.tsx
index 1341fb177..990146302 100644
--- a/src/components/Tool/FixMailingAddresses/Contact.tsx
+++ b/src/components/Tool/FixMailingAddresses/Contact.tsx
@@ -120,7 +120,6 @@ interface Props {
     addresses,
     id,
     name,
-    onlyErrorOnce,
   }: HandleSingleConfirmProps) => void;
 }
 
diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx
index c434631d5..be34724c6 100644
--- a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx
+++ b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx
@@ -429,7 +429,40 @@ describe('FixSendNewsletter', () => {
   });
 
   describe('handleSingleConfirm()', () => {
-    it('should fire handleSingleConfirm', async () => {
+    const name = 'Baggins, Frodo';
+    it('should handle error', async () => {
+      const { getAllByRole, getByText, queryByTestId } = render(
+        <Components
+          mocks={{
+            InvalidAddresses: {
+              ...mockInvalidAddressesResponse.InvalidAddresses,
+            },
+            UpdateContactAddress: () => {
+              throw new Error('Server Error');
+            },
+          }}
+        />,
+      );
+      await waitFor(() =>
+        expect(queryByTestId('loading')).not.toBeInTheDocument(),
+      );
+      userEvent.click(getAllByRole('button', { name: 'Confirm' })[0]);
+
+      await waitFor(() => expect(getByText(name)).toBeInTheDocument());
+
+      await waitFor(() => {
+        expect(mockEnqueue).toHaveBeenCalledWith(
+          `Error updating contact ${name}`,
+          {
+            variant: 'error',
+            autoHideDuration: 7000,
+          },
+        );
+      });
+      expect(getByText(name)).toBeInTheDocument();
+    });
+
+    it('should handle success and remove contact', async () => {
       const { getAllByRole, getByText, queryByTestId, queryByText } = render(
         <Components
           mocks={{
@@ -444,7 +477,6 @@ describe('FixSendNewsletter', () => {
       );
       userEvent.click(getAllByRole('button', { name: 'Confirm' })[0]);
 
-      const name = 'Baggins, Frodo';
       await waitFor(() => expect(getByText(name)).toBeInTheDocument());
 
       await waitFor(() => {
@@ -457,10 +489,86 @@ describe('FixSendNewsletter', () => {
   });
 
   describe('handleBulkConfirm()', () => {
-    it('should fire handleSingleConfirm', async () => {
+    const name1 = 'Baggins, Frodo';
+    const name2 = 'Gamgee, Samwise';
+
+    it('should handle Error', async () => {
+      process.env.APP_NAME = 'MPDX';
+      const { getByRole, getByText, queryByTestId } = render(
+        <Components
+          mocks={{
+            InvalidAddresses: {
+              contacts: {
+                nodes: [
+                  {
+                    id: 'contactId',
+                    name: name1,
+                    status: null,
+                    addresses: {
+                      nodes: [mpdxSourcedAddress, tntSourcedAddress],
+                    },
+                  },
+                  {
+                    id: 'contactId2',
+                    name: name2,
+                    status: null,
+                    addresses: {
+                      nodes: [mpdxSourcedAddress, tntSourcedAddress],
+                    },
+                  },
+                ],
+              },
+            },
+            UpdateContactAddress: () => {
+              throw new Error('Server Error');
+            },
+          }}
+        />,
+      );
+      await waitFor(() =>
+        expect(queryByTestId('loading')).not.toBeInTheDocument(),
+      );
+
+      expect(getByText(name1)).toBeInTheDocument();
+      expect(getByText(name2)).toBeInTheDocument();
+
+      userEvent.click(getByRole('button', { name: 'Confirm 2 as MPDX' }));
+
+      await waitFor(() =>
+        expect(getByRole('heading', { name: 'Confirm' })).toBeInTheDocument(),
+      );
+
+      userEvent.click(getByRole('button', { name: 'Yes' }));
+
+      await waitFor(() => {
+        expect(mockEnqueue).toHaveBeenCalledWith(
+          `Error updating contact ${name1}`,
+          {
+            variant: 'error',
+            autoHideDuration: 7000,
+          },
+        );
+        expect(mockEnqueue).toHaveBeenCalledWith(
+          `Error updating contact ${name2}`,
+          {
+            variant: 'error',
+            autoHideDuration: 7000,
+          },
+        );
+        expect(mockEnqueue).toHaveBeenCalledWith(
+          `Error when updating 2 contact(s)`,
+          {
+            variant: 'error',
+          },
+        );
+
+        expect(getByText(name1)).toBeInTheDocument();
+        expect(getByText(name2)).toBeInTheDocument();
+      });
+    });
+
+    it('should handle success and remove contacts', async () => {
       process.env.APP_NAME = 'MPDX';
-      const name1 = 'Baggins, Frodo';
-      const name2 = 'Gamgee, Samwise';
       const { getByRole, queryByTestId, queryByText } = render(
         <Components
           mocks={{
@@ -514,7 +622,7 @@ describe('FixSendNewsletter', () => {
     });
   });
 
-  it('should fire handleSingleConfirm', async () => {
+  it('should not fire handleSingleConfirm', async () => {
     process.env.APP_NAME = 'MPDX';
     const { getByRole, queryByTestId, queryByText } = render(
       <Components
@@ -538,13 +646,11 @@ describe('FixSendNewsletter', () => {
       expect(getByRole('heading', { name: 'Confirm' })).toBeInTheDocument(),
     );
 
-    userEvent.click(getByRole('button', { name: 'Yes' }));
+    userEvent.click(getByRole('button', { name: 'No' }));
 
     await waitFor(() => {
-      expect(mockEnqueue).toHaveBeenCalledWith(`Updated contact ${name}`, {
-        variant: 'success',
-      });
-      expect(queryByText(name)).not.toBeInTheDocument();
+      expect(mockEnqueue).not.toHaveBeenCalled();
+      expect(queryByText(name)).toBeInTheDocument();
     });
   });
 });
diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
index e738f529d..5fc6a7cfd 100644
--- a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
+++ b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
@@ -153,9 +153,8 @@ const FixSendNewsletter: React.FC<Props> = ({
     addresses,
     id,
     name,
-    onlyErrorOnce = false,
   }: HandleSingleConfirmProps) => {
-    const errors: string[] = [];
+    let errorOccurred = false;
 
     for (let idx = 0; idx < addresses.length; idx++) {
       const address = addresses[idx];
@@ -170,29 +169,21 @@ const FixSendNewsletter: React.FC<Props> = ({
           },
         },
         update(cache) {
-          if (idx === addresses.length - 1 && !errors.length) {
+          if (idx === addresses.length - 1 && !errorOccurred) {
             cache.evict({ id: `Contact:${id}` });
           }
         },
-        onError(error) {
-          errors.push(
-            `${name} - ${t('Error while saving addresses.')} ${error.cause}`,
-          );
+        onError() {
+          errorOccurred = true;
         },
       });
     }
 
-    if (errors.length) {
-      if (onlyErrorOnce) {
-        enqueueSnackbar(t(`Error updating contact ${name}`), {
-          variant: 'error',
-          autoHideDuration: 7000,
-        });
-      } else {
-        errors.forEach((error) => {
-          enqueueSnackbar(error, { variant: 'error' });
-        });
-      }
+    if (errorOccurred) {
+      enqueueSnackbar(t(`Error updating contact ${name}`), {
+        variant: 'error',
+        autoHideDuration: 7000,
+      });
       return { success: false };
     } else {
       enqueueSnackbar(t(`Updated contact ${name}`), { variant: 'success' });
@@ -222,7 +213,6 @@ const FixSendNewsletter: React.FC<Props> = ({
               addresses,
               id: contact.id,
               name: contact.name,
-              onlyErrorOnce: true,
             });
           callsByContact.push(callContactMutation);
         }