@social-mail/social-mail-client 1.2.309 → 1.2.310

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

@@ -178,6 +178,19 @@ export default class ConversationPage extends ContentPage {
 
                     const isDraft = item.status === "draft";
 
+                    if (item.status === "closed") {
+                        return <div
+                            class={itemCss}
+                            data-sent={sent}>
+                            <div data-layout="row">
+                                <div data-flex="stretch-full" text={`Closed by ${item.senderName}`}/>
+                                <div
+                                    text={DateFormats.relative.short(internalDate)}
+                                    title={DateFormats.withWeekDayAndTime(internalDate)}/>
+                            </div>
+                        </div>;
+                    }
+
                     let readStatus = "";
                     let readColor = "";
                     if (sent) {
@@ -297,18 +310,21 @@ export default class ConversationPage extends ContentPage {
         this.actionRenderer = () => <PopupActionButton
                 icon="fas fa-bars"
             >
-            <div data-layout="vertical-flex" style-width="200px">
+            <div
+                data-layout="vertical-flex"
+                style-width="200px"
+                data-font-size="small">
                 <MenuItem
                     data-click-event="close-all-threads"
                     label="Close All Threads"
                     />
-                { this.parameters.autoClose
+                { !this.parameters.autoClose
                     ? <MenuItem
                         data-click-event="close-permanently"
                         label="Close Threads Permanently"
                         />
                     : <MenuItem
-                    data-click-event="close-permanently"
+                    data-click-event="open-threads"
                     label="Open Threads on new Email"
                     />}
                 { this.parameters.blocked
@@ -426,16 +442,30 @@ export default class ConversationPage extends ContentPage {
         await this.conversationService.stopEmail(thread);
     }
 
-    @Action({ onEvent: "close-all-threads"})
+    @Action({
+        onEvent: "close-all-threads",
+        confirm: "You sure you want to close all threads?"
+    })
     async closeAllThreads() {
         await this.conversationService.closeAllThreads(this.parameters);
     }
 
-    @Action({ onEvent: "close-permanently"})
+    @Action({
+        onEvent: "close-permanently",
+        confirm: "Are you sure, you wan to close this contact permanently?"
+    })
     async closePermament() {
         await this.conversationService.closePermanently(this.parameters);
     }
 
+    @Action({
+        onEvent: "open-threads",
+        confirm: "Are you sure you want to change this contact to normal?"
+    })
+    async openThreads() {
+        await this.conversationService.closePermanently(this.parameters);
+    }
+
     @Action({ onEvent: "forward-email"})
     async forwardEmail(thread: IMailboxContactEmail, ce: CustomEvent) {
         void InlinePopup.show(ce.target as HTMLElement, <div

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

@@ -25,6 +25,7 @@ import AddMiniContactPage from "./contact/AddMiniContactPage";
 import PopupService from "@web-atoms/core/dist/web/services/PopupService";
 import MailboxService from "../../../common/pages/mailboxes/services/MailboxService";
 import { toKMBString } from "../../../common/NumberFormats";
+import { MailAppEvents } from "../../commands/MailAppEvents";
 
 const css = styled.css `
 
@@ -201,6 +202,7 @@ export default class MailsPage extends MasterDetailPage {
     private version = 1;
 
     private conversationType = "all";
+    private threadsRepeater: AtomRepeater;
 
     async init() {
 
@@ -251,6 +253,7 @@ export default class MailsPage extends MasterDetailPage {
                 data-items-updated-event="mails-available"
                 data-selection-updated-event="mail-selected"
                 selectedItem={Bind.twoWays(() => this.selectedThread)}
+                presenter={Bind.presenter((c) => this.threadsRepeater = c)}
                 selectOnClick={true}
                 items={this.mails}
                 { ... InfiniteRepeater.pagedItems((start) => (c, e, cancelToken) => this.mailService.list({
@@ -307,6 +310,11 @@ export default class MailsPage extends MasterDetailPage {
         }));
     }
 
+    @Action({ onEvent: MailAppEvents.mailboxContactUpdated})
+    updateMailboxContact(mc: IMailboxContact) {
+        this.threadsRepeater.refreshItem(mc);
+    }
+
     @Action({ onEvent: "compose-template"})
     async composeTemplate() {
         const template = await PageNavigator.pushPageForResult(ChooserTemplatePage);

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

@@ -14,6 +14,7 @@ import BusyProgress from "../../../../services/BusyProgress";
 import EmailContentDownloader from "../../../../services/email/EmailContentDownloader";
 import EngagementService from "./EngagementService";
 import { apiPath } from "../../../../common/apiPath";
+import { MailAppEvents } from "../../../commands/MailAppEvents";
 
 export const renderMail = AtomControl.registerProperty("data-html", "html", (c, e, value) => {
     if (!value) {
@@ -110,12 +111,14 @@ export default class ConversationService {
         contact.closeAllConversations = true;
         await this.entityService.save(contact, (c) => c);
         (contact as any).openThreads = 0;
+        MailAppEvents.mailboxContactUpdated.dispatchEvent(contact);
     }
 
     async closePermanently(contact: IMailboxContact) {
         contact.autoClose = !contact.autoClose;
         contact.dateUpdated = DateTime.now;
         await this.entityService.save(contact, (c) => c);
+        MailAppEvents.mailboxContactUpdated.dispatchEvent(contact);
     }
 
     public async getDraft({ mailboxID, emailAddressID, email }: IMailboxContactEmail) {