@social-mail/social-mail-client 1.8.322 → 1.8.324

package/src/web/commands/MailAppEvents.ts

@@ -3,6 +3,8 @@ import { IMailboxContact } from "../../model/model";
 
 export const MailAppEvents = {
 
-    mailboxContactUpdated: EventScope.create<IMailboxContact>()
+    mailboxContactUpdated: EventScope.create<IMailboxContact>(),
+
+    refreshMailboxContacts: EventScope.create(),
 
 };

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

@@ -38,6 +38,7 @@ import AtomPopover from "@web-atoms/web-controls/dist/basic/elements/AtomPopover
 import { ReportPhishingCommand, ReportSpamCommand } from "./commands/ReportEmailCommand";
 import { ReportConversationPhishing, ReportConversationSpam } from "./commands/ReportConversationCommand";
 import NewConversationRequest from "./commands/NewConversationRequest";
+import { MailAppEvents } from "../../commands/MailAppEvents";
 
 const itemCss = "conversation-page-item-css";
 
@@ -66,7 +67,7 @@ export default class ConversationPage extends ContentPage {
     public mailsRepeater: AtomRepeater;
 
     @InjectProperty
-    private conversationService: ConversationService;
+    public conversationService: ConversationService;
 
     private mails: IMailboxContactEmail[] = [];
 
@@ -409,6 +410,7 @@ export default class ConversationPage extends ContentPage {
         this.parameters.folderTagID = SocialMailApp.contactsFolderTagID;
         await es.save(this.parameters, (c) => c);
         this.showComposeButton();
+        MailAppEvents.refreshMailboxContacts.dispatchEvent(this.parameters);
     }
 
     @Action({ onEvent: "click"})
@@ -668,6 +670,7 @@ export default class ConversationPage extends ContentPage {
     })
     async blockSender() {
         await this.conversationService.block(this.parameters);
+        MailAppEvents.refreshMailboxContacts.dispatchEvent(this.parameters);
     }
 
     @Action({
@@ -676,6 +679,7 @@ export default class ConversationPage extends ContentPage {
     })
     async unblockSender() {
         await this.conversationService.block(this.parameters);
+        MailAppEvents.refreshMailboxContacts.dispatchEvent(this.parameters);
     }
 
     @Action({

package/src/web/page/mails/commands/NewConversationRequest.tsx

@@ -3,6 +3,7 @@ import { AddIconTextButton, DeleteIconTextButton } from "../../../../common/cont
 import { ReportConversationSpam, ReportConversationPhishing } from "./ReportConversationCommand";
 
 import "./NewConversationRequest.local.css";
+import AtomPopover from "@web-atoms/web-controls/dist/basic/elements/AtomPopover";
 
 export default function NewConversationRequest() {
     return <div class="new-conversation-request">
@@ -16,15 +17,30 @@ export default function NewConversationRequest() {
                     text="Approve Sender"
                 />
                 <DeleteIconTextButton
-                    data-click-event="block-sender"
-                    text="Block Sender"
+                    event-click={(e) => AtomPopover.create(e.target as HTMLElement,{
+                         nodeFactory: () => <div>
+                            <div data-layout="vertical-flex">
+                                <DeleteIconTextButton
+                                    data-click-event="block-sender"
+                                    icon="fad fa-shield-quartered"
+                                    data-color="red"
+                                    text="Block Sender"
+                                    />
+                                <ReportConversationSpam/>
+                                <ReportConversationPhishing/>
+                            </div>
+                        </div>,
+                        "anchor-bottom": "parent-top",
+                        closeOnClick: true
+                    })}
+                    text="Block"
                     />
             </div>
-            <h6>If you believe this message contains spam or any harmful activity, we encourage you to please report them.</h6>
+            {/* <h6>If you believe this message contains spam or any harmful activity, we encourage you to please report them.</h6>
             <div data-layout="flex-center">
                 <ReportConversationSpam/>
                 <ReportConversationPhishing/>
-            </div>
+            </div> */}
         </div>
     </div>;
 }

package/src/web/page/mails/commands/ReportConversationCommand.tsx

@@ -7,20 +7,30 @@ import { DeleteIconTextButton } from "../../../../common/controls/buttons/IconBu
 import type ConversationPage from "../ConversationPage";
 
 UICommand.on<ConversationPage>("report-spam", async ({ control }) => {
-    PageNavigator.pushPage(MiniComposePage, {
+
+    const thread = control.mailsRepeater.items[0];
+    await control.conversationService.block(thread);
+
+    await PageNavigator.pushPageForResult(MiniComposePage, {
         mailto: Mailto.create({ to: "report@esocialmail.com", subject: "Spam Report", body: "Attached email contains #Spam." }),
-        thread: control.mailsRepeater.items[0],
+        thread,
         asAttachment: true
     });
+
 });
 
 
 UICommand.on<ConversationPage>("report-phishing", async ({ control }) => {
-    PageNavigator.pushPage(MiniComposePage, {
+
+    const thread = control.mailsRepeater.items[0];
+    await control.conversationService.block(thread);
+
+    await PageNavigator.pushPageForResult(MiniComposePage, {
         mailto: Mailto.create({ to: "report@esocialmail.com", subject: "Phishing Report", body: "Attached email contains #Phishing." }),
         thread: control.mailsRepeater.items[0],
         asAttachment: true
     });
+
 });
 
 export function ReportConversationPhishing() {

package/src/web/page/mails/contacts/MailboxContact.local.css

@@ -91,6 +91,8 @@
             & > .name {
                 grid-row: 1;
                 grid-column: 1;
+                font-size: larger;
+                font-weight: bold;
                 overflow: hidden;
                 white-space: nowrap;
                 text-overflow: ellipsis;

package/src/web/page/mails/contacts/MailboxContacts.tsx

@@ -176,7 +176,8 @@ export default class MailsPage extends MasterDetailPage {
                     cancelToken
                 }))}
                 itemRenderer={(item: IMailboxContact) => {
-                    const name = displayName(item) + " " + item.emailAddress.emailAddress;
+                    const name = displayName(item);
+                    const fullName = name + " " + item.emailAddress.emailAddress;
                     const subject = item.lastEmail?.subject;
                     const summary = item.lastEmail?.summary;
                     return <div
@@ -184,8 +185,13 @@ export default class MailsPage extends MasterDetailPage {
                         data-unread={item.unread > 0}>
                             <div
                                 class="name"
-                                title={name}
+                                title={fullName}
                                 text={name}/>
+                            {/* <div
+                                class="address"
+                                text={item.emailAddress.emailAddress}
+                                title={fullName}
+                                /> */}
                             <div class="subject"
                                 title={subject}
                                 text={subject}/>
@@ -226,6 +232,11 @@ export default class MailsPage extends MasterDetailPage {
         }));
     }
 
+    @Action({ onEvent: MailAppEvents.refreshMailboxContacts })
+    refreshMailboxContacts() {
+        this.version++;
+    }
+
     @Action({ onEvent: MailAppEvents.mailboxContactUpdated})
     updateMailboxContact(mc: IMailboxContact) {
         const { mailboxID , emailAddressID } = mc;