Skip to content

Commit 9babcb5

Browse files
comfy-pr-bothuntcsgampagent
authored
[backport cloud/1.50] fix: show complete workspace member list (#15242)
Backport of #15224 to `cloud/1.50` Automatically created by backport workflow. Co-authored-by: Hunter <huntcsg@users.noreply.github.com> Co-authored-by: Amp <amp@ampcode.com>
1 parent 3c2f9f1 commit 9babcb5

2 files changed

Lines changed: 33 additions & 2 deletions

File tree

src/platform/workspace/stores/teamWorkspaceStore.test.ts

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -890,6 +890,34 @@ describe('useTeamWorkspaceStore', () => {
890890
expect(store.members[0].monthlyCreditLimit).toBeNull()
891891
expect(store.members[1].creditsUsedThisMonth).toBeUndefined()
892892
expect(store.members[1].monthlyCreditLimit).toBeUndefined()
893+
expect(mockWorkspaceApi.listMembers).toHaveBeenCalledWith({ limit: 100 })
894+
})
895+
896+
it('fetchMembers applies the default limit to partial parameters', async () => {
897+
mockWorkspaceApi.listMembers.mockResolvedValue({
898+
members: [],
899+
pagination: { offset: 20, limit: 100, total: 0 }
900+
})
901+
const store = useTeamWorkspaceStore()
902+
await store.initialize()
903+
904+
await store.fetchMembers({ offset: 20 })
905+
expect(mockWorkspaceApi.listMembers).toHaveBeenLastCalledWith({
906+
limit: 100,
907+
offset: 20
908+
})
909+
910+
await store.fetchMembers({ offset: 20, limit: undefined })
911+
expect(mockWorkspaceApi.listMembers).toHaveBeenLastCalledWith({
912+
limit: 100,
913+
offset: 20
914+
})
915+
916+
await store.fetchMembers({ offset: 20, limit: 25 })
917+
expect(mockWorkspaceApi.listMembers).toHaveBeenLastCalledWith({
918+
limit: 25,
919+
offset: 20
920+
})
893921
})
894922

895923
it('fetchMembers supports a personal workspace with Team entitlement', async () => {

src/platform/workspace/stores/teamWorkspaceStore.ts

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -599,13 +599,16 @@ export const useTeamWorkspaceStore = defineStore('teamWorkspace', () => {
599599
* Fetch members for the current workspace.
600600
*/
601601
async function fetchMembers(
602-
params?: ListMembersParams
602+
params: ListMembersParams = {}
603603
): Promise<WorkspaceMember[]> {
604604
const generation = identityGeneration
605605
const workspaceId = activeWorkspaceId.value
606606
if (!workspaceId) return []
607607

608-
const response = await workspaceApi.listMembers(params)
608+
const response = await workspaceApi.listMembers({
609+
...params,
610+
limit: params.limit ?? 100
611+
})
609612
const members = response.members.map(mapApiMemberToWorkspaceMember)
610613
if (!isStaleWorkspace(generation, workspaceId)) {
611614
updateWorkspace(workspaceId, { members })

0 commit comments

Comments
 (0)