@social-mail/social-mail-client 1.0.39 → 1.0.40

package/dist/web/page/mails/service/ConversationService.js

@@ -1,7 +1,7 @@
-System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/core/dist/di/Inject", "../../../../services/EntityService", "../../../../model/model", "../../../../common/Sql", "@web-atoms/email-dom/dist/DomToString", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/dist/web/controls/AtomControl", "@web-atoms/core/dist/web/core/AtomUI", "@web-atoms/date-time/dist/DateTime"], function (_export, _context) {
+System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/core/dist/di/Inject", "../../../../services/EntityService", "../../../../model/model", "../../../../common/Sql", "@web-atoms/email-dom/dist/DomToString", "@web-atoms/core/dist/core/XNode", "@web-atoms/core/dist/web/controls/AtomControl", "@web-atoms/core/dist/web/core/AtomUI", "@web-atoms/date-time/dist/DateTime", "../../../../common/events/CommonEvents"], function (_export, _context) {
   "use strict";
 
-  var __awaiter, __decorate, __metadata, DISingleton, Inject, EntityService, Email, MailboxThreadEmail, Sql, DomToString, XNode, AtomControl, descendentElementIterator, DateTime, renderMail, ConversationService;
+  var __awaiter, __decorate, __metadata, DISingleton, Inject, EntityService, MailboxThreadEmail, Sql, DomToString, XNode, AtomControl, descendentElementIterator, DateTime, CommonEvents, renderMail, ConversationService;
   return {
     setters: [function (_tslib) {
       __awaiter = _tslib.__awaiter;
@@ -14,7 +14,6 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
     }, function (_servicesEntityService) {
       EntityService = _servicesEntityService.default;
     }, function (_modelModel) {
-      Email = _modelModel.Email;
       MailboxThreadEmail = _modelModel.MailboxThreadEmail;
     }, function (_commonSql) {
       Sql = _commonSql.Sql;
@@ -28,6 +27,8 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
       descendentElementIterator = _webAtomsCoreDistWebCoreAtomUI.descendentElementIterator;
     }, function (_webAtomsDateTimeDistDateTime) {
       DateTime = _webAtomsDateTimeDistDateTime.default;
+    }, function (_commonEventsCommonEvents) {
+      CommonEvents = _commonEventsCommonEvents.CommonEvents;
     }],
     execute: function () {
       _export("renderMail", renderMail = AtomControl.registerProperty("data-html", "html", (c, e, value) => {
@@ -35,7 +36,8 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
           e.innerHTML = "";
           return;
         }
-        const mail = value;
+        const thread = value;
+        const mail = thread.email;
         const html = mail.htmlBody;
         const msg = document.createElement("div");
         if (!html) {
@@ -65,17 +67,16 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
           }
         }
         e.appendChild(msg);
-        if (!mail.timeRead) {
+        if (!thread.timeRead) {
           const timeRead = DateTime.utcNow;
-          mail.timeRead = timeRead;
+          thread.timeRead = timeRead;
           const control = AtomControl.from(e);
           const entityService = control.app.resolve(EntityService);
-          const {
-            emailID
-          } = mail;
-          entityService.save(Email.patch(mail, {
+          entityService.save(MailboxThreadEmail.patch(thread, {
             timeRead
-          })).catch(console.error);
+          })).then(() => {
+            CommonEvents.onThreadMarkedAsRead.dispatchEvent(thread);
+          }, console.error);
         }
         return;
       }));
@@ -107,7 +108,7 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
             });
             return {
               total: emails.total,
-              items: emails.items.map(x => x.email)
+              items: emails
             };
           });
         }

package/dist/web/page/mails/service/ConversationService.js.map

