Care Loading icon in organization and facility users

ohcnetwork · Jan 4, 2025 · d71b047 · d71b047
1 parent 68c4c3d
commit d71b047
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/components/Facility/FacilityUsers.tsx b/src/components/Facility/FacilityUsers.tsx
@@ -13,6 +13,8 @@ import routes from "@/Utils/request/api";
 import query from "@/Utils/request/query";
 import useTanStackQueryInstead from "@/Utils/request/useQuery";
 
+import Loading from "../Common/Loading";
+
 export default function FacilityUsers(props: { facilityId: number }) {
   const { t } = useTranslation();
   const { qParams, updateQuery, Pagination } = useFilters({
@@ -41,7 +43,7 @@ export default function FacilityUsers(props: { facilityId: number }) {
   });
 
   if (userListLoading) {
-    return <div>Loading...</div>;
+    return <Loading />;
   }
   if (!userListData) {
     return <div>No users found</div>;

diff --git a/src/pages/FacilityOrganization/components/FacilityOrganizationLayout.tsx b/src/pages/FacilityOrganization/components/FacilityOrganizationLayout.tsx
@@ -12,6 +12,7 @@ import {
 } from "@/components/ui/breadcrumb";
 import { Menubar, MenubarMenu, MenubarTrigger } from "@/components/ui/menubar";
 
+import Loading from "@/components/Common/Loading";
 import Page from "@/components/Common/Page";
 
 import routes from "@/Utils/request/api";
@@ -61,7 +62,7 @@ export default function FacilityOrganizationLayout({
   });
 
   if (isLoading) {
-    return <div>Loading...</div>;
+    return <Loading />;
   }
   // add loading state
   if (!org) {

diff --git a/src/pages/Organization/components/OrganizationLayout.tsx b/src/pages/Organization/components/OrganizationLayout.tsx
@@ -12,6 +12,7 @@ import {
 } from "@/components/ui/breadcrumb";
 import { Menubar, MenubarMenu, MenubarTrigger } from "@/components/ui/menubar";
 
+import Loading from "@/components/Common/Loading";
 import Page from "@/components/Common/Page";
 
 import query from "@/Utils/request/query";
@@ -76,7 +77,7 @@ export default function OrganizationLayout({
   });
 
   if (isLoading) {
-    return <div>Loading...</div>;
+    return <Loading />;
   }
   // add loading state
   if (!org) {