From 12d4146eb90bd2e877195e3aa9c0d5df10420a11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Muhammed=20O=C4=9Fuz?=
 <54470681+muhammedogz@users.noreply.github.com>
Date: Tue, 6 Jan 2026 02:27:37 +0300
Subject: [PATCH] fix: clear all filters when resetting attribute search
 (#45109)

Closes #45108

Signed-off-by: Muhammed Oguz <muhammed0748@outlook.com>
---
 .../src/components/users/UserDataTableAttributeSearchForm.tsx  | 3 +++
 .../src/components/users/UserDataTableToolbarItems.tsx         | 1 +
 2 files changed, 4 insertions(+)

diff --git a/js/apps/admin-ui/src/components/users/UserDataTableAttributeSearchForm.tsx b/js/apps/admin-ui/src/components/users/UserDataTableAttributeSearchForm.tsx
index a7249aaa270..a6f48bef052 100644
--- a/js/apps/admin-ui/src/components/users/UserDataTableAttributeSearchForm.tsx
+++ b/js/apps/admin-ui/src/components/users/UserDataTableAttributeSearchForm.tsx
@@ -33,6 +33,7 @@ type UserDataTableAttributeSearchFormProps = {
   profile: UserProfileConfig;
   createAttributeSearchChips: () => ReactNode;
   searchUserWithAttributes: () => void;
+  clearAllFilters: () => void;
 };
 
 type UserFilterForm = UserAttribute & { exact: boolean };
@@ -43,6 +44,7 @@ export function UserDataTableAttributeSearchForm({
   profile,
   createAttributeSearchChips,
   searchUserWithAttributes,
+  clearAllFilters,
 }: UserDataTableAttributeSearchFormProps) {
   const { t } = useTranslation();
   const { addAlert } = useAlerts();
@@ -134,6 +136,7 @@ export function UserDataTableAttributeSearchForm({
       (chip) => chip.name !== chip.name,
     );
     setActiveFilters({ ...activeFilters, userAttribute: filtered });
+    clearAllFilters();
   };
 
   const createAttributeKeyInputField = () => {
diff --git a/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx b/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx
index 4a7022f3729..3ea72b32179 100644
--- a/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx
+++ b/js/apps/admin-ui/src/components/users/UserDataTableToolbarItems.tsx
@@ -137,6 +137,7 @@ export function UserDataTableToolbarItems({
             setActiveFilters={setActiveFilters}
             profile={profile}
             createAttributeSearchChips={createAttributeSearchChips}
+            clearAllFilters={clearAllFilters}
             searchUserWithAttributes={() => {
               searchUserWithAttributes();
               setSearchDropdownOpen(false);