Project share popover user count

admin/database/database.go

@@ -150,6 +150,7 @@ type DB interface {
 
 	FindUsergroupsForUser(ctx context.Context, userID, orgID string) ([]*Usergroup, error)
 	FindUsergroupMemberUsers(ctx context.Context, groupID, afterEmail string, limit int) ([]*UsergroupMemberUser, error)
+	CountUsergroupMemberUsers(ctx context.Context, groupID string) (int, error)
 	InsertUsergroupMemberUser(ctx context.Context, groupID, userID string) error
 	DeleteUsergroupMemberUser(ctx context.Context, groupID, userID string) error
 	DeleteUsergroupsMemberUser(ctx context.Context, orgID, userID string) error

admin/database/postgres/postgres.go

@@ -1080,6 +1080,15 @@ func (c *connection) FindUsergroupMemberUsers(ctx context.Context, groupID, afte
 	return res, nil
 }
 
+func (c *connection) CountUsergroupMemberUsers(ctx context.Context, groupID string) (int, error) {
+	var count int
+	err := c.getDB(ctx).QueryRowxContext(ctx, "SELECT COUNT(*) FROM usergroups_users WHERE usergroup_id = $1", groupID).Scan(&count)
+	if err != nil {
+		return 0, parseErr("usergroup member count", err)
+	}
+	return count, nil
+}
+
 func (c *connection) InsertUsergroupMemberUser(ctx context.Context, groupID, userID string) error {
 	_, err := c.getDB(ctx).ExecContext(ctx, "INSERT INTO usergroups_users (user_id, usergroup_id) VALUES ($1, $2)", userID, groupID)
 	if err != nil {

admin/server/usergroups.go

@@ -692,6 +692,11 @@ func (s *Server) ListUsergroupMemberUsers(ctx context.Context, req *adminv1.List
 		return nil, err
 	}
 
+	count, err := s.admin.DB.CountUsergroupMemberUsers(ctx, group.ID)
+	if err != nil {
+		return nil, err
+	}
+
 	nextToken := ""
 	if len(members) >= pageSize {
 		nextToken = marshalPageToken(members[len(members)-1].Email)
@@ -704,6 +709,7 @@ func (s *Server) ListUsergroupMemberUsers(ctx context.Context, req *adminv1.List
 
 	return &adminv1.ListUsergroupMemberUsersResponse{
 		Members:       dtos,
+		TotalCount:    uint32(count),
 		NextPageToken: nextToken,
 	}, nil
 }

proto/gen/rill/admin/v1/admin.swagger.yaml

@@ -5594,6 +5594,10 @@ definitions:
           $ref: '#/definitions/v1UsergroupMemberUser'
       nextPageToken:
         type: string
+      totalCount:
+        type: integer
+        format: int64
+        title: Total number of members in the usergroup
   v1ListUsergroupsForOrganizationAndUserResponse:
     type: object
     properties:

proto/gen/rill/admin/v1/openapi.yaml

@@ -1156,6 +1156,10 @@ components:
                     type: array
                 nextPageToken:
                     type: string
+                totalCount:
+                    format: int64
+                    title: Total number of members in the usergroup
+                    type: integer
             type: object
         v1ListUsergroupsForOrganizationAndUserResponse:
             properties:
@@ -2302,7 +2306,7 @@ externalDocs:
 info:
     description: Rill Admin API enables programmatic management of Rill Cloud resources, including organizations, projects, and user access. It provides endpoints for creating, updating, and deleting these resources, as well as managing authentication and permissions.
     title: Rill Admin API
-    version: v0.78.0
+    version: v0.78.2
 openapi: 3.0.3
 paths:
     /v1/ai/complete:

proto/gen/rill/admin/v1/public.openapi.yaml

@@ -1156,6 +1156,10 @@ components:
                     type: array
                 nextPageToken:
                     type: string
+                totalCount:
+                    format: int64
+                    title: Total number of members in the usergroup
+                    type: integer
             type: object
         v1ListUsergroupsForOrganizationAndUserResponse:
             properties:
@@ -2302,7 +2306,7 @@ externalDocs:
 info:
     description: Rill Admin API enables programmatic management of Rill Cloud resources, including organizations, projects, and user access. It provides endpoints for creating, updating, and deleting these resources, as well as managing authentication and permissions.
     title: Rill Admin API
-    version: v0.78.0
+    version: v0.78.2
 openapi: 3.0.3
 paths:
     /v1/ai/complete: {}

proto/rill/admin/v1/api.proto

@@ -2201,6 +2201,7 @@ message ListUsergroupMemberUsersRequest {
 message ListUsergroupMemberUsersResponse {
   repeated UsergroupMemberUser members = 1;
   string next_page_token = 2;
+  uint32 total_count = 3; // Total number of members in the usergroup
 }
 
 message RemoveUsergroupMemberUserRequest {

web-admin/src/client/gen/index.schemas.ts

@@ -852,6 +852,7 @@ export interface V1ListUserAuthTokensResponse {
 export interface V1ListUsergroupMemberUsersResponse {
   members?: V1UsergroupMemberUser[];
   nextPageToken?: string;
+  totalCount?: number;
 }
 
 export interface V1ListUsergroupsForOrganizationAndUserResponse {

web-admin/src/features/projects/user-management/GeneralAccessSelectorDropdown.svelte

@@ -19,7 +19,6 @@
   export let organization: string;
   export let project: string;
 
-  let open = false;
   let accessDropdownOpen = false;
   let accessType: "everyone" | "invite-only" = "everyone";
 
@@ -36,7 +35,7 @@
       undefined,
       {
         query: {
-          enabled: open,
+          enabled: accessDropdownOpen,
           refetchOnMount: true,
           refetchOnWindowFocus: true,
         },
@@ -49,15 +48,15 @@
     undefined,
     {
       query: {
-        enabled: open,
+        enabled: accessDropdownOpen,
         refetchOnMount: true,
         refetchOnWindowFocus: true,
       },
     },
   );
 
-  $: userGroupMemberUsers = $listUsergroupMemberUsers?.data?.members ?? [];
-  $: userGroupMemberUsersCount = userGroupMemberUsers?.length ?? 0;
+  $: userGroupMemberUsersCount =
+    $listUsergroupMemberUsers?.data?.totalCount ?? 0;
   $: projectMemberUserGroupsList =
     $listProjectMemberUsergroups.data?.members ?? [];
 

web-common/src/proto/gen/rill/admin/v1/api_pb.ts

@@ -8621,6 +8621,13 @@ export class ListUsergroupMemberUsersResponse extends Message<ListUsergroupMembe
    */
   nextPageToken = "";
 
+  /**
+   * Total number of members in the usergroup
+   *
+   * @generated from field: uint32 total_count = 3;
+   */
+  totalCount = 0;
+
   constructor(data?: PartialMessage<ListUsergroupMemberUsersResponse>) {
     super();
     proto3.util.initPartial(data, this);
@@ -8631,6 +8638,7 @@ export class ListUsergroupMemberUsersResponse extends Message<ListUsergroupMembe
   static readonly fields: FieldList = proto3.util.newFieldList(() => [
     { no: 1, name: "members", kind: "message", T: UsergroupMemberUser, repeated: true },
     { no: 2, name: "next_page_token", kind: "scalar", T: 9 /* ScalarType.STRING */ },
+    { no: 3, name: "total_count", kind: "scalar", T: 13 /* ScalarType.UINT32 */ },
   ]);
 
   static fromBinary(bytes: Uint8Array, options?: Partial<BinaryReadOptions>): ListUsergroupMemberUsersResponse {