Skip to content
Open
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
16 changes: 9 additions & 7 deletions src/components/EnvelopeList.vue
Original file line number Diff line number Diff line change
Expand Up @@ -503,12 +503,14 @@ export default {
}
}

await Promise.all(this.selectedEnvelopes.map(async (envelope) => {
logger.info(`deleting thread ${envelope.threadRootId}`)
await this.mainStore.deleteThread({
envelope,
})
})).catch(async (error) => {
try {
for (const envelope of this.selectedEnvelopes) {
logger.info(`deleting thread ${envelope.threadRootId}`)
await this.mainStore.deleteThread({
envelope,
})
}
} catch (error) {
showError(await matchError(error, {
[NoTrashMailboxConfiguredError.getName()]() {
return t('mail', 'No trash folder configured')
Expand All @@ -518,7 +520,7 @@ export default {
return t('mail', 'Could not delete message')
},
}))
})
}
if (nextEnvelopeToNavigate) {
await this.$router.push({
name: 'message',
Expand Down
65 changes: 65 additions & 0 deletions src/tests/unit/components/EnvelopeList.vue.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/**
* SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

import { showError } from '@nextcloud/dialogs'
import { flushPromises } from '@vue/test-utils'
import EnvelopeList from '../../../components/EnvelopeList.vue'

vi.mock('@nextcloud/dialogs', async (importOriginal) => ({
...await importOriginal(),
showError: vi.fn(),
}))

function createContext(deleteThread) {
const envelopes = [
{ databaseId: 1, threadRootId: 'a' },
{ databaseId: 2, threadRootId: 'b' },
{ databaseId: 3, threadRootId: 'c' },
]
return {
selectedEnvelopes: envelopes.slice(0, 2),
sortedEnvelops: envelopes,
$route: { params: { mailboxId: 10, threadId: 99 } },
$router: { push: vi.fn() },
mainStore: { deleteThread },
unselectAll: vi.fn(),
}
}

describe('EnvelopeList', () => {
beforeEach(() => {
vi.clearAllMocks()
})

it('deletes the selected threads one after another', async () => {
const pending = []
const deleteThread = vi.fn(() => new Promise((resolve) => pending.push(resolve)))
const context = createContext(deleteThread)

const done = EnvelopeList.methods.deleteAllSelected.call(context)
await flushPromises()
const callsBeforeFirstFinished = deleteThread.mock.calls.length
pending[0]()
await flushPromises()
pending[1]()
await done

expect(callsBeforeFirstFinished).toBe(1)
expect(deleteThread).toHaveBeenCalledTimes(2)
expect(deleteThread).toHaveBeenNthCalledWith(2, { envelope: context.selectedEnvelopes[1] })
expect(context.unselectAll).toHaveBeenCalled()
})

it('stops at the first failed thread', async () => {
const deleteThread = vi.fn().mockRejectedValue(new Error('denied'))
const context = createContext(deleteThread)

await EnvelopeList.methods.deleteAllSelected.call(context)

expect(deleteThread).toHaveBeenCalledTimes(1)
expect(showError).toHaveBeenCalledTimes(1)
expect(context.unselectAll).toHaveBeenCalled()
})
})