fix loading state and bugs

ohcnetwork · Jan 8, 2024 · f707015 · f707015
1 parent 713a55d
commit f707015
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Components/Facility/CentralNursingStation.tsx b/src/Components/Facility/CentralNursingStation.tsx
@@ -48,7 +48,7 @@ export default function CentralNursingStation({ facilityId }: Props) {
       offset: (qParams.page ? qParams.page - 1 : 0) * PER_PAGE_LIMIT,
       asset_class: "HL7MONITOR",
       ordering: qParams.ordering || "bed__name",
-      bed_is_occupied: qParams.hide_monitors_without_patient ? true : false,
+      bed_is_occupied: qParams.hide_monitors_without_patient === "true",
     },
   });
 
@@ -190,7 +190,7 @@ export default function CentralNursingStation({ facilityId }: Props) {
         </div>
       }
     >
-      {data === undefined ? (
+      {data === undefined || query.loading ? (
         <Loading />
       ) : data.length === 0 ? (
         <div className="flex h-[80vh] w-full items-center justify-center text-center text-black">