(fix) O3-3547: Handle possibly undefined encounter.obs in LabResultsF…

…orm (openmrs#1903) Handle possibly undefined encounter.obs in LabResultsForm Co-authored-by: Dennis Kigen <[email protected]>
mccarthyaaron · Jul 10, 2024 · c3a736d · c3a736d
1 parent 5bc005c
commit c3a736d
Showing 1 changed file with 20 additions and 13 deletions.
diff --git a/packages/esm-patient-orders-app/src/lab-results/lab-results-form.component.tsx b/packages/esm-patient-orders-app/src/lab-results/lab-results-form.component.tsx
@@ -39,20 +39,27 @@ const LabResultsForm: React.FC<LabResultsFormProps> = ({
     defaultValues: {},
   });
 
-  if (!isLoadingEncounter && encounter?.obs.length > 0 && !isEditing) {
-    setObsUuid(encounter.obs.find((obs) => obs.order?.uuid === order.uuid).uuid);
-    setIsEditing(true);
-  }
-
-  if (isEditing && !obsUuid) {
-    setIsLoadingInitialValues(true);
-    fetchObservation(obsUuid).then((data) => {
-      if (data) {
-        setInitialValues(data);
+  useEffect(() => {
+    if (!isLoadingEncounter && encounter?.obs && encounter.obs.length > 0 && !isEditing) {
+      const matchingObs = encounter.obs.find((obs) => obs.order?.uuid === order.uuid);
+      if (matchingObs) {
+        setObsUuid(matchingObs.uuid);
+        setIsEditing(true);
       }
-      setIsLoadingInitialValues(false);
-    });
-  }
+    }
+  }, [isLoadingEncounter, encounter, order.uuid, isEditing]);
+
+  useEffect(() => {
+    if (isEditing && obsUuid) {
+      setIsLoadingInitialValues(true);
+      fetchObservation(obsUuid).then((data) => {
+        if (data) {
+          setInitialValues(data);
+        }
+        setIsLoadingInitialValues(false);
+      });
+    }
+  }, [isEditing, obsUuid]);
 
   useEffect(() => {
     promptBeforeClosing(() => isDirty);