From c19c3c80cc41f2f66418dab1fc0ea4e70e3eca84 Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Tue, 19 Nov 2024 14:13:18 +0100
Subject: [PATCH] use user and client from form when on the events section
 (#35098)

fixes: #35048

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
---
 js/apps/admin-ui/src/events/UserEvents.tsx | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/js/apps/admin-ui/src/events/UserEvents.tsx b/js/apps/admin-ui/src/events/UserEvents.tsx
index 5dd19e03124..24f1c0bc158 100644
--- a/js/apps/admin-ui/src/events/UserEvents.tsx
+++ b/js/apps/admin-ui/src/events/UserEvents.tsx
@@ -169,10 +169,10 @@ export const UserEvents = ({ user, client }: UserEventsProps) => {
 
   function loader(first?: number, max?: number) {
     return adminClient.realms.findEvents({
-      // The admin client wants 'dateFrom' and 'dateTo' to be Date objects, however it cannot actually handle them so we need to cast to any.
-      ...(activeFilters as any),
       client,
       user,
+      // The admin client wants 'dateFrom' and 'dateTo' to be Date objects, however it cannot actually handle them so we need to cast to any.
+      ...(activeFilters as any),
       realm,
       first,
       max,
@@ -217,6 +217,14 @@ export const UserEvents = ({ user, client }: UserEventsProps) => {
       (value) => value !== "" || (Array.isArray(value) && value.length > 0),
     );
 
+    if (user) {
+      delete newFilters.user;
+    }
+
+    if (client) {
+      delete newFilters.client;
+    }
+
     setActiveFilters(newFilters);
     setKey(key + 1);
   }
@@ -393,6 +401,7 @@ export const UserEvents = ({ user, client }: UserEventsProps) => {
                       key={key}
                       categoryName={filterLabels[key]}
                       onClick={() => removeFilter(key)}
+                      isClosable
                     >
                       {typeof value === "string" ? (
                         <Chip isReadOnly>{value}</Chip>