@rapidmx/web-client 0.18.0 → 0.20.0

package/dist/apps/www/index.js

@@ -31,7 +31,7 @@ import { setReadStateMany } from "../shared/mail/messageReadState.js";
 import { useMarkMessageRead } from "../shared/mail/useMarkMessageRead.js";
 import { ROW_FOCUS_CLASS, UnreadBar, UnreadLabel, dateClass, isUnread, rowClass, senderClass, subjectClass } from "../shared/components/mail/unreadStyle.js";
 import { LazyConversationThreadPane, LazyMessageDetailPane, prefetchReadingPane } from "../shared/components/mail/LazyReadingPane.js";
-import ConversationList from "../shared/components/mail/ConversationList.js";
+import ConversationList, { conversationRowKey } from "../shared/components/mail/ConversationList.js";
 import SwipeRow from "../shared/components/mail/SwipeRow.js";
 import InviteRowChip from "../shared/components/mail/invite/InviteRowChip.js";
 import MoveToFolderDialog from "../shared/components/mail/MoveToFolderDialog.js";
@@ -313,7 +313,7 @@ function appendUnseenRows(shown, more, idOf, cap) {
     return cap !== undefined && combined.length > cap ? combined.slice(0, cap) : combined;
 }
 const messageUid = (message) => message.uid;
-const conversationKey = (conversation) => conversation.conversationId;
+const conversationKey = conversationRowKey;
 /** Flattens and sorts a per-mailbox fetch into one merged, newest-first list - the aggregate ("All
  * Inboxes" etc.) equivalent of `mergeSearchResults()` above, but simpler: an aggregated message has no
  * natural relevance score to normalize, so this only ever sorts by `receivedDate`. */
@@ -349,6 +349,23 @@ async function fetchAggregateMessages(mailboxFolders, type, filter) {
     }));
     return mergeInboxMessages(perMailbox);
 }
+/**
+ * The conversation-list counterpart of `fetchAggregateMessages()`: one `listConversations()` per accessible mailbox that has a folder of
+ * `type`, each scoped to *that folder* (so "All Inboxes" groups only Inbox mail - not the Sent Items copy of a reply, which a mailbox-wide
+ * grouping pulls in) and each row tagged with its mailbox, then merged newest activity first. Same first-page-only scope, and the same
+ * rule that a mailbox that has no such folder or fails to answer contributes nothing rather than blanking the rest.
+ */
+async function fetchAggregateConversations(mailboxFolders, type, params) {
+    const perMailbox = await Promise.all(mailboxFolders.map(async ({ mailbox, folders }) => {
+        const folder = folders.find((f) => f.type === type);
+        if (!folder) {
+            return [];
+        }
+        const rows = await listConversations(mailbox.uid, { ...params, folderUid: folder.uid, page: 0 }).catch(() => []);
+        return rows.map((row) => ({ ...row, mailboxUid: mailbox.uid }));
+    }));
+    return perMailbox.flat().sort((a, b) => Date.parse(b.latestDate) - Date.parse(a.latestDate));
+}
 /** Groups search results by the conversation each message belongs to - within its own mailbox - the groups in the order of their first result. */
 function groupByConversation(results) {
     const groups = new Map();
@@ -862,12 +879,27 @@ function InboxContent({ userUid }) {
             setLoading(true);
             return;
         }
+        if (asConversations && aggregateFolderType) {
+            // Grouped per mailbox, inside that mailbox's folder of this type, and merged - first pages only, like the message listing.
+            setLoading(true);
+            setError(null);
+            setHasMore(false);
+            void fetchAggregateConversations(mailboxFolders, aggregateFolderType, conversationParams(0))
+                .then((results) => {
+                if (isCurrentRun()) {
+                    setConversations(results);
+                }
+            })
+                .finally(() => {
+                if (isCurrentRun()) {
+                    setLoading(false);
+                }
+            });
+            return invalidate;
+        }
         if (asConversations) {
-            // Conversations stay single-mailbox (not aggregated across mailboxes in this pass) - in
-            // aggregate mode this falls back to `activeMailboxUid`, the same mailbox unlock/labels use
-            // (always set - `MailShell` only renders this component once at least one mailbox exists).
-            // They're scoped to the selected folder (`folderUid`, absent only in aggregate mode), so the
-            // conversation list matches the folder the sidebar has selected rather than the whole mailbox.
+            // A single mailbox's own folder (`folderUid`), so the conversation list matches the folder the sidebar has selected rather
+            // than the whole mailbox.
             if (snapshot) {
                 setConversations(snapshot.conversations);
                 listedOffsetRef.current = snapshot.conversations.length;
@@ -1212,7 +1244,14 @@ function InboxContent({ userUid }) {
         const isCurrent = () => searchRunIdRef.current === listRun && liveRunRef.current === myRun;
         void (async () => {
             try {
-                if (asConversations) {
+                if (asConversations && aggregateFolderType) {
+                    // No paging here either: the fresh merged first pages are the list.
+                    const fresh = await fetchAggregateConversations(mailboxFolders, aggregateFolderType, conversationParams(0));
+                    if (isCurrent()) {
+                        setConversations(fresh);
+                    }
+                }
+                else if (asConversations) {
                     const fresh = await listConversations(activeMailboxUid, conversationParams(0));
                     if (!isCurrent()) {
                         return;
@@ -1897,7 +1936,7 @@ function InboxContent({ userUid }) {
         }
         removedAnchorRef.current = null;
         setSelectedUid(uid);
-        setOpenThread({ conversation, uid, mailboxUid: activeMailboxUid });
+        setOpenThread({ conversation, uid, mailboxUid: conversation.mailboxUid ?? activeMailboxUid });
     }
     // ---- Keyboard shortcuts (see `shared/keyboard`). Each is registered only while this view can do it, and calls what the toolbar and
     // ---- the selection bar call: the same bulk-action path (`runBulkAction()` - so the same optimistic badge tracking, the same rollback,
@@ -1929,7 +1968,9 @@ function InboxContent({ userUid }) {
     /** The index of the selected row: the open message's, or the open conversation's; -1 with nothing selected. */
     function selectedRowIndex() {
         if (inConversations) {
-            return openThread ? listedConversations.findIndex((c) => c.conversationId === openThread.conversation.conversationId) : -1;
+            return openThread
+                ? listedConversations.findIndex((c) => c.conversationId === openThread.conversation.conversationId && (!c.mailboxUid || c.mailboxUid === openThread.mailboxUid))
+                : -1;
         }
         return messages.findIndex((m) => m.uid === selectedUid);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rapidmx/web-client",
-  "version": "0.18.0",
+  "version": "0.20.0",
   "description": "RapidMX's webmail and admin console React UI for web-based clients.",
   "type": "module",
   "repository": "https://github.com/rapidmx/web-client",
@@ -40,7 +40,7 @@
     "@dnd-kit/core": "^6.3.1",
     "@journeyapps/wa-sqlite": "^2.0.4",
     "@peculiar/x509": "^2.1.0",
-    "@rapidmx/react-shared": "^0.19.0",
+    "@rapidmx/react-shared": "^0.21.0",
     "@tiptap/core": "^3.31.3",
     "@tiptap/extension-highlight": "^3.31.3",
     "@tiptap/extension-image": "^3.31.3",