refresh administrations upon archive (#6586)

ohcnetwork · Nov 10, 2023 · 5b9c618 · 5b9c618
1 parent 9f36488
commit 5b9c618
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 17 deletions.
diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationEventCell.tsx
@@ -11,12 +11,14 @@ interface Props {
   administrations: MedicineAdministrationRecord[];
   interval: { start: Date; end: Date };
   prescription: Prescription;
+  refetch: () => void;
 }
 
 export default function AdministrationEventCell({
   administrations,
   interval: { start, end },
   prescription,
+  refetch,
 }: Props) {
   const [showTimeline, setShowTimeline] = useState(false);
   // Check if cell belongs to an administered prescription
@@ -55,6 +57,7 @@ export default function AdministrationEventCell({
             interval={{ start, end }}
             prescription={prescription}
             showPrescriptionDetails
+            onRefetch={refetch}
           />
         </DialogModal>
         <button

diff --git a/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx b/src/Components/Medicine/MedicineAdministrationSheet/AdministrationTableRow.tsx
@@ -33,22 +33,25 @@ export default function MedicineAdministrationTableRow({
   const [showAdminister, setShowAdminister] = useState(false);
   const [showDiscontinue, setShowDiscontinue] = useState(false);
 
-  const { data, loading } = useQuery(MedicineRoutes.listAdministrations, {
-    pathParams: { consultation },
-    query: {
-      prescription: prescription.id,
-      administered_date_after: formatDateTime(
-        props.intervals[0].start,
-        "YYYY-MM-DD"
-      ),
-      administered_date_before: formatDateTime(
-        props.intervals[props.intervals.length - 1].end,
-        "YYYY-MM-DD"
-      ),
-      archived: false,
-    },
-    key: `${prescription.last_administered_on}`,
-  });
+  const { data, loading, refetch } = useQuery(
+    MedicineRoutes.listAdministrations,
+    {
+      pathParams: { consultation },
+      query: {
+        prescription: prescription.id,
+        administered_date_after: formatDateTime(
+          props.intervals[0].start,
+          "YYYY-MM-DD"
+        ),
+        administered_date_before: formatDateTime(
+          props.intervals[props.intervals.length - 1].end,
+          "YYYY-MM-DD"
+        ),
+        archived: false,
+      },
+      key: `${prescription.last_administered_on}`,
+    }
+  );
 
   return (
     <tr
@@ -220,6 +223,7 @@ export default function MedicineAdministrationTableRow({
                 administrations={data.results}
                 interval={{ start, end }}
                 prescription={prescription}
+                refetch={refetch}
               />
             )}
           </td>

diff --git a/src/Components/Medicine/PrescrpitionTimeline.tsx b/src/Components/Medicine/PrescrpitionTimeline.tsx
@@ -28,11 +28,13 @@ interface Props {
   interval: { start: Date; end: Date };
   prescription: Prescription;
   showPrescriptionDetails?: boolean;
+  onRefetch?: () => void;
 }
 
 export default function PrescrpitionTimeline({
   prescription,
   interval,
+  onRefetch,
 }: Props) {
   const consultation = useSlug("consultation");
   const { data, refetch, loading } = useQuery(
@@ -82,7 +84,10 @@ export default function PrescrpitionTimeline({
               <MedicineAdministeredNode
                 key={`activity-${event.type}-${prescription.id}`}
                 event={event}
-                onArchived={refetch}
+                onArchived={() => {
+                  onRefetch?.();
+                  refetch();
+                }}
                 isLastNode={index === events.length - 1}
                 hideArchive={prescription.discontinued}
               />