feat: mail UI improvements - folder mapping, display name, resize perf, list header
- Add configurable folder mapping (sent/drafts/spam/trash) per account - Migration 0005_folder_mapping.sql with 4 new columns on mail_accounts - Backend: send_mail uses account.sent_folder_imap_name if set - Backend: _build_folder_hierarchy respects folder_mapping for is_standard - Frontend: MailSettings shows folder mapping editor per account - Frontend: MailSettings allows editing display_name for existing accounts - Frontend: MailFolderTree shows display_name || email, removes MailIcon - Frontend: ResizablePanel isDragging state with contain:strict + pointer-events:none - Frontend: MailList merges select-all and sort controls into one line
This commit is contained in:
@@ -0,0 +1,6 @@
|
|||||||
|
-- Mail plugin migration 0005: add configurable IMAP folder mapping columns
|
||||||
|
|
||||||
|
ALTER TABLE mail_accounts ADD COLUMN IF NOT EXISTS sent_folder_imap_name VARCHAR(255);
|
||||||
|
ALTER TABLE mail_accounts ADD COLUMN IF NOT EXISTS drafts_folder_imap_name VARCHAR(255);
|
||||||
|
ALTER TABLE mail_accounts ADD COLUMN IF NOT EXISTS spam_folder_imap_name VARCHAR(255);
|
||||||
|
ALTER TABLE mail_accounts ADD COLUMN IF NOT EXISTS trash_folder_imap_name VARCHAR(255);
|
||||||
@@ -48,6 +48,10 @@ class MailAccount(Base, TenantMixin):
|
|||||||
encrypted_password: Mapped[str] = mapped_column(Text, nullable=False)
|
encrypted_password: Mapped[str] = mapped_column(Text, nullable=False)
|
||||||
is_shared: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
|
is_shared: Mapped[bool] = mapped_column(Boolean, nullable=False, default=False)
|
||||||
is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
is_active: Mapped[bool] = mapped_column(Boolean, nullable=False, default=True)
|
||||||
|
sent_folder_imap_name: Mapped[str | None] = mapped_column(String(255), nullable=True)
|
||||||
|
drafts_folder_imap_name: Mapped[str | None] = mapped_column(String(255), nullable=True)
|
||||||
|
spam_folder_imap_name: Mapped[str | None] = mapped_column(String(255), nullable=True)
|
||||||
|
trash_folder_imap_name: Mapped[str | None] = mapped_column(String(255), nullable=True)
|
||||||
deleted_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
deleted_at: Mapped[datetime | None] = mapped_column(DateTime(timezone=True), nullable=True)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,10 @@ class MailAccountCreate(BaseModel):
|
|||||||
username: str = Field(default="", min_length=0, max_length=255)
|
username: str = Field(default="", min_length=0, max_length=255)
|
||||||
password: str = Field(..., min_length=1, max_length=512)
|
password: str = Field(..., min_length=1, max_length=512)
|
||||||
is_shared: bool = False
|
is_shared: bool = False
|
||||||
|
sent_folder_imap_name: str | None = Field(None, max_length=255)
|
||||||
|
drafts_folder_imap_name: str | None = Field(None, max_length=255)
|
||||||
|
spam_folder_imap_name: str | None = Field(None, max_length=255)
|
||||||
|
trash_folder_imap_name: str | None = Field(None, max_length=255)
|
||||||
|
|
||||||
|
|
||||||
class MailAccountUpdate(BaseModel):
|
class MailAccountUpdate(BaseModel):
|
||||||
@@ -38,6 +42,10 @@ class MailAccountUpdate(BaseModel):
|
|||||||
password: str | None = Field(None, min_length=1, max_length=512)
|
password: str | None = Field(None, min_length=1, max_length=512)
|
||||||
is_shared: bool | None = None
|
is_shared: bool | None = None
|
||||||
is_active: bool | None = None
|
is_active: bool | None = None
|
||||||
|
sent_folder_imap_name: str | None = Field(None, max_length=255)
|
||||||
|
drafts_folder_imap_name: str | None = Field(None, max_length=255)
|
||||||
|
spam_folder_imap_name: str | None = Field(None, max_length=255)
|
||||||
|
trash_folder_imap_name: str | None = Field(None, max_length=255)
|
||||||
|
|
||||||
|
|
||||||
class MailAccountResponse(BaseModel):
|
class MailAccountResponse(BaseModel):
|
||||||
@@ -54,6 +62,10 @@ class MailAccountResponse(BaseModel):
|
|||||||
username: str
|
username: str
|
||||||
is_shared: bool
|
is_shared: bool
|
||||||
is_active: bool
|
is_active: bool
|
||||||
|
sent_folder_imap_name: str | None = None
|
||||||
|
drafts_folder_imap_name: str | None = None
|
||||||
|
spam_folder_imap_name: str | None = None
|
||||||
|
trash_folder_imap_name: str | None = None
|
||||||
created_at: datetime | None = None
|
created_at: datetime | None = None
|
||||||
updated_at: datetime | None = None
|
updated_at: datetime | None = None
|
||||||
|
|
||||||
|
|||||||
@@ -270,6 +270,10 @@ async def create_mail_account(
|
|||||||
encrypted_password=encrypt_password(data["password"]),
|
encrypted_password=encrypt_password(data["password"]),
|
||||||
is_shared=data.get("is_shared", False),
|
is_shared=data.get("is_shared", False),
|
||||||
is_active=True,
|
is_active=True,
|
||||||
|
sent_folder_imap_name=data.get("sent_folder_imap_name"),
|
||||||
|
drafts_folder_imap_name=data.get("drafts_folder_imap_name"),
|
||||||
|
spam_folder_imap_name=data.get("spam_folder_imap_name"),
|
||||||
|
trash_folder_imap_name=data.get("trash_folder_imap_name"),
|
||||||
)
|
)
|
||||||
db.add(account)
|
db.add(account)
|
||||||
await db.flush()
|
await db.flush()
|
||||||
@@ -319,6 +323,10 @@ async def update_mail_account(db: AsyncSession, account: MailAccount, data: dict
|
|||||||
"username": "username",
|
"username": "username",
|
||||||
"is_shared": "is_shared",
|
"is_shared": "is_shared",
|
||||||
"is_active": "is_active",
|
"is_active": "is_active",
|
||||||
|
"sent_folder_imap_name": "sent_folder_imap_name",
|
||||||
|
"drafts_folder_imap_name": "drafts_folder_imap_name",
|
||||||
|
"spam_folder_imap_name": "spam_folder_imap_name",
|
||||||
|
"trash_folder_imap_name": "trash_folder_imap_name",
|
||||||
}
|
}
|
||||||
for api_field, model_field in field_map.items():
|
for api_field, model_field in field_map.items():
|
||||||
if api_field in data and data[api_field] is not None:
|
if api_field in data and data[api_field] is not None:
|
||||||
@@ -351,6 +359,10 @@ def account_to_response(account: MailAccount) -> dict:
|
|||||||
"username": account.username,
|
"username": account.username,
|
||||||
"is_shared": account.is_shared,
|
"is_shared": account.is_shared,
|
||||||
"is_active": account.is_active,
|
"is_active": account.is_active,
|
||||||
|
"sent_folder_imap_name": account.sent_folder_imap_name,
|
||||||
|
"drafts_folder_imap_name": account.drafts_folder_imap_name,
|
||||||
|
"spam_folder_imap_name": account.spam_folder_imap_name,
|
||||||
|
"trash_folder_imap_name": account.trash_folder_imap_name,
|
||||||
"created_at": account.created_at,
|
"created_at": account.created_at,
|
||||||
"updated_at": account.updated_at,
|
"updated_at": account.updated_at,
|
||||||
}
|
}
|
||||||
@@ -454,6 +466,7 @@ def _build_folder_hierarchy(
|
|||||||
tenant_id: uuid.UUID,
|
tenant_id: uuid.UUID,
|
||||||
existing_folders: dict[str, MailFolder],
|
existing_folders: dict[str, MailFolder],
|
||||||
delimiter: str = '.',
|
delimiter: str = '.',
|
||||||
|
folder_mapping: dict[str, str | None] | None = None,
|
||||||
) -> list[MailFolder]:
|
) -> list[MailFolder]:
|
||||||
"""Create or update MailFolder records from IMAP LIST response.
|
"""Create or update MailFolder records from IMAP LIST response.
|
||||||
|
|
||||||
@@ -463,6 +476,13 @@ def _build_folder_hierarchy(
|
|||||||
"""
|
"""
|
||||||
result: list[MailFolder] = []
|
result: list[MailFolder] = []
|
||||||
|
|
||||||
|
# Build reverse mapping: imap_name -> standard type (sent/drafts/spam/trash)
|
||||||
|
mapping_by_imap: dict[str, str] = {}
|
||||||
|
if folder_mapping:
|
||||||
|
for std_type, imap_name_val in folder_mapping.items():
|
||||||
|
if imap_name_val:
|
||||||
|
mapping_by_imap[imap_name_val] = std_type
|
||||||
|
|
||||||
# First pass: create or update folder records
|
# First pass: create or update folder records
|
||||||
for flags, imap_name in imap_folders:
|
for flags, imap_name in imap_folders:
|
||||||
if not imap_name:
|
if not imap_name:
|
||||||
@@ -471,6 +491,19 @@ def _build_folder_hierarchy(
|
|||||||
display_name = _get_german_folder_name(imap_name)
|
display_name = _get_german_folder_name(imap_name)
|
||||||
is_standard = imap_name in STANDARD_IMAP_FOLDERS
|
is_standard = imap_name in STANDARD_IMAP_FOLDERS
|
||||||
|
|
||||||
|
# If account has explicit folder mapping, mark mapped folders as standard
|
||||||
|
if imap_name in mapping_by_imap:
|
||||||
|
is_standard = True
|
||||||
|
std_type = mapping_by_imap[imap_name]
|
||||||
|
if std_type == "sent":
|
||||||
|
display_name = "Gesendet"
|
||||||
|
elif std_type == "drafts":
|
||||||
|
display_name = "Entwürfe"
|
||||||
|
elif std_type == "spam":
|
||||||
|
display_name = "Spam"
|
||||||
|
elif std_type == "trash":
|
||||||
|
display_name = "Papierkorb"
|
||||||
|
|
||||||
if imap_name in existing_folders:
|
if imap_name in existing_folders:
|
||||||
folder = existing_folders[imap_name]
|
folder = existing_folders[imap_name]
|
||||||
folder.name = display_name
|
folder.name = display_name
|
||||||
@@ -641,8 +674,15 @@ async def imap_sync_account(
|
|||||||
break
|
break
|
||||||
|
|
||||||
# 3) Create/update folders in DB
|
# 3) Create/update folders in DB
|
||||||
|
folder_mapping = {
|
||||||
|
"sent": account.sent_folder_imap_name,
|
||||||
|
"drafts": account.drafts_folder_imap_name,
|
||||||
|
"spam": account.spam_folder_imap_name,
|
||||||
|
"trash": account.trash_folder_imap_name,
|
||||||
|
}
|
||||||
db_folders = _build_folder_hierarchy(
|
db_folders = _build_folder_hierarchy(
|
||||||
imap_folders, account.id, tenant_id, existing_by_imap, imap_delimiter
|
imap_folders, account.id, tenant_id, existing_by_imap, imap_delimiter,
|
||||||
|
folder_mapping=folder_mapping,
|
||||||
)
|
)
|
||||||
for folder in db_folders:
|
for folder in db_folders:
|
||||||
if folder.id is None:
|
if folder.id is None:
|
||||||
@@ -1079,8 +1119,20 @@ async def send_mail_via_smtp(
|
|||||||
await smtp.send_message(msg, recipients=recipients)
|
await smtp.send_message(msg, recipients=recipients)
|
||||||
await smtp.quit()
|
await smtp.quit()
|
||||||
|
|
||||||
# Store sent mail in Sent folder — flexible lookup to handle
|
# Store sent mail in Sent folder — use configured mapping if set,
|
||||||
# different IMAP naming conventions (Sent, INBOX.Sent, Sent Items, etc.)
|
# otherwise flexible lookup to handle different IMAP naming conventions
|
||||||
|
if account.sent_folder_imap_name:
|
||||||
|
sent_folder = (
|
||||||
|
await db.execute(
|
||||||
|
select(MailFolder).where(
|
||||||
|
and_(
|
||||||
|
MailFolder.account_id == account.id,
|
||||||
|
MailFolder.imap_name == account.sent_folder_imap_name,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
).scalar_one_or_none()
|
||||||
|
else:
|
||||||
sent_folder = (
|
sent_folder = (
|
||||||
await db.execute(
|
await db.execute(
|
||||||
select(MailFolder).where(
|
select(MailFolder).where(
|
||||||
|
|||||||
@@ -19,6 +19,10 @@ export interface MailAccount {
|
|||||||
smtp_port: number;
|
smtp_port: number;
|
||||||
is_shared: boolean;
|
is_shared: boolean;
|
||||||
is_active: boolean;
|
is_active: boolean;
|
||||||
|
sent_folder_imap_name?: string | null;
|
||||||
|
drafts_folder_imap_name?: string | null;
|
||||||
|
spam_folder_imap_name?: string | null;
|
||||||
|
trash_folder_imap_name?: string | null;
|
||||||
created_at?: string | null;
|
created_at?: string | null;
|
||||||
updated_at?: string | null;
|
updated_at?: string | null;
|
||||||
}
|
}
|
||||||
@@ -195,6 +199,10 @@ export interface CreateAccountPayload {
|
|||||||
username?: string;
|
username?: string;
|
||||||
password: string;
|
password: string;
|
||||||
is_shared?: boolean;
|
is_shared?: boolean;
|
||||||
|
sent_folder_imap_name?: string | null;
|
||||||
|
drafts_folder_imap_name?: string | null;
|
||||||
|
spam_folder_imap_name?: string | null;
|
||||||
|
trash_folder_imap_name?: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface UpdateAccountPayload {
|
export interface UpdateAccountPayload {
|
||||||
@@ -205,6 +213,10 @@ export interface UpdateAccountPayload {
|
|||||||
smtp_port?: number;
|
smtp_port?: number;
|
||||||
password?: string;
|
password?: string;
|
||||||
is_active?: boolean;
|
is_active?: boolean;
|
||||||
|
sent_folder_imap_name?: string | null;
|
||||||
|
drafts_folder_imap_name?: string | null;
|
||||||
|
spam_folder_imap_name?: string | null;
|
||||||
|
trash_folder_imap_name?: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CreateFolderPayload {
|
export interface CreateFolderPayload {
|
||||||
|
|||||||
@@ -207,8 +207,7 @@ function AccountNode({
|
|||||||
data-testid={`account-${account.id}`}
|
data-testid={`account-${account.id}`}
|
||||||
>
|
>
|
||||||
<ChevronIcon expanded={expanded} />
|
<ChevronIcon expanded={expanded} />
|
||||||
<MailIcon />
|
<span className="flex-1 truncate text-left">{account.display_name || account.email}</span>
|
||||||
<span className="flex-1 truncate text-left">{account.email}</span>
|
|
||||||
</button>
|
</button>
|
||||||
{expanded && (
|
{expanded && (
|
||||||
<div role="group" className="ml-2">
|
<div role="group" className="ml-2">
|
||||||
|
|||||||
@@ -91,8 +91,9 @@ export function MailList({
|
|||||||
|
|
||||||
return (
|
return (
|
||||||
<div className="flex flex-col h-full" data-testid="mail-list" role="listbox" aria-label={t('mail.selectMail')}>
|
<div className="flex flex-col h-full" data-testid="mail-list" role="listbox" aria-label={t('mail.selectMail')}>
|
||||||
{/* Select-all header */}
|
{/* Select-all + Sort header in one row */}
|
||||||
<div className="flex items-center gap-2 px-3 py-2 md:px-4 md:py-2 border-b border-secondary-200 bg-secondary-50 flex-shrink-0">
|
<div className="flex items-center justify-between gap-2 px-3 py-2 md:px-4 md:py-2 border-b border-secondary-200 bg-secondary-50 flex-shrink-0">
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
<input
|
<input
|
||||||
type="checkbox"
|
type="checkbox"
|
||||||
checked={allSelected}
|
checked={allSelected}
|
||||||
@@ -107,9 +108,8 @@ export function MailList({
|
|||||||
</span>
|
</span>
|
||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
{/* Sort header */}
|
|
||||||
{onSortChange && (
|
{onSortChange && (
|
||||||
<div className="flex items-center gap-2 px-3 py-1.5 md:px-4 border-b border-secondary-200 bg-secondary-50 flex-shrink-0" data-testid="mail-sort-bar">
|
<div className="flex items-center gap-2" data-testid="mail-sort-bar">
|
||||||
<label htmlFor="mail-sort-by" className="text-xs text-secondary-600">
|
<label htmlFor="mail-sort-by" className="text-xs text-secondary-600">
|
||||||
{t('mail.sortBy')}:
|
{t('mail.sortBy')}:
|
||||||
</label>
|
</label>
|
||||||
@@ -141,6 +141,7 @@ export function MailList({
|
|||||||
</button>
|
</button>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
</div>
|
||||||
{/* Mail list — scrolls, pagination stays fixed */}
|
{/* Mail list — scrolls, pagination stays fixed */}
|
||||||
<ul className="divide-y divide-secondary-100 flex-1 overflow-y-auto" role="list">
|
<ul className="divide-y divide-secondary-100 flex-1 overflow-y-auto" role="list">
|
||||||
{mails.map((mail) => (
|
{mails.map((mail) => (
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ export function ResizablePanel({
|
|||||||
...rest
|
...rest
|
||||||
}: ResizablePanelProps) {
|
}: ResizablePanelProps) {
|
||||||
const [width, setWidth] = useState(initialWidth);
|
const [width, setWidth] = useState(initialWidth);
|
||||||
|
const [isDragging, setIsDragging] = useState(false);
|
||||||
const isResizing = useRef(false);
|
const isResizing = useRef(false);
|
||||||
const startX = useRef(0);
|
const startX = useRef(0);
|
||||||
const startWidth = useRef(0);
|
const startWidth = useRef(0);
|
||||||
@@ -47,6 +48,7 @@ export function ResizablePanel({
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
isResizing.current = true;
|
isResizing.current = true;
|
||||||
|
setIsDragging(true);
|
||||||
startX.current = e.clientX;
|
startX.current = e.clientX;
|
||||||
startWidth.current = width;
|
startWidth.current = width;
|
||||||
document.body.style.cursor = 'col-resize';
|
document.body.style.cursor = 'col-resize';
|
||||||
@@ -66,6 +68,7 @@ export function ResizablePanel({
|
|||||||
const handleMouseUp = () => {
|
const handleMouseUp = () => {
|
||||||
if (isResizing.current) {
|
if (isResizing.current) {
|
||||||
isResizing.current = false;
|
isResizing.current = false;
|
||||||
|
setIsDragging(false);
|
||||||
document.body.style.cursor = '';
|
document.body.style.cursor = '';
|
||||||
document.body.style.userSelect = '';
|
document.body.style.userSelect = '';
|
||||||
}
|
}
|
||||||
@@ -90,7 +93,14 @@ export function ResizablePanel({
|
|||||||
data-testid={rest['data-testid']}
|
data-testid={rest['data-testid']}
|
||||||
>
|
>
|
||||||
{/* Inner scrollable content area — scrollbar stays inside, never overlaps handle */}
|
{/* Inner scrollable content area — scrollbar stays inside, never overlaps handle */}
|
||||||
<div className="flex-1 overflow-y-auto overflow-x-hidden min-h-0">
|
<div
|
||||||
|
className="flex-1 overflow-y-auto overflow-x-hidden min-h-0"
|
||||||
|
style={{
|
||||||
|
contain: 'strict',
|
||||||
|
pointerEvents: isDragging ? 'none' : 'auto',
|
||||||
|
willChange: isDragging ? 'width' : undefined,
|
||||||
|
}}
|
||||||
|
>
|
||||||
{children}
|
{children}
|
||||||
</div>
|
</div>
|
||||||
{resizable && (
|
{resizable && (
|
||||||
|
|||||||
@@ -21,7 +21,10 @@ import {
|
|||||||
deleteAccount,
|
deleteAccount,
|
||||||
testConnection,
|
testConnection,
|
||||||
triggerSync,
|
triggerSync,
|
||||||
|
updateAccount,
|
||||||
|
fetchFolders,
|
||||||
type MailAccount,
|
type MailAccount,
|
||||||
|
type MailFolder,
|
||||||
type CreateAccountPayload,
|
type CreateAccountPayload,
|
||||||
} from '@/api/mail';
|
} from '@/api/mail';
|
||||||
|
|
||||||
@@ -47,6 +50,12 @@ export function MailSettingsPage() {
|
|||||||
const [saving, setSaving] = useState(false);
|
const [saving, setSaving] = useState(false);
|
||||||
const [testing, setTesting] = useState<string | null>(null);
|
const [testing, setTesting] = useState<string | null>(null);
|
||||||
const [syncing, setSyncing] = useState<string | null>(null);
|
const [syncing, setSyncing] = useState<string | null>(null);
|
||||||
|
const [editingDisplayName, setEditingDisplayName] = useState<string | null>(null);
|
||||||
|
const [displayNameValue, setDisplayNameValue] = useState('');
|
||||||
|
const [accountFolders, setAccountFolders] = useState<Record<string, MailFolder[]>>({});
|
||||||
|
const [folderMappingEdit, setFolderMappingEdit] = useState<string | null>(null);
|
||||||
|
const [folderMappingValues, setFolderMappingValues] = useState<Record<string, string>>({});
|
||||||
|
const [savingMapping, setSavingMapping] = useState(false);
|
||||||
|
|
||||||
const loadAccounts = useCallback(async () => {
|
const loadAccounts = useCallback(async () => {
|
||||||
setLoading(true);
|
setLoading(true);
|
||||||
@@ -134,6 +143,63 @@ export function MailSettingsPage() {
|
|||||||
}
|
}
|
||||||
}, [toast, t]);
|
}, [toast, t]);
|
||||||
|
|
||||||
|
const handleSaveDisplayName = useCallback(async (accountId: string) => {
|
||||||
|
try {
|
||||||
|
const updated = await updateAccount(accountId, { display_name: displayNameValue });
|
||||||
|
setAccounts((prev) => prev.map((a) => (a.id === accountId ? updated : a)));
|
||||||
|
setEditingDisplayName(null);
|
||||||
|
toast.success(t('common.saved'));
|
||||||
|
} catch (err: any) {
|
||||||
|
toast.error(err?.message || err?.detail || 'Save failed');
|
||||||
|
}
|
||||||
|
}, [displayNameValue, toast, t]);
|
||||||
|
|
||||||
|
const handleStartEditDisplayName = useCallback((acc: MailAccount) => {
|
||||||
|
setEditingDisplayName(acc.id);
|
||||||
|
setDisplayNameValue(acc.display_name || '');
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const loadAccountFolders = useCallback(async (accountId: string) => {
|
||||||
|
try {
|
||||||
|
const folders = await fetchFolders(accountId);
|
||||||
|
setAccountFolders((prev) => ({ ...prev, [accountId]: folders }));
|
||||||
|
} catch {
|
||||||
|
// non-critical
|
||||||
|
}
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
const handleStartFolderMapping = useCallback((acc: MailAccount) => {
|
||||||
|
setFolderMappingEdit(acc.id);
|
||||||
|
setFolderMappingValues({
|
||||||
|
sent: acc.sent_folder_imap_name || '',
|
||||||
|
drafts: acc.drafts_folder_imap_name || '',
|
||||||
|
spam: acc.spam_folder_imap_name || '',
|
||||||
|
trash: acc.trash_folder_imap_name || '',
|
||||||
|
});
|
||||||
|
if (!accountFolders[acc.id]) {
|
||||||
|
loadAccountFolders(acc.id);
|
||||||
|
}
|
||||||
|
}, [accountFolders, loadAccountFolders]);
|
||||||
|
|
||||||
|
const handleSaveFolderMapping = useCallback(async (accountId: string) => {
|
||||||
|
setSavingMapping(true);
|
||||||
|
try {
|
||||||
|
const payload: Record<string, string | null> = {};
|
||||||
|
payload.sent_folder_imap_name = folderMappingValues.sent || null;
|
||||||
|
payload.drafts_folder_imap_name = folderMappingValues.drafts || null;
|
||||||
|
payload.spam_folder_imap_name = folderMappingValues.spam || null;
|
||||||
|
payload.trash_folder_imap_name = folderMappingValues.trash || null;
|
||||||
|
const updated = await updateAccount(accountId, payload);
|
||||||
|
setAccounts((prev) => prev.map((a) => (a.id === accountId ? updated : a)));
|
||||||
|
setFolderMappingEdit(null);
|
||||||
|
toast.success(t('common.saved'));
|
||||||
|
} catch (err: any) {
|
||||||
|
toast.error(err?.message || err?.detail || 'Save failed');
|
||||||
|
} finally {
|
||||||
|
setSavingMapping(false);
|
||||||
|
}
|
||||||
|
}, [folderMappingValues, toast, t]);
|
||||||
|
|
||||||
const activeTab = searchParams.get('tab') || 'accounts';
|
const activeTab = searchParams.get('tab') || 'accounts';
|
||||||
|
|
||||||
const tabs = [
|
const tabs = [
|
||||||
@@ -238,7 +304,32 @@ export function MailSettingsPage() {
|
|||||||
<Card key={acc.id}>
|
<Card key={acc.id}>
|
||||||
<div className="flex items-center justify-between">
|
<div className="flex items-center justify-between">
|
||||||
<div className="min-w-0 flex-1">
|
<div className="min-w-0 flex-1">
|
||||||
|
{editingDisplayName === acc.id ? (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
|
<Input
|
||||||
|
value={displayNameValue}
|
||||||
|
onChange={(e) => setDisplayNameValue(e.target.value)}
|
||||||
|
placeholder={acc.email}
|
||||||
|
className="flex-1"
|
||||||
|
/>
|
||||||
|
<Button size="sm" onClick={() => handleSaveDisplayName(acc.id)}>{t('common.save')}</Button>
|
||||||
|
<Button variant="secondary" size="sm" onClick={() => setEditingDisplayName(null)}>{t('common.cancel')}</Button>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="flex items-center gap-2">
|
||||||
<p className="font-medium text-secondary-900">{acc.display_name || acc.email}</p>
|
<p className="font-medium text-secondary-900">{acc.display_name || acc.email}</p>
|
||||||
|
<button
|
||||||
|
onClick={() => handleStartEditDisplayName(acc)}
|
||||||
|
className="text-xs text-secondary-400 hover:text-secondary-600"
|
||||||
|
aria-label={t('common.edit')}
|
||||||
|
data-testid={`edit-display-name-${acc.id}`}
|
||||||
|
>
|
||||||
|
<svg className="w-3.5 h-3.5" fill="none" viewBox="0 0 24 24" stroke="currentColor" aria-hidden="true">
|
||||||
|
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M11 5H6a2 2 0 00-2 2v11a2 2 0 002 2h11a2 2 0 002-2v-5m-1.414-9.414a2 2 0 112.828 2.828L11.828 15H9v-2.828l8.586-8.586z" />
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
<p className="text-sm text-secondary-500 truncate">{acc.email}</p>
|
<p className="text-sm text-secondary-500 truncate">{acc.email}</p>
|
||||||
<p className="text-xs text-secondary-400 mt-1">
|
<p className="text-xs text-secondary-400 mt-1">
|
||||||
{t('mail.serverInfo')}: {acc.imap_host}:{acc.imap_port} / {acc.smtp_host}:{acc.smtp_port}
|
{t('mail.serverInfo')}: {acc.imap_host}:{acc.imap_port} / {acc.smtp_host}:{acc.smtp_port}
|
||||||
@@ -277,6 +368,43 @@ export function MailSettingsPage() {
|
|||||||
</Button>
|
</Button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
{/* Folder mapping section */}
|
||||||
|
{folderMappingEdit === acc.id ? (
|
||||||
|
<div className="mt-3 pt-3 border-t border-secondary-200 space-y-2" data-testid={`folder-mapping-${acc.id}`}>
|
||||||
|
<p className="text-xs font-medium text-secondary-600">Ordner-Zuordnung</p>
|
||||||
|
{(['sent', 'drafts', 'spam', 'trash'] as const).map((type) => (
|
||||||
|
<div key={type} className="flex items-center gap-2">
|
||||||
|
<label className="text-xs text-secondary-500 w-20">
|
||||||
|
{type === 'sent' ? 'Gesendet' : type === 'drafts' ? 'Entwürfe' : type === 'spam' ? 'Spam' : 'Papierkorb'}
|
||||||
|
</label>
|
||||||
|
<select
|
||||||
|
value={folderMappingValues[type] || ''}
|
||||||
|
onChange={(e) => setFolderMappingValues((prev) => ({ ...prev, [type]: e.target.value }))}
|
||||||
|
className="text-xs rounded border border-secondary-300 bg-white px-1.5 py-0.5 text-secondary-700 focus:outline-none focus:ring-1 focus:ring-primary-500 flex-1"
|
||||||
|
>
|
||||||
|
<option value="">(automatisch)</option>
|
||||||
|
{(accountFolders[acc.id] || []).map((f) => (
|
||||||
|
<option key={f.id} value={f.imap_name}>{f.imap_name}</option>
|
||||||
|
))}
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
|
))}
|
||||||
|
<div className="flex gap-2 mt-2">
|
||||||
|
<Button size="sm" onClick={() => handleSaveFolderMapping(acc.id)} isLoading={savingMapping}>{t('common.save')}</Button>
|
||||||
|
<Button variant="secondary" size="sm" onClick={() => setFolderMappingEdit(null)}>{t('common.cancel')}</Button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
) : (
|
||||||
|
<div className="mt-2">
|
||||||
|
<button
|
||||||
|
onClick={() => handleStartFolderMapping(acc)}
|
||||||
|
className="text-xs text-secondary-400 hover:text-secondary-600"
|
||||||
|
data-testid={`folder-mapping-btn-${acc.id}`}
|
||||||
|
>
|
||||||
|
Ordner-Zuordnung bearbeiten
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
)}
|
||||||
</Card>
|
</Card>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user