From 88734f3d5fbbe7cf30e00b188943bbad4d449034 Mon Sep 17 00:00:00 2001
From: Dhivas Sugumar <dhivassugumar@gmail.com>
Date: Wed, 29 Mar 2023 17:38:38 -0400
Subject: [PATCH 1/8] Added an update reviewer patch to api client to hadnle
 email and phone number updates.

---
 src/api/apiClient.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/api/apiClient.ts b/src/api/apiClient.ts
index 25c47a4..b61f27b 100644
--- a/src/api/apiClient.ts
+++ b/src/api/apiClient.ts
@@ -2,7 +2,7 @@ import { Auth } from 'aws-amplify';
 import axios, { AxiosInstance } from 'axios';
 import { Letter } from './dtos/letter';
 import Role from './dtos/role';
-import { Response, Survey, SurveyData, surveysSchema } from './dtos/survey-assignment.dto';
+import { Response, Reviewer, Survey, SurveyData, surveysSchema } from './dtos/survey-assignment.dto';
 import User from './dtos/user.dto';
 
 const defaultBaseUrl = process.env.REACT_APP_API_BASE_URL ?? 'http://localhost:5000';
@@ -96,6 +96,10 @@ export class ApiClient {
       responses,
     }) as Promise<Letter>;
   }
+
+  public async updateReviewer(reviewerUuid: string, secondaryEmail?: string, phone?: string) : Promise<Reviewer> {
+      return this.patch(`/reviewer/${reviewerUuid}`, {secondaryEmail, phone}) as Promise<Reviewer>
+    }
 }
 
 export default new ApiClient();

From 4ff599e62a534a63a8807ec62eedb5d501802c75 Mon Sep 17 00:00:00 2001
From: Dhivas Sugumar <dhivassugumar@gmail.com>
Date: Wed, 29 Mar 2023 17:55:42 -0400
Subject: [PATCH 2/8] Updated reviewer type to also hold phone number and
 secondary email.

---
 src/api/dtos/survey-assignment.dto.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/api/dtos/survey-assignment.dto.ts b/src/api/dtos/survey-assignment.dto.ts
index 7ef0c61..43a1ef2 100644
--- a/src/api/dtos/survey-assignment.dto.ts
+++ b/src/api/dtos/survey-assignment.dto.ts
@@ -42,7 +42,11 @@ export interface Youth extends PersonInfo {
   assignmentUuid: string;
 }
 
-export type Reviewer = PersonInfo;
+export interface Reviewer extends PersonInfo {
+  reviewerUuid: string
+  secondaryEmail: string;
+  phone: string;
+}
 
 interface PersonInfo {
   email: string;

From 7bd14161125b8733c1c80b7a93a463b213c366f7 Mon Sep 17 00:00:00 2001
From: Dhivas Sugumar <dhivassugumar@gmail.com>
Date: Wed, 29 Mar 2023 17:59:22 -0400
Subject: [PATCH 3/8] Changed update reviewer to take a reviewer object
 instead.

---
 src/api/apiClient.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/api/apiClient.ts b/src/api/apiClient.ts
index b61f27b..6a6aa0a 100644
--- a/src/api/apiClient.ts
+++ b/src/api/apiClient.ts
@@ -97,8 +97,9 @@ export class ApiClient {
     }) as Promise<Letter>;
   }
 
-  public async updateReviewer(reviewerUuid: string, secondaryEmail?: string, phone?: string) : Promise<Reviewer> {
-      return this.patch(`/reviewer/${reviewerUuid}`, {secondaryEmail, phone}) as Promise<Reviewer>
+  public async updateReviewer(reviewer : Reviewer) : Promise<Reviewer> {
+      const {secondaryEmail, phone} = reviewer;
+      return this.patch(`/reviewer/${reviewer.reviewerUuid}`, {secondaryEmail, phone}) as Promise<Reviewer>
     }
 }
 

From 37bcc42e6c174794204d326ad62031823e15d665 Mon Sep 17 00:00:00 2001
From: Dhivas Sugumar <dhivassugumar@gmail.com>
Date: Sun, 2 Apr 2023 14:36:12 -0400
Subject: [PATCH 4/8] Added updateREviewer function to pass through parent
 components from survey controller.

