bugFix - TypeError related to Date object

uwcirg · Aug 4, 2023 · f12979b · f12979b
1 parent 0e8dca1
commit f12979b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/patientsearch/src/js/components/PatientListTable.js b/patientsearch/src/js/components/PatientListTable.js
@@ -444,7 +444,7 @@ export default function PatientListTable() {
             }
             let value = nodes && nodes.length ? nodes[nodes.length-1].value : null;
             if (dataType === "date") {
-              value = getLocalDateTimeString(value);
+              value = value ? getLocalDateTimeString(value) : "--";
             }
             if (dataType === "timeago" && value) {
               value = getTimeAgoDisplay(new Date(value));

diff --git a/patientsearch/src/js/helpers/utility.js b/patientsearch/src/js/helpers/utility.js
@@ -185,6 +185,7 @@ export function getLocalDateTimeString(utcDateString, shortFormat) {
   //note javascript Date object automatically convert UTC date/time to locate date/time, no need to parse and convert
   let dateObj =
     utcDateString instanceof Date ? utcDateString : new Date(utcDateString);
+  if (!isValid(dateObj)) return utcDateString;
   let year = dateObj.getFullYear();
   let month = pad(dateObj.getMonth() + 1);
   let day = pad(dateObj.getDate());