Merge pull request #38 from OpenLMIS/OLMIS-7906-fix

OLMIS-7906: fix to await facilityData
OpenLMIS · Apr 11, 2024 · 8b6b314 · 8b6b314
2 parents ed54295 + e5ab485
commit 8b6b314
Showing 1 changed file with 15 additions and 10 deletions.
diff --git a/src/buq/components/MOHApproval/MohForFinalApproval.jsx b/src/buq/components/MOHApproval/MohForFinalApproval.jsx
@@ -51,9 +51,8 @@ const MohForFinalApproval = ({ loadingModalService, facilityService }) => {
     };
 
     const combineData = async () => {
-        let items = [];
-        buqsData.map((buq, index) => {
-            const facilityData = facilityService.get(buq.bottomUpQuantification.facilityId);
+        const promises = buqsData.map(async (buq, index) => {
+            const facilityData = await facilityService.get(buq.bottomUpQuantification.facilityId);
 
             const calc = buq.calculatedGroupsCosts;
 
@@ -66,18 +65,24 @@ const MohForFinalApproval = ({ loadingModalService, facilityService }) => {
                 others: calc.Others,
             };
 
-            items.push({
+            return {
                 buq,
                 calculatedGroupsCosts: calculatedGroups,
                 idCheckbox: `${buq.bottomUpQuantification.id}${buq.bottomUpQuantification.facilityId}`,
-                facilityName: facilityData.$$state.value.name,
-                facilityType: facilityData.$$state.value.type.name,
+                facilityName: facilityData.name,
+                facilityType: facilityData.type.name,
                 key: index + buq.bottomUpQuantification.id,
-            })
+            };
+        });
 
-            setData(items);
-            loadingModalService.close();
-        })
+        Promise.all(promises)
+            .then((data) => {
+                setData(data);
+                loadingModalService.close();
+            })
+            .catch(() => {
+                loadingModalService.close();
+            });
     };
 
     const handleFinalApproveAction = () => {