PR review changes

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
keycloak · Apr 5, 2024 · da39d43 · da39d43
1 parent 5fd2600
commit da39d43
Showing 1 changed file with 24 additions and 22 deletions.
diff --git a/js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx b/js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx
@@ -27,7 +27,6 @@ import { PaginatingTableToolbar } from "../table-toolbar/PaginatingTableToolbar"
 import { GroupPath } from "./GroupPath";
 
 import "./group-picker-dialog.css";
-import { countGroups } from "../../groups/components/GroupTree";
 
 export type GroupPickerDialogProps = {
   id?: string;
@@ -79,7 +78,7 @@ export const GroupPickerDialog = ({
 
       if (!groupId) {
         const args: GroupQuery = {
-          first: first,
+          first,
           max: max + 1,
         };
         if (isSearching) {
@@ -95,8 +94,8 @@ export const GroupPickerDialog = ({
         }
 
         const args: SubGroupQuery = {
-          first: first,
-          max: max + 1,
+          first,
+          max,
           parentId: groupId,
         };
         groups = await adminClient.groups.listSubGroups(args);
@@ -121,8 +120,8 @@ export const GroupPickerDialog = ({
         group.checked = !!selectedRows.find((r) => r.id === group.id);
       });
       setGroups(groups);
-      if (isSearching) {
-        setCount(countGroups(groups));
+      if (isSearching || !groupId) {
+        setCount(groups.length);
       }
     },
     [groupId, filter, first, max],
@@ -222,22 +221,22 @@ export const GroupPickerDialog = ({
           ))}
         </Breadcrumb>
         <DataList aria-label={t("groups")} isCompact>
-          {groups.map((group: SelectableGroup) => (
+          {groups.slice(0, max).map((group: SelectableGroup) => (
             <Fragment key={group.id}>
-                {(!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.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
@@ -307,7 +306,10 @@ const GroupRow = ({
       onClick={(e) => {
         if (type === "selectOne") {
           onSelect(group.id!);
-        } else if ((e.target as HTMLInputElement).type !== "checkbox") {
+        } else if (
+          (e.target as HTMLInputElement).type !== "checkbox" &&
+          group.subGroupCount !== 0
+        ) {
           onSelect(group.id!);
           setIsSearching(false);
         }