Thanks to visit codestin.com
Credit goes to github.com

Skip to content

don't lazy load when searching (#31100) #31658

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonkoops merged 1 commit into from
Jul 26, 2024
Merged

don't lazy load when searching (#31100) #31658

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions js/apps/admin-ui/src/groups/components/GroupTree.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,21 @@ type GroupTreeProps = {

const SUBGROUP_COUNT = 50;

const TreeLoading = () => {
const { t } = useTranslation();
return (
<>
<Spinner size="sm" /> {t("spinnerLoading")}
</>
);
};

const LOADING_TREE = [
{
name: <TreeLoading />,
},
];

export const GroupTree = ({
refresh: viewRefresh,
canViewDetails,
Expand Down Expand Up @@ -184,6 +199,7 @@ export const GroupTree = ({
group: GroupRepresentation,
refresh: () => void,
): ExtendedTreeViewDataItem => {
const hasSubGroups = group.subGroupCount;
return {
id: group.id,
name: (
Expand All @@ -192,16 +208,10 @@ export const GroupTree = ({
</Tooltip>
),
access: group.access || {},
children: group.subGroupCount
? [
{
name: (
<>
<Spinner size="sm" /> {t("spinnerLoading")}
</>
),
},
]
children: hasSubGroups
? search.length === 0
? LOADING_TREE
: group.subGroups?.map((g) => mapGroup(g, refresh))
: undefined,
action: (hasAccess("manage-users") || group.access?.manage) && (
<GroupTreeContextMenu group={group} refresh={refresh} />
Expand Down