@@ -1 +1 @@
-{"version":3,"names":["DISingleton","_webAtomsCoreDistDiDISingleton","default","_webAtomsCoreDistDiInject","Inject","_servicesEntityService","EntityService","_modelModel","Email","MailboxThreadEmail","_commonSql","Sql","_webAtomsEmailDomDistDomToString","DomToString","_webAtomsCoreDistCoreXNode","XNode","_webAtomsCoreDistWebControlsAtomControl","AtomControl","_webAtomsCoreDistWebCoreAtomUI","descendentElementIterator","_webAtomsDateTimeDistDateTime","DateTime","execute","_export","renderMail","registerProperty","c","e","value","innerHTML","mail","html","htmlBody","msg","document","createElement","iterator","split","p","appendChild","createTextNode","tagName","src","getAttribute","startsWith","cid","substring","a","attachments","find","x","contentID","setAttribute","appFileID","fileContentID","name","target","timeRead","utcNow","control","from","entityService","app","resolve","emailID","save","patch","catch","console","error","ConversationService","list","search","mailboxID","emailAddressID","start","size","version","cancelToken","q","query","where","text","iLike","email","subject","textBody","emails","include","recipients","forEach","r","emailAddress","orderByDescending","toPagedList","total","items","map","renderText","div","textContent","renderHtml","toHtml","create","__decorate"],"sources":["../../../../../src/web/page/mails/service/ConversationService.tsx"],"sourcesContent":[null],"mappings":";;;;;;;;;;MAAOA,WAAW,GAAAC,8BAAA,CAAAC,OAAA;IAAA,aAAAC,yBAAA;MACTC,MAAM,GAAAD,yBAAA,CAANC,MAAM;IAAA,aAAAC,sBAAA;MACRC,aAAa,GAAAD,sBAAA,CAAAH,OAAA;IAAA,aAAAK,WAAA;MACXC,KAAK,GAAAD,WAAA,CAALC,KAAK;MAAUC,kBAAkB,GAAAF,WAAA,CAAlBE,kBAAkB;IAAA,aAAAC,UAAA;MACjCC,GAAG,GAAAD,UAAA,CAAHC,GAAG;IAAA,aAAAC,gCAAA;MACLC,WAAW,GAAAD,gCAAA,CAAAV,OAAA;IAAA,aAAAY,0BAAA;MACXC,KAAK,GAAAD,0BAAA,CAAAZ,OAAA;IAAA,aAAAc,uCAAA;MACHC,WAAW,GAAAD,uCAAA,CAAXC,WAAW;IAAA,aAAAC,8BAAA;MACXC,yBAAyB,GAAAD,8BAAA,CAAzBC,yBAAyB;IAAA,aAAAC,6BAAA;MAC3BC,QAAQ,GAAAD,6BAAA,CAAAlB,OAAA;IAAA;IAAAoB,OAAA,WAAAA,CAAA;MAAAC,OAAA,eAEFC,UAAU,GAAGP,WAAW,CAACQ,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,CAACC,CAAC,EAAEC,CAAC,EAAEC,KAAK,KAAI;QACxF,IAAI,CAACA,KAAK,EAAE;UACRD,CAAC,CAACE,SAAS,GAAG,EAAE;UAChB;;QAEJ,MAAMC,IAAI,GAAGF,KAAe;QAC5B,MAAMG,IAAI,GAAGD,IAAI,CAACE,QAAQ;QAC1B,MAAMC,GAAG,GAAGC,QAAQ,CAACC,aAAa,CAAC,KAAK,CAAC;QACzC,IAAG,CAACJ,IAAI,EAAE;UACN,KAAK,MAAMK,QAAQ,IAAIL,IAAI,CAACM,KAAK,CAAC,IAAI,CAAC,EAAE;YACrC,MAAMC,CAAC,GAAGJ,QAAQ,CAACC,aAAa,CAAC,GAAG,CAAC;YACrCG,CAAC,CAACC,WAAW,CAACL,QAAQ,CAACM,cAAc,CAACJ,QAAQ,CAAC,CAAC;YAChDH,GAAG,CAACM,WAAW,CAACD,CAAC,CAAC;;UAEtBX,CAAC,CAACY,WAAW,CAACN,GAAG,CAAC;UAClB;;QAEJA,GAAG,CAACJ,SAAS,GAAGE,IAAI;QACpB,KAAK,MAAMK,QAAQ,IAAIjB,yBAAyB,CAACc,GAAG,CAAC,EAAE;UACnD,IAAGG,QAAQ,CAACK,OAAO,KAAK,KAAK,EAAE;YAC3B,MAAMC,GAAG,GAAGN,QAAQ,CAACO,YAAY,CAAC,KAAK,CAAC;YACxC,IAAID,GAAG,aAAHA,GAAG,uBAAHA,GAAG,CAAEE,UAAU,CAAC,MAAM,CAAC,EAAE;cACzB,MAAMC,GAAG,GAAGH,GAAG,CAACI,SAAS,CAAC,CAAC,CAAC;cAC5B,MAAMC,CAAC,GAAGjB,IAAI,CAACkB,WAAW,CAACC,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACC,SAAS,KAAKN,GAAG,CAAC;cAC3D,IAAIE,CAAC,EAAE;gBACHX,QAAQ,CAACgB,YAAY,CAAC,KAAK,EAAE,cAAcL,CAAC,CAACM,SAAS,IAAIN,CAAC,CAACO,aAAa,IAAIP,CAAC,CAACQ,IAAI,EAAE,CAAC;;;YAG9F;;UAEJ,IAAInB,QAAQ,CAACK,OAAO,KAAK,GAAG,EAAE;YACzBL,QAA8B,CAACoB,MAAM,GAAG,QAAQ;;;QAGzD7B,CAAC,CAACY,WAAW,CAACN,GAAG,CAAC;QAClB,IAAI,CAACH,IAAI,CAAC2B,QAAQ,EAAE;UAChB,MAAMA,QAAQ,GAAGpC,QAAQ,CAACqC,MAAM;UAChC5B,IAAI,CAAC2B,QAAQ,GAAGA,QAAQ;UACxB,MAAME,OAAO,GAAG1C,WAAW,CAAC2C,IAAI,CAACjC,CAAC,CAAC;UACnC,MAAMkC,aAAa,GAAGF,OAAO,CAACG,GAAG,CAACC,OAAO,CAACzD,aAAa,CAAC;UACxD,MAAM;YAAE0D;UAAO,CAAE,GAAGlC,IAAI;UACxB+B,aAAa,CAACI,IAAI,CAACzD,KAAK,CAAC0D,KAAK,CAACpC,IAAI,EAAE;YACjC2B;WACH,CAAC,CAAC,CAACU,KAAK,CAACC,OAAO,CAACC,KAAK,CAAC;;QAE5B;MACJ,CAAC,CAAC;MAGmBC,mBAAmB,GAAzB,MAAMA,mBAAmB;QAKvBC,IAAIA,CAAC;UACdC,MAAM,GAAG,EAAE;UACXC,SAAS;UACTC,cAAc;UACdC,KAAK,GAAG,CAAC;UACTC,IAAI,GAAG,GAAG;UACVC,OAAO,GAAG,CAAC;UACXC;QAAW,CACd;;YACG,IAAIC,CAAC,GAAG,IAAI,CAAClB,aAAa,CAACmB,KAAK,CAACvE,kBAAkB,CAAC,CAC/CwE,KAAK,CAAC;cAAER,SAAS;cAAEC;YAAc,CAAE,EAAGpC,CAAC,IACnCY,CAAC,IAAKA,CAAC,CAACuB,SAAS,KAAKnC,CAAC,CAACmC,SAAS,IAC3BvB,CAAC,CAACwB,cAAc,KAAKpC,CAAC,CAACoC,cAAc,CAAC;YACrD,IAAIF,MAAM,EAAE;cACRA,MAAM,GAAG,IAAIA,MAAM,GAAG;cACtBO,CAAC,GAAGA,CAAC,CAACE,KAAK,CAAC;gBAAET;cAAM,CAAE,EAAGlC,CAAC,IAAMY,CAAC,IAAKvC,GAAG,CAACuE,IAAI,CAACC,KAAK,CAACjC,CAAC,CAACkC,KAAK,CAACC,OAAO,EAAE/C,CAAC,CAACkC,MAAM,CAAC,IAAI7D,GAAG,CAACuE,IAAI,CAACC,KAAK,CAACjC,CAAC,CAACkC,KAAK,CAACE,QAAQ,EAAEhD,CAAC,CAACkC,MAAM,CAAC,CAAC;;YAElI,MAAMe,MAAM,GAAG,MAAMR,CAAC,CACjBS,OAAO,CAAEtC,CAAC,IAAK,CAACA,CAAC,CAACkC,KAAK,CAACK,UAAU,CAACC,OAAO,CAAEC,CAAC,IAAKA,CAAC,CAACC,YAAY,CAAC,EAAE1C,CAAC,CAACkC,KAAK,CAACpC,WAAW,CAAC,CAAC,CACxF6C,iBAAiB,CAAE3C,CAAC,IAAKA,CAAC,CAACc,OAAO,CAAC,CACnC8B,WAAW,CAAC;cAAEnB,KAAK;cAAEC,IAAI;cAAEE;YAAW,CAAE,CAAC;YAC9C,OAAO;cAAEiB,KAAK,EAAER,MAAM,CAACQ,KAAK;cAAEC,KAAK,EAAET,MAAM,CAACS,KAAK,CAACC,GAAG,CAAE/C,CAAC,IAAKA,CAAC,CAACkC,KAAK;YAAC,CAAC;UAC1E,CAAC;;QAEMc,UAAUA,CAACnE,IAAY;UAC1B,MAAMoE,GAAG,GAAGjE,QAAQ,CAACC,aAAa,CAAC,KAAK,CAAC;UACzCgE,GAAG,CAACtE,SAAS,GAAGE,IAAI;UACpB,OAAOoE,GAAG,CAACC,WAAW;QAC1B;QAEOC,UAAUA,CAACtE,IAAY;UAC1B,MAAMoE,GAAG,GAAGjE,QAAQ,CAACC,aAAa,CAAC,KAAK,CAAC;UACzCgE,GAAG,CAACtE,SAAS,GAAGE,IAAI;UAEpB,OAAOoE,GAAG,CAACtE,SAAS;QACxB;QAGOyE,MAAMA,CAAChB,QAAgB;UAC1B,OAAOzE,WAAW,CAACE,KAAA,CAAAwF,MAAA,iBACTjB,QAAQ,CAACjD,KAAK,CAAC,IAAI,CAAC,CAAC4D,GAAG,CAAE3D,CAAC,IAAKvB,KAAA,CAAAwF,MAAA;YAAGrB,IAAI,EAAE5C;UAAC,EAAG,CAAC,CAClD,CAAC;QACX;OAEH;MA/CGkE,UAAA,EAACpG,MAAM,E,0BACgBE,aAAa,E,yDAAC;MAHpBgE,mBAAmB,GAAAkC,UAAA,EADvCxG,WAAW,EAAE,C,EACOsE,mBAAmB,CAiDvC;MAAA/C,OAAA,YAjDoB+C,mBAAmB;IAAA;EAAA;AAAA"}
+{"version":3,"names":["DISingleton","_webAtomsCoreDistDiDISingleton","default","_webAtomsCoreDistDiInject","Inject","_servicesEntityService","EntityService","_modelModel","MailboxThreadEmail","_commonSql","Sql","_webAtomsEmailDomDistDomToString","DomToString","_webAtomsCoreDistCoreXNode","XNode","_webAtomsCoreDistWebControlsAtomControl","AtomControl","_webAtomsCoreDistWebCoreAtomUI","descendentElementIterator","_webAtomsDateTimeDistDateTime","DateTime","_commonEventsCommonEvents","CommonEvents","execute","_export","renderMail","registerProperty","c","e","value","innerHTML","thread","mail","email","html","htmlBody","msg","document","createElement","iterator","split","p","appendChild","createTextNode","tagName","src","getAttribute","startsWith","cid","substring","a","attachments","find","x","contentID","setAttribute","appFileID","fileContentID","name","target","timeRead","utcNow","control","from","entityService","app","resolve","save","patch","then","onThreadMarkedAsRead","dispatchEvent","console","error","ConversationService","list","search","mailboxID","emailAddressID","start","size","version","cancelToken","q","query","where","text","iLike","subject","textBody","emails","include","recipients","forEach","r","emailAddress","orderByDescending","emailID","toPagedList","total","items","renderText","div","textContent","renderHtml","toHtml","create","map","__decorate"],"sources":["../../../../../src/web/page/mails/service/ConversationService.tsx"],"sourcesContent":[null],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.0.39",
+  "version": "1.0.40",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/common/events/CommonEvents.ts

@@ -0,0 +1,6 @@
+import EventScope from "@web-atoms/core/dist/core/EventScope";
+import { IMailboxThreadEmail } from "../../model/model";
+
+export const CommonEvents = {
+    onThreadMarkedAsRead: EventScope.create<IMailboxThreadEmail>()
+};

package/src/model/model.ts

@@ -150,7 +150,6 @@ export interface IEmail extends IClrEntity {
 	status?: "queued" | "received" | "draft" | "pending-approval" | "scheduled" | "sent" | "sent-failed";
 	originalFileID?: number | null;
 	workflowID?: string | null;
-	timeRead?: DateTime | null;
 	parentID?: number | null;
 	senderEmail?: IEmailAddress;
 	originalFile?: IAppFile;
@@ -252,6 +251,7 @@ export interface IMailboxThreadEmail extends IClrEntity {
 	mailboxID?: number;
 	emailAddressID?: number;
 	emailID?: number;
+	timeRead?: DateTime;
 	mailbox?: IMailbox;
 	email?: IEmail;
 }

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

@@ -1,20 +1,22 @@
 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, IEmail, MailboxThreadEmail } from "../../../../model/model";
+import { Email, IEmail, IMailboxThreadEmail, MailboxThreadEmail } 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";
 import { AtomControl } from "@web-atoms/core/dist/web/controls/AtomControl";
 import { descendentElementIterator} from "@web-atoms/core/dist/web/core/AtomUI";
 import DateTime from "@web-atoms/date-time/dist/DateTime";
+import { CommonEvents } from "../../../../common/events/CommonEvents";
 
 export const renderMail = AtomControl.registerProperty("data-html", "html", (c, e, value) => {
     if (!value) {
         e.innerHTML = "";
         return;
     }
-    const mail = value as IEmail;
+    const thread = value as IMailboxThreadEmail;
+    const mail = thread.email;
     const html = mail.htmlBody;
     const msg = document.createElement("div");
     if(!html) {
@@ -44,15 +46,16 @@ export const renderMail = AtomControl.registerProperty("data-html", "html", (c,
         }
     }
     e.appendChild(msg);
-    if (!mail.timeRead) {
+    if (!thread.timeRead) {
         const timeRead = DateTime.utcNow;
-        mail.timeRead = timeRead;
+        thread.timeRead = timeRead;
         const control = AtomControl.from(e);
         const entityService = control.app.resolve(EntityService);
-        const { emailID } = mail;
-        entityService.save(Email.patch(mail, {
+        entityService.save(MailboxThreadEmail.patch(thread, {
             timeRead
-        })).catch(console.error);
+        })).then(() => {
+            CommonEvents.onThreadMarkedAsRead.dispatchEvent(thread);
+        }, console.error);
     }
     return;
 });
@@ -84,7 +87,7 @@ export default class ConversationService {
             .include((x) => [x.email.recipients.forEach((r) => r.emailAddress), x.email.attachments])
             .orderByDescending((x) => x.emailID)
             .toPagedList({ start, size, cancelToken });
-        return { total: emails.total, items: emails.items.map((x) => x.email)};
+        return { total: emails.total, items: emails };
     }
 
     public renderText(html: string) {