@social-mail/social-mail-client 1.2.367 → 1.2.369

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

@@ -2,7 +2,7 @@
 import DISingleton from "@web-atoms/core/dist/di/DISingleton";
 import { Inject } from "@web-atoms/core/dist/di/Inject";
 import EntityService from "../../../../services/EntityService";
-import { Email, EmailEngagement, EmailRecipient, IEmail, IMailboxContact, IMailboxContactEmail, MailboxContactEmail, MailboxEmail } from "../../../../model/model";
+import { Email, EmailEngagement, EmailRecipient, IEmail, IMailbox, IMailboxContact, IMailboxContactEmail, MailboxContactEmail, MailboxEmail } from "../../../../model/model";
 import { Sql } from "../../../../common/Sql";
 import DomToString from "@web-atoms/email-dom/dist/DomToString";
 import XNode from "@web-atoms/core/dist/core/XNode";
@@ -49,7 +49,7 @@ export const renderMail = AtomControl.registerProperty("data-html", "html", (c,
             if (src) {
                 if (src.startsWith("cid:")) {
                     cid = src.substring(4);
-                    const a = mail.attachments.find((x) => x.contentID === cid);
+                    const a = mail.attachments?.find((x) => x.contentID === cid);
                     if (a) {
                         iterator.setAttribute("src", apiPath(`/api/files/${a.appFileID}/${a.fileContentID}/${a.name}`));
                     }
@@ -133,7 +133,7 @@ export default class ConversationService {
             .firstOrDefault();
     }
 
-    public async draft({ mailboxID, emailAddressID, email }: IMailboxContactEmail, create = false, saveAttachments = true, cancelToken?) {
+    public async draft( email: IEmail, mailboxContacts: IMailboxContact[], create = false, saveAttachments = true, cancelToken?) {
         if (email?.emailID) {
             email.subject ||= "";
             email.dateUpdated = DateTime.now;
@@ -148,23 +148,29 @@ export default class ConversationService {
             const recipients = email.recipients ??= [];
             const mailboxes = email.mailboxes ??= [];
             const threads = email.threadContacts ??= [];
-            email.senderID = mailboxID;
-            email.status = "draft";
-            if (!mailboxes.some((m) => m.mailboxID === mailboxID)) {
-                mailboxes.push(MailboxEmail.create({
-                    mailboxID
-                }));
-            }
-            if(!recipients.some((r) => r.emailAddressID === emailAddressID)) {
-                recipients.push(EmailRecipient.create({
-                    emailAddressID
-                }));
+            // email.senderID = mailboxID;
+            // senderID must be set
+            if (!email.senderID) {
+                throw new Error("SenderID is not set");
             }
-            if (!threads.some((r) => r.mailboxID === mailboxID)) {
-                threads.push(MailboxContactEmail.create({
-                    mailboxID,
-                    emailAddressID
-                }));
+            email.status = "draft";
+            for (const { mailboxID, emailAddressID } of mailboxContacts) { 
+                if (!mailboxes.some((m) => m.mailboxID === mailboxID)) {
+                    mailboxes.push(MailboxEmail.create({
+                        mailboxID
+                    }));
+                }
+                if(!recipients.some((r) => r.emailAddressID === emailAddressID)) {
+                    recipients.push(EmailRecipient.create({
+                        emailAddressID
+                    }));
+                }
+                if (!threads.some((r) => r.mailboxID === mailboxID)) {
+                    threads.push(MailboxContactEmail.create({
+                        mailboxID,
+                        emailAddressID
+                    }));
+                }
             }
             await this.entityService.save(email);
         }