src-advisory/SRCmail
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: hide server scheduled folder when virtual one is shown #495

Browse Source
This commit is contained in:
Linus Rath
2026-06-28 20:36:32 +02:00
parent d4c066622b
commit 1f21a5213f
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/layout/sidebar.tsx
+8 -2
View File
@@ -811,8 +811,14 @@ export function Sidebar({
}); });
}; };
// When the app renders its own virtual "Scheduled" folder (for delayed
// sends, driven by EmailSubmission), hide the server-provided scheduled
// mailbox (e.g. Stalwart's auto-created Scheduled folder, role === 'scheduled')
// so it does not appear twice. (#495)
const isServerScheduledNode = (n: MailboxNode) => showScheduledMailbox && n.role === 'scheduled';
const mailboxTree = buildMailboxTree(mailboxes); const mailboxTree = buildMailboxTree(mailboxes);
const ownTree = mailboxTree.filter(n => !n.id.startsWith('shared-account-')); const ownTree = mailboxTree.filter(n => !n.id.startsWith('shared-account-') && !isServerScheduledNode(n));
const sharedAccounts = mailboxTree.filter(n => n.id.startsWith('shared-account-')); const sharedAccounts = mailboxTree.filter(n => n.id.startsWith('shared-account-'));
// Multi-account mode (Pro shell): render every connected account as its // Multi-account mode (Pro shell): render every connected account as its
@@ -827,7 +833,7 @@ export function Sidebar({
? mailboxes ? mailboxes
: (accountMailboxes?.[account.id] ?? []); : (accountMailboxes?.[account.id] ?? []);
const tree = buildMailboxTree(accountMailboxList).filter( const tree = buildMailboxTree(accountMailboxList).filter(
(n) => !n.id.startsWith('shared-account-') (n) => !n.id.startsWith('shared-account-') && !(isActive && isServerScheduledNode(n))
); );
return { account, isActive, tree }; return { account, isActive, tree };
}) })