@openmrs/esm-patient-search-app 9.2.1-pre.6809 → 9.2.1-pre.6821

package/dist/openmrs-esm-patient-search-app.js.buildmanifest.json

@@ -45,7 +45,7 @@
       "auxiliaryFiles": [
         "384.js.map"
       ],
-      "hash": "c6692c99d3244011",
+      "hash": "fc3e281f24fda75a",
       "childrenByOrder": {}
     },
     {
@@ -207,9 +207,9 @@
       "entry": false,
       "recorded": false,
       "reason": "reused as split chunk (cache group: default)",
-      "size": 318869,
+      "size": 318958,
       "sizes": {
-        "javascript": 318869
+        "javascript": 318958
       },
       "names": [],
       "idHints": [],
@@ -223,7 +223,7 @@
       "auxiliaryFiles": [
         "1804.js.map"
       ],
-      "hash": "6bbc8988446a20a1",
+      "hash": "19a6603ae4bf8060",
       "childrenByOrder": {}
     },
     {
@@ -497,9 +497,9 @@
       "entry": false,
       "recorded": false,
       "reason": "split chunk (cache group: default)",
-      "size": 61186,
+      "size": 61053,
       "sizes": {
-        "javascript": 61186
+        "javascript": 61053
       },
       "names": [],
       "idHints": [],
@@ -513,7 +513,7 @@
       "auxiliaryFiles": [
         "3842.js.map"
       ],
-      "hash": "c5bf184ded9471e1",
+      "hash": "efd8a415e4bba98e",
       "childrenByOrder": {}
     },
     {
@@ -862,7 +862,7 @@
       "auxiliaryFiles": [
         "4946.js.map"
       ],
-      "hash": "82469e4e29029447",
+      "hash": "0f7d3695e27f10ce",
       "childrenByOrder": {}
     },
     {

package/dist/routes.json

@@ -1 +1 @@
-{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"pages":[{"component":"root","route":"search"}],"extensions":[{"name":"patient-search-icon","component":"patientSearchIcon","slot":"top-nav-actions-slot","order":10},{"name":"patient-search-button","component":"patientSearchButton","slot":"patient-search-button-slot","offline":true},{"name":"patient-search-bar","component":"patientSearchBar","slot":"patient-search-bar-slot","offline":true}],"workspaces":[{"component":"patientSearchWorkspace","groups":["ward-patient-admission-requests"],"name":"patient-search-workspace","title":"searchPatient","type":"patient-search-workspace","width":"narrow"}],"version":"9.2.1-pre.6809"}
+{"$schema":"https://json.openmrs.org/routes.schema.json","backendDependencies":{"webservices.rest":"^2.2.0"},"pages":[{"component":"root","route":"search"}],"extensions":[{"name":"patient-search-icon","component":"patientSearchIcon","slot":"top-nav-actions-slot","order":10},{"name":"patient-search-button","component":"patientSearchButton","slot":"patient-search-button-slot","offline":true},{"name":"patient-search-bar","component":"patientSearchBar","slot":"patient-search-bar-slot","offline":true}],"workspaces":[{"component":"patientSearchWorkspace","groups":["ward-patient-admission-requests"],"name":"patient-search-workspace","title":"searchPatient","type":"patient-search-workspace","width":"narrow"}],"version":"9.2.1-pre.6821"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-patient-search-app",
-  "version": "9.2.1-pre.6809",
+  "version": "9.2.1-pre.6821",
   "description": "Patient search microfrontend for O3",
   "browser": "dist/openmrs-esm-patient-search-app.js",
   "main": "src/index.ts",

package/src/compact-patient-search/compact-patient-banner.component.tsx

@@ -16,7 +16,7 @@ import styles from './compact-patient-banner.scss';
 
 interface ClickablePatientContainerProps {
   children: React.ReactNode;
-  patient: SearchedPatient;
+  patient: fhir.Patient;
 }
 
 interface CompactPatientBannerProps {
@@ -28,21 +28,18 @@ const CompactPatientBanner = forwardRef<HTMLDivElement, CompactPatientBannerProp
     return patients.map(mapToFhirPatient);
   }, [patients]);
 
-  const renderPatient = useCallback(
-    (patient: fhir.Patient, index: number) => {
-      const patientName = getPatientName(patient);
+  const renderPatient = useCallback((patient: fhir.Patient) => {
+    const patientName = getPatientName(patient);
 
-      return (
-        <ClickablePatientContainer key={patient.id} patient={patients[index]}>
-          <div className={styles.patientAvatar} role="img">
-            <PatientPhoto patientUuid={patient.id} patientName={patientName} />
-          </div>
-          <PatientBannerPatientInfo patient={patient} />
-        </ClickablePatientContainer>
-      );
-    },
-    [patients],
-  );
+    return (
+      <ClickablePatientContainer key={patient.id} patient={patient}>
+        <div className={styles.patientAvatar} role="img">
+          <PatientPhoto patientUuid={patient.id} patientName={patientName} />
+        </div>
+        <PatientBannerPatientInfo patient={patient} />
+      </ClickablePatientContainer>
+    );
+  }, []);
 
   return <div ref={ref}>{fhirMappedPatients.map(renderPatient)}</div>;
 });
