From ad48ab6ba7a37d4eab7ab762041ffe3bbfb2578c Mon Sep 17 00:00:00 2001
From: Daniel Volz <mail@danielvolz.org>
Date: Mon, 30 Mar 2026 20:58:35 +0200
Subject: [PATCH] fix: prefer latest medication data when opening edit

---
 frontend/src/pages/MedicationsPage.tsx        | 28 ++++++++++++-------
 .../src/test/pages/MedicationsPage.test.tsx   | 24 ++++++++++++++++
 2 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/frontend/src/pages/MedicationsPage.tsx b/frontend/src/pages/MedicationsPage.tsx
index bc02a38..14a206e 100644
--- a/frontend/src/pages/MedicationsPage.tsx
+++ b/frontend/src/pages/MedicationsPage.tsx
@@ -1291,13 +1291,19 @@ export function MedicationsPage() {
 		});
 	}
 
+	const getLatestMedication = useCallback(
+		(med: Medication) => meds.find((candidate) => candidate.id === med.id) ?? med,
+		[meds]
+	);
+
 	function handleEditClick(med: Medication) {
+		const latestMedication = getLatestMedication(med);
 		if (formChanged) {
 			pendingActionRef.current = () => {
 				setShowNameValidation(false);
 				setReadOnlyView(false);
-				resetMedicationEnrichment(med.name || med.genericName || "");
-				startEdit(med, openEditModal);
+				resetMedicationEnrichment(latestMedication.name || latestMedication.genericName || "");
+				startEdit(latestMedication, openEditModal);
 				setViewMode("form");
 				scrollToTopForDesktopEdit();
 			};
@@ -1308,19 +1314,20 @@ export function MedicationsPage() {
 		setShowNameValidation(false);
 		setReadOnlyView(false);
 		setActiveTab("general");
-		resetMedicationEnrichment(med.name || med.genericName || "");
-		startEdit(med, openEditModal);
+		resetMedicationEnrichment(latestMedication.name || latestMedication.genericName || "");
+		startEdit(latestMedication, openEditModal);
 		setViewMode("form");
 		scrollToTopForDesktopEdit();
 	}
 
 	function handleViewClick(med: Medication) {
+		const latestMedication = getLatestMedication(med);
 		if (formChanged) {
 			pendingActionRef.current = () => {
 				setShowNameValidation(false);
 				setReadOnlyView(true);
-				resetMedicationEnrichment(med.name || med.genericName || "");
-				startEdit(med, openEditModal);
+				resetMedicationEnrichment(latestMedication.name || latestMedication.genericName || "");
+				startEdit(latestMedication, openEditModal);
 				setViewMode("form");
 				scrollToTopForDesktopEdit();
 			};
@@ -1331,8 +1338,8 @@ export function MedicationsPage() {
 		setShowNameValidation(false);
 		setReadOnlyView(true);
 		setActiveTab("general");
-		resetMedicationEnrichment(med.name || med.genericName || "");
-		startEdit(med, openEditModal);
+		resetMedicationEnrichment(latestMedication.name || latestMedication.genericName || "");
+		startEdit(latestMedication, openEditModal);
 		setViewMode("form");
 		scrollToTopForDesktopEdit();
 	}
@@ -1390,7 +1397,8 @@ export function MedicationsPage() {
 		if (processedEditMedIdRef.current === editMedId) return;
 		const parsedMedId = Number.parseInt(editMedId, 10);
 		if (Number.isNaN(parsedMedId)) return;
-		const medicationToEdit = allMeds.find((med) => med.id === parsedMedId);
+		const medicationToEdit =
+			meds.find((med) => med.id === parsedMedId) ?? allMeds.find((med) => med.id === parsedMedId);
 		if (!medicationToEdit) return;
 
 		processedEditMedIdRef.current = editMedId;
@@ -1408,7 +1416,7 @@ export function MedicationsPage() {
 		const nextParams = new URLSearchParams(searchParams);
 		nextParams.delete("editMedId");
 		setSearchParams(nextParams, { replace: true });
-	}, [allMeds, openEditModal, searchParams, setSearchParams, startEdit]);
+	}, [allMeds, meds, openEditModal, searchParams, setSearchParams, startEdit]);
 
 	const selectedMedication = useMemo(() => {
 		if (!editingId) return null;
diff --git a/frontend/src/test/pages/MedicationsPage.test.tsx b/frontend/src/test/pages/MedicationsPage.test.tsx
index a9c8825..d322d9d 100644
--- a/frontend/src/test/pages/MedicationsPage.test.tsx
+++ b/frontend/src/test/pages/MedicationsPage.test.tsx
@@ -439,6 +439,30 @@ describe("MedicationsPage with items", () => {
 		expect(startEdit).toHaveBeenCalledTimes(1);
 	});
 
+	it("prefers the latest context medication data when opening edit", () => {
+		const startEdit = vi.fn();
+		const contextMedication = { ...mockMeds[0], takenBy: ["Alice", "Bob"] };
+		const staleFetchedMedication = { ...mockMeds[0], takenBy: [] };
+
+		mockContextValue = createMockContext({
+			meds: [contextMedication],
+			existingPeople: ["Alice", "Bob"],
+		});
+		mockFormHookValue = createMockFormHook({ startEdit });
+		fetchMock.mockResolvedValue({ ok: true, json: async () => [staleFetchedMedication] });
+
+		renderPage();
+
+		const editButton = document.querySelector(".med-actions .info") as HTMLButtonElement | null;
+		expect(editButton).toBeInTheDocument();
+		fireEvent.click(editButton as HTMLButtonElement);
+
+		expect(startEdit).toHaveBeenCalledWith(
+			expect.objectContaining({ id: 1, takenBy: ["Alice", "Bob"] }),
+			expect.any(Function)
+		);
+	});
+
 	it("opens edit flow from editMedId query parameter", async () => {
 		const startEdit = vi.fn();
 		mockFormHookValue = createMockFormHook({ startEdit });