Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions js/api-XzRA2j3B.chunk.mjs → js/api-BcnqSuh8.chunk.mjs

Large diffs are not rendered by default.

File renamed without changes.

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/teams-main.mjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/teams-settings-team-folders.mjs

Large diffs are not rendered by default.

28 changes: 27 additions & 1 deletion src/teams/api.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,33 @@ vi.mock('./team-page/services/collaborationAutocompletion.js', () => ({
getSuggestions: vi.fn(),
}))

const { createTeam } = await import('./api.ts')
const { createTeam, fetchTeams } = await import('./api.ts')

describe('fetchTeams', () => {
it('drops circles the current user is not a member of', async () => {
const circles = [
{ id: 'team1', name: 'team1', displayName: 'Team One', population: 3, initiator: { level: 9 } },
{ id: 'visible1', name: 'visible1', displayName: 'Visible circle', population: 10, initiator: null },
]
vi.mocked(axios.get)
.mockResolvedValueOnce({ data: { ocs: { data: circles } } })
.mockResolvedValueOnce({ data: { ocs: { data: [] } } })

const teams = await fetchTeams()

expect(teams).toHaveLength(1)
expect(teams[0].id).toBe('team1')
expect(teams[0].myRole).toBe('owner')
})

it('returns an empty list when the circles response carries no data', async () => {
vi.mocked(axios.get)
.mockResolvedValueOnce({ data: { ocs: {} } })
.mockResolvedValueOnce({ data: { ocs: { data: [] } } })

await expect(fetchTeams()).resolves.toEqual([])
})
})

describe('createTeam', () => {
beforeEach(() => {
Expand Down
4 changes: 2 additions & 2 deletions src/teams/api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ interface RawCircle {
displayName: string
description?: string
population?: number
initiator?: { level?: number }
initiator?: { level?: number } | null
}

/** Raw team as returned by the dashboard widget endpoint. */
Expand Down Expand Up @@ -148,7 +148,7 @@ export async function fetchTeams(): Promise<Team[]> {
if (circlesRes.status === 'rejected') {
throw circlesRes.reason
}
const circles = circlesRes.value.data.ocs.data ?? []
const circles = (circlesRes.value.data.ocs.data ?? []).filter((circle) => circle.initiator)

// The dashboard only enriches each team with member/resource previews, so
// treat a failure there as "no previews" rather than failing the whole page.
Expand Down
Loading