@tuturuuu/ui 0.26.1 → 0.27.0

package/src/components/ui/custom/workspace-access/workspace-access-invite-pos-panel.tsx

@@ -0,0 +1,75 @@
+'use client';
+
+import { CreditCard, ShieldCheck, TriangleAlert } from '@tuturuuu/icons';
+import { Checkbox } from '@tuturuuu/ui/checkbox';
+import { useTranslations } from 'next-intl';
+
+export function WorkspaceAccessInvitePosPanel({
+  confirmDefaultAdminMigration,
+  defaultAdminEnabled,
+  joinedMemberCount,
+  onConfirmDefaultAdminMigrationChange,
+}: {
+  confirmDefaultAdminMigration: boolean;
+  defaultAdminEnabled: boolean;
+  joinedMemberCount: number;
+  onConfirmDefaultAdminMigrationChange: (value: boolean) => void;
+}) {
+  const t = useTranslations();
+
+  return (
+    <div className="space-y-3 rounded-xl border border-dynamic-blue/25 bg-dynamic-blue/5 p-3.5 sm:p-4">
+      <div className="flex items-start gap-3">
+        <div className="mt-0.5 rounded-lg border border-dynamic-blue/20 bg-background p-2 text-dynamic-blue">
+          <CreditCard className="size-4" />
+        </div>
+        <div className="min-w-0 space-y-1">
+          <p className="font-medium text-sm">
+            {t('ws-members.pos_operator_title')}
+          </p>
+          <p className="text-muted-foreground text-sm leading-5">
+            {t('ws-members.pos_operator_description')}
+          </p>
+        </div>
+      </div>
+
+      <div className="grid gap-2 sm:grid-cols-2">
+        {defaultAdminEnabled ? (
+          <div className="flex items-center gap-2 rounded-lg border bg-background/70 p-3 text-sm">
+            <ShieldCheck className="size-4 text-dynamic-green" />
+            <span>
+              {joinedMemberCount}{' '}
+              {t('ws-members.pos_operator_existing_members')}
+            </span>
+          </div>
+        ) : null}
+        <div className="flex items-center gap-2 rounded-lg border bg-background/70 p-3 text-sm">
+          <CreditCard className="size-4 text-dynamic-blue" />
+          <span>{t('ws-members.pos_operator_only_permission')}</span>
+        </div>
+      </div>
+
+      {defaultAdminEnabled ? (
+        <div className="flex items-start gap-2 rounded-lg border border-dynamic-orange/25 bg-dynamic-orange/5 p-3 text-sm">
+          <TriangleAlert className="mt-0.5 size-4 shrink-0 text-dynamic-orange" />
+          <p className="text-muted-foreground leading-5">
+            {t('ws-members.pos_operator_admin_migration_note')}
+          </p>
+        </div>
+      ) : null}
+
+      <label className="flex cursor-pointer items-start gap-3 rounded-lg border bg-background p-3 transition-colors hover:bg-muted/20 active:scale-[0.99]">
+        <Checkbox
+          checked={confirmDefaultAdminMigration}
+          className="mt-0.5"
+          onCheckedChange={(checked) =>
+            onConfirmDefaultAdminMigrationChange(checked === true)
+          }
+        />
+        <span className="text-sm leading-5">
+          {t('ws-members.pos_operator_confirmation')}
+        </span>
+      </label>
+    </div>
+  );
+}

package/src/components/ui/custom/workspace-access/workspace-access-invite-role-picker.tsx

