@social-mail/social-mail-client 1.2.92 → 1.2.95

package/src/services/email/EmailContentDownloader.ts

@@ -1,6 +1,6 @@
 import DISingleton from "@web-atoms/core/dist/di/DISingleton";
 import TaskManager from "@web-atoms/entity/dist/models/TaskManager";
-import { EmailEngagement, IEmail } from "../../model/model";
+import { EmailEngagement, IEmail, IMailboxContactEmail } from "../../model/model";
 import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
 import { Inject } from "@web-atoms/core/dist/di/Inject";
 import EntityService from "../EntityService";
@@ -9,37 +9,29 @@ import DateTime from "@web-atoms/date-time/dist/DateTime";
 @DISingleton({})
 export default class EmailContentDownloader extends TaskManager {
 
-    async download(email: IEmail) {
-
-        if (email.htmlBody) {
-            return email.htmlBody;
-        }
-
-        if (!email.originalFileID) {
-            return;
-        }
+    async download(mce: IMailboxContactEmail) {
 
         const cache = await window.caches.open("email-content-cache");
 
-        const cacheKey = new URL(email.htmlBodyUrl, location.href);
+        const cacheKey = new URL(mce.htmlBodyUrl, location.href);
 
         const content = await cache.match(cacheKey);
 
         if (content) {
-            return email.htmlBody = await content.text();
+            return mce.email.htmlBody = await content.text();
         }
 
         return await this.run(async () => {
 
             for(let i = 0;i<3;i++) {
                 try {
-                    const text = await FetchBuilder.get(email.htmlBodyUrl).responseAsText();
+                    const text = await FetchBuilder.get(mce.htmlBodyUrl).responseAsText();
                     await cache.put(cacheKey, new Response(text, {
                         headers: {
                             "cache-control": "public, max-age=86000"
                         }
                     }));
-                    return email.htmlBody = text;
+                    return mce.email.htmlBody = text;
                 } catch (error){
                     // eslint-disable-next-line no-console
                     console.error(error);

package/src/services/socket/sockets.ts

@@ -88,7 +88,10 @@ class SocketNamespace {
 @DISingleton()
 export class MailboxSocket {
 
-    async join(room: string, events: { newMail(mailboxID, emailAddressID, emailID); }) {
+    async join(room: string, events: {
+        newMail(mailboxID, emailAddressID, emailID);
+        mailRead?(mailboxID, emailAddressID, emailID);
+    }) {
         const disposables = new AtomDisposableList();
         const ns = SocketNamespace.for("mailbox");
         ns.connect(room, events).then((v) => disposables.add(v), console.error);

package/src/web/page/mails/ConversationPage.tsx

@@ -126,7 +126,16 @@ export default class ConversationPage extends ContentPage {
         this.registerDisposable(await this.resolve(MailboxSocket).join(mb.mailboxID.toString(), {
             newMail: () => {
                 this.version ++;
-            }
+            },
+            mailRead: (mailboxID, emailAddressID, emailID) => {
+                for (const iterator of this.mailsRepeater.items) {
+                    if (iterator.emailID !== emailID) {
+                        continue;
+                    }
+                    iterator.timeRead = DateTime.now;
+                    this.mailsRepeater.refreshItem(iterator);
+                }
+            },
         }));
 
         this.renderer = <div>
@@ -153,6 +162,22 @@ export default class ConversationPage extends ContentPage {
                     const remaining = DateTime.from(item.dateSent ?? DateTime.today).diff(DateTime.now);
                     const isSending = thread.email.status === "scheduled" && remaining.totalSeconds > 3;
 
+                    let readStatus = "";
+                    let readColor = "";
+                    if (sent) {
+                        const timeRead = thread.timeRead && DateTime.from(thread.timeRead);
+                        if (timeRead) {
+                            readStatus = `Read ${DateFormats.relative.short(timeRead)}`;
+                            readColor = "green";
+                        } else if (item.status === "sent"){
+                            readStatus = "Sent";
+                            readColor = "yellow";
+                        } else {
+                            readStatus = "In queue";
+                            readColor = "lightblue";
+                        }
+                    }
+
                     if (remaining.totalSeconds > 0) {
                         setTimeout(() => this.mailsRepeater.refreshItem(thread), 2000);
                     }
@@ -193,7 +218,15 @@ export default class ConversationPage extends ContentPage {
                         {thread.email.tags && <div data-layout="row">
                             { ... thread.email.tags.split(",").map((x) => <span text={`#${x.startsWith("#") ? x.substring(1) : x}`}/>)}
                         </div>}
-                        { !sent && <div data-layout="row">
+                        { sent
+                            ? <div data-layout="row">
+                                <i
+                                    class="fa-solid fa-circle-small"
+                                    style-color={readColor}
+                                    title={readStatus}
+                                    />
+                                </div>
+                            : <div data-layout="row">
 
                             <i
                                 data-click-event="react-email"

package/src/web/page/mails/service/ConversationService.tsx

@@ -79,38 +79,6 @@ export const renderMail = AtomControl.registerProperty("data-html", "html", (c,
     return;
 });
 
-const downloadEmailContent = async (es: EntityService, email: IEmail) => {
-    if (email.replyCount) {
-        const children = await es.query(Email)
-        .where({ emailID: email.emailID }, (p) => (x) => x.emailID === p.emailID && x.engagement !== null)
-        .orderByDescending((x) => x.emailID)
-        .toPagedList({
-            start: 0,
-            size: 4,
-            cacheVersion: "a",
-            cacheSeconds: 900
-        });
-        email.children = children?.items ?? [];
-    } else {
-        email.children ??= [];
-    }
-
-    if (!email.originalFileID) {
-        return;
-    }
-
-    for(let i=0;i < 10;i++) {
-        try {
-            const rs = await fetch(email.htmlBodyUrl);
-            const text = await rs.text();
-            email.htmlBody = text;
-            return;
-        } catch (error) {
-            console.error(error);
-        }
-    }
-};
-
 @DISingleton()
 export default class ConversationService {
 
@@ -210,7 +178,8 @@ export default class ConversationService {
         const d = BusyProgress.create();
 
         try {
-            for (const { email } of emails.items) {
+            for (const mce of emails.items) {
+                const { email } = mce;
                 // if (email.htmlBody || typeof email.htmlBody === "string") {
                 //     continue;
                 // }
@@ -219,7 +188,7 @@ export default class ConversationService {
                 email.htmlBody ??= "";
                 email.textBody ??= "";
 
-                tasks.push(this.downloadEmailContent(email));
+                tasks.push(this.downloadEmailContent(mce));
                 tasks.push(this.engagementService.downloadEngagements(email));
             }
             await Promise.all(tasks);
@@ -236,7 +205,8 @@ export default class ConversationService {
         CommonEvents.onEmailUnscheduled.dispatchEvent(mce);
     }
 
-    async downloadEmailContent(email: IEmail) {
+    async downloadEmailContent(mce: IMailboxContactEmail) {
+        const { email } = mce;
         if (email.replyCount) {
             const children = await this.entityService.query(Email)
             .where({ emailID: email.emailID }, (p) => (x) => x.emailID === p.emailID && x.engagement !== null)
@@ -251,7 +221,7 @@ export default class ConversationService {
         } else {
             email.children ??= [];
         }
-        await this.emailContentDownloader.download(email);
+        await this.emailContentDownloader.download(mce);
     }