Skip to content

Make approving/rejecting orders only update the order itself #221

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.

Sign up for GitHub

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

Merged
nathantew14 merged 3 commits into from
Dec 12, 2025
Merged

Make approving/rejecting orders only update the order itself #221

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
50c5b58
Make approving/rejecting orders only update the order itself
noahseethorcodes Dec 11, 2025
830f511
Rename some fields for clarity
nathantew14 Dec 11, 2025
ffbce58
Add toasts
noahseethorcodes Dec 11, 2025
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
46 changes: 40 additions & 6 deletions src/app/pharmacy/orders/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,38 @@ export default function OrdersPage() {
return () => clearInterval(intervalId);
}, [isAutoRefreshEnabled]);

const handleApproveOrRejectOrder = (orderId: number) => {
setOrderRowData(prev =>
prev
.map(row => ({
...row,
data: row.data
.map(visit => ({
...visit,
orders: visit.orders.filter(order => order.order_id !== orderId),
}))
// Drop visits that no longer have any orders
.filter(visit => visit.orders.length > 0),
}))
// Drop patients that no longer have any visits
.filter(row => row.data.length > 0)
);

setFilteredOrderRowData(prev =>
prev
.map(row => ({
...row,
data: row.data
.map(visit => ({
...visit,
orders: visit.orders.filter(order => order.order_id !== orderId),
}))
.filter(visit => visit.orders.length > 0),
}))
.filter(row => row.data.length > 0)
);
};

return (
<LoadingPage isLoading={isLoading} message="Loading Pending Orders...">
<div className="p-2">
Expand Down Expand Up @@ -180,7 +212,7 @@ export default function OrdersPage() {
<OrderRow
key={x.patient?.patient_id || index}
orderRowData={x}
removeNonPendingOrder={fetchPendingOrders}
onApproveOrRejectOrder={handleApproveOrRejectOrder}
/>
))
)}
Expand All @@ -194,10 +226,10 @@ export default function OrdersPage() {

function OrderRow({
orderRowData: { patient, data },
removeNonPendingOrder,
onApproveOrRejectOrder,
}: {
orderRowData: OrderRowData;
removeNonPendingOrder: (id: number) => void;
onApproveOrRejectOrder: (id: number) => void;
}) {
const onPatchError = (err: Error, medicine_name: string) => {
toast.error(() => (
Expand All @@ -222,7 +254,7 @@ function OrderRow({
{/* Hacky regex workaround cuz backend send patient_id with village prefix and padded zeroes*/}
<Link
href={`/records/patient-record?id=${patient.patient_id.replace(/^..0*/, "")}`}
className="block rounded-lg border border-gray-200 p-4
className="rounded-lg border border-gray-200 p-4
transition-all hover:shadow-md hover:-translate-y-0.5 hover:bg-gray-50 cursor-pointer
flex flex-col items-center bg-slate-50"
>
Expand Down Expand Up @@ -296,7 +328,8 @@ function OrderRow({
onPatchError(new Error(r.error), o.medication_name);
return;
}
removeNonPendingOrder(o.order_id)
onApproveOrRejectOrder(o.order_id)
toast.success(`Order Approved`);
})
}}
handleCancelOrder={async () => {
Expand All @@ -307,7 +340,8 @@ function OrderRow({
onPatchError(new Error(r.error), o.medication_name);
return;
}
removeNonPendingOrder(o.order_id)
onApproveOrRejectOrder(o.order_id)
toast.success(`Order Rejected`);
})
}}
/>
Expand Down