(fix) appointment list does not handle location properly (#1021)

* Fix to appointment location interface to correctly represent rest response data * Gracefully handle missing appointment locations
openmrs · Mar 10, 2024 · 38a56ac · 38a56ac
1 parent d277bf4
commit 38a56ac
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/esm-appointments-app/src/home/appointments-base-table.component.tsx b/packages/esm-appointments-app/src/home/appointments-base-table.component.tsx
@@ -187,8 +187,8 @@ const AppointmentsBaseTable = () => {
       sortKey: appointment.patient.identifier,
     },
     location: {
-      content: <span className={styles.statusContainer}>{appointment.location.display}</span>,
-      sortKey: appointment.location,
+      content: <span className={styles.statusContainer}>{appointment.location?.name}</span>,
+      sortKey: appointment.location?.name,
     },
     service: {
       content: <span className={styles.serviceContainer}>{appointment.service.name}</span>,

diff --git a/packages/esm-appointments-app/src/types/index.ts b/packages/esm-appointments-app/src/types/index.ts
@@ -8,12 +8,17 @@ export enum SearchTypes {
   SCHEDULED_VISITS = 'scheduled-visits',
 }
 
+export interface AppointmentLocation {
+  uuid: string;
+  name: string;
+}
+
 export interface Appointment {
   appointmentKind: string;
   appointmentNumber: string;
   comments: string;
   endDateTime: Date | number | any;
-  location: OpenmrsResource;
+  location: AppointmentLocation;
   patient: {
     identifier: string;
     identifiers: Array<Identifier>;