Merge pull request #440 from ertush/hotfix

Added Update to Facility Type details field to facility Upgrade and D…
ertush · Aug 7, 2024 · 7523949 · 7523949
2 parents bea16e2 + c41e2cf
commit 7523949
Show file tree

Hide file tree

Showing 3 changed files with 164 additions and 40 deletions.
diff --git a/pages/facilities/[id].js b/pages/facilities/[id].js
@@ -908,7 +908,7 @@ const queryId = zSchema.parse(ctx.query).id
         })
           .then((r) => r.json())
           .then(async (json) => {
-            allOptions["data"] = json
+            allOptions["data"] = json ?? null
 
 
             // fetch ward boundaries
@@ -926,10 +926,9 @@ const queryId = zSchema.parse(ctx.query).id
 
                 _data = await response.json();
 
-                const [lng, lat] =
-                  _data?.ward_boundary.properties.center.coordinates;
+                const [lng, lat] = _data?.ward_boundary.properties.center.coordinates ?? null;
 
-                allOptions["geoLocation"] = JSON.parse(JSON.stringify(_data?.ward_boundary));
+                allOptions["geoLocation"] = JSON.parse(JSON.stringify(_data?.ward_boundary)) ?? null;
                 allOptions["center"] = [lat, lng];
 
               } catch (e) {
@@ -949,7 +948,7 @@ const queryId = zSchema.parse(ctx.query).id
                   }
                 )).json()
 
-                allOptions["updates"] = facilityUpdateData
+                allOptions["updates"] = facilityUpdateData ?? null
 
 
               }
@@ -967,7 +966,7 @@ const queryId = zSchema.parse(ctx.query).id
                   }
                 })
 
-                allOptions["activityLog"] = (await resp.json()).revisions
+                allOptions["activityLog"] = (await resp.json())?.revisions ?? null
 
               }
               catch (e) {

diff --git a/pages/facilities/index.js b/pages/facilities/index.js
@@ -951,6 +951,8 @@ export async function getServerSideProps(ctx) {
         url = `${url}&page=${ctx.query.page}`
     }
 
+    console.log({url})
+
 
     try {
         facilities = (await (await fetch(url, {
-Original file line number
+Diff line change
@@ Expand Up / @@ -951,6 +951,8 @@ export async function getServerSideProps(ctx) { @@
             url = `${url}&page=${ctx.query.page}`
         }
+        console.log({url})
         try {
             facilities = (await (await fetch(url, {
@@ Expand Down @@