From 9f74a6578083e664964b6646275cd001711cada9 Mon Sep 17 00:00:00 2001
From: Karthikeyan Singaravelan <tir.karthi@gmail.com>
Date: Thu, 9 Jan 2025 22:16:27 +0530
Subject: [PATCH] Use setSearchParams after setTableURLState to ensure updates
 are not overriden by setTableURLState. (#45500)

---
 airflow/ui/src/pages/Dag/Runs/Runs.tsx        | 2 +-
 airflow/ui/src/pages/DagsList/DagsFilters.tsx | 4 ++--
 airflow/ui/src/pages/Variables/Variables.tsx  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/airflow/ui/src/pages/Dag/Runs/Runs.tsx b/airflow/ui/src/pages/Dag/Runs/Runs.tsx
index e77cc9f2d37cf..53ec75ac1e6c0 100644
--- a/airflow/ui/src/pages/Dag/Runs/Runs.tsx
+++ b/airflow/ui/src/pages/Dag/Runs/Runs.tsx
@@ -144,11 +144,11 @@ export const Runs = () => {
       } else {
         searchParams.set(STATE_PARAM, val);
       }
-      setSearchParams(searchParams);
       setTableURLState({
         pagination: { ...pagination, pageIndex: 0 },
         sorting,
       });
+      setSearchParams(searchParams);
     },
     [pagination, searchParams, setSearchParams, setTableURLState, sorting],
   );
diff --git a/airflow/ui/src/pages/DagsList/DagsFilters.tsx b/airflow/ui/src/pages/DagsList/DagsFilters.tsx
index 632170b24c506..6128380609af1 100644
--- a/airflow/ui/src/pages/DagsList/DagsFilters.tsx
+++ b/airflow/ui/src/pages/DagsList/DagsFilters.tsx
@@ -81,11 +81,11 @@ export const DagsFilters = () => {
       } else {
         searchParams.set(PAUSED_PARAM, val);
       }
-      setSearchParams(searchParams);
       setTableURLState({
         pagination: { ...pagination, pageIndex: 0 },
         sorting,
       });
+      setSearchParams(searchParams);
     },
     [pagination, searchParams, setSearchParams, setTableURLState, sorting],
   );
@@ -97,11 +97,11 @@ export const DagsFilters = () => {
       } else {
         searchParams.set(LAST_DAG_RUN_STATE_PARAM, value);
       }
-      setSearchParams(searchParams);
       setTableURLState({
         pagination: { ...pagination, pageIndex: 0 },
         sorting,
       });
+      setSearchParams(searchParams);
     },
     [pagination, searchParams, setSearchParams, setTableURLState, sorting],
   );
diff --git a/airflow/ui/src/pages/Variables/Variables.tsx b/airflow/ui/src/pages/Variables/Variables.tsx
index bfe266a21a5e7..94ae08f760dc2 100644
--- a/airflow/ui/src/pages/Variables/Variables.tsx
+++ b/airflow/ui/src/pages/Variables/Variables.tsx
@@ -138,11 +138,11 @@ export const Variables = () => {
     } else {
       searchParams.delete(NAME_PATTERN_PARAM);
     }
-    setSearchParams(searchParams);
     setTableURLState({
       pagination: { ...pagination, pageIndex: 0 },
       sorting,
     });
+    setSearchParams(searchParams);
     setVariableKeyPattern(value);
   };