Skip to content

Project share user count #8625

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

Draft
ericokuma wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Project share user count #8625

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c6c16e
Optimize general access user count with ListOrganizationMemberUsers a…
cursoragent Jan 13, 2026
34f2b57
fix(web-admin): use usersCount from autogroup:members for project sha…
cursoragent Jan 13, 2026
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
36 changes: 20 additions & 16 deletions web-admin/src/features/projects/user-management/GeneralAccessSelectorDropdown.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
createAdminServiceListProjectMemberUsergroups,
createAdminServiceRemoveProjectMemberUsergroup,
createAdminServiceAddProjectMemberUsergroup,
createAdminServiceListUsergroupMemberUsers,
createAdminServiceListOrganizationMemberUsergroups,
} from "@rilldata/web-admin/client";
import { ProjectUserRoles } from "@rilldata/web-common/features/users/roles.ts";
import { useQueryClient } from "@tanstack/svelte-query";
Expand All @@ -19,7 +19,6 @@
export let organization: string;
export let project: string;

let open = false;
let accessDropdownOpen = false;
let accessType: "everyone" | "invite-only" = "everyone";

Expand All @@ -36,28 +35,33 @@
undefined,
{
query: {
enabled: open,
enabled: accessDropdownOpen,
refetchOnMount: true,
refetchOnWindowFocus: true,
},
},
);

$: listUsergroupMemberUsers = createAdminServiceListUsergroupMemberUsers(
organization,
"autogroup:members",
undefined,
{
query: {
enabled: open,
refetchOnMount: true,
refetchOnWindowFocus: true,
// Use ListOrganizationMemberUsergroups with includeCounts to get the usersCount
// for autogroup:members, which specifically excludes guest users
$: listOrgMemberUsergroups =
createAdminServiceListOrganizationMemberUsergroups(
organization,
{ includeCounts: true },
{
query: {
enabled: accessDropdownOpen,
refetchOnMount: true,
refetchOnWindowFocus: true,
},
},
},
);
);

$: userGroupMemberUsers = $listUsergroupMemberUsers?.data?.members ?? [];
$: userGroupMemberUsersCount = userGroupMemberUsers?.length ?? 0;
// Get the user count from the autogroup:members group (excludes guests)
$: autogroupMembersGroup = $listOrgMemberUsergroups?.data?.members?.find(
(group) => group.groupName === "autogroup:members",
);
$: userGroupMemberUsersCount = autogroupMembersGroup?.usersCount ?? 0;
$: projectMemberUserGroupsList =
$listProjectMemberUsergroups.data?.members ?? [];

Expand Down
Loading