From 47653681c586840b5fd93fea81e2dac05b11fe60 Mon Sep 17 00:00:00 2001 From: mahendar Date: Sat, 4 Jan 2025 19:51:27 +0530 Subject: [PATCH 1/3] facility name in users page --- src/components/Facility/FacilityUsers.tsx | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/components/Facility/FacilityUsers.tsx b/src/components/Facility/FacilityUsers.tsx index 2e8e7b4a769..2d3ab387ff7 100644 --- a/src/components/Facility/FacilityUsers.tsx +++ b/src/components/Facility/FacilityUsers.tsx @@ -11,7 +11,6 @@ import useFilters from "@/hooks/useFilters"; import routes from "@/Utils/request/api"; import query from "@/Utils/request/query"; -import useTanStackQueryInstead from "@/Utils/request/useQuery"; export default function FacilityUsers(props: { facilityId: number }) { const { t } = useTranslation(); @@ -22,15 +21,13 @@ export default function FacilityUsers(props: { facilityId: number }) { const [activeTab, setActiveTab] = useState(0); const { facilityId } = props; - const { data: facilityData } = useTanStackQueryInstead( - routes.getAnyFacility, - { - pathParams: { - id: facilityId, - }, - prefetch: facilityId !== undefined, - }, - ); + const { data: facilityData } = useQuery({ + queryKey: ["getFacility", facilityId], + queryFn: query(routes.facility.show, { + pathParams: { id: facilityId }, + }), + enabled: !!facilityId, + }); const { data: userListData, isLoading: userListLoading } = useQuery({ queryKey: ["facilityUsers", facilityId], From 9261c5b36b0bf00fb78f2d8bc96ab6f6c7fefd58 Mon Sep 17 00:00:00 2001 From: mahendar Date: Sat, 4 Jan 2025 20:17:02 +0530 Subject: [PATCH 2/3] translation --- src/components/Facility/FacilityUsers.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Facility/FacilityUsers.tsx b/src/components/Facility/FacilityUsers.tsx index 2d3ab387ff7..c99dfb4de71 100644 --- a/src/components/Facility/FacilityUsers.tsx +++ b/src/components/Facility/FacilityUsers.tsx @@ -41,7 +41,7 @@ export default function FacilityUsers(props: { facilityId: number }) { return
Loading...
; } if (!userListData) { - return
No users found
; + return
{t("no_users_found")}
; } return ( From df72debab504154c4f75d341c486a3338a4704ae Mon Sep 17 00:00:00 2001 From: mahendar Date: Sat, 4 Jan 2025 20:59:55 +0530 Subject: [PATCH 3/3] removed facility name --- src/components/Facility/FacilityUsers.tsx | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/components/Facility/FacilityUsers.tsx b/src/components/Facility/FacilityUsers.tsx index c99dfb4de71..8678c5ebf99 100644 --- a/src/components/Facility/FacilityUsers.tsx +++ b/src/components/Facility/FacilityUsers.tsx @@ -21,14 +21,6 @@ export default function FacilityUsers(props: { facilityId: number }) { const [activeTab, setActiveTab] = useState(0); const { facilityId } = props; - const { data: facilityData } = useQuery({ - queryKey: ["getFacility", facilityId], - queryFn: query(routes.facility.show, { - pathParams: { id: facilityId }, - }), - enabled: !!facilityId, - }); - const { data: userListData, isLoading: userListLoading } = useQuery({ queryKey: ["facilityUsers", facilityId], queryFn: query(routes.facility.getUsers, { @@ -45,11 +37,7 @@ export default function FacilityUsers(props: { facilityId: number }) { } return ( - +