Stefan Hildebrandt
7c221c4a4a
Rework the sidebar "All accounts" section into a "Unified Mailbox" that, by default, stays within the active login account and its shared/group folders. Merging across multiple logged-in accounts becomes an opt-in sub-option instead of the default, and the standalone per-account "All Mail" virtual folder is folded into the unified All mail / Unread / Starred entries (its folder selection now narrows those lists). Scope: - lib/unified-mailbox.ts: UnifiedAccountClient.crossIncludedMailboxIds; the cross views honor the per-account folder selection (union across accounts = the sum of each account's selection), falling back to inbox+custom when unset. - stores/email-store.ts: buildUnifiedAccountClients gains scopeToClientAccountId (the account boundary) and populates crossIncludedMailboxIds from allMailFolderIds; remove the standalone __all_mail__ fetch/search/load-more branches. - page.tsx: scope to the active account unless cross-account is active (per-user opt-in AND admin gate); the per-role unified mailboxes obey the same scope. Folding: - Drop ALL_MAIL_MAILBOX_ID (lib/jmap/types.ts); thread-list source-folder column now keys on isUnifiedView only; settings folder picker moves under the unified group and shows once any unified entry is enabled. Config: - User: new unifiedCrossAccount (default false); includeGroupInUnified default flips to true; enableAllMailView retired; the three cross-view toggles now gate the unified Unread/Starred/All mail entries. - Admin: new unifiedCrossAccountEnabled gate, default FALSE (cross-account is an admin opt-in; when off the per-user toggle is hidden and the scope is forced account-bounded at runtime). allMailViewEnabled deprecated and normalized forward into crossAllViewEnabled on policy load; cross-view gate labels reworded to "Unified Mailbox: ...". Header: the sidebar section shows "All accounts" when cross-account is active (opt-in AND admin gate AND >1 connected account), else "Unified Mailbox". Migration: - Settings persist v5 -> v6 (exported migrateSettings) - cross-active users keep cross-account; All-Mail-only users get the account-bounded unified All mail entry with folder ids preserved; includeGroupInUnified enabled for every migrated config; fresh installs are account-bounded. - Admin policy: one-shot, marker-guarded migratePolicyUnifiedMailbox (run before configManager.load) enables unifiedCrossAccountEnabled when a cross view was active, so existing cross-account installs keep the behaviour despite the default-false gate. Skipped on read-only config dirs. Locales: sidebar all_accounts (original label) + unified_mailbox (translated, per locale) keys; dead standalone all_mail strings removed across all 20 locales. Docs: FEATURES.md updated to the account-bounded model, the cross-account gate, and the folder-narrowed aggregate entries. Verification: tsc clean, eslint clean, full vitest suite green (incl. translations completeness, cross-view/migration coverage, and the admin policy migration test).
60 lines
2.5 KiB
TypeScript
60 lines
2.5 KiB
TypeScript
import { describe, it, expect, beforeEach, afterEach } from 'vitest';
|
|
import { mkdtemp, rm, readFile, writeFile } from 'node:fs/promises';
|
|
import { existsSync } from 'node:fs';
|
|
import { tmpdir } from 'node:os';
|
|
import path from 'node:path';
|
|
import { migratePolicyUnifiedMailbox } from '../migrate';
|
|
|
|
// migratePolicyUnifiedMailbox reads ADMIN_CONFIG_DIR at call time (see paths.ts),
|
|
// so each test points it at a fresh temp dir.
|
|
let dir: string;
|
|
const policyPath = () => path.join(dir, 'policy.json');
|
|
const markerPath = () => path.join(dir, '.migrated-unified-mailbox');
|
|
|
|
const writePolicy = (features: Record<string, unknown>) =>
|
|
writeFile(policyPath(), JSON.stringify({ features, restrictions: {} }, null, 2), 'utf-8');
|
|
const readFeatures = async () =>
|
|
JSON.parse(await readFile(policyPath(), 'utf-8')).features as Record<string, unknown>;
|
|
|
|
beforeEach(async () => {
|
|
dir = await mkdtemp(path.join(tmpdir(), 'bw-policy-'));
|
|
process.env.ADMIN_CONFIG_DIR = dir;
|
|
});
|
|
|
|
afterEach(async () => {
|
|
delete process.env.ADMIN_CONFIG_DIR;
|
|
await rm(dir, { recursive: true, force: true });
|
|
});
|
|
|
|
describe('migratePolicyUnifiedMailbox', () => {
|
|
it('enables unifiedCrossAccountEnabled when a cross view was active', async () => {
|
|
await writePolicy({ crossUnreadViewEnabled: true });
|
|
await migratePolicyUnifiedMailbox();
|
|
expect((await readFeatures()).unifiedCrossAccountEnabled).toBe(true);
|
|
expect(existsSync(markerPath())).toBe(true);
|
|
});
|
|
|
|
it('does not enable it for a standalone All-Mail-only policy', async () => {
|
|
await writePolicy({ allMailViewEnabled: true, crossUnreadViewEnabled: false, crossStarredViewEnabled: false, crossAllViewEnabled: false });
|
|
await migratePolicyUnifiedMailbox();
|
|
expect((await readFeatures()).unifiedCrossAccountEnabled).toBeUndefined();
|
|
});
|
|
|
|
it('is a one-shot: a later admin disable survives a re-run', async () => {
|
|
await writePolicy({ crossAllViewEnabled: true });
|
|
await migratePolicyUnifiedMailbox();
|
|
expect((await readFeatures()).unifiedCrossAccountEnabled).toBe(true);
|
|
|
|
// Admin turns it back off; the marker is present, so re-running is a no-op.
|
|
await writePolicy({ crossAllViewEnabled: true, unifiedCrossAccountEnabled: false });
|
|
await migratePolicyUnifiedMailbox();
|
|
expect((await readFeatures()).unifiedCrossAccountEnabled).toBe(false);
|
|
});
|
|
|
|
it('no policy.json: writes the marker and does not throw', async () => {
|
|
await migratePolicyUnifiedMailbox();
|
|
expect(existsSync(markerPath())).toBe(true);
|
|
expect(existsSync(policyPath())).toBe(false);
|
|
});
|
|
});
|