From d7ceb59cd71c65af9276ef9aeb150aa2cedcdf84 Mon Sep 17 00:00:00 2001 From: Daniel Kesselberg <3902676+kesselb@users.noreply.github.com> Date: Wed, 18 Nov 2026 22:43:48 +0000 Subject: [PATCH] fix(ui): nest special-use mailboxes below their ordinary parents Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: Daniel Kesselberg <3902676+kesselb@users.noreply.github.com> --- src/store/mainStore/actions.js | 53 ++++++++++++++------------ src/tests/unit/store/mutations.spec.js | 33 ++++++++++++++++ 2 files changed, 62 insertions(+), 24 deletions(-) diff --git a/src/store/mainStore/actions.js b/src/store/mainStore/actions.js index eb4a93d1ea..b34ed2c9e4 100644 --- a/src/store/mainStore/actions.js +++ b/src/store/mainStore/actions.js @@ -158,29 +158,34 @@ function combineEnvelopeLists(sortOrder) { return pipe(flatten, orderBy(prop('dateInt'), 'desc')) } -const addMailboxToState = curry((mailboxes, account, mailbox) => { - mailbox.accountId = account.id - mailbox.mailboxes = [] - mailbox.envelopeLists = {} - - transformMailboxName(account, mailbox) - - mailboxes[mailbox.databaseId] = mailbox - const parent = Object.values(mailboxes) - .filter((mb) => mb.accountId === account.id) - .find((mb) => mb.name === mailbox.path) - if (mailbox.path === '' || !parent) { - account.mailboxes.push(mailbox.databaseId) - } else { - parent.mailboxes.push(mailbox.databaseId) - } +function addMailboxesToState(mailboxes, account, newMailboxes) { + newMailboxes.forEach((mailbox) => { + mailbox.accountId = account.id + mailbox.mailboxes = [] + mailbox.envelopeLists = {} - Object.defineProperty(mailbox, 'isSubscribed', { - get() { - return this.attributes?.includes('\\subscribed') ?? false - }, + transformMailboxName(account, mailbox) + + mailboxes[mailbox.databaseId] = mailbox + + Object.defineProperty(mailbox, 'isSubscribed', { + get() { + return this.attributes?.includes('\\subscribed') ?? false + }, + }) + }) + + newMailboxes.forEach((mailbox) => { + const parent = Object.values(mailboxes) + .filter((mb) => mb.accountId === account.id) + .find((mb) => mb.name === mailbox.path) + if (mailbox.path === '' || !parent) { + account.mailboxes.push(mailbox.databaseId) + } else { + parent.mailboxes.push(mailbox.databaseId) + } }) -}) +} function transformMailboxName(account, mailbox) { // Add all mailboxes (including submailboxes to state, but only toplevel to account @@ -262,7 +267,7 @@ export default function mainStoreActions() { account.mailboxes = await fetchAllMailboxes(account.id, true) const mailboxes = sortMailboxes(account.mailboxes || [], account) account.mailboxes = [] - mailboxes.map(addMailboxToState(this.mailboxes, account)) + addMailboxesToState(this.mailboxes, account, mailboxes) }, async finishAccountSetup({ account }) { logger.debug(`Fetching mailboxes for account ${account.id}, …`, { account }) @@ -1927,7 +1932,7 @@ export default function mainStoreActions() { account.mailboxes = [] account.aliases = sortAliases(account.aliases ?? []) - mailboxes.map(addMailboxToState(this.mailboxes, account)) + addMailboxesToState(this.mailboxes, account, mailboxes) }, editAccountMutation(account) { this.accountsUnmapped[account.id] = { ...this.accountsUnmapped[account.id], ...account } @@ -1974,7 +1979,7 @@ export default function mainStoreActions() { account, mailbox, }) { - addMailboxToState(this.mailboxes, account, mailbox) + addMailboxesToState(this.mailboxes, account, [mailbox]) }, updateMailboxMutation({ mailbox }) { const account = this.accountsUnmapped[mailbox.accountId] diff --git a/src/tests/unit/store/mutations.spec.js b/src/tests/unit/store/mutations.spec.js index 0bfdeb1fdd..345de63bb6 100644 --- a/src/tests/unit/store/mutations.spec.js +++ b/src/tests/unit/store/mutations.spec.js @@ -384,6 +384,39 @@ describe('Pinia store mutations', () => { }) }) + it('adds a special-use mailbox below its ordinary parents', () => { + store.addAccountMutation({ + accountId: 13, + id: 13, + mailboxes: [ + { + databaseId: 345, + name: 'shared/team@example.com/Sent Items', + delimiter: '/', + specialUse: ['sent'], + }, + { + databaseId: 346, + name: 'shared/team@example.com', + delimiter: '/', + specialUse: [], + }, + { + databaseId: 347, + name: 'shared', + delimiter: '/', + specialUse: [], + }, + ], + aliases: [], + }) + + expect(store.accountsUnmapped[13].mailboxes).toEqual([347]) + expect(store.mailboxes[347].mailboxes).toEqual([346]) + expect(store.mailboxes[346].mailboxes).toEqual([345]) + expect(store.mailboxes[345].displayName).toEqual('Sent Items') + }) + it('adds a top level mailbox', () => { const account = { accountId: 13,