diff --git a/src/components/Resource/ResourceCreate.tsx b/src/components/Resource/ResourceCreate.tsx index b21a74d0c96..73a5ff652e0 100644 --- a/src/components/Resource/ResourceCreate.tsx +++ b/src/components/Resource/ResourceCreate.tsx @@ -1,6 +1,6 @@ import { zodResolver } from "@hookform/resolvers/zod"; import { useMutation, useQuery } from "@tanstack/react-query"; -import { navigate, useQueryParams } from "raviger"; +import { Link, navigate, useQueryParams } from "raviger"; import { useForm } from "react-hook-form"; import { useTranslation } from "react-i18next"; import { toast } from "sonner"; @@ -81,13 +81,20 @@ export default function ResourceCreate(props: ResourceProps) { const { data: facilityData } = useQuery({ queryKey: ["facility", facilityId], - queryFn: () => - query(routes.getAnyFacility, { - pathParams: { id: String(facilityId) }, - }), + queryFn: query(routes.getAnyFacility, { + pathParams: { id: String(facilityId) }, + }), enabled: !!facilityId, }); + const { data: patientData } = useQuery({ + queryKey: ["patient", related_patient], + queryFn: query(routes.patient.getPatient, { + pathParams: { id: String(related_patient) }, + }), + enabled: !!related_patient, + }); + const form = useForm({ resolver: zodResolver(resourceFormSchema), defaultValues: { @@ -145,23 +152,34 @@ export default function ResourceCreate(props: ResourceProps) {
- {related_patient && ( + {patientData && (
- - - {t("linked_patient")}:{" "} - {related_patient} - + + + + {t("linked_patient")}:{" "} + {patientData.name} + +
)} diff --git a/src/components/Resource/ResourceList.tsx b/src/components/Resource/ResourceList.tsx index 1ba35b0effe..96bab782705 100644 --- a/src/components/Resource/ResourceList.tsx +++ b/src/components/Resource/ResourceList.tsx @@ -103,7 +103,16 @@ export default function ResourceList({ facilityId }: { facilityId: string }) { const resources = queryResources?.results || []; return ( - +