Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Minor fixes in resource creation form #10218

Merged
merged 23 commits into from
Feb 10, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 31 additions & 13 deletions src/components/Resource/ResourceCreate.tsx
Original file line number Diff line number Diff line change
@@ -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";
Expand Down Expand Up @@ -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<ResourceFormValues>({
resolver: zodResolver(resourceFormSchema),
defaultValues: {
Expand Down Expand Up @@ -145,23 +152,34 @@ export default function ResourceCreate(props: ResourceProps) {
<Page
title={t("create_resource_request")}
crumbsReplacements={{
[facilityId]: { name: facilityData?.name || "" },
[facilityId]: {
name: facilityData?.name || "",
uri: `/facility/${facilityId}/settings/general`,
},
resource: { style: "pointer-events-none" },
}}
backUrl={`/facility/${facilityId}`}
backUrl={`/facility/${facilityId}/settings/general`}
>
<div className="container mx-auto max-w-4xl">
<Card className="mt-4">
<Form {...form}>
<form onSubmit={form.handleSubmit(onSubmit)} className="space-y-6">
{related_patient && (
{patientData && (
<Alert>
<div className="flex items-center gap-2">
<CareIcon icon="l-user" className="h-5 w-5 text-blue-700" />
<AlertDescription className="text-sm text-blue-700">
{t("linked_patient")}:{" "}
<span className="font-medium">{related_patient}</span>
</AlertDescription>
<Link
href={`/facility/${facilityId}/patient/${related_patient}/resource_requests`}
className="flex items-center gap-2"
>
<CareIcon
icon="l-user"
className="h-5 w-5 text-blue-700"
/>
<AlertDescription className="text-sm text-blue-700">
{t("linked_patient")}:{" "}
<span className="font-medium">{patientData.name}</span>
</AlertDescription>
</Link>
</div>
</Alert>
)}
Expand Down
11 changes: 10 additions & 1 deletion src/components/Resource/ResourceList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,16 @@ export default function ResourceList({ facilityId }: { facilityId: string }) {
const resources = queryResources?.results || [];

return (
<Page title={t("resource")} hideBack={true}>
<Page
title={t("resource")}
hideBack={true}
crumbsReplacements={{
[facilityId]: {
name: facilityId || "",
uri: `/facility/${facilityId}/settings/general`,
},
}}
>
Rishith25 marked this conversation as resolved.
Show resolved Hide resolved
<div className="space-y-4 mt-2">
<div className="rounded-lg border bg-card shadow-sm">
<div className="flex flex-col">
Expand Down
Loading