@@ -0,0 +1,151 @@
+'use client';
+
+import { Search, ShieldUser } from '@tuturuuu/icons';
+import {
+  Accordion,
+  AccordionContent,
+  AccordionItem,
+  AccordionTrigger,
+} from '@tuturuuu/ui/accordion';
+import { Badge } from '@tuturuuu/ui/badge';
+import { Button } from '@tuturuuu/ui/button';
+import { Checkbox } from '@tuturuuu/ui/checkbox';
+import { Input } from '@tuturuuu/ui/input';
+import { Label } from '@tuturuuu/ui/label';
+import { useTranslations } from 'next-intl';
+import { useState } from 'react';
+
+export function WorkspaceAccessInviteRolePicker({
+  noRoleLabel,
+  onChange,
+  roleIds,
+  roles,
+}: {
+  noRoleLabel: string;
+  onChange: (roleIds: string[]) => void;
+  roleIds: string[];
+  roles: Array<{ id: string; name: string }>;
+}) {
+  const t = useTranslations();
+  const [query, setQuery] = useState('');
+  const selected = new Set(roleIds);
+  const normalizedQuery = query.trim().toLocaleLowerCase();
+  const visibleRoles = normalizedQuery
+    ? roles.filter((role) =>
+        role.name.toLocaleLowerCase().includes(normalizedQuery)
+      )
+    : roles;
+
+  const toggleRole = (roleId: string) => {
+    onChange(
+      selected.has(roleId)
+        ? roleIds.filter((id) => id !== roleId)
+        : [...roleIds, roleId]
+    );
+  };
+
+  return (
+    <Accordion type="single" collapsible defaultValue="workspace-roles">
+      <AccordionItem
+        value="workspace-roles"
+        className="overflow-hidden rounded-xl border bg-background px-3"
+      >
+        <AccordionTrigger className="items-center py-3 hover:no-underline">
+          <span className="flex min-w-0 items-center gap-3">
+            <span className="flex size-9 shrink-0 items-center justify-center rounded-lg border bg-muted/30 text-dynamic-blue">
+              <ShieldUser className="size-4" />
+            </span>
+            <span className="min-w-0 text-left">
+              <span className="flex items-center gap-2">
+                <span className="truncate">
+                  {t('ws-members.role-placeholder')}
+                </span>
+                <Badge
+                  variant="outline"
+                  className="rounded-full font-normal text-[10px] uppercase tracking-wide"
+                >
+                  {t('ws-members.invite_roles_optional')}
+                </Badge>
+              </span>
+              <span
+                aria-live="polite"
+                className="mt-0.5 block text-muted-foreground text-xs"
+              >
+                {t('ws-members.roles_selected', { count: roleIds.length })}
+              </span>
+            </span>
+          </span>
+        </AccordionTrigger>
+
+        <AccordionContent className="space-y-3 border-t pt-3">
+          <p className="text-muted-foreground text-xs leading-5">
+            {t('ws-members.invite_roles_description')}
+          </p>
+
+          {roles.length > 0 ? (
+            <>
+              <div className="flex items-center gap-2">
+                <div className="relative min-w-0 flex-1">
+                  <Label
+                    htmlFor="workspace-access-invite-role-search"
+                    className="sr-only"
+                  >
+                    {t('ws-members.invite_roles_search')}
+                  </Label>
+                  <Search className="pointer-events-none absolute top-1/2 left-3 size-4 -translate-y-1/2 text-muted-foreground" />
+                  <Input
+                    id="workspace-access-invite-role-search"
+                    value={query}
+                    onChange={(event) => setQuery(event.target.value)}
+                    placeholder={t('ws-members.invite_roles_search')}
+                    className="h-10 rounded-lg pl-9"
+                  />
+                </div>
+                {roleIds.length > 0 ? (
+                  <Button
+                    type="button"
+                    variant="ghost"
+                    size="sm"
+                    className="shrink-0"
+                    onClick={() => onChange([])}
+                  >
+                    {t('ws-members.clear_all_roles')}
+                  </Button>
+                ) : null}
+              </div>
+
+              {visibleRoles.length > 0 ? (
+                <div className="max-h-52 space-y-1 overflow-y-auto rounded-lg border p-1.5">
+                  {visibleRoles.map((role) => (
+                    <label
+                      key={role.id}
+                      className={`flex cursor-pointer items-center gap-3 rounded-md px-3 py-2.5 transition-colors active:scale-[0.99] ${selected.has(role.id) ? 'bg-dynamic-blue/10 text-foreground' : 'hover:bg-muted/50'}`}
+                    >
+                      <Checkbox
+                        aria-label={role.name}
+                        checked={selected.has(role.id)}
+                        onCheckedChange={() => toggleRole(role.id)}
+                      />
+                      <ShieldUser className="size-4 text-dynamic-blue" />
+                      <span className="min-w-0 flex-1 truncate font-medium text-sm">
+                        {role.name}
+                      </span>
+                    </label>
+                  ))}
+                </div>
+              ) : (
+                <div className="rounded-lg border border-dashed p-4 text-center text-muted-foreground text-sm">
+                  {t('ws-members.invite_roles_no_match')}
+                </div>
+              )}
+            </>
+          ) : (
+            <div className="rounded-lg border border-dashed p-4 text-center text-muted-foreground text-sm">
+              {noRoleLabel}
+            </div>
+          )}
+        </AccordionContent>
+      </AccordionItem>
+    </Accordion>
+  );
+}

