From 952d484907166543aa12d065e704575311ce781c Mon Sep 17 00:00:00 2001
From: Erik Jan de Wit <erikjan.dewit@gmail.com>
Date: Wed, 3 Apr 2024 10:56:08 +0200
Subject: [PATCH] filter out parent group if it doesn't match (#28344)

fixes: #28079

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
---
 .../components/group/GroupPickerDialog.tsx    | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx b/js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx
index ad7fbb3429..6980434f44 100644
--- a/js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx
+++ b/js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx
@@ -226,18 +226,20 @@ export const GroupPickerDialog = ({
             .slice(groupId ? first : 0, max + (groupId ? first : 0))
             .map((group: SelectableGroup) => (
               <Fragment key={group.id}>
-                <GroupRow
-                  key={group.id}
-                  group={group}
-                  isRowDisabled={isRowDisabled}
-                  onSelect={setGroupId}
-                  type={type}
-                  isSearching={isSearching}
-                  setIsSearching={setIsSearching}
-                  selectedRows={selectedRows}
-                  setSelectedRows={setSelectedRows}
-                  canBrowse={canBrowse}
-                />
+                {(!isSearching || group.name?.includes(filter)) && (
+                  <GroupRow
+                    key={group.id}
+                    group={group}
+                    isRowDisabled={isRowDisabled}
+                    onSelect={setGroupId}
+                    type={type}
+                    isSearching={isSearching}
+                    setIsSearching={setIsSearching}
+                    selectedRows={selectedRows}
+                    setSelectedRows={setSelectedRows}
+                    canBrowse={canBrowse}
+                  />
+                )}
                 {isSearching &&
                   group.subGroups?.map((g) => (
                     <GroupRow