---
 src/api/apiClient.ts                           |  4 ++--
 src/components/survey/CollectContactPage.tsx   | 10 ++++++++--
 src/components/survey/ContactInfoCollect.tsx   | 16 +++++++++++++---
 src/components/survey/SurveyViewController.tsx |  9 ++++++---
 4 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/src/api/apiClient.ts b/src/api/apiClient.ts
index 6a6aa0a..3896602 100644
--- a/src/api/apiClient.ts
+++ b/src/api/apiClient.ts
@@ -97,9 +97,9 @@ export class ApiClient {
     }) as Promise<Letter>;
   }
 
-  public async updateReviewer(reviewer : Reviewer) : Promise<Reviewer> {
+  public async updateReviewer(reviewer : Reviewer) : Promise<Reviewer>  {
       const {secondaryEmail, phone} = reviewer;
-      return this.patch(`/reviewer/${reviewer.reviewerUuid}`, {secondaryEmail, phone}) as Promise<Reviewer>
+      return this.patch(`/reviewer/${reviewer.reviewerUuid}`, {secondaryEmail, phone})  as Promise<Reviewer>
     }
 }
 
diff --git a/src/components/survey/CollectContactPage.tsx b/src/components/survey/CollectContactPage.tsx
index ce9d1e3..5cae9e7 100644
--- a/src/components/survey/CollectContactPage.tsx
+++ b/src/components/survey/CollectContactPage.tsx
@@ -1,19 +1,25 @@
 import React from 'react';
 import { Box, Center, Text, VStack } from '@chakra-ui/react';
 import ContactInfoCollect from './ContactInfoCollect';
+import { Reviewer } from '../../api/dtos/survey-assignment.dto';
 
 interface CollectContactPageProps {
   confirm: () => void;
+  reviewer: Reviewer
+  updateContact: (reviewerUpdate : Reviewer) => Promise<Reviewer>
 }
 
-const CollectContactPage: React.FC<CollectContactPageProps> = ({ confirm }) => (
+const CollectContactPage: React.FC<CollectContactPageProps> = ({ updateContact, reviewer }) => (
   <Center mt={20}>
     <VStack justify="center" height="full">
       <Box padding="4" W="md">
         <Text fontWeight={600} mb={6}>
           Please provide additional contact information if you desire
         </Text>
-        <ContactInfoCollect onSubmit={confirm} />
+        <ContactInfoCollect 
+        updateContact={updateContact} 
+        reviewer={reviewer}
+        />
       </Box>
     </VStack>
   </Center>
diff --git a/src/components/survey/ContactInfoCollect.tsx b/src/components/survey/ContactInfoCollect.tsx
index 35ed614..393c160 100644
--- a/src/components/survey/ContactInfoCollect.tsx
+++ b/src/components/survey/ContactInfoCollect.tsx
@@ -10,6 +10,7 @@ import {
   VStack,
 } from '@chakra-ui/react';
 import React, { useState } from 'react';
+import { Reviewer } from '../../api/dtos/survey-assignment.dto';
 
 export interface ContactFormValues {
   email: string;
@@ -17,7 +18,8 @@ export interface ContactFormValues {
 }
 
 interface ContactFormProps {
-  onSubmit: () => void;
+  updateContact: (reviewerUpdate : Reviewer) => Promise<Reviewer>
+  reviewer: Reviewer
 }
 
 const validateEmail = (value: string) => {
@@ -38,7 +40,7 @@ const validatePhoneNumber = (value: string) => {
   return error;
 };
 
-const ContactInfoCollect: React.FC<ContactFormProps> = ({ onSubmit }) => {
+const ContactInfoCollect: React.FC<ContactFormProps> = ({ updateContact, reviewer }) => {
   const [email, setEmail] = useState('');
   const [phoneNumber, setPhoneNumber] = useState('');
   const toast = useToast();
@@ -69,8 +71,16 @@ const ContactInfoCollect: React.FC<ContactFormProps> = ({ onSubmit }) => {
       });
       return;
     }
+    const updateReviewer = {
+      email: reviewer.email,
+      firstName: reviewer.firstName,
+      lastName: reviewer.lastName,
+      reviewerUuid: reviewer.reviewerUuid,
+      secondaryEmail: email,
+      phone: phoneNumber,
+    }
     // TODO: Send email and phone number to the backend
-    onSubmit();
+    updateContact(updateReviewer);
   };
 
   // eslint-disable-next-line no-alert
diff --git a/src/components/survey/SurveyViewController.tsx b/src/components/survey/SurveyViewController.tsx
index f13ab32..8cec255 100644
--- a/src/components/survey/SurveyViewController.tsx
+++ b/src/components/survey/SurveyViewController.tsx
@@ -1,7 +1,7 @@
 import { useToast } from '@chakra-ui/react';
 import { useMachine } from '@xstate/react';
 import React, { useCallback } from 'react';
-import { Response, SurveyData, Youth } from '../../api/dtos/survey-assignment.dto';
+import { Response, Reviewer, SurveyData, Youth } from '../../api/dtos/survey-assignment.dto';
 import { TOAST_POPUP_DURATION } from '../../pages/basicConstants';
 import ConfirmAssignments from './ConfirmAssignments';
 import ConfirmReviewerIdentity from './ConfirmReviewerIdentity';
@@ -72,8 +72,11 @@ const SurveyViewController: React.FC<SurveyViewControllerProps> = ({
         />
       )}
 
-      {state.matches('provideContactInfo') && (
-        <CollectContactPage confirm={() => send('CONFIRM')} />
+{state.matches('provideContactInfo') && (
+        <CollectContactPage 
+        reviewer = {reviewer}
+        updateContact={async (reviewerUpdate : Reviewer) => {
+          apiClient.updateReviewer(reviewerUpdate);}} />
       )}
 
       {state.matches('confirmAssignments') && (

From 4b10c3e7e4611f04b8bc8016d6dd93021f10fbb9 Mon Sep 17 00:00:00 2001
From: Dhivas Sugumar <dhivassugumar@gmail.com>
Date: Sun, 2 Apr 2023 14:57:24 -0400
Subject: [PATCH 5/8] MOved to calling the api client directly in the
 component.

---
 src/api/apiClient.ts                           | 4 ++--
 src/components/survey/CollectContactPage.tsx   | 5 +----
 src/components/survey/ContactInfoCollect.tsx   | 6 +++---
 src/components/survey/SurveyViewController.tsx | 4 +---
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/api/apiClient.ts b/src/api/apiClient.ts
index 3896602..7808c51 100644
--- a/src/api/apiClient.ts
+++ b/src/api/apiClient.ts
@@ -98,8 +98,8 @@ export class ApiClient {
   }
 
   public async updateReviewer(reviewer : Reviewer) : Promise<Reviewer>  {
-      const {secondaryEmail, phone} = reviewer;
-      return this.patch(`/reviewer/${reviewer.reviewerUuid}`, {secondaryEmail, phone})  as Promise<Reviewer>
+      const {secondaryEmail, phone, reviewerUuid} = reviewer;
+      return this.patch(`/reviewer/${reviewerUuid}`, {secondaryEmail, phone})  as Promise<Reviewer>
     }
 }
 
diff --git a/src/components/survey/CollectContactPage.tsx b/src/components/survey/CollectContactPage.tsx
index 5cae9e7..f9415b0 100644
--- a/src/components/survey/CollectContactPage.tsx
+++ b/src/components/survey/CollectContactPage.tsx
@@ -4,12 +4,10 @@ import ContactInfoCollect from './ContactInfoCollect';
 import { Reviewer } from '../../api/dtos/survey-assignment.dto';
 
 interface CollectContactPageProps {
-  confirm: () => void;
   reviewer: Reviewer
-  updateContact: (reviewerUpdate : Reviewer) => Promise<Reviewer>
 }
 
-const CollectContactPage: React.FC<CollectContactPageProps> = ({ updateContact, reviewer }) => (
+const CollectContactPage: React.FC<CollectContactPageProps> = ({reviewer }) => (
   <Center mt={20}>
     <VStack justify="center" height="full">
       <Box padding="4" W="md">
@@ -17,7 +15,6 @@ const CollectContactPage: React.FC<CollectContactPageProps> = ({ updateContact,
           Please provide additional contact information if you desire
         </Text>
         <ContactInfoCollect 
-        updateContact={updateContact} 
         reviewer={reviewer}
         />
       </Box>
diff --git a/src/components/survey/ContactInfoCollect.tsx b/src/components/survey/ContactInfoCollect.tsx
index 393c160..0539a7b 100644
--- a/src/components/survey/ContactInfoCollect.tsx
+++ b/src/components/survey/ContactInfoCollect.tsx
@@ -10,6 +10,7 @@ import {
   VStack,
 } from '@chakra-ui/react';
 import React, { useState } from 'react';
+import apiClient from '../../api/apiClient';
 import { Reviewer } from '../../api/dtos/survey-assignment.dto';
 
 export interface ContactFormValues {
@@ -18,7 +19,6 @@ export interface ContactFormValues {
 }
 
 interface ContactFormProps {
-  updateContact: (reviewerUpdate : Reviewer) => Promise<Reviewer>
   reviewer: Reviewer
 }
 
@@ -40,7 +40,7 @@ const validatePhoneNumber = (value: string) => {
   return error;
 };
 
-const ContactInfoCollect: React.FC<ContactFormProps> = ({ updateContact, reviewer }) => {
+const ContactInfoCollect: React.FC<ContactFormProps> = ({reviewer }) => {
   const [email, setEmail] = useState('');
   const [phoneNumber, setPhoneNumber] = useState('');
   const toast = useToast();
@@ -80,7 +80,7 @@ const ContactInfoCollect: React.FC<ContactFormProps> = ({ updateContact, reviewe
       phone: phoneNumber,
     }
     // TODO: Send email and phone number to the backend
-    updateContact(updateReviewer);
+    apiClient.updateReviewer(updateReviewer)
   };
 
   // eslint-disable-next-line no-alert
diff --git a/src/components/survey/SurveyViewController.tsx b/src/components/survey/SurveyViewController.tsx
index 8cec255..f611c99 100644
--- a/src/components/survey/SurveyViewController.tsx
+++ b/src/components/survey/SurveyViewController.tsx
@@ -74,9 +74,7 @@ const SurveyViewController: React.FC<SurveyViewControllerProps> = ({
 
 {state.matches('provideContactInfo') && (
         <CollectContactPage 
-        reviewer = {reviewer}
-        updateContact={async (reviewerUpdate : Reviewer) => {
-          apiClient.updateReviewer(reviewerUpdate);}} />
+        reviewer = {reviewer}/>
       )}
 
       {state.matches('confirmAssignments') && (

From 3360b8476da9336d2a7ec5c42a8ccc2f4267100b Mon Sep 17 00:00:00 2001
From: Dhivas Sugumar <dhivassugumar@gmail.com>
Date: Sun, 2 Apr 2023 15:43:42 -0400
Subject: [PATCH 6/8] Added functionality to pass reviewer params done to child
 component to make api call.

---
 src/components/survey/CollectContactPage.tsx  |  4 ++-
 src/components/survey/ContactInfoCollect.tsx  | 29 ++++++++++++-------
 .../survey/SurveyViewController.tsx           |  5 +++-
 src/pages/survey/SurveyPage.tsx               |  1 +
 4 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/components/survey/CollectContactPage.tsx b/src/components/survey/CollectContactPage.tsx
index f9415b0..cad64cf 100644
--- a/src/components/survey/CollectContactPage.tsx
+++ b/src/components/survey/CollectContactPage.tsx
@@ -5,9 +5,10 @@ import { Reviewer } from '../../api/dtos/survey-assignment.dto';
 
 interface CollectContactPageProps {
   reviewer: Reviewer
+  reviewerUuid: string | undefined
 }
 
-const CollectContactPage: React.FC<CollectContactPageProps> = ({reviewer }) => (
+const CollectContactPage: React.FC<CollectContactPageProps> = ({reviewer, reviewerUuid }) => (
   <Center mt={20}>
     <VStack justify="center" height="full">
       <Box padding="4" W="md">
@@ -16,6 +17,7 @@ const CollectContactPage: React.FC<CollectContactPageProps> = ({reviewer }) => (
         </Text>
         <ContactInfoCollect 
         reviewer={reviewer}
+        reviewerUuid={reviewerUuid}
         />
       </Box>
     </VStack>
diff --git a/src/components/survey/ContactInfoCollect.tsx b/src/components/survey/ContactInfoCollect.tsx
index 0539a7b..c2f4f15 100644
--- a/src/components/survey/ContactInfoCollect.tsx
+++ b/src/components/survey/ContactInfoCollect.tsx
@@ -20,6 +20,7 @@ export interface ContactFormValues {
 
 interface ContactFormProps {
   reviewer: Reviewer
+  reviewerUuid: string | undefined
 }
 
 const validateEmail = (value: string) => {
@@ -40,7 +41,7 @@ const validatePhoneNumber = (value: string) => {
   return error;
 };
 
-const ContactInfoCollect: React.FC<ContactFormProps> = ({reviewer }) => {
+const ContactInfoCollect: React.FC<ContactFormProps> = ({reviewer, reviewerUuid }) => {
   const [email, setEmail] = useState('');
   const [phoneNumber, setPhoneNumber] = useState('');
   const toast = useToast();
@@ -71,16 +72,24 @@ const ContactInfoCollect: React.FC<ContactFormProps> = ({reviewer }) => {
       });
       return;
     }
-    const updateReviewer = {
-      email: reviewer.email,
-      firstName: reviewer.firstName,
-      lastName: reviewer.lastName,
-      reviewerUuid: reviewer.reviewerUuid,
-      secondaryEmail: email,
-      phone: phoneNumber,
+    if (reviewerUuid) {
+      const updateReviewer = {
+        email: reviewer.email,
+        firstName: reviewer.firstName,
+        lastName: reviewer.lastName,
+        reviewerUuid,
+        secondaryEmail: email,
+        phone: phoneNumber,
+      }
+      // TODO: Send email and phone number to the backend
+      apiClient.updateReviewer(updateReviewer)
     }
-    // TODO: Send email and phone number to the backend
-    apiClient.updateReviewer(updateReviewer)
+    else {
+      toast({
+        title: 'There was an error in updating contact information.',
+      });
+    }
+
   };
 
   // eslint-disable-next-line no-alert
diff --git a/src/components/survey/SurveyViewController.tsx b/src/components/survey/SurveyViewController.tsx
index f611c99..4adc050 100644
--- a/src/components/survey/SurveyViewController.tsx
+++ b/src/components/survey/SurveyViewController.tsx
@@ -1,7 +1,7 @@
 import { useToast } from '@chakra-ui/react';
 import { useMachine } from '@xstate/react';
 import React, { useCallback } from 'react';
-import { Response, Reviewer, SurveyData, Youth } from '../../api/dtos/survey-assignment.dto';
+import { Response, SurveyData, Youth } from '../../api/dtos/survey-assignment.dto';
 import { TOAST_POPUP_DURATION } from '../../pages/basicConstants';
 import ConfirmAssignments from './ConfirmAssignments';
 import ConfirmReviewerIdentity from './ConfirmReviewerIdentity';
@@ -16,6 +16,7 @@ import CollectContactPage from './CollectContactPage';
 
 interface SurveyViewControllerProps extends SurveyData {
   completeAssignment: (assignmentUuid: string, responses: Response[]) => Promise<void>;
+  reviewerUuid: string | undefined, 
 }
 
 /**
@@ -32,6 +33,7 @@ const SurveyViewController: React.FC<SurveyViewControllerProps> = ({
   completeAssignment,
   reviewer,
   questions,
+  reviewerUuid,
 }) => {
   // See state machine visualization in `stateMachine.ts` for the entire state machine flow.
   const [state, send] = useMachine(createSurveyViewMachine(treatmentYouth, controlYouth));
@@ -74,6 +76,7 @@ const SurveyViewController: React.FC<SurveyViewControllerProps> = ({
 
 {state.matches('provideContactInfo') && (
         <CollectContactPage 
+        reviewerUuid = {reviewerUuid}
         reviewer = {reviewer}/>
       )}
 
diff --git a/src/pages/survey/SurveyPage.tsx b/src/pages/survey/SurveyPage.tsx
index 0c07794..dbbb962 100644
--- a/src/pages/survey/SurveyPage.tsx
+++ b/src/pages/survey/SurveyPage.tsx
@@ -39,6 +39,7 @@ const SurveyPage: React.FC = () => {
       {isLoading && <LoadingSpinner />}
       {data && (
         <SurveyViewController
+          reviewerUuid={reviewerUuid}
           reviewer={data.reviewer}
           questions={data.questions}
           treatmentYouth={data.treatmentYouth}

From 808ef8b9b7d4e5e4a030a01c7627631ed74ba77a Mon Sep 17 00:00:00 2001
From: Dhivas Sugumar <dhivassugumar@gmail.com>
Date: Sun, 2 Apr 2023 15:52:02 -0400
Subject: [PATCH 7/8] Reviewer contact update works.

---
 src/components/survey/CollectContactPage.tsx   |  4 +++-
 src/components/survey/ContactInfoCollect.tsx   | 11 ++++-------
 src/components/survey/SurveyViewController.tsx |  4 +++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/components/survey/CollectContactPage.tsx b/src/components/survey/CollectContactPage.tsx
index cad64cf..d45fc5d 100644
--- a/src/components/survey/CollectContactPage.tsx
+++ b/src/components/survey/CollectContactPage.tsx
@@ -6,9 +6,10 @@ import { Reviewer } from '../../api/dtos/survey-assignment.dto';
 interface CollectContactPageProps {
   reviewer: Reviewer
   reviewerUuid: string | undefined
+  confirm: () => void 
 }
 
-const CollectContactPage: React.FC<CollectContactPageProps> = ({reviewer, reviewerUuid }) => (
+const CollectContactPage: React.FC<CollectContactPageProps> = ({reviewer, reviewerUuid , confirm}) => (
   <Center mt={20}>
     <VStack justify="center" height="full">
       <Box padding="4" W="md">
@@ -18,6 +19,7 @@ const CollectContactPage: React.FC<CollectContactPageProps> = ({reviewer, review
         <ContactInfoCollect 
         reviewer={reviewer}
         reviewerUuid={reviewerUuid}
+        confirm={confirm}
         />
       </Box>
     </VStack>
diff --git a/src/components/survey/ContactInfoCollect.tsx b/src/components/survey/ContactInfoCollect.tsx
index c2f4f15..e9add68 100644
--- a/src/components/survey/ContactInfoCollect.tsx
+++ b/src/components/survey/ContactInfoCollect.tsx
@@ -21,6 +21,7 @@ export interface ContactFormValues {
 interface ContactFormProps {
   reviewer: Reviewer
   reviewerUuid: string | undefined
+  confirm: () => void 
 }
 
 const validateEmail = (value: string) => {
@@ -41,7 +42,7 @@ const validatePhoneNumber = (value: string) => {
   return error;
 };
 
-const ContactInfoCollect: React.FC<ContactFormProps> = ({reviewer, reviewerUuid }) => {
+const ContactInfoCollect: React.FC<ContactFormProps> = ({reviewer, reviewerUuid, confirm }) => {
   const [email, setEmail] = useState('');
   const [phoneNumber, setPhoneNumber] = useState('');
   const toast = useToast();
@@ -82,12 +83,8 @@ const ContactInfoCollect: React.FC<ContactFormProps> = ({reviewer, reviewerUuid
         phone: phoneNumber,
       }
       // TODO: Send email and phone number to the backend
-      apiClient.updateReviewer(updateReviewer)
-    }
-    else {
-      toast({
-        title: 'There was an error in updating contact information.',
-      });
+      await apiClient.updateReviewer(updateReviewer)
+      confirm()
     }
 
   };
diff --git a/src/components/survey/SurveyViewController.tsx b/src/components/survey/SurveyViewController.tsx
index 4adc050..39fcdcf 100644
--- a/src/components/survey/SurveyViewController.tsx
+++ b/src/components/survey/SurveyViewController.tsx
@@ -77,7 +77,9 @@ const SurveyViewController: React.FC<SurveyViewControllerProps> = ({
 {state.matches('provideContactInfo') && (
         <CollectContactPage 
         reviewerUuid = {reviewerUuid}
-        reviewer = {reviewer}/>
+        reviewer = {reviewer}
+        confirm={() => send('CONFIRM')}
+        />
       )}
 
       {state.matches('confirmAssignments') && (

From 783f7db6651816098aa821ddfb4b81b0e0889821 Mon Sep 17 00:00:00 2001
From: Dhivas Sugumar <dhivassugumar@gmail.com>
Date: Fri, 14 Apr 2023 14:29:29 -0400
Subject: [PATCH 8/8] Fixed eslint issues.

---
 src/api/apiClient.ts                           | 16 +++++++++++-----
 src/api/dtos/survey-assignment.dto.ts          |  2 +-
 src/components/survey/CollectContactPage.tsx   | 18 +++++++++---------
 src/components/survey/ContactInfoCollect.tsx   | 15 +++++++--------
 src/components/survey/SurveyViewController.tsx | 12 ++++++------
 5 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/src/api/apiClient.ts b/src/api/apiClient.ts
index 7808c51..185b639 100644
--- a/src/api/apiClient.ts
+++ b/src/api/apiClient.ts
@@ -2,7 +2,13 @@ import { Auth } from 'aws-amplify';
 import axios, { AxiosInstance } from 'axios';
 import { Letter } from './dtos/letter';
 import Role from './dtos/role';
-import { Response, Reviewer, Survey, SurveyData, surveysSchema } from './dtos/survey-assignment.dto';
+import {
+  Response,
+  Reviewer,
+  Survey,
+  SurveyData,
+  surveysSchema,
+} from './dtos/survey-assignment.dto';
 import User from './dtos/user.dto';
 
 const defaultBaseUrl = process.env.REACT_APP_API_BASE_URL ?? 'http://localhost:5000';
@@ -97,10 +103,10 @@ export class ApiClient {
     }) as Promise<Letter>;
   }
 
-  public async updateReviewer(reviewer : Reviewer) : Promise<Reviewer>  {
-      const {secondaryEmail, phone, reviewerUuid} = reviewer;
-      return this.patch(`/reviewer/${reviewerUuid}`, {secondaryEmail, phone})  as Promise<Reviewer>
-    }
+  public async updateReviewer(reviewer: Reviewer): Promise<Reviewer> {
+    const { secondaryEmail, phone, reviewerUuid } = reviewer;
+    return this.patch(`/reviewer/${reviewerUuid}`, { secondaryEmail, phone }) as Promise<Reviewer>;
+  }
 }
 
 export default new ApiClient();
diff --git a/src/api/dtos/survey-assignment.dto.ts b/src/api/dtos/survey-assignment.dto.ts
index 43a1ef2..49b5305 100644
--- a/src/api/dtos/survey-assignment.dto.ts
+++ b/src/api/dtos/survey-assignment.dto.ts
@@ -43,7 +43,7 @@ export interface Youth extends PersonInfo {
 }
 
 export interface Reviewer extends PersonInfo {
-  reviewerUuid: string
+  reviewerUuid: string;
   secondaryEmail: string;
   phone: string;
 }
diff --git a/src/components/survey/CollectContactPage.tsx b/src/components/survey/CollectContactPage.tsx
index d45fc5d..bbf60b1 100644
--- a/src/components/survey/CollectContactPage.tsx
+++ b/src/components/survey/CollectContactPage.tsx
@@ -4,23 +4,23 @@ import ContactInfoCollect from './ContactInfoCollect';
 import { Reviewer } from '../../api/dtos/survey-assignment.dto';
 
 interface CollectContactPageProps {
-  reviewer: Reviewer
-  reviewerUuid: string | undefined
-  confirm: () => void 
+  reviewer: Reviewer;
+  reviewerUuid: string | undefined;
+  confirm: () => void;
 }
 
-const CollectContactPage: React.FC<CollectContactPageProps> = ({reviewer, reviewerUuid , confirm}) => (
+const CollectContactPage: React.FC<CollectContactPageProps> = ({
+  reviewer,
+  reviewerUuid,
+  confirm,
+}) => (
   <Center mt={20}>
     <VStack justify="center" height="full">
       <Box padding="4" W="md">
         <Text fontWeight={600} mb={6}>
           Please provide additional contact information if you desire
         </Text>
-        <ContactInfoCollect 
-        reviewer={reviewer}
-        reviewerUuid={reviewerUuid}
-        confirm={confirm}
-        />
+        <ContactInfoCollect reviewer={reviewer} reviewerUuid={reviewerUuid} confirm={confirm} />
       </Box>
     </VStack>
   </Center>
diff --git a/src/components/survey/ContactInfoCollect.tsx b/src/components/survey/ContactInfoCollect.tsx
index e9add68..b9e4f33 100644
--- a/src/components/survey/ContactInfoCollect.tsx
+++ b/src/components/survey/ContactInfoCollect.tsx
@@ -19,9 +19,9 @@ export interface ContactFormValues {
 }
 
 interface ContactFormProps {
-  reviewer: Reviewer
-  reviewerUuid: string | undefined
-  confirm: () => void 
+  reviewer: Reviewer;
+  reviewerUuid: string | undefined;
+  confirm: () => void;
 }
 
 const validateEmail = (value: string) => {
@@ -42,7 +42,7 @@ const validatePhoneNumber = (value: string) => {
   return error;
 };
 
-const ContactInfoCollect: React.FC<ContactFormProps> = ({reviewer, reviewerUuid, confirm }) => {
+const ContactInfoCollect: React.FC<ContactFormProps> = ({ reviewer, reviewerUuid, confirm }) => {
   const [email, setEmail] = useState('');
   const [phoneNumber, setPhoneNumber] = useState('');
   const toast = useToast();
@@ -81,12 +81,11 @@ const ContactInfoCollect: React.FC<ContactFormProps> = ({reviewer, reviewerUuid,
         reviewerUuid,
         secondaryEmail: email,
         phone: phoneNumber,
-      }
+      };
       // TODO: Send email and phone number to the backend
-      await apiClient.updateReviewer(updateReviewer)
-      confirm()
+      await apiClient.updateReviewer(updateReviewer);
+      confirm();
     }
-
   };
 
   // eslint-disable-next-line no-alert
diff --git a/src/components/survey/SurveyViewController.tsx b/src/components/survey/SurveyViewController.tsx
index 39fcdcf..a27862f 100644
--- a/src/components/survey/SurveyViewController.tsx
+++ b/src/components/survey/SurveyViewController.tsx
@@ -16,7 +16,7 @@ import CollectContactPage from './CollectContactPage';
 
 interface SurveyViewControllerProps extends SurveyData {
   completeAssignment: (assignmentUuid: string, responses: Response[]) => Promise<void>;
-  reviewerUuid: string | undefined, 
+  reviewerUuid: string | undefined;
 }
 
 /**
@@ -74,11 +74,11 @@ const SurveyViewController: React.FC<SurveyViewControllerProps> = ({
         />
       )}
 
-{state.matches('provideContactInfo') && (
-        <CollectContactPage 
-        reviewerUuid = {reviewerUuid}
-        reviewer = {reviewer}
-        confirm={() => send('CONFIRM')}
+      {state.matches('provideContactInfo') && (
+        <CollectContactPage
+          reviewerUuid={reviewerUuid}
+          reviewer={reviewer}
+          confirm={() => send('CONFIRM')}
         />
       )}