Merge pull request #978 from CruGlobal/MPDX-7535-fix-newsletter-confirm

MPDX-7535 - Fix Send Newsletter: Confirm button
CruGlobal · Jul 31, 2024 · 1b734b6 · 1b734b6
2 parents 3475d73 + a5a2492
commit 1b734b6
Show file tree

Hide file tree

Showing 10 changed files with 435 additions and 145 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -42,6 +42,7 @@ const customJestConfig = {
     '!**/*.mock.*',
     '!**/*.stories.*',
     '!**/*.test.*',
+    '!**/*Mock.ts',
   ],
   testEnvironment: 'jest-environment-jsdom',
   snapshotFormat: {

diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.test.tsx
@@ -8,7 +8,7 @@ import TestRouter from '__tests__/util/TestRouter';
 import { GqlMockedProvider } from '__tests__/util/graphqlMocking';
 import { CreateContactAddressMutation } from 'src/components/Contacts/ContactDetails/ContactDetailsTab/Mailing/AddAddressModal/CreateContactAddress.generated';
 import theme from 'src/theme';
-import FixSendNewsletter from './FixMailingAddresses';
+import FixMailingAddresses from './FixMailingAddresses';
 import {
   mockInvalidAddressesResponse,
   mpdxSourcedAddress,
@@ -54,7 +54,7 @@ const Components = ({
           mocks={mocks}
           cache={cache}
         >
-          <FixSendNewsletter
+          <FixMailingAddresses
             accountListId={accountListId}
             setContactFocus={setContactFocus}
           />
@@ -64,7 +64,7 @@ const Components = ({
   </SnackbarProvider>
 );
 
-describe('FixSendNewsletter', () => {
+describe('FixMailingAddresses', () => {
   beforeEach(() => {
     setContactFocus.mockClear();
   });

diff --git a/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx b/src/components/Tool/FixMailingAddresses/FixMailingAddresses.tsx
@@ -130,7 +130,7 @@ enum ModalEnum {
 
 const sourceOptions = [appName, 'DataServer'];
 
-const FixSendNewsletter: React.FC<Props> = ({
+const FixMailingAddresses: React.FC<Props> = ({
   accountListId,
   setContactFocus,
 }: Props) => {
@@ -475,4 +475,4 @@ const FixSendNewsletter: React.FC<Props> = ({
   );
 };
 
-export default FixSendNewsletter;
+export default FixMailingAddresses;
diff --git a/src/components/Tool/FixSendNewsletter/Contact.test.tsx b/src/components/Tool/FixSendNewsletter/Contact.test.tsx
@@ -5,7 +5,7 @@ import Contact from './Contact';
 import {
   ContactPrimaryAddressFragment,
   ContactPrimaryPersonFragment,
-} from './GetInvalidNewsletter.generated';
+} from './InvalidNewsletter.generated';
 
 const TestComponent = ({
   primaryPerson,
@@ -21,7 +21,7 @@ const TestComponent = ({
       primaryPerson={primaryPerson}
       status=""
       primaryAddress={primaryAddress}
-      updateFunction={jest.fn()}
+      handleSingleConfirm={jest.fn()}
       setContactFocus={jest.fn()}
     />
   </ThemeProvider>

diff --git a/src/components/Tool/FixSendNewsletter/Contact.tsx b/src/components/Tool/FixSendNewsletter/Contact.tsx
@@ -19,7 +19,7 @@ import { StyledInput } from '../StyledInput';
 import {
   ContactPrimaryAddressFragment,
   ContactPrimaryPersonFragment,
-} from './GetInvalidNewsletter.generated';
+} from './InvalidNewsletter.generated';
 
 const useStyles = makeStyles()(() => ({
   left: {
@@ -85,7 +85,11 @@ interface Props {
   status?: string;
   primaryAddress?: ContactPrimaryAddressFragment;
   source?: string;
-  updateFunction: (id: string, sendNewsletter: string) => Promise<void>;
+  handleSingleConfirm: (
+    id: string,
+    name: string,
+    sendNewsletter: string,
+  ) => Promise<void>;
   setContactFocus: SetContactFocus;
 }
 
@@ -95,7 +99,7 @@ const Contact = ({
   primaryPerson,
   status,
   primaryAddress,
-  updateFunction,
+  handleSingleConfirm,
   setContactFocus,
 }: Props): ReactElement => {
   const { t } = useTranslation();
@@ -121,8 +125,6 @@ const Contact = ({
     setNewsletter(newNewsletterValue);
   }, [primaryAddress]);
 
-  //TODO: Add button functionality
-
   const handleChange = (
     event:
       | React.ChangeEvent<HTMLSelectElement>
@@ -252,7 +254,7 @@ const Contact = ({
             <Box className={classes.buttonTop}>
               <Button
                 variant="contained"
-                onClick={() => updateFunction(id, newsletter)}
+                onClick={() => handleSingleConfirm(id, name, newsletter)}
               >
                 <Icon
                   path={mdiCheckboxMarkedCircle}

diff --git a/src/components/Tool/FixSendNewsletter/FindSendNewsletter.test.tsx b/src/components/Tool/FixSendNewsletter/FindSendNewsletter.test.tsx