Skip to content
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

Jump to bottom

use subGroupCount to render subGroups #28173

Merged
merged 2 commits into from Apr 8, 2024
Merged

use subGroupCount to render subGroups #28173

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5fd2600
use subGroupCount to render subGroups
edewit Mar 22, 2024
da39d43
PR review changes
edewit Mar 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
86 changes: 43 additions & 43 deletions js/apps/admin-ui/src/components/group/GroupPickerDialog.tsx
View file
Open in desktop
Expand Up @@ -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;
Expand Down Expand Up @@ -79,7 +78,7 @@ export const GroupPickerDialog = ({

if (!groupId) {
const args: GroupQuery = {
first: first,
first,
max: max + 1,
};
if (isSearching) {
Expand All @@ -93,14 +92,13 @@ export const GroupPickerDialog = ({
throw new Error(t("notFound"));
}
}
if (group?.id) {
const args: SubGroupQuery = {
first: first,
max: max + 1,
parentId: group.id,
};
groups = await adminClient.groups.listSubGroups(args);
}

const args: SubGroupQuery = {
first,
max,
parentId: groupId,
};
groups = await adminClient.groups.listSubGroups(args);
}

if (id) {
Expand All @@ -115,15 +113,16 @@ export const GroupPickerDialog = ({
setJoinedGroups(existingUserGroups || []);
if (selectedGroup) {
setNavigation([...navigation, selectedGroup]);
setCount(selectedGroup.subGroupCount!);
}

if (groups) {
groups.forEach((group: SelectableGroup) => {
group.checked = !!selectedRows.find((r) => r.id === group.id);
});
setGroups(groups);
groups.forEach((group: SelectableGroup) => {
group.checked = !!selectedRows.find((r) => r.id === group.id);
});
setGroups(groups);
if (isSearching || !groupId) {
setCount(groups.length);
}
setCount(isSearching ? countGroups(groups || []) : groups?.length || 0);
},
[groupId, filter, first, max],
);
Expand Down Expand Up @@ -222,14 +221,27 @@ export const GroupPickerDialog = ({
))}
</Breadcrumb>
<DataList aria-label={t("groups")} isCompact>
{groups
.slice(groupId ? first : 0, max + (groupId ? first : 0))
.map((group: SelectableGroup) => (
<Fragment key={group.id}>
{(!isSearching || group.name?.includes(filter)) && (
{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.subGroups?.map((g) => (
<GroupRow
key={group.id}
group={group}
key={g.id}
group={g}
isRowDisabled={isRowDisabled}
onSelect={setGroupId}
type={type}
Expand All @@ -239,24 +251,9 @@ export const GroupPickerDialog = ({
setSelectedRows={setSelectedRows}
canBrowse={canBrowse}
/>
)}
{isSearching &&
group.subGroups?.map((g) => (
<GroupRow
key={g.id}
group={g}
isRowDisabled={isRowDisabled}
onSelect={setGroupId}
type={type}
isSearching={isSearching}
setIsSearching={setIsSearching}
selectedRows={selectedRows}
setSelectedRows={setSelectedRows}
canBrowse={canBrowse}
/>
))}
</Fragment>
))}
))}
</Fragment>
))}
</DataList>
{groups.length === 0 && !isSearching && (
<ListEmptyState
Expand Down Expand Up @@ -309,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);
}
Expand Down Expand Up @@ -363,7 +363,7 @@ const GroupRow = ({
aria-label={t("groupName")}
isPlainButtonAction
>
{(canBrowse || type === "selectOne") && (
{(canBrowse || type === "selectOne") && group.subGroupCount !== 0 && (
<Button variant="link" aria-label={t("select")}>
<AngleRightIcon />
</Button>
Expand Down