From bb16be8d176c98b0c5124a03a79ae6b124d6ebe1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= <emile@probo.com>
Date: Wed, 29 Jul 2026 10:00:04 +0200
Subject: [PATCH] Cancel pending people search on filter change
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A debounced search could fire after status, role, kind, or sort
changed and refetch with the previous filter values, briefly
reverting the list. Cancel the pending callback before those
immediate refetches so the latest filters stick.

Signed-off-by: Émile Ré <emile@probo.com>
---
 .../iam/organizations/people/_components/PeopleList.tsx    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/apps/console/src/pages/iam/organizations/people/_components/PeopleList.tsx b/apps/console/src/pages/iam/organizations/people/_components/PeopleList.tsx
index 659231a34..ca64a7dc9 100644
--- a/apps/console/src/pages/iam/organizations/people/_components/PeopleList.tsx
+++ b/apps/console/src/pages/iam/organizations/people/_components/PeopleList.tsx
@@ -163,7 +163,6 @@ export function PeopleList(props: {
   const debouncedRefetchQuery = useDebounceCallback(
     useCallback(
       (value: string) => {
-        const newQuery = value === "" ? null : value;
         startTransition(() => {
           peoplePagination.refetch(
             {
@@ -172,7 +171,7 @@ export function PeopleList(props: {
                 field: order.field as ProfileOrderField,
               },
               filter: {
-                query: newQuery,
+                query: value === "" ? null : value,
                 states: statesFilter.length > 0 ? statesFilter : null,
                 role: roleFilter,
                 kind: kindFilter,
@@ -194,6 +193,7 @@ export function PeopleList(props: {
   };
 
   const handleStateFilterToggle = (state: ProfileState) => {
+    debouncedRefetchQuery.cancel();
     const newStates = statesFilter.includes(state)
       ? statesFilter.filter(s => s !== state)
       : [...statesFilter, state];
@@ -202,12 +202,14 @@ export function PeopleList(props: {
   };
 
   const handleRoleFilterChange = (value: string) => {
+    debouncedRefetchQuery.cancel();
     const newRole = value === "ALL" ? null : (value as MembershipRole);
     setRoleFilter(newRole);
     refetchPeople({ role: newRole });
   };
 
   const handleKindFilterChange = (value: string) => {
+    debouncedRefetchQuery.cancel();
     const newKind = value === "ALL" ? null : value;
     setKindFilter(newKind);
     refetchPeople({ kind: newKind });
@@ -218,6 +220,7 @@ export function PeopleList(props: {
   };
 
   const refetchWithFilters: ComponentProps<typeof SortableTable>["refetch"] = ({ order: nextOrder }) => {
+    debouncedRefetchQuery.cancel();
     setOrder(nextOrder);
     refetchPeople({}, nextOrder);
   };