(fix) O3-3902 - make age() function (and its usage) handle null birth… (

#1306)
openmrs · Sep 3, 2024 · 2543e1b · 2543e1b
1 parent 04c991e
commit 2543e1b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/...ent-search-app/src/patient-search-page/patient-banner/banner/patient-banner.component.tsx b/...ent-search-app/src/patient-search-page/patient-banner/banner/patient-banner.component.tsx
@@ -86,8 +86,13 @@ const PatientBanner: React.FC<PatientBannerProps> = ({ patient, patientUuid, hid
               />
             </div>
             <div className={styles.demographics}>
-              <span>{getGender(patient.person.gender)}</span> &middot; <span>{age(patient.person.birthdate)}</span>{' '}
-              &middot; <span>{formatDate(parseDate(patient.person.birthdate), { mode: 'wide', time: false })}</span>
+              <span>{getGender(patient.person.gender)}</span>
+              {patient.person.birthdate && (
+                <>
+                  &middot; <span>{age(patient.person.birthdate)}</span> &middot;{' '}
+                  <span>{formatDate(parseDate(patient.person.birthdate), { mode: 'wide', time: false })}</span>
+                </>
+              )}
             </div>
             <div>
               <div className={styles.identifiers}>

diff --git a/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-age.tsx b/packages/esm-ward-app/src/ward-patient-card/row-elements/ward-patient-age.tsx
@@ -6,7 +6,7 @@ export interface WardPatientAgeProps {
 }
 
 const WardPatientAge: React.FC<WardPatientAgeProps> = ({ patient }) => {
-  return <div>{age(patient.person?.birthdate)}</div>;
+  return patient.person?.birthdate ? <div>{age(patient.person.birthdate)}</div> : null;
 };
 
 export default WardPatientAge;
diff --git a/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.workspace.tsx b/packages/esm-ward-app/src/ward-workspace/patient-details/ward-patient.workspace.tsx
@@ -45,7 +45,9 @@ const PatientWorkspaceTitle: React.FC<WardPatientWorkspaceViewProps> = ({ patien
     <>
       <div>{patient.person.display} &nbsp;</div>
       <div className={styles.headerPatientDetail}>&middot; &nbsp; {getGender(t, patient.person?.gender)}</div>
-      <div className={styles.headerPatientDetail}>&middot; &nbsp; {age(patient.person?.birthdate)}</div>
+      {patient.person?.birthdate && (
+        <div className={styles.headerPatientDetail}>&middot; &nbsp; {age(patient.person?.birthdate)}</div>
+      )}
     </>
   );
 };