package/src/components/ui/custom/workspace-access/workspace-access-labels.ts

@@ -32,7 +32,7 @@ export function getWorkspaceAccessLabels(
     noRolesLabel:
       mode === 'cms'
         ? t('external-projects.settings.no_roles_label')
-        : t('ws-members.no_roles_found'),
+        : t('ws-members.no_roles_assigned'),
     protectedMemberLabel:
       mode === 'cms'
         ? t('external-projects.settings.protected_member_label')

package/src/components/ui/custom/workspace-access/workspace-access-member-row.tsx

@@ -34,6 +34,7 @@ import {
   shouldShowProtectedMemberStatus,
 } from './member-filter-utils';
 import type { WorkspaceAccessLabels, WorkspaceAccessRole } from './types';
+import { WorkspaceAccessInvitationRoleMenu } from './workspace-access-invitation-role-menu';
 
 type GuestContext = InternalApiEnhancedWorkspaceMember & {
   direct_board_guest?: boolean;
@@ -46,6 +47,7 @@ type Props = {
   canEditProfiles: boolean;
   canManageMembers: boolean;
   canManageRoles: boolean;
+  canUpdateInvitationRoles: boolean;
   defaultAdminEnabled: boolean;
   isMutating: boolean;
   labels: WorkspaceAccessLabels;
@@ -57,6 +59,11 @@ type Props = {
     userId?: null | string;
   }) => void;
   onRemoveRole: (payload: { roleId: string; userId: string }) => void;
+  onUpdateInvitationRole: (payload: {
+    email?: null | string;
+    roleIds: string[];
+    userId?: null | string;
+  }) => void;
   roles: Array<Pick<WorkspaceAccessRole, 'id' | 'name'>>;
 };
 
@@ -64,6 +71,7 @@ export function WorkspaceAccessMemberRow({
   canEditProfiles,
   canManageMembers,
   canManageRoles,
+  canUpdateInvitationRoles,
   defaultAdminEnabled,
   isMutating,
   labels,
@@ -72,6 +80,7 @@ export function WorkspaceAccessMemberRow({
   onEditMemberProfile,
   onRemoveMember,
   onRemoveRole,
+  onUpdateInvitationRole,
   roles,
 }: Props) {
   const t = useTranslations();
@@ -81,6 +90,11 @@ export function WorkspaceAccessMemberRow({
   const memberName = getMemberDisplayName(member, t('common.unknown'));
   const guest = member as GuestContext;
   const canRemoveRoles = canManageRoles && memberId && !member.pending;
+  const canUpdateInvitationRole =
+    canUpdateInvitationRoles &&
+    member.pending &&
+    member.workspace_member_type !== 'GUEST' &&
+    Boolean(memberId || member.email);
   const canEditProfile =
     canEditProfiles &&
     canManageMembers &&
@@ -281,7 +295,16 @@ export function WorkspaceAccessMemberRow({
         </div>
 
         <div className="mt-2.5 flex flex-wrap gap-1.5 sm:mt-3">
-          {member.roles.length > 0 ? (
+          {canUpdateInvitationRole ? (
+            <WorkspaceAccessInvitationRoleMenu
+              email={member.email}
+              isMutating={isMutating}
+              onUpdate={onUpdateInvitationRole}
+              assignedRoles={member.roles}
+              roles={roles}
+              userId={member.id}
+            />
+          ) : member.roles.length > 0 ? (
             member.roles.map((role) => (
               <Badge
                 key={`${member.id ?? member.email}-${role.id}`}
@@ -297,7 +320,9 @@ export function WorkspaceAccessMemberRow({
             </Badge>
           ) : (
             <Badge variant="outline" className="h-5 px-1.5 text-xs">
-              {labels.noRolesLabel}
+              {member.pending
+                ? t('ws-members.no_role_assigned')
+                : labels.noRolesLabel}
             </Badge>
           )}
         </div>

package/src/components/ui/custom/workspace-access/workspace-access-members.tsx

@@ -11,6 +11,7 @@ type Props = {
   canEditProfiles: boolean;
   canManageMembers: boolean;
   canManageRoles: boolean;
+  canUpdateInvitationRoles: boolean;
   defaultAdminEnabled: boolean;
   isLoading: boolean;
   isMutating: boolean;
@@ -23,6 +24,11 @@ type Props = {
     userId?: null | string;
   }) => void;
   onRemoveRole: (payload: { roleId: string; userId: string }) => void;
+  onUpdateInvitationRole: (payload: {
+    email?: null | string;
+    roleIds: string[];
+    userId?: null | string;
+  }) => void;
   roles: Array<Pick<WorkspaceAccessRole, 'id' | 'name'>>;
   searchTerm: string;
   status: string;
@@ -32,6 +38,7 @@ export function WorkspaceAccessMembers({
   canEditProfiles,
   canManageMembers,
   canManageRoles,
+  canUpdateInvitationRoles,
   defaultAdminEnabled,
   isLoading,
   isMutating,
@@ -41,6 +48,7 @@ export function WorkspaceAccessMembers({
   onEditMemberProfile,
   onRemoveMember,
   onRemoveRole,
+  onUpdateInvitationRole,
   roles,
   searchTerm,
   status,
@@ -83,6 +91,7 @@ export function WorkspaceAccessMembers({
           canEditProfiles={canEditProfiles}
           canManageMembers={canManageMembers}
           canManageRoles={canManageRoles}
+          canUpdateInvitationRoles={canUpdateInvitationRoles}
           defaultAdminEnabled={defaultAdminEnabled}
           isMutating={isMutating}
           labels={labels}
@@ -91,6 +100,7 @@ export function WorkspaceAccessMembers({
           onEditMemberProfile={onEditMemberProfile}
           onRemoveMember={onRemoveMember}
           onRemoveRole={onRemoveRole}
+          onUpdateInvitationRole={onUpdateInvitationRole}
           roles={roles}
         />
       ))}

package/src/components/ui/custom/workspace-access/workspace-access-page.tsx

@@ -37,9 +37,16 @@ import { WorkspaceAccessMembers } from './workspace-access-members';
 import { WorkspaceAccessPageHeader } from './workspace-access-page-header';
 import { WorkspaceAccessPeopleFilters } from './workspace-access-people-filters';
 import { WorkspaceAccessRoleEditorDialog } from './workspace-access-role-editor-dialog';
+import { listAllWorkspaceAccessRoles } from './workspace-access-role-options';
 import { WorkspaceAccessRoles } from './workspace-access-roles';
 import { WorkspaceAccessTabsToolbar } from './workspace-access-tabs-toolbar';
 
+type InvitationRoleUpdate = {
+  email?: null | string;
+  roleIds: string[];
+  userId?: null | string;
+};
+
 export function WorkspaceAccessPage({
   adapter,
   disableInvite = false,
@@ -57,6 +64,7 @@ export function WorkspaceAccessPage({
   const [inviteAccessPreset, setInviteAccessPreset] = useState<
     'guest' | 'member' | 'pos_operator'
   >('member');
+  const [inviteRoleIds, setInviteRoleIds] = useState<string[]>([]);
   const [confirmDefaultAdminMigration, setConfirmDefaultAdminMigration] =
     useState(false);
   const [inviteDialogOpen, setInviteDialogOpen] = useState(false);
@@ -92,6 +100,7 @@ export function WorkspaceAccessPage({
   const workspaceId = context.workspaceId;
   const canManageMembers = context.canManageMembers;
   const canManageRoles = context.canManageRoles;
+  const canAssignInviteRoles = canManageRoles && mode === 'workspace';
   const canInvite = canManageMembers && !disableInvite;
   const permissionUser = useMemo(
     () =>
@@ -145,6 +154,12 @@ export function WorkspaceAccessPage({
     queryKey: ['workspace-access', workspaceId, 'roles', search],
     staleTime: 30_000,
   });
+  const inviteRolesQuery = useQuery({
+    enabled: inviteDialogOpen && canAssignInviteRoles,
+    queryFn: () => listAllWorkspaceAccessRoles(adapter, workspaceId),
+    queryKey: ['workspace-access', workspaceId, 'invite-roles'],
+    staleTime: 30_000,
+  });
   const memberDefaultQuery = useQuery({
     enabled: canManageRoles,
     queryFn: () => adapter.getDefaultRole(workspaceId, 'MEMBER'),
@@ -166,6 +181,9 @@ export function WorkspaceAccessPage({
       queryClient.invalidateQueries({
         queryKey: ['workspace-access', workspaceId, 'roles'],
       }),
+      queryClient.invalidateQueries({
+        queryKey: ['workspace-access', workspaceId, 'invite-roles'],
+      }),
       queryClient.invalidateQueries({
         queryKey: ['workspace-access', workspaceId, 'defaults'],
       }),
@@ -179,12 +197,17 @@ export function WorkspaceAccessPage({
         confirmDefaultAdminMigration,
         emails: parseInviteEmails(inviteEmails),
         memberType: inviteAccessPreset === 'guest' ? 'GUEST' : 'MEMBER',
+        roleIds:
+          canAssignInviteRoles && inviteAccessPreset === 'member'
+            ? inviteRoleIds
+            : [],
       }),
     onError: (error) =>
       toast.error(error instanceof Error ? error.message : t('common.error')),
     onSuccess: async (result) => {
       setInviteEmails('');
       setInviteAccessPreset('member');
+      setInviteRoleIds([]);
       setConfirmDefaultAdminMigration(false);
       setInviteDialogOpen(false);
       toast.success(result.message ?? t('ws-members.invitation-sent'));
@@ -247,6 +270,66 @@ export function WorkspaceAccessPage({
       await invalidateAccessData();
     },
   });
+  const invitationRoleMutation = useMutation({
+    mutationFn: (payload: InvitationRoleUpdate) => {
+      if (!adapter.updateInvitationRole) {
+        throw new Error(t('common.error'));
+      }
+      return adapter.updateInvitationRole(workspaceId, payload);
+    },
+    onMutate: async (payload) => {
+      const queryKey = ['workspace-access', workspaceId, 'members'] as const;
+      await queryClient.cancelQueries({ queryKey });
+      const previousMembers =
+        queryClient.getQueryData<InternalApiEnhancedWorkspaceMember[]>(
+          queryKey
+        );
+      const roleById = new Map(
+        (inviteRolesQuery.data?.data ?? rolesQuery.data?.data ?? []).map(
+          (role) => [role.id, role]
+        )
+      );
+      const nextRoles = payload.roleIds.flatMap((roleId) => {
+        const role = roleById.get(roleId);
+        return role ? [{ id: role.id, name: role.name, permissions: [] }] : [];
+      });
+      const normalizedEmail = payload.email?.trim().toLowerCase() ?? null;
+
+      queryClient.setQueryData<InternalApiEnhancedWorkspaceMember[]>(
+        queryKey,
+        (members = []) =>
+          members.map((member) => {
+            const matchesUser = Boolean(
+              payload.userId && member.id === payload.userId
+            );
+            const matchesEmail = Boolean(
+              normalizedEmail &&
+                member.email?.trim().toLowerCase() === normalizedEmail
+            );
+            if (!member.pending || (!matchesUser && !matchesEmail)) {
+              return member;
+            }
+
+            return {
+              ...member,
+              roles: nextRoles,
+            };
+          })
+      );
+
+      return { previousMembers, queryKey };
+    },
+    onError: (error, _payload, context) => {
+      if (context?.previousMembers) {
+        queryClient.setQueryData(context.queryKey, context.previousMembers);
+      }
+      toast.error(error instanceof Error ? error.message : t('common.error'));
+    },
+    onSettled: invalidateAccessData,
+    onSuccess: () => {
+      toast.success(t('ws-members.invitation_role_updated'));
+    },
+  });
   const deleteRoleMutation = useMutation({
     mutationFn: (roleId: string) => adapter.deleteRole(workspaceId, roleId),
     onError: (error) =>
@@ -394,11 +477,15 @@ export function WorkspaceAccessPage({
             canEditProfiles={Boolean(adapter.updateMemberProfile)}
             canManageMembers={canManageMembers}
             canManageRoles={canManageRoles}
+            canUpdateInvitationRoles={
+              canManageRoles && Boolean(adapter.updateInvitationRole)
+            }
             defaultAdminEnabled={defaultAdminEnabled}
             isLoading={membersQuery.isPending}
             isMutating={
               removeMemberMutation.isPending ||
               roleMembershipMutation.isPending ||
+              invitationRoleMutation.isPending ||
               updateMemberProfileMutation.isPending
             }
             labels={labels}
@@ -411,7 +498,10 @@ export function WorkspaceAccessPage({
             onRemoveRole={(payload) =>
               roleMembershipMutation.mutate({ ...payload, action: 'remove' })
             }
-            roles={roles}
+            onUpdateInvitationRole={(payload) =>
+              invitationRoleMutation.mutate(payload)
+            }
+            roles={inviteRolesQuery.data?.data ?? roles}
             searchTerm={search}
             status={status}
           />
@@ -475,23 +565,32 @@ export function WorkspaceAccessPage({
 
       <WorkspaceAccessInviteDialog
         accessPreset={inviteAccessPreset}
-        canManageRoles={canManageRoles}
+        canManageRoles={canAssignInviteRoles}
         confirmDefaultAdminMigration={confirmDefaultAdminMigration}
         defaultAdminEnabled={defaultAdminEnabled}
         emails={inviteEmails}
         isSubmitting={inviteMutation.isPending}
         joinedMemberCount={joinedCount}
+        noRoleLabel={t('ws-members.no_role_assigned')}
         onAccessPresetChange={(value) => {
           setInviteAccessPreset(value);
-          if (value !== 'pos_operator') {
+          if (value === 'member') {
             setConfirmDefaultAdminMigration(false);
+          } else {
+            setInviteRoleIds([]);
+            if (value === 'guest') {
+              setConfirmDefaultAdminMigration(false);
+            }
           }
         }}
         onConfirmDefaultAdminMigrationChange={setConfirmDefaultAdminMigration}
         onEmailsChange={setInviteEmails}
         onOpenChange={setInviteDialogOpen}
+        onRoleIdsChange={setInviteRoleIds}
         onSubmit={() => inviteMutation.mutate()}
         open={inviteDialogOpen}
+        roleIds={inviteRoleIds}
+        roles={inviteRolesQuery.data?.data ?? []}
       />
 
       {profileMember ? (

package/src/components/ui/custom/workspace-access/workspace-access-role-options.test.ts

@@ -0,0 +1,35 @@
+import { describe, expect, it, vi } from 'vitest';
+import type { WorkspaceAccessAdapter, WorkspaceAccessRole } from './types';
+import { listAllWorkspaceAccessRoles } from './workspace-access-role-options';
+
+function createRoles(start: number, count: number): WorkspaceAccessRole[] {
+  return Array.from({ length: count }, (_, index) => ({
+    id: `role-${start + index}`,
+    name: `Role ${start + index}`,
+    permissions: [],
+  }));
+}
+
+describe('listAllWorkspaceAccessRoles', () => {
+  it('paginates beyond the first 100 assignable roles', async () => {
+    const listRoleOptions = vi
+      .fn()
+      .mockResolvedValueOnce({ count: 125, data: createRoles(0, 100) })
+      .mockResolvedValueOnce({ count: 125, data: createRoles(100, 25) });
+
+    const result = await listAllWorkspaceAccessRoles(
+      { listRoleOptions } as unknown as WorkspaceAccessAdapter,
+      'workspace-1'
+    );
+
+    expect(result.data).toHaveLength(125);
+    expect(listRoleOptions).toHaveBeenNthCalledWith(1, 'workspace-1', {
+      page: '1',
+      pageSize: '100',
+    });
+    expect(listRoleOptions).toHaveBeenNthCalledWith(2, 'workspace-1', {
+      page: '2',
+      pageSize: '100',
+    });
+  });
+});

package/src/components/ui/custom/workspace-access/workspace-access-role-options.ts

@@ -0,0 +1,21 @@
+import type { WorkspaceAccessAdapter, WorkspaceAccessRole } from './types';
+
+export async function listAllWorkspaceAccessRoles(
+  adapter: WorkspaceAccessAdapter,
+  workspaceId: string
+) {
+  const pageSize = 100;
+  const roles: WorkspaceAccessRole[] = [];
+
+  for (let page = 1; ; page += 1) {
+    const result = await adapter.listRoleOptions(workspaceId, {
+      page: String(page),
+      pageSize: String(pageSize),
+    });
+    roles.push(...result.data.map((role) => ({ ...role, permissions: [] })));
+
+    if (roles.length >= result.count || result.data.length < pageSize) {
+      return { count: result.count, data: roles };
+    }
+  }
+}

package/src/components/ui/custom/workspace-select-invitations.tsx

@@ -31,8 +31,9 @@ export function useWorkspaceInvitations({
     queryKey: ['workspace-invitations', ...(cacheScope ? [cacheScope] : [])],
     queryFn: async () => (await listWorkspaceInvitations()).invitations,
     enabled,
+    gcTime: 30 * 60_000,
     retry: 1,
-    staleTime: 30_000,
+    staleTime: 5 * 60_000,
   });
   const invitations = query.data ?? [];
   const mutation = useMutation({