From 2cb4842aa135bc3d661702f935932f650e64c1b7 Mon Sep 17 00:00:00 2001
From: Ashesh3 <3626859+Ashesh3@users.noreply.github.com>
Date: Mon, 12 Feb 2024 02:27:35 +0530
Subject: [PATCH 1/2] Fix update log filters on page change

---
 .../Facility/Consultations/DailyRoundsList.tsx        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
index 828a41c8c24..5c249517403 100644
--- a/src/Components/Facility/Consultations/DailyRoundsList.tsx
+++ b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -11,6 +11,8 @@ import DailyRoundsFilter from "./DailyRoundsFilter";
 import { ConsultationModel } from "../models";
 import { useSlugs } from "../../../Common/hooks/useSlug";
 import { TimelineNode } from "../../../CAREUI/display/Timeline";
+import { useState } from "react";
+import { QueryParams } from "../../../Utils/request/types";
 
 interface Props {
   consultation: ConsultationModel;
@@ -19,6 +21,7 @@ interface Props {
 export default function DailyRoundsList({ consultation }: Props) {
   const [consultationId] = useSlugs("consultation");
   const { t } = useTranslation();
+  const [query, setQuery] = useState<QueryParams>();
 
   const consultationUrl = `/facility/${consultation.facility}/patient/${consultation.patient}/consultation/${consultation.id}`;
 
@@ -26,12 +29,18 @@ export default function DailyRoundsList({ consultation }: Props) {
     <PaginatedList
       route={routes.getDailyReports}
       pathParams={{ consultationId }}
+      query={query}
     >
       {({ refetch }) => (
         <>
           <div className="flex flex-1 justify-between">
             <PageTitle title="Update Log" hideBack breadcrumbs={false} />
-            <DailyRoundsFilter onApply={(query) => refetch({ query })} />
+            <DailyRoundsFilter
+              onApply={(query) => {
+                setQuery(query);
+                refetch();
+              }}
+            />
           </div>
 
           <div className="-mt-2 flex w-full flex-col gap-4">

From 6d1928330fe83707dead863acac4620f24462720 Mon Sep 17 00:00:00 2001
From: Ashesh3 <3626859+Ashesh3@users.noreply.github.com>
Date: Mon, 12 Feb 2024 11:29:19 +0530
Subject: [PATCH 2/2] Clear unnecessary refetch

---
 src/Components/Facility/Consultations/DailyRoundsList.tsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Components/Facility/Consultations/DailyRoundsList.tsx b/src/Components/Facility/Consultations/DailyRoundsList.tsx
index 5c249517403..d438ee098c7 100644
--- a/src/Components/Facility/Consultations/DailyRoundsList.tsx
+++ b/src/Components/Facility/Consultations/DailyRoundsList.tsx
@@ -31,14 +31,13 @@ export default function DailyRoundsList({ consultation }: Props) {
       pathParams={{ consultationId }}
       query={query}
     >
-      {({ refetch }) => (
+      {() => (
         <>
           <div className="flex flex-1 justify-between">
             <PageTitle title="Update Log" hideBack breadcrumbs={false} />
             <DailyRoundsFilter
               onApply={(query) => {
                 setQuery(query);
-                refetch();
               }}
             />
           </div>