From efb994055c0cb257d591eaaddcdc90f7b8496f63 Mon Sep 17 00:00:00 2001
From: divija-zemoso <divija.amaram@zemosolabs.com>
Date: Fri, 30 Sep 2022 14:36:10 +0530
Subject: [PATCH] added error messages

---
 src/patients/search/ViewPatients.tsx          |  2 +-
 src/patients/visits/FilterPatientModal.tsx    |  2 ++
 .../appointments/AppointmentDetailForm.tsx    |  2 +-
 .../appointments/edit/EditAppointment.tsx     |  2 ++
 .../appointments/new/NewAppointment.tsx       | 24 ++++++++++---------
 .../appointments/service/Appointments.tsx     | 11 +++++++--
 .../appointments/view/ViewAppointment.tsx     |  2 ++
 7 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/src/patients/search/ViewPatients.tsx b/src/patients/search/ViewPatients.tsx
index d659a0339b..d9dc221616 100644
--- a/src/patients/search/ViewPatients.tsx
+++ b/src/patients/search/ViewPatients.tsx
@@ -1,7 +1,7 @@
 import { Button } from '@hospitalrun/components'
 import React, { useEffect } from 'react'
 import { useDispatch } from 'react-redux'
-import { useHistory } from 'react-router'
+import { useHistory } from 'react-router-dom'
 
 import useAddBreadcrumbs from '../../page-header/breadcrumbs/useAddBreadcrumbs'
 import { useButtonToolbarSetter } from '../../page-header/button-toolbar/ButtonBarProvider'
diff --git a/src/patients/visits/FilterPatientModal.tsx b/src/patients/visits/FilterPatientModal.tsx
index 9ab199cbe6..44775f58dd 100644
--- a/src/patients/visits/FilterPatientModal.tsx
+++ b/src/patients/visits/FilterPatientModal.tsx
@@ -40,6 +40,7 @@ const FilterPatientModal = ({ show, onCloseButtonClick, onFieldChange }: Props)
           <Label text={t('scheduling.appointment.type')} title="type" />
           <Select
             id="type"
+            defaultSelected={appointmentTypes.filter(({ value }) => value === appointmentType)}
             options={appointmentTypes}
             onChange={(values) => setappointmentType(values[0])}
           />
@@ -47,6 +48,7 @@ const FilterPatientModal = ({ show, onCloseButtonClick, onFieldChange }: Props)
         <div className="form-group">
           <Label text="Status" title="Status" />
           <Select
+            defaultSelected={appointmentStatus.filter(({ value }) => value == patientStatus)}
             id="status"
             options={appointmentStatus}
             onChange={(values) => setPatientStatus(values[0])}
diff --git a/src/scheduling/appointments/AppointmentDetailForm.tsx b/src/scheduling/appointments/AppointmentDetailForm.tsx
index f280612150..d0a92acd51 100644
--- a/src/scheduling/appointments/AppointmentDetailForm.tsx
+++ b/src/scheduling/appointments/AppointmentDetailForm.tsx
@@ -76,7 +76,7 @@ const AppointmentDetailForm = (props: Props) => {
             />
             <AsyncTypeahead
               id="patientTypeahead"
-              disabled={!isEditable}
+              disabled={!isEditable || patient !== undefined}
               defaultInputValue={patient ? String(patient) : ''}
               placeholder={t('scheduling.appointment.patient')}
               onChange={(p: any) => {
diff --git a/src/scheduling/appointments/edit/EditAppointment.tsx b/src/scheduling/appointments/edit/EditAppointment.tsx
index 93d193a270..080b8feaa8 100644
--- a/src/scheduling/appointments/edit/EditAppointment.tsx
+++ b/src/scheduling/appointments/edit/EditAppointment.tsx
@@ -82,6 +82,8 @@ const EditAppointment = () => {
       console.log('updated the values successfully')
       Toast('success', t('states.success'), t('scheduling.appointment.successfullyUpdated'))
       history.push(`/appointments/${id}`)
+    } else {
+      Toast('error', t('states.error'), 'Could not edit appointment')
     }
   }
 
diff --git a/src/scheduling/appointments/new/NewAppointment.tsx b/src/scheduling/appointments/new/NewAppointment.tsx
index 56faab2d5b..4b72a46dcf 100644
--- a/src/scheduling/appointments/new/NewAppointment.tsx
+++ b/src/scheduling/appointments/new/NewAppointment.tsx
@@ -1,6 +1,6 @@
 // import { Button, Spinner, Toast } from '@hospitalrun/components'
 import { Button, Spinner, Toast } from '@hospitalrun/components'
-import isEmpty from 'lodash/isEmpty'
+// import isEmpty from 'lodash/isEmpty'
 // import addMinutes from 'date-fns/addMinutes'
 // import roundToNearestMinutes from 'date-fns/roundToNearestMinutes'
 // import isEmpty from 'lodash/isEmpty'
@@ -71,7 +71,9 @@ const NewAppointment = () => {
     let { id, status } = await createAppointment(newAppointment)
     console.log('id: ' + id + ' ' + 'status: ' + status)
     setAptId(id)
-    if (status === 'success') setSaved(true)
+    status === 'success'
+      ? setSaved(true)
+      : Toast('error', t('states.error'), t('scheduling.appointment.errors.createAppointmentError'))
     setError(validateNewAppointment(newAppointment))
   }
 
@@ -82,16 +84,16 @@ const NewAppointment = () => {
   useEffect(() => {
     // if save click and no error proceed, else give error message.
     if (saved) {
-      if (isEmpty(newAppointmentMutateError) && !isErrorNewAppointment) {
-        newAppointmentMutate(newAppointment).then((_result) => {
-          Toast('success', t('states.success'), t('scheduling.appointment.successfullyCreated'))
-          console.log(aptId)
-          history.push(`/appointments/${aptId}`)
-        })
-      } else if (!isEmpty(newAppointmentMutateError)) {
-        newAppointmentMutateError.message = 'scheduling.appointment.errors.createAppointmentError'
-      }
+      newAppointmentMutate(newAppointment).then((_result) => {
+        Toast('success', t('states.success'), t('scheduling.appointment.successfullyCreated'))
+        console.log(aptId)
+        history.push(`/appointments/${aptId}`)
+      })
     }
+    // else {
+    //   Toast('error', t('states.error'), t('scheduling.appointment.errors.createAppointmentError'))
+    //   // newAppointmentMutateError.message = 'scheduling.appointment.errors.createAppointmentError'
+    // }
     setSaved(false)
   }, [
     saved,
diff --git a/src/scheduling/appointments/service/Appointments.tsx b/src/scheduling/appointments/service/Appointments.tsx
index 0ebafc5c51..c57dda8725 100644
--- a/src/scheduling/appointments/service/Appointments.tsx
+++ b/src/scheduling/appointments/service/Appointments.tsx
@@ -57,7 +57,7 @@ export const createAppointment = (appointment: Appointment) => {
       participant: [
         {
           actor: {
-            reference: `Patient/140919926030337`,
+            reference: `Patient/${appointment.patientId}`,
           },
         },
         {
@@ -125,6 +125,7 @@ export const createAppointment = (appointment: Appointment) => {
     })
     .catch((error) => {
       console.log(error)
+      return { id: 404, status: 'error' }
     })
 }
 
@@ -142,7 +143,11 @@ export const updateAppointment = (appointment: Appointment) => {
       participant: [
         {
           actor: {
-            reference: `Patient/${appointment?.participant[0].actor.reference.substring(8)}`,
+            reference: `Patient/${
+              appointment.patientId
+                ? appointment.patientId
+                : appointment?.participant[0].actor.reference.substring(8)
+            }`,
           },
         },
         {
@@ -211,6 +216,7 @@ export const updateAppointment = (appointment: Appointment) => {
     })
     .catch((error) => {
       console.log(error)
+      return { id: 404, status: 'error' }
     })
 }
 
@@ -223,5 +229,6 @@ export const deleteAppointment = (id: number) => {
     })
     .catch((error) => {
       console.log(error)
+      return 'error'
     })
 }
diff --git a/src/scheduling/appointments/view/ViewAppointment.tsx b/src/scheduling/appointments/view/ViewAppointment.tsx
index dd5e8b9134..947ded3065 100644
--- a/src/scheduling/appointments/view/ViewAppointment.tsx
+++ b/src/scheduling/appointments/view/ViewAppointment.tsx
@@ -98,6 +98,8 @@ const ViewAppointment = () => {
     if (status === 'success') {
       history.push('/appointments')
       Toast('success', t('states.success'), t('scheduling.appointment.successfullyDeleted'))
+    } else {
+      Toast('error', t('states.error'), 'Could not delete appointment')
     }
 
     setShowDeleteConfirmation(false)