add loading..

AdityaJ2305 · Jan 22, 2025 · f9c9ae2 · f9c9ae2
1 parent 5a3feb0
commit f9c9ae2
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 19 deletions.
diff --git a/src/components/Facility/FacilityUsers.tsx b/src/components/Facility/FacilityUsers.tsx
@@ -73,10 +73,12 @@ export default function FacilityUsers(props: { facilityId: string }) {
           className="bg-purple-50 text-purple-700 ml-2 text-sm font-medium rounded-xl px-3 m-3"
           variant="outline"
         >
-          {t("entity_count", {
-            count: userListData?.count || "...",
-            entity: "User",
-          })}
+          {userListData
+            ? t("entity_count", {
+                count: userListData?.count || 0,
+                entity: "User",
+              })
+            : "Loading..."}
         </Badge>
       }
     >

diff --git a/src/pages/Organization/OrganizationFacilities.tsx b/src/pages/Organization/OrganizationFacilities.tsx
@@ -65,9 +65,11 @@ export default function OrganizationFacilities({
               className="bg-purple-50 text-purple-700 ml-2 text-sm font-medium rounded-xl px-3 m-3"
               variant="outline"
             >
-              {t("facility_count", {
-                count: facilities?.count || "...",
-              })}
+              {facilities
+                ? t("facility_count", {
+                    count: facilities.count,
+                  })
+                : "Loading..."}
             </Badge>
           </div>
           <AddFacilitySheet organizationId={id} />

diff --git a/src/pages/Organization/OrganizationPatients.tsx b/src/pages/Organization/OrganizationPatients.tsx
@@ -104,10 +104,12 @@ export default function OrganizationPatients({ id, navOrganizationId }: Props) {
               className="bg-purple-50 text-purple-700 ml-2 text-sm font-medium rounded-xl px-3 m-3"
               variant="outline"
             >
-              {t("entity_count", {
-                count: patients?.count || "...",
-                entity: "Patient",
-              })}
+              {patients
+                ? t("entity_count", {
+                    count: patients.count,
+                    entity: "Patient",
+                  })
+                : "Loading..."}
             </Badge>
           </div>
         </div>

diff --git a/src/pages/Organization/OrganizationUsers.tsx b/src/pages/Organization/OrganizationUsers.tsx
@@ -64,10 +64,12 @@ export default function OrganizationUsers({ id, navOrganizationId }: Props) {
               className="bg-purple-50 text-purple-700 ml-2 text-sm font-medium rounded-xl px-3 m-3"
               variant="outline"
             >
-              {t("entity_count", {
-                count: users?.count || "...",
-                entity: "User",
-              })}
+              {users
+                ? t("entity_count", {
+                    count: users.count || 0,
+                    entity: "User",
+                  })
+                : "Loading..."}
             </Badge>
           </div>
           <div className="flex gap-2">

diff --git a/src/pages/Organization/OrganizationView.tsx b/src/pages/Organization/OrganizationView.tsx
@@ -58,10 +58,12 @@ export default function OrganizationView({ id, navOrganizationId }: Props) {
               className="bg-purple-50 text-purple-700 ml-2 text-sm font-medium rounded-xl px-3 m-3"
               variant="outline"
             >
-              {t("entity_count", {
-                count: children?.count || "...",
-                entity: "Organization",
-              })}
+              {children
+                ? t("entity_count", {
+                    count: children.count || 0,
+                    entity: "Organization",
+                  })
+                : "Loading..."}
             </Badge>
           </div>
           <div className="w-72">