From 7668881972cd6e74775a55a62716d6f6bb9f0204 Mon Sep 17 00:00:00 2001
From: jona <jona@soerensen.com>
Date: Sun, 20 Apr 2025 13:13:03 +0300
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20(useEntityListProvider)=20Adjust?=
 =?UTF-8?q?=20filter=20handling=20for=20user=20and=20group=20types=20to=20?=
 =?UTF-8?q?fix=20EntityOwnerPicker=20for=20users/groups?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Jona Warnecke <jona@soerensen.com>
---
 plugins/catalog-react/src/hooks/useEntityListProvider.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
index 1d3afd8d9b..b0a0a24fb1 100644
--- a/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
+++ b/plugins/catalog-react/src/hooks/useEntityListProvider.tsx
@@ -241,7 +241,13 @@ export const EntityListProvider = <EntityFilters extends DefaultEntityFilters>(
   // based on the requested filters changing.
   const [{ loading, error }, refresh] = useAsyncFn(
     async () => {
-      const compacted = compact(Object.values(requestedFilters));
+      const kindValue =
+        requestedFilters.kind?.value?.toLocaleLowerCase('en-US');
+      const effectiveFilters =
+        kindValue === 'user' || kindValue === 'group'
+          ? { ...requestedFilters, owners: undefined }
+          : requestedFilters;
+      const compacted = compact(Object.values(effectiveFilters));
 
       const queryParams = Object.keys(requestedFilters).reduce(
         (params, key) => {