alma/Neah
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

courrier multi account restore compose

Browse Source
This commit is contained in:
alma 2025-04-29 10:55:00 +02:00
parent 1a380f973c
commit 686ea6cb53
2 changed files with 36 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
app/courrier/page.tsx
View File

@ -154,6 +154,7 @@ export default function CourrierPage() {
searchQuery, searchQuery,
page, page,
totalPages, totalPages,
totalEmails,
loadEmails, loadEmails,
handleEmailSelect, handleEmailSelect,
markEmailAsRead, markEmailAsRead,
@ -609,10 +610,10 @@ export default function CourrierPage() {
// Update handleMailboxChange to ensure consistent folder naming and prevent race conditions // Update handleMailboxChange to ensure consistent folder naming and prevent race conditions
const handleMailboxChange = (folder: string, accountId?: string) => { const handleMailboxChange = (folder: string, accountId?: string) => {
// Enhanced logging to trace the flow // Enhanced logging to trace the flow
logEmailOp('MAILBOX-CHANGE', `Starting mailbox change to folder=${folder}, accountId=${accountId || 'undefined'}`); logEmailOp('MAILBOX-CHANGE-V2', `Starting mailbox change to folder=${folder}, accountId=${accountId || 'undefined'}`);
if (!accountId || accountId === 'loading-account') { if (!accountId || accountId === 'loading-account') {
logEmailOp('MAILBOX-CHANGE', 'No valid accountId provided, using default flow', { folder }); logEmailOp('MAILBOX-CHANGE-V2', 'No valid accountId provided, using default flow', { folder });
changeFolder(folder); changeFolder(folder);
return; return;
} }
@ -625,7 +626,7 @@ export default function CourrierPage() {
const account = accounts.find(a => a.id.toString() === accountId.toString()); const account = accounts.find(a => a.id.toString() === accountId.toString());
if (!account) { if (!account) {
logEmailOp('MAILBOX-CHANGE', `ERROR: Account not found: ${accountId}`); logEmailOp('MAILBOX-CHANGE-V2', `ERROR: Account not found: ${accountId}`);
toast({ toast({
title: "Account not found", title: "Account not found",
description: `The account ${accountId} could not be found.`, description: `The account ${accountId} could not be found.`,
@ -635,7 +636,7 @@ export default function CourrierPage() {
return; return;
} }
logEmailOp('MAILBOX-CHANGE', `Found account: ${account.email}`, { logEmailOp('MAILBOX-CHANGE-V2', `Found account: ${account.email}`, {
folderCount: account.folders?.length || 0, folderCount: account.folders?.length || 0,
folder: folder folder: folder
}); });
@ -649,12 +650,12 @@ export default function CourrierPage() {
folderAccountId = parts[0]; folderAccountId = parts[0];
baseFolder = parts[1]; baseFolder = parts[1];
logEmailOp('MAILBOX-CHANGE', `Parsed folder: accountId=${folderAccountId}, baseFolder=${baseFolder}`); logEmailOp('MAILBOX-CHANGE-V2', `Parsed folder: accountId=${folderAccountId}, baseFolder=${baseFolder}`);
// CRITICAL FIX: If the folder has an account prefix that doesn't match the requested account, // CRITICAL FIX: If the folder has an account prefix that doesn't match the requested account,
// log a warning and ALWAYS use the requested accountId // log a warning and ALWAYS use the requested accountId
if (folderAccountId !== accountId.toString()) { if (folderAccountId !== accountId.toString()) {
logEmailOp('MAILBOX-CHANGE', `WARNING: Folder prefix mismatch - FIXING`, { logEmailOp('MAILBOX-CHANGE-V2', `WARNING: Folder prefix mismatch - FIXING`, {
folderAccount: folderAccountId, folderAccount: folderAccountId,
requestedAccount: accountId, requestedAccount: accountId,
originalFolder: folder, originalFolder: folder,
@ -667,7 +668,14 @@ export default function CourrierPage() {
// ALWAYS create a consistent folder name with REQUESTED account prefix // ALWAYS create a consistent folder name with REQUESTED account prefix
const prefixedFolder = `${accountId}:${baseFolder}`; const prefixedFolder = `${accountId}:${baseFolder}`;
logEmailOp('MAILBOX-CHANGE', `Normalized folder name: ${prefixedFolder}`); logEmailOp('MAILBOX-CHANGE-V2', `Normalized folder name: ${prefixedFolder}`);
// Check if we're already on this folder to avoid unnecessary refreshes
if (currentFolder === prefixedFolder) {
logEmailOp('MAILBOX-CHANGE-V2', `Already on folder ${prefixedFolder}, skipping change`);
setLoading(false);
return;
}
// CRITICAL FIX: Lock in the selected folder BEFORE changing it in the system // CRITICAL FIX: Lock in the selected folder BEFORE changing it in the system
// This prevents any race conditions where the folder gets reset to INBOX // This prevents any race conditions where the folder gets reset to INBOX
@ -676,18 +684,17 @@ export default function CourrierPage() {
...prev, ...prev,
[accountId]: prefixedFolder [accountId]: prefixedFolder
}; };
logEmailOp('MAILBOX-CHANGE', `Updated selected folders map`, updated); logEmailOp('MAILBOX-CHANGE-V2', `Updated selected folders map`, updated);
return updated; return updated;
}); });
// Call changeFolder with the prefixed folder name and explicit accountId // Now use the changeFolder function from the hook with our properly formatted folder name
// This ensures that both the folder name and accountId parameter are consistent
changeFolder(prefixedFolder, accountId) changeFolder(prefixedFolder, accountId)
.then(() => { .then(() => {
logEmailOp('MAILBOX-CHANGE', `Successfully changed to folder ${prefixedFolder}`); logEmailOp('MAILBOX-CHANGE-V2', `Successfully changed to folder ${prefixedFolder}`);
}) })
.catch(error => { .catch(error => {
logEmailOp('MAILBOX-CHANGE', `ERROR: Failed to change to folder ${prefixedFolder}`, { error }); logEmailOp('MAILBOX-CHANGE-V2', `ERROR: Failed to change to folder ${prefixedFolder}`, { error });
toast({ toast({
title: "Error changing folders", title: "Error changing folders",
description: `Failed to change to folder ${baseFolder}. ${error instanceof Error ? error.message : String(error)}`, description: `Failed to change to folder ${baseFolder}. ${error instanceof Error ? error.message : String(error)}`,

29
hooks/use-courrier.ts
View File

@ -289,21 +289,26 @@ export const useCourrier = () => {
} }
}, [loadEmails]); }, [loadEmails]);
// Load emails when folder or page changes // Load emails when page changes for pagination only
useEffect(() => { useEffect(() => {
if (session?.user?.id) { // We ONLY want this to run when page changes, not when currentFolder changes
// If page is greater than 1, we're loading more emails // This prevents race conditions when switching folders
const isLoadingMore = page > 1; if (session?.user?.id && page > 1) {
loadEmails(isLoadingMore); // Log what we're doing
console.log(`[PAGINATION] Loading page ${page} for folder ${currentFolder}`);
// If we're loading the first page, publish an event to reset scroll position // Simple approach that doesn't require complex parameter handling
if (page === 1 && typeof window !== 'undefined') { changeFolder(currentFolder)
// Use a custom event to communicate with the EmailList component .catch(err => {
const event = new CustomEvent('reset-email-scroll'); console.error(`[PAGINATION] Error loading more emails:`, err);
window.dispatchEvent(event); });
}
} }
}, [currentFolder, page, perPage, session?.user?.id, loadEmails]); }, [page, session?.user?.id, changeFolder]); // Deliberately NOT including currentFolder here
// ADDING DEBUG LOGS to track currentFolder changes
useEffect(() => {
console.log(`[DEBUG] currentFolder changed to: ${currentFolder}`);
}, [currentFolder]);
// Fetch a single email's content // Fetch a single email's content
const fetchEmailContent = useCallback(async (emailId: string, accountId?: string, folderOverride?: string) => { const fetchEmailContent = useCallback(async (emailId: string, accountId?: string, folderOverride?: string) => {