@social-mail/social-mail-client 1.2.85 → 1.2.86

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

@@ -0,0 +1 @@
+{"version":3,"names":["Inject","_webAtomsCoreDistDiInject","_servicesEntityService","EntityService","default","_modelModel","Email","EmailEngagement","_commonCacheCacheTTL","CacheTTL","_webAtomsDateTimeDistDateTime","DateTime","_servicesEmailEmailContentDownloader","EmailContentDownloader","_webAtomsCoreDistDiDISingleton","DISingleton","execute","cacheSeconds","seconds","oneMonth","EngagementService","downloadEngagements","email","emailID","now","minute","Math","floor","addMinutes","cacheVersion","dateUpdated","from","msSinceEpoch","toString","engagements","entityService","query","where","p","x","toArray","error","console","list","start","size","engagement","mailboxID","emailAddressID","q","parentID","toPagedList","Promise","all","items","map","emailContentDownloder","download","__decorate","_export"],"sources":["../../../../../src/web/page/mails/service/EngagementService.tsx"],"sourcesContent":[null],"mappings":"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"}

package/package.json

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

package/src/services/email/EmailContentDownloader.ts

@@ -9,13 +9,8 @@ import DateTime from "@web-atoms/date-time/dist/DateTime";
 @DISingleton({})
 export default class EmailContentDownloader extends TaskManager {
 
-    @Inject
-    private entityService: EntityService;
-
     async download(email: IEmail) {
 
-        await this.downloadEngagements(email);
-
         if (email.htmlBody) {
             return email.htmlBody;
         }
@@ -53,49 +48,4 @@ export default class EmailContentDownloader extends TaskManager {
         });
     }
 
-    async downloadEngagements(email: IEmail) {
-
-        const { emailID } = email;
-
-        let now = DateTime.now;
-        const minute = Math.floor(now.minute / 5);
-        now = now.addMinutes(-minute);
-
-        const cacheVersion = email.dateUpdated ? DateTime.from(email.dateUpdated).msSinceEpoch.toString(36) : "-";
-
-        email.engagements = await this.entityService.query(EmailEngagement)
-            .where({ emailID }, (p) => (x) => x.emailID === p.emailID)
-            .toArray({
-                cacheVersion,
-                cacheSeconds: 300
-            });
-
-        // const cache = await window.caches.open("email-content-engagements");
-        // const cacheKey = new URL(email.htmlBodyUrl, location.href);
-        // const content = await cache.match(cacheKey);
-
-        // if (content) {
-        //     email.engagements = await content.json();
-        //     return;
-        // }
-        // return await this.run(async () => {
-
-        //     for(let i = 0;i<3;i++) {
-        //         try {
-        //             const text = await this.entityService.query(EmailEngagement)
-        //                 .where();
-        //             await cache.put(cacheKey, new Response(text, {
-        //                 headers: {
-        //                     "cache-control": "public, max-age=86000"
-        //                 }
-        //             }));
-        //             return email.htmlBody = text;
-        //         } catch (error){
-        //             // eslint-disable-next-line no-console
-        //             console.error(error);
-        //         }
-        //     }
-        // });
-   }
-
 }

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

@@ -29,6 +29,7 @@ import { CommonEvents } from "../../../common/events/CommonEvents";
 import DateTime from "@web-atoms/date-time/dist/DateTime";
 import EmojiPicker from "../../../common/controls/emoji-picker/EmojiPicker";
 import EntityService from "../../../services/EntityService";
+import EngagementDetails from "./engagements/EngagementDetails";
 
 const itemCss = styled.css `
     border: solid 1px lightgray;
@@ -179,7 +180,12 @@ export default class ConversationPage extends ContentPage {
                             <div class="message" { ... renderMail(thread)} ></div>
                         </LimitedText>
                         { item.engagements?.length && <div class="engagements">
-                            { ... item.engagements.map((x) => <span text={`${x.engagement} ${x.count}`}/>)}
+                            { ... item.engagements.map((x) =>
+                                <span
+                                    data-click-event="view-engagements"
+                                    data-cursor="pointer"
+                                    title={`View all ${x.engagement} ${x.count}`}
+                                    text={`${x.engagement} ${x.count}`}/>)}
                         </div>}
                         { item.attachments?.length && <div class="attachments" data-layout="flex-wrap-padding">
                             { ... item.attachments.map(FilePreview)}
@@ -191,7 +197,7 @@ export default class ConversationPage extends ContentPage {
 
                             <i
                                 data-click-event="react-email"
-                                class="fad fa-face-smile-plus" title="React"/>
+                                class="fa-light fa-face-smile-plus" title="React"/>
                             <i
                                 data-click-event="reply-email"
                                 class="fas fa-reply" title="Reply"/>
@@ -471,6 +477,13 @@ export default class ConversationPage extends ContentPage {
         await this.conversationService.block(this.parameters);
     }
 
+    @Action({
+        onEvent: "view-engagements"
+    })
+    async viewEngagements(thread: IMailboxContactEmail) {
+        PageNavigator.pushPage(EngagementDetails, thread);
+    }
+
     @Action({
         onEvent: "delete-draft",
         confirm: "Are you sure you want to delete this draft?"

package/src/web/page/mails/engagements/EngagementDetails.tsx

@@ -0,0 +1,70 @@
+import { PopupWindowPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
+import { IEmail, IMailboxContactEmail } from "../../../../model/model";
+import XNode from "@web-atoms/core/dist/core/XNode";
+import ToggleButtonBar from "@web-atoms/web-controls/dist/basic/ToggleButtonBar";
+import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
+import Bind from "@web-atoms/core/dist/core/Bind";
+import InfiniteRepeater from "../../../../common/controls/repeater/InfiniteRepeater";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import EngagementService from "../service/EngagementService";
+import { DateFormats } from "../../../../common/date/DateFormats";
+
+export default class EngagementDetails extends PopupWindowPage<IMailboxContactEmail> {
+
+    selectedEngagement = "";
+
+    emails: IEmail[] = [];
+
+    @InjectProperty
+    engagementService: EngagementService;
+
+    async init() {
+
+
+        const {
+            email: {
+                    engagements,
+                    emailID,
+                    dateUpdated
+                },
+            emailAddressID,
+            mailboxID,
+        } = this.parameters;
+
+        this.title = "Responses";
+
+        this.selectedEngagement = engagements[0].engagement;
+
+        this.headerRenderer = () => <div>
+            <ToggleButtonBar
+                items={engagements}
+                labelPath={(x) => `${x.engagement} ${x.count}`}
+                valuePath={(x) => x.engagement}
+                value={Bind.twoWaysImmediate(() => this.selectedEngagement)}
+                />
+        </div>;
+
+        this.renderer = <div>
+            <AtomRepeater
+                data-layout="data-grid"
+                items={this.emails}
+                { ... InfiniteRepeater.pagedItems((start) =>
+                    (c, e, cancelToken) => this.engagementService.list({
+                        start,
+                        engagement: this.selectedEngagement,
+                        emailID,
+                        emailAddressID,
+                        mailboxID,
+                        dateUpdated
+                    })
+                )}
+                itemRenderer={(item: IEmail) => <div>
+                    <div text={item.senderName}/>
+                    <div text={item.engagement}/>
+                    <div text={DateFormats.relative.short(item.dateReceived)}/>
+                </div>}
+                />
+        </div>;
+
+    }
+}

package/src/web/page/mails/mini-compose/MiniComposeBox.tsx

@@ -127,7 +127,6 @@ export default class MiniComposeBox extends AtomControl {
                         <ToggleEmoji/>
                     </Toolbar>
                     <input
-                        autofocus={true}
                         style-place-self="stretch"
                         style-margin-left="5px"
                         style-margin-right="5px"

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

@@ -12,6 +12,7 @@ import DateTime from "@web-atoms/date-time/dist/DateTime";
 import { CommonEvents } from "../../../../common/events/CommonEvents";
 import BusyProgress from "../../../../services/BusyProgress";
 import EmailContentDownloader from "../../../../services/email/EmailContentDownloader";
+import EngagementService from "./EngagementService";
 
 export const renderMail = AtomControl.registerProperty("data-html", "html", (c, e, value) => {
     if (!value) {
@@ -111,6 +112,9 @@ export default class ConversationService {
     @Inject
     private emailContentDownloader: EmailContentDownloader;
 
+    @Inject
+    private engagementService: EngagementService;
+
     public async getDraft({ mailboxID, emailAddressID, email }: IMailboxContactEmail) {
         const draft = "draft";
         return await this.entityService.query(MailboxContactEmail)
@@ -208,6 +212,7 @@ export default class ConversationService {
                 email.textBody ??= "";
 
                 tasks.push(this.downloadEmailContent(email));
+                tasks.push(this.engagementService.downloadEngagements(email));
             }
             await Promise.all(tasks);
         } finally {

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

@@ -0,0 +1,69 @@
+import DITransient from "@web-atoms/core/dist/di/DITransient";
+import { Inject } from "@web-atoms/core/dist/di/Inject";
+import EntityService from "../../../../services/EntityService";
+import { Email, EmailEngagement, IEmail, MailboxContactEmail } from "../../../../model/model";
+import { CacheTTL } from "../../../../common/cache/CacheTTL";
+import DateTime from "@web-atoms/date-time/dist/DateTime";
+import EmailContentDownloader from "../../../../services/email/EmailContentDownloader";
+import DISingleton from "@web-atoms/core/dist/di/DISingleton";
+
+const cacheSeconds = CacheTTL.seconds.oneMonth;
+
+@DISingleton()
+export default class EngagementService {
+
+    @Inject
+    entityService: EntityService;
+
+    @Inject
+    emailContentDownloder: EmailContentDownloader;
+
+    async downloadEngagements(email: IEmail) {
+
+        try {
+            const { emailID } = email;
+
+            let now = DateTime.now;
+            const minute = Math.floor(now.minute / 5);
+            now = now.addMinutes(-minute);
+
+            const cacheVersion = email.dateUpdated ? DateTime.from(email.dateUpdated).msSinceEpoch.toString(36) : "-";
+
+            email.engagements = await this.entityService.query(EmailEngagement)
+                .where({ emailID }, (p) => (x) => x.emailID === p.emailID)
+                .toArray({
+                    cacheVersion,
+                    cacheSeconds: 300
+                });
+        } catch (error) {
+            console.error(error);
+        }
+   }
+
+    async list({
+        start = 0,
+        size = 50,
+        engagement = "",
+        emailID = 0,
+        mailboxID = 0,
+        emailAddressID = 0,
+        dateUpdated = null
+    }) {
+        const q = this.entityService.query(Email)
+            .where({ mailboxID, emailAddressID, engagement, emailID}, (p) =>
+                    (x) => x.engagement === p.engagement
+                    && x.parentID === p.emailID
+            );
+
+        const cacheVersion = dateUpdated ? DateTime.from(dateUpdated).msSinceEpoch.toString(36) : "-";
+
+        const list = await q.toPagedList(
+            { start, size, cacheVersion , cacheSeconds }
+        );
+
+        await Promise.all(list.items.map((x) => this.emailContentDownloder.download(x)));
+
+        return list;
+    }
+
+}