@@ -50,7 +47,7 @@ const CompactPatientBanner = forwardRef<HTMLDivElement, CompactPatientBannerProp
 const ClickablePatientContainer = ({ patient, children }: ClickablePatientContainerProps) => {
   const { nonNavigationSelectPatientAction, patientClickSideEffect } = usePatientSearchContext();
   const config = useConfig<PatientSearchConfig>();
-  const isDeceased = Boolean(patient?.person?.deathDate);
+  const isDeceased = Boolean(patient?.deceasedDateTime);
 
   if (nonNavigationSelectPatientAction) {
     return (
@@ -58,10 +55,10 @@ const ClickablePatientContainer = ({ patient, children }: ClickablePatientContai
         className={classNames(styles.patientSearchResult, styles.patientSearchResultButton, {
           [styles.deceased]: isDeceased,
         })}
-        key={patient.uuid}
+        key={patient.id}
         onClick={() => {
-          nonNavigationSelectPatientAction(patient.uuid);
-          patientClickSideEffect?.(patient.uuid);
+          nonNavigationSelectPatientAction(patient.id, patient);
+          patientClickSideEffect?.(patient.id, patient);
         }}>
         {children}
       </button>
@@ -73,10 +70,10 @@ const ClickablePatientContainer = ({ patient, children }: ClickablePatientContai
       className={classNames(styles.patientSearchResult, {
         [styles.deceased]: isDeceased,
       })}
-      key={patient.uuid}
-      onBeforeNavigate={() => patientClickSideEffect?.(patient.uuid)}
+      key={patient.id}
+      onBeforeNavigate={() => patientClickSideEffect?.(patient.id, patient)}
       to={interpolateString(config.search.patientChartUrl, {
-        patientUuid: patient.uuid,
+        patientUuid: patient.id,
       })}>
       {children}
     </ConfigurableLink>

package/src/patient-search-button/patient-search-button.component.tsx

@@ -13,7 +13,7 @@ interface PatientSearchButtonProps {
   isOpen?: boolean;
   searchQuery?: string;
   searchQueryUpdatedAction?: (query: string) => {};
-  selectPatientAction?: (patientUuid: string) => {};
+  selectPatientAction?: (patientUuid: string, patient: fhir.Patient) => {};
   showPatientSearch?: () => void;
   workspaceTitle?: string;
 }

package/src/patient-search-context.ts

@@ -6,13 +6,13 @@ export interface PatientSearchContextProps {
    * dashboard. If null/undefined, patient results will be links to the
    * patient dashboard.
    */
-  nonNavigationSelectPatientAction?: (patientUuid: string) => void;
+  nonNavigationSelectPatientAction?: (patientUuid: string, patient: fhir.Patient) => void;
   /**
    * A function to execute when the user clicks on a patient result. Will
    * be executed whether or not nonNavigationSelectPatientAction is defined,
    * just before navigation (or after nonNavigationSelectPatientAction is called).
    */
-  patientClickSideEffect?: ((patientUuid: string) => void) | (() => void);
+  patientClickSideEffect?: ((patientUuid: string, patient: fhir.Patient) => void) | (() => void);
   handleReturnToSearchList?: () => void;
   showPatientSearch?: () => void;
   hidePatientSearch?: () => void;

package/src/patient-search-page/patient-banner/banner/patient-banner.component.tsx

@@ -21,7 +21,7 @@ import styles from './patient-banner.scss';
 
 interface ClickablePatientContainerProps {
   children: React.ReactNode;
-  patientUuid: string;
+  patient: fhir.Patient;
 }
 
 interface PatientBannerProps {
@@ -56,7 +56,7 @@ const PatientBanner: React.FC<PatientBannerProps> = ({ patient, patientUuid, hid
           [styles.activePatientContainer]: !isDeceased,
         })}
         role="banner">
-        <ClickablePatientContainer patientUuid={patientUuid}>
+        <ClickablePatientContainer patient={fhirMappedPatient}>
           <div className={styles.patientAvatar} role="img">
             <PatientPhoto patientUuid={patientUuid} patientName={patientName} />
           </div>
@@ -109,18 +109,19 @@ const PatientBanner: React.FC<PatientBannerProps> = ({ patient, patientUuid, hid
   );
 };
 
-const ClickablePatientContainer = ({ patientUuid, children }: ClickablePatientContainerProps) => {
+const ClickablePatientContainer = ({ patient, children }: ClickablePatientContainerProps) => {
   const { nonNavigationSelectPatientAction, patientClickSideEffect } = usePatientSearchContext();
   const config = useConfig<PatientSearchConfig>();
+  const patientUuid = patient.id;
 
   const handleClick = useCallback(() => {
-    nonNavigationSelectPatientAction(patientUuid);
-    patientClickSideEffect?.(patientUuid);
-  }, [nonNavigationSelectPatientAction, patientClickSideEffect, patientUuid]);
+    nonNavigationSelectPatientAction(patientUuid, patient);
+    patientClickSideEffect?.(patientUuid, patient);
+  }, [nonNavigationSelectPatientAction, patientClickSideEffect, patientUuid, patient]);
 
   const handleBeforeNavigate = useCallback(() => {
-    patientClickSideEffect?.(patientUuid);
-  }, [patientClickSideEffect, patientUuid]);
+    patientClickSideEffect?.(patientUuid, patient);
+  }, [patientClickSideEffect, patientUuid, patient]);
 
   if (nonNavigationSelectPatientAction) {
     return (