libre.sh/keycloak-scim
4
0
Fork 0
Code Issues 15 Pull requests Releases 1 Activity Actions

don't lazy load when searching (#31100)

Browse source 
fixes: #31070

Signed-off-by: Erik Jan de Wit <erikjan.dewit@gmail.com>
This commit is contained in:
Erik Jan de Wit 2024-07-09 13:44:34 +02:00 committed by GitHub
parent 2dc37d2513
commit 932a92a316
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
js/apps/admin-ui/src/groups/components/GroupTree.tsx
View file

@ -147,6 +147,21 @@ type GroupTreeProps = {
const SUBGROUP_COUNT = 50; const SUBGROUP_COUNT = 50;
const TreeLoading = () => {
const { t } = useTranslation();
return (
<>
<Spinner size="sm" /> {t("spinnerLoading")}
</>
);
};
const LOADING_TREE = [
{
name: <TreeLoading />,
},
];
export const GroupTree = ({ export const GroupTree = ({
refresh: viewRefresh, refresh: viewRefresh,
canViewDetails, canViewDetails,
@ -183,6 +198,7 @@ export const GroupTree = ({
group: GroupRepresentation, group: GroupRepresentation,
refresh: () => void, refresh: () => void,
): ExtendedTreeViewDataItem => { ): ExtendedTreeViewDataItem => {
const hasSubGroups = group.subGroupCount;
return { return {
id: group.id, id: group.id,
name: ( name: (
@ -191,16 +207,10 @@ export const GroupTree = ({
</Tooltip> </Tooltip>
), ),
access: group.access || {}, access: group.access || {},
children: group.subGroupCount children: hasSubGroups
? [ ? search.length === 0
{ ? LOADING_TREE
name: ( : group.subGroups?.map((g) => mapGroup(g, refresh))
<>
<Spinner size="sm" /> {t("spinnerLoading")}
</>
),
},
]
: undefined, : undefined,
action: (hasAccess("manage-users") || group.access?.manage) && ( action: (hasAccess("manage-users") || group.access?.manage) && (
<GroupTreeContextMenu group={group} refresh={refresh} /> <GroupTreeContextMenu group={group} refresh={refresh} />