(fix) Pass patient object to banner actions menu

packages/esm-patient-search-app/src/compact-patient-search/compact-patient-banner.component.tsx

@@ -14,6 +14,7 @@ import { useTranslation } from 'react-i18next';
 import { PatientSearchContext } from '../patient-search-context';
 import type { FHIRIdentifier, FHIRPatientType, Identifier, SearchedPatient } from '../types';
 import styles from './compact-patient-banner.scss';
+import { toFhirPatient } from './compact-patient-search.resource';
 
 interface ClickablePatientContainerProps {
   patient: SearchedPatient;
@@ -56,43 +57,12 @@ const CompactPatientBanner = forwardRef<HTMLDivElement, CompactPatientBannerProp
     }
   };
 
+  // TODO: If/When the online patient search is migrated to the FHIR API at some point, this could
+  // be removed. In fact, it could maybe be done at this point already, but doing it when the
+  // search returns FHIR objects is much simpler because the code which uses the `fhirPatients`
+  // doesn't have to be touched then.
   const fhirPatients: Array<FHIRPatientType> = useMemo(() => {
-    // TODO: If/When the online patient search is migrated to the FHIR API at some point, this could
-    // be removed. In fact, it could maybe be done at this point already, but doing it when the
-    // search returns FHIR objects is much simpler because the code which uses the `fhirPatients`
-    // doesn't have to be touched then.
-    return patients.map((patient) => {
-      const preferredAddress = patient.person.addresses?.find((address) => address.preferred);
-      return {
-        id: patient.uuid,
-        name: [
-          {
-            id: String(Math.random()), // not used
-            given: [patient.person.personName.givenName, patient.person.personName.middleName],
-            family: patient.person.personName.familyName,
-            text: patient.person.personName.display,
-          },
-        ],
-        gender: patient.person.gender,
-        birthDate: patient.person.birthdate,
-        deceasedDateTime: patient.person.deathDate,
-        deceasedBoolean: patient.person.dead,
-        identifier: patient.identifiers as unknown as Array<FHIRIdentifier>,
-        address: preferredAddress
-          ? [
-              {
-                id: String(Math.random()), // not used
-                city: preferredAddress.cityVillage,
-                country: preferredAddress.country,
-                postalCode: preferredAddress.postalCode,
-                state: preferredAddress.stateProvince,
-                use: 'home',
-              },
-            ]
-          : [],
-        telecom: patient.attributes?.filter((attribute) => attribute.attributeType.display == 'Telephone Number'),
-      };
-    });
+    return patients.map(toFhirPatient);
   }, [patients]);
 
   return (
@@ -109,7 +79,7 @@ const CompactPatientBanner = forwardRef<HTMLDivElement, CompactPatientBannerProp
           ? [preferredIdentifier, ...configuredIdentifiers]
           : configuredIdentifiers;
 
-        const patientName = getPatientName(patient);
+        const patientName = getPatientName(patient as fhir.Patient);
 
         return (
           <ClickablePatientContainer key={patient.id} patient={patients[index]}>

packages/esm-patient-search-app/src/compact-patient-search/compact-patient-search.resource.ts

@@ -0,0 +1,34 @@
+import { type FHIRIdentifier, type FHIRPatientType, type SearchedPatient } from '../types';
+
+export function toFhirPatient(patient: SearchedPatient): FHIRPatientType {
+  const preferredAddress = patient.person.addresses?.find((address) => address.preferred);
+  return {
+    id: patient.uuid,
+    name: [
+      {
+        id: String(Math.random()), // not used
+        given: [patient.person.personName.givenName, patient.person.personName.middleName],
+        family: patient.person.personName.familyName,
+        text: patient.person.personName.display,
+      },
+    ],
+    gender: patient.person.gender,
+    birthDate: patient.person.birthdate,
+    deceasedDateTime: patient.person.deathDate,
+    deceasedBoolean: patient.person.dead,
+    identifier: patient.identifiers as unknown as Array<FHIRIdentifier>,
+    address: preferredAddress
+      ? [
+          {
+            id: String(Math.random()), // not used
+            city: preferredAddress.cityVillage,
+            country: preferredAddress.country,
+            postalCode: preferredAddress.postalCode,
+            state: preferredAddress.stateProvince,
+            use: 'home',
+          },
+        ]
+      : [],
+    telecom: patient.attributes?.filter((attribute) => attribute.attributeType.display == 'Telephone Number'),
+  };
+}

packages/esm-patient-search-app/src/patient-search-page/patient-banner/banner/patient-banner.component.tsx

@@ -18,6 +18,7 @@ import {
 import { type SearchedPatient } from '../../../types';
 import styles from './patient-banner.scss';
 import { PatientSearchContext } from '../../../patient-search-context';
+import { toFhirPatient } from '../../../compact-patient-search/compact-patient-search.resource';
 
 interface PatientBannerProps {
   patient: SearchedPatient;
@@ -57,9 +58,7 @@ const PatientBanner: React.FC<PatientBannerProps> = ({ patient, patientUuid, hid
   const isDeceased = !!patient.person.deathDate;
 
   const fhirPatient = React.useMemo(() => {
-    return {
-      deceasedDateTime: patient.person.deathDate,
-    };
+    return toFhirPatient(patient);
   }, [patient]);
 
   return (
@@ -109,6 +108,7 @@ const PatientBanner: React.FC<PatientBannerProps> = ({ patient, patientUuid, hid
           {!hideActionsOverflow ? (
             <PatientBannerActionsMenu
               patientUuid={patientUuid}
+              patient={fhirPatient as fhir.Patient}
               actionsSlotName={'patient-search-actions-slot'}
               additionalActionsSlotState={{
                 selectPatientAction: nonNavigationSelectPatientAction,

packages/esm-patient-search-app/src/types/index.ts

@@ -55,6 +55,7 @@ export interface FHIRPatientType {
     postalCode: string;
     country: string;
   }>;
+  telecom: object;
 }
 
 export interface FHIRIdentifier {