[Release] Version 0.0.1 (#243)

* [Fix] Fix replacement application expiry date ([Fix] Fix replacement application expiry date #242)
* [Feature] Build privacy policy and terms and conditions pages ([Feature] Build privacy policy and terms and conditions pages #241)
* [Improvement] Add error logging, improve error handling ([Improvement] Add error logging, improve error handling #240)
* [Fix] Convert patient condition field to checkbox field ([Fix] Convert patient condition field to checkbox field #239)
* [Feature] Add date of birth filter to permit holders page ([Feature] Add date of birth filter to permit holders page #238)
* [Fix] Prevent RCD email from breaking into two lines ([Fix] Prevent RCD email from breaking into two lines #237)
* [Fix] Various bug fixes ([Fix] Various bug fixes #236)

Author: OustanDing

components/admin/permit-holders/Typeahead.tsx

@@ -1,4 +1,4 @@
-import { useQuery } from '@apollo/client'; // Apollo
+import { useQuery } from '@tools/hooks/graphql'; // Apollo
 import { Text } from '@chakra-ui/react'; //Chakra UI
 import Typeahead from '@components/Typeahead'; // Typeahead component
 import { formatFullName } from '@lib/utils/format'; // String formatter util

components/admin/permit-holders/additional-notes/Modal.tsx

@@ -1,4 +1,5 @@
-import { useMutation } from '@apollo/client';
+// import { useMutation } from '@tools/hooks/graphql';
+import { useMutation } from '@tools/hooks/graphql';
 import {
   Button,
   Modal,
@@ -9,7 +10,6 @@ import {
   ModalOverlay,
   Textarea,
   Text,
-  useToast,
 } from '@chakra-ui/react';
 import {
   UpdateApplicantNotesRequest,
@@ -39,20 +39,8 @@ const AdditionalNotesModal: FC<Props> = ({
     setNotes(notesInput);
   }, [isOpen, notesInput]);
 
-  const toast = useToast();
-
-  const [updateApplicantNotes, { loading: submitting }] = useMutation<
-    UpdateApplicantNotesResponse,
-    UpdateApplicantNotesRequest
-  >(UPDATE_APPLICANT_NOTES, {
-    onError: error => {
-      toast({
-        status: 'error',
-        description: error.message,
-        isClosable: true,
-      });
-    },
-  });
+  const [updateApplicantNotes, { loading: submitting }] =
+    useMutation<UpdateApplicantNotesResponse, UpdateApplicantNotesRequest>(UPDATE_APPLICANT_NOTES);
 
   const handleSave = async () => {
     await updateApplicantNotes({ variables: { input: { id: applicantId, notes } } });

components/admin/permit-holders/current-application/Card/MedicalInformationSection.tsx

@@ -37,15 +37,22 @@ const MedicalInformationSection: FC<Props> = ({ medicalInformation }) => {
             <Text as="p" textStyle="body-regular">
               {disability}
             </Text>
-            <Badge bgColor="background.informative">{titlecase(patientCondition as string)}</Badge>
+
+            {patientCondition !== null
+              ? patientCondition.map(condition => (
+                  <Badge key={condition} bgColor="background.informative">
+                    {titlecase(condition)}
+                  </Badge>
+                ))
+              : 'N/A'}
           </HStack>
         </GridItem>
-        {patientCondition === 'OTHER' && (
+        {patientCondition?.includes('OTHER') && (
           <>
             {/* Condition description */}
             <GridItem>
               <Text as="p" textStyle="body-regular">
-                Condition description
+                Other condition description
               </Text>
             </GridItem>
             <GridItem>

components/admin/permit-holders/doctor-information/Card.tsx

@@ -1,8 +1,8 @@
-import { Text, Divider, VStack, Button, Flex, useToast } from '@chakra-ui/react'; // Chakra UI
+import { Text, Divider, VStack, Button, Flex } from '@chakra-ui/react'; // Chakra UI
 import PermitHolderInfoCard from '@components/admin/LayoutCard'; // Custom Card Component
 import EditDoctorInformationModal from '@components/admin/requests/doctor-information/EditModal'; // Edit doctor information modal component
 import PreviousDoctorsModal from '@components/admin/permit-holders/doctor-information/PreviousDoctorsModal'; // Previous Doctors' Information Modal
-import { useMutation, useQuery } from '@apollo/client';
+import { useMutation, useQuery } from '@tools/hooks/graphql';
 import {
   DoctorFormData,
   GetDoctorInformationRequest,
@@ -31,27 +31,17 @@ type DoctorInformationProps = {
 export default function DoctorInformationCard(props: DoctorInformationProps) {
   const { applicantId, isUpdated } = props;
 
-  const toast = useToast();
-
   const { data, refetch } = useQuery<GetDoctorInformationResponse, GetDoctorInformationRequest>(
     GET_DOCTOR_INFORMATION,
     {
       variables: { id: applicantId },
     }
   );
 
-  const [updateDoctorInformation] = useMutation<
-    UpdateDoctorInformationResponse,
-    UpdateDoctorInformationRequest
-  >(UPDATE_DOCTOR_INFORMATION, {
-    onError: error => {
-      toast({
-        status: 'error',
-        description: error.message,
-        isClosable: true,
-      });
-    },
-  });
+  const [updateDoctorInformation] =
+    useMutation<UpdateDoctorInformationResponse, UpdateDoctorInformationRequest>(
+      UPDATE_DOCTOR_INFORMATION
+    );
   const handleSave = async (doctorFormData: DoctorFormData) => {
     const validatedData = await requestPhysicianInformationSchema.validate(doctorFormData);
 

components/admin/permit-holders/guardian-information/Card.tsx

@@ -1,4 +1,4 @@
-import { useMutation } from '@apollo/client';
+import { useMutation } from '@tools/hooks/graphql';
 import { Button, Divider, VStack, Link as FileLink } from '@chakra-ui/react';
 import PermitHolderInfoCard from '@components/admin/LayoutCard';
 import {

components/admin/permit-holders/medical-history/Modal.tsx

@@ -18,6 +18,7 @@ import { ReactNode } from 'react'; // React
 import { MobilityAid } from '@lib/graphql/types'; // Application type & Aid enum
 import { formatDate } from '@lib/utils/date'; // Date formatter util
 import { MedicalHistoryRow } from '@tools/admin/permit-holders/medical-history';
+import { titlecase } from '@tools/string';
 
 type MedicalHistoryModalProps = {
   details: MedicalHistoryRow['details'];
@@ -65,9 +66,15 @@ export default function MedicalHistoryModal(props: MedicalHistoryModalProps) {
             </Text>
           </ModalHeader>
           <ModalBody paddingTop="0px" paddingBottom="36px" paddingX="4px">
-            <Badge display="inline-block" backgroundColor="background.informative">
-              {patientCondition}
-            </Badge>
+            {patientCondition.map(condition => (
+              <Badge
+                key={condition}
+                display="inline-block"
+                backgroundColor="background.informative"
+              >
+                {titlecase(condition)}
+              </Badge>
+            ))}
             <Divider my="24px" />
             <Box>
               <Text as="h3" textStyle="heading" paddingBottom="20px">

components/admin/permit-holders/permit-holder-information/Card.tsx

@@ -23,9 +23,10 @@ import {
   UpdateApplicantGeneralInformationResponse,
   UPDATE_APPLICANT_GENERAL_INFORMATION_MUTATION,
 } from '@tools/admin/permit-holders/permit-holder-information';
-import { useMutation, useQuery } from '@apollo/client';
+import { useMutation, useQuery } from '@tools/hooks/graphql';
 import Address from '@components/admin/Address';
 import { permitHolderInformationSchema } from '@lib/applicants/validation';
+import { titlecase } from '@tools/string';
 
 type PersonalInformationProps = {
   readonly applicantId: number;
@@ -138,7 +139,7 @@ export default function PermitHolderInformationCard(props: PersonalInformationPr
             Date of Birth: {formatDateYYYYMMDD(new Date(dateOfBirth))}
           </Text>
           <Text as="p" textStyle="body-regular">
-            Gender: {gender === 'OTHER' ? otherGender : gender}
+            Gender: {gender === 'OTHER' ? otherGender : titlecase(gender)}
           </Text>
         </VStack>
 

components/admin/permit-holders/reports/GenerateModal.tsx

@@ -20,7 +20,7 @@ import {
 } from '@chakra-ui/react'; // Chakra UI
 import { DownloadIcon } from '@chakra-ui/icons';
 import { GenerateReportStep, PERMIT_HOLDERS_COLUMNS } from '@tools/admin/reports'; //GenerateReportStep enum
-import { useLazyQuery } from '@apollo/client';
+import { useLazyQuery } from '@tools/hooks/graphql';
 import {
   GENERATE_PERMIT_HOLDERS_REPORT_QUERY,
   GeneratePermitHoldersReportRequest,
@@ -92,12 +92,6 @@ export default function GenerateReportModal(props: Props) {
         });
       }
     },
-    onError: error => {
-      toast({
-        status: 'error',
-        description: error.message,
-      });
-    },
   });
 
   /**

components/admin/permit-holders/table/ConfirmSetActiveModal.tsx

@@ -9,7 +9,7 @@ import {
   Button,
   useToast,
 } from '@chakra-ui/react'; // Chakra UI
-import { useMutation } from '@apollo/client';
+import { useMutation } from '@tools/hooks/graphql';
 import {
   SetApplicantAsActiveRequest,
   SetApplicantAsActiveResponse,
@@ -46,12 +46,6 @@ export default function SetPermitHolderToActiveModal(props: Props) {
         });
       }
     },
-    onError: error => {
-      toast({
-        status: 'error',
-        description: error.message,
-      });
-    },
   });
 
   // Sets permit holder status to active and closes modal

components/admin/permit-holders/table/ConfirmSetInactiveModal.tsx

@@ -13,7 +13,7 @@ import {
   Textarea,
   useToast,
 } from '@chakra-ui/react'; // Chakra UI
-import { useMutation } from '@apollo/client';
+import { useMutation } from '@tools/hooks/graphql';
 import {
   SetApplicantAsInactiveRequest,
   SetApplicantAsInactiveResponse,
@@ -55,12 +55,6 @@ export default function SetPermitHolderToInactiveModal({
         });
       }
     },
-    onError: error => {
-      toast({
-        status: 'error',
-        description: error.message,
-      });
-    },
   });
   // Close modal handler
   const handleClose = () => {