@social-mail/social-mail-client 1.1.39 → 1.2.2

package/dist/web/page/mails/service/MailService.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"], function (_export, _context) {
   "use strict";
 
-  var __awaiter, __decorate, __metadata, DISingleton, Inject, EntityService, AppFile, Mailbox, MailboxThread, Sql, MailService;
+  var __awaiter, __decorate, __metadata, DISingleton, Inject, EntityService, AppFile, Mailbox, MailboxContact, Sql, MailService;
   return {
     setters: [function (_tslib) {
       __awaiter = _tslib.__awaiter;
@@ -16,7 +16,7 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
     }, function (_modelModel) {
       AppFile = _modelModel.AppFile;
       Mailbox = _modelModel.Mailbox;
-      MailboxThread = _modelModel.MailboxThread;
+      MailboxContact = _modelModel.MailboxContact;
     }, function (_commonSql) {
       Sql = _commonSql.Sql;
     }],
@@ -39,7 +39,7 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
           cancelToken
         }) {
           return __awaiter(this, void 0, void 0, function* () {
-            let q = this.entityService.query(MailboxThread).where({
+            let q = this.entityService.query(MailboxContact).where({
               mailboxID,
               showBlocked
             }, p => x => x.mailboxID === p.mailboxID && x.blocked === p.showBlocked).orderByDescending(x => x.dateUpdated);

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

@@ -1 +1 @@
-{"version":3,"names":["DISingleton","_webAtomsCoreDistDiDISingleton","default","_webAtomsCoreDistDiInject","Inject","_servicesEntityService","EntityService","_modelModel","AppFile","Mailbox","MailboxThread","_commonSql","Sql","execute","MailService","mailbox","mailboxID","entityService","query","where","p","x","include","emailAddress","firstOrDefault","list","search","start","size","version","showBlocked","cancelToken","q","blocked","orderByDescending","dateUpdated","likeSearch","text","iLike","lastEmail","textBody","subject","name","senderName","toPagedList","raw","email","originalFileID","file","appFileID","rs","fetch","url","send","iterator","recipients","emailAddressText","trim","cloner","attachments","copy","save","__decorate","_export"],"sources":["../../../../../src/web/page/mails/service/MailService.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"names":["DISingleton","_webAtomsCoreDistDiDISingleton","default","_webAtomsCoreDistDiInject","Inject","_servicesEntityService","EntityService","_modelModel","AppFile","Mailbox","MailboxContact","_commonSql","Sql","execute","MailService","mailbox","mailboxID","entityService","query","where","p","x","include","emailAddress","firstOrDefault","list","search","start","size","version","showBlocked","cancelToken","q","blocked","orderByDescending","dateUpdated","likeSearch","text","iLike","lastEmail","textBody","subject","name","senderName","toPagedList","raw","email","originalFileID","file","appFileID","rs","fetch","url","send","iterator","recipients","emailAddressText","trim","cloner","attachments","copy","save","__decorate","_export"],"sources":["../../../../../src/web/page/mails/service/MailService.ts"],"sourcesContent":[null],"mappings":"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"}

package/package.json

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

package/src/common/events/CommonEvents.ts

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

package/src/model/model.ts

@@ -287,6 +287,7 @@ export interface IEmail extends IClrEntity {
 	status?: "queued" | "received" | "draft" | "pending-approval" | "scheduled" | "sent" | "sent-failed";
 	forwardCount?: number;
 	replyCount?: number;
+	viewCount?: number;
 	originalFileID?: number | null;
 	originalFileSize?: number;
 	workflowID?: string | null;
@@ -307,14 +308,14 @@ export interface IEmail extends IClrEntity {
 	recipients?: ICollection<IEmailRecipient>;
 	tags?: ICollection<IEmailTag>;
 	mailboxes?: ICollection<IMailboxEmail>;
-	lastEmailThreads?: ICollection<IMailboxThread>;
-	threadEmails?: ICollection<IMailboxThreadEmail>;
+	lastEmailThreads?: ICollection<IMailboxContact>;
+	threadEmails?: ICollection<IMailboxContactEmail>;
 	subscriberActivities?: ICollection<ISubscriberActivity>;
 }
 
 export const EmailStatusArray = [{"label":"queued","value":"queued"},{"label":"received","value":"received"},{"label":"draft","value":"draft"},{"label":"pending-approval","value":"pending-approval"},{"label":"scheduled","value":"scheduled"},{"label":"sent","value":"sent"},{"label":"sent-failed","value":"sent-failed"}];
 
-export const Email: IModel<IEmail> = new Model<IEmail>("Email", ["emailID"], { senderName: "",received: false,dateReceived: new DefaultFactory(() => new DateTime()),dateCreated: new DefaultFactory(() => new DateTime()),status: "queued",forwardCount: 0,replyCount: 0,originalFileSize: 0 });
+export const Email: IModel<IEmail> = new Model<IEmail>("Email", ["emailID"], { senderName: "",received: false,dateReceived: new DefaultFactory(() => new DateTime()),dateCreated: new DefaultFactory(() => new DateTime()),status: "queued",forwardCount: 0,replyCount: 0,viewCount: 0,originalFileSize: 0 });
 
 export interface IEmailEngagement extends IClrEntity {
 	emailID?: number;
@@ -378,8 +379,7 @@ export interface IEmailAddress extends IClrEntity {
 	mailbox?: IMailbox;
 	contactEmails?: ICollection<IContactEmail>;
 	recipients?: ICollection<IEmailRecipient>;
-	threads?: ICollection<IMailboxThread>;
-	subscribedMailboxes?: ICollection<IMailboxSubscriber>;
+	threads?: ICollection<IMailboxContact>;
 	subscriberActivities?: ICollection<ISubscriberActivity>;
 }
 
@@ -419,10 +419,9 @@ export interface IMailbox extends IClrEntity {
 	contacts?: ICollection<IContact>;
 	templates?: ICollection<IEmailTemplate>;
 	emails?: ICollection<IMailboxEmail>;
-	threads?: ICollection<IMailboxThread>;
-	threadEmails?: ICollection<IMailboxThreadEmail>;
+	mailboxContacts?: ICollection<IMailboxContact>;
+	threadEmails?: ICollection<IMailboxContactEmail>;
 	syncTargets?: ICollection<IMailboxSyncTarget>;
-	subscribers?: ICollection<IMailboxSubscriber>;
 	subscriberActivities?: ICollection<ISubscriberActivity>;
 	userPins?: ICollection<IUserPin>;
 	userMailboxes?: ICollection<IUserMailbox>;
@@ -439,25 +438,33 @@ export interface IMailboxEmail extends IClrEntity {
 
 export const MailboxEmail: IModel<IMailboxEmail> = new Model<IMailboxEmail>("MailboxEmail", ["mailboxID","emailID"], {  });
 
-export interface IMailboxThread extends IClrEntity {
+export interface IMailboxContact extends IClrEntity {
 	mailboxID?: number;
 	emailAddressID?: number;
 	lastEmailID?: number | null;
+	dateCreated?: DateTime;
 	dateUpdated?: DateTime;
 	unread?: number;
 	total?: number;
 	doNotIndex?: boolean | null;
 	doNotIndexAttachments?: boolean | null;
+	isOwner?: boolean;
+	canContribute?: boolean;
 	priority?: number;
 	blocked?: boolean;
+	status?: "invited" | "added" | "active" | "unsubscribed" | "blocked";
+	emailAddressText?: string;
+	name?: string;
 	mailbox?: IMailbox;
 	emailAddress?: IEmailAddress;
 	lastEmail?: IEmail;
 }
 
-export const MailboxThread: IModel<IMailboxThread> = new Model<IMailboxThread>("MailboxThread", ["mailboxID","emailAddressID"], { dateUpdated: new DefaultFactory(() => new DateTime()),unread: 0,total: 0,priority: 0,blocked: false });
+export const MailboxContactStatusArray = [{"label":"invited","value":"invited"},{"label":"added","value":"added"},{"label":"active","value":"active"},{"label":"unsubscribed","value":"unsubscribed"},{"label":"blocked","value":"blocked"}];
 
-export interface IMailboxThreadEmail extends IClrEntity {
+export const MailboxContact: IModel<IMailboxContact> = new Model<IMailboxContact>("MailboxContact", ["mailboxID","emailAddressID"], { dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),unread: 0,total: 0,isOwner: false,canContribute: false,priority: 0,blocked: false,status: "invited" });
+
+export interface IMailboxContactEmail extends IClrEntity {
 	mailboxID?: number;
 	emailAddressID?: number;
 	emailID?: number;
@@ -468,7 +475,7 @@ export interface IMailboxThreadEmail extends IClrEntity {
 	email?: IEmail;
 }
 
-export const MailboxThreadEmail: IModel<IMailboxThreadEmail> = new Model<IMailboxThreadEmail>("MailboxThreadEmail", ["mailboxID","emailAddressID","emailID"], { dateReceived: new DefaultFactory(() => new DateTime()) });
+export const MailboxContactEmail: IModel<IMailboxContactEmail> = new Model<IMailboxContactEmail>("MailboxContactEmail", ["mailboxID","emailAddressID","emailID"], { dateReceived: new DefaultFactory(() => new DateTime()) });
 
 export interface IMailboxSyncTarget extends IClrEntity {
 	readonly syncTargetID?: number;
@@ -498,33 +505,15 @@ export const MailboxSyncTargetLastSyncStatusArray = [{"label":"none","value":"no
 
 export const MailboxSyncTarget: IModel<IMailboxSyncTarget> = new Model<IMailboxSyncTarget>("MailboxSyncTarget", ["syncTargetID"], { direction: "in",protocol: "imap",username: "",host: "",port: 0,isSecure: false,syncAllFolders: false,syncJunkMails: false,intervalSeconds: 0,active: false });
 
-export interface IMailboxSubscriber extends IClrEntity {
-	mailboxID?: number;
-	subscriberID?: number;
-	name?: string | null;
-	isOwner?: boolean;
-	canContribute?: boolean;
-	status?: "invited" | "added" | "active" | "unsubscribed" | "blocked";
-	dateCreated?: DateTime;
-	dateUpdated?: DateTime;
-	/** Used for adding new subscriber only */
-	emailAddress?: string;
-	mailbox?: IMailbox;
-	subscriber?: IEmailAddress;
-}
-
-export const MailboxSubscriberStatusArray = [{"label":"invited","value":"invited"},{"label":"added","value":"added"},{"label":"active","value":"active"},{"label":"unsubscribed","value":"unsubscribed"},{"label":"blocked","value":"blocked"}];
-
-export const MailboxSubscriber: IModel<IMailboxSubscriber> = new Model<IMailboxSubscriber>("MailboxSubscriber", ["mailboxID","subscriberID"], { isOwner: false,canContribute: false,status: "invited",dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()) });
-
 export interface ISubscriberActivity extends IClrEntity {
 	readonly activityID?: number;
 	mailboxID?: number;
 	emailID?: number;
-	subscriberID?: number;
+	emailAddressID?: number;
 	activity?: string;
 	dateCreated?: DateTime;
 	uid?: number | null;
+	ipAddress?: string | null;
 	mailbox?: IMailbox;
 	email?: IEmail;
 	subscriber?: IEmailAddress;

package/src/web/page/channels/services/ChannelService.ts

@@ -1,7 +1,7 @@
 import DITransient from "@web-atoms/core/dist/di/DITransient";
 import { Inject } from "@web-atoms/core/dist/di/Inject";
 import EntityService from "../../../../services/EntityService";
-import { IMailboxSubscriber, Mailbox, MailboxSubscriber } from "../../../../model/model";
+import { IMailboxContact, Mailbox, MailboxContact } from "../../../../model/model";
 import { Sql } from "../../../../common/Sql";
 
 @DITransient({})
@@ -18,29 +18,29 @@ export default class ChannelService {
     }
 
     public async subscribers({ id, cancelToken, size, start, search, v}) {
-        let q = this.entityService.query(MailboxSubscriber)
+        let q = this.entityService.query(MailboxContact)
             .where({ id }, (p) => (x) => x.mailboxID === p.id);
         if (search) {
             if(!/\%/i.test(search)) {
                 search += "%";
             }
             q = q.where( { search }, (p) => (x) =>
-                Sql.text.iLike(x.subscriber.name, p.search)
-                || Sql.text.iLike(x.subscriber.emailAddress, p.search)
+                Sql.text.iLike(x.emailAddress.name, p.search)
+                || Sql.text.iLike(x.emailAddress.emailAddress, p.search)
             );
         }
-        return q.include((x) => x.subscriber).toPagedList({
+        return q.include((x) => x.emailAddress).toPagedList({
             start,
             size,
             cancelToken
         });
     }
 
-    public save(model: IMailboxSubscriber) {
+    public save(model: IMailboxContact) {
         return this.entityService.save(model);
     }
 
-    public async saveAll(subscribers: IMailboxSubscriber[]) {
+    public async saveAll(subscribers: IMailboxContact[]) {
         const cloners = [];
         for (const iterator of subscribers) {
             cloners.push(this.entityService.cloner(iterator).copy);

package/src/web/page/channels/subscribers/ChannelSubscribersPage.tsx

@@ -1,7 +1,7 @@
 import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
 import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
 import ChannelService from "../services/ChannelService";
-import { IMailbox, IMailboxSubscriber } from "../../../../model/model";
+import { IMailbox, IMailboxContact } from "../../../../model/model";
 import XNode from "@web-atoms/core/dist/core/XNode";
 import AtomRepeater, { SelectAll, SelectorCheckBox } from "@web-atoms/web-controls/dist/basic/AtomRepeater";
 import InfiniteRepeater from "../../../../common/controls/repeater/InfiniteRepeater";
@@ -21,11 +21,11 @@ export default class ChannelSubscribersPage extends ContentPage {
 
     private search = "";
 
-    private subscribers: IMailboxSubscriber[] = [];
+    private subscribers: IMailboxContact[] = [];
 
     private version = 1;
 
-    private selected: IMailboxSubscriber[] = [];
+    private selected: IMailboxContact[] = [];
 
     @InjectProperty
     private channelService: ChannelService;
@@ -62,6 +62,7 @@ export default class ChannelSubscribersPage extends ContentPage {
 
         this.renderer = <div>
             <AtomRepeater
+                data-layout="data-grid"
                 items={this.subscribers}
                 selectedItems={this.selected}
                 allowMultipleSelection={true}
@@ -76,10 +77,10 @@ export default class ChannelSubscribersPage extends ContentPage {
                             v: this.version
                         })
                     )}
-                itemRenderer={(item: IMailboxSubscriber) => <div data-layout="row">
+                itemRenderer={(item: IMailboxContact) => <div data-layout="row">
                     <SelectorCheckBox
                         />
-                    <div text={item.subscriber.emailAddress}/>
+                    <div text={item.emailAddress.emailAddress}/>
                     <div text={item.status}/>
                     <div
                         text={item.isOwner ? "Is Owner": ""}/>
@@ -91,6 +92,10 @@ export default class ChannelSubscribersPage extends ContentPage {
         this.footerRenderer = () => <div
             style-display={Bind.oneWay(() => this.selected.length > 0)}
             data-layout="command-row">
+            <SaveIconTextButton
+                data-click-event="activate-subscribers"
+                text="Activate"
+                />
             <DeleteIconTextButton
                 data-click-event="delete-subscribers"
                 text="Delete"
@@ -121,6 +126,19 @@ export default class ChannelSubscribersPage extends ContentPage {
         this.version++;
     }
 
+    @Action({
+        onEvent: "activate-subscribers",
+        confirm: "Are you sure you want to activate given subscribers?"
+    })
+    async activateSubscribers() {
+        for (const iterator of this.selected) {
+            iterator.status = "active";
+        }
+        await this.channelService.saveAll(this.selected);
+        this.selected.clear();
+        this.version++;
+    }
+
     @Action({
         onEvent: "update-rights",
     })

package/src/web/page/channels/subscribers/add/AddSubscriberPage.tsx

@@ -3,7 +3,7 @@ import XNode from "@web-atoms/core/dist/core/XNode";
 import Form from "@web-atoms/web-controls/dist/basic/Form";
 import FormField from "@web-atoms/web-controls/dist/basic/FormField";
 import { ContentPage, PopupWindowPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
-import { IMailboxSubscriber, MailboxSubscriber } from "../../../../../model/model";
+import { IMailboxContact, MailboxContact } from "../../../../../model/model";
 import { SaveIconTextButton } from "../../../../../common/controls/buttons/IconButton";
 import Action from "@web-atoms/core/dist/view-model/Action";
 import { Inject } from "@web-atoms/core/dist/di/Inject";
@@ -15,7 +15,7 @@ export default class AddSubscriberPage extends PopupWindowPage {
 
     public parameters: { id: number};
 
-    private model: IMailboxSubscriber = MailboxSubscriber.create({});
+    private model: IMailboxContact = MailboxContact.create({});
 
     private emailAddress: string = "";
 
@@ -25,7 +25,7 @@ export default class AddSubscriberPage extends PopupWindowPage {
     async init() {
 
         this.title = "Add/Invite new subscriber";
-        this.model.emailAddress ??= "";
+        this.model.emailAddressText ??= "";
         this.model.mailboxID = this.parameters.id;
         this.renderer = <div>
             {/* <p>We recommend inviting subscribers to maintain your reputation as a sender.
@@ -38,7 +38,7 @@ export default class AddSubscriberPage extends PopupWindowPage {
                 <FormField label="Email Address">
                     <input
                         autofocus={true}
-                        value={Bind.twoWaysImmediate(() => this.model.emailAddress)}/>
+                        value={Bind.twoWaysImmediate(() => this.model.emailAddressText)}/>
                 </FormField>
                 <FormField label="Name">
                     <input

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

@@ -1,5 +1,5 @@
 import { ContentPage, isMobileView } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
-import { Email, EmailRecipient, IEmail, IMailboxThread, IMailboxThreadEmail } from "../../../model/model";
+import { Email, EmailRecipient, IEmail, IMailboxContact, IMailboxContactEmail } from "../../../model/model";
 import { Inject } from "@web-atoms/core/dist/di/Inject";
 import MailService from "./service/MailService";
 import XNode from "@web-atoms/core/dist/core/XNode";
@@ -74,12 +74,12 @@ const fixLinks = () => {
 
 export default class ConversationPage extends ContentPage {
 
-    public parameters: IMailboxThread;
+    public parameters: IMailboxContact;
 
     @InjectProperty
     private conversationService: ConversationService;
 
-    private mails: IMailboxThreadEmail[] = [];
+    private mails: IMailboxContactEmail[] = [];
 
     private search: string = "";
     private version = 1;
@@ -128,7 +128,7 @@ export default class ConversationPage extends ContentPage {
                             version: this.version,
                             cancelToken
                         }))}
-                itemRenderer={(thread: IMailboxThreadEmail) => {
+                itemRenderer={(thread: IMailboxContactEmail) => {
                     const item = thread.email;
                     const internalDate = item.dateSent ?? item.dateReceived ?? item.dateCreated;
                     const sent = item.senderID === thread.mailboxID;
@@ -214,7 +214,7 @@ export default class ConversationPage extends ContentPage {
         const inReplyTo = url.searchParams.get("inReplyTo") ?? "";
 
         const { item } = AtomRepeater.itemFromElement(e.target as HTMLElement);
-        const { email: { parentID,  headerMessageID }} = item as IMailboxThreadEmail;
+        const { email: { parentID,  headerMessageID }} = item as IMailboxContactEmail;
 
         const recipients = [EmailRecipient.create({ emailAddressText: to })];
 
@@ -237,7 +237,7 @@ export default class ConversationPage extends ContentPage {
     }
 
     @Action({ onEvent: "mail-options"})
-    async mailOptions(thread: IMailboxThreadEmail, ce: CustomEvent) {
+    async mailOptions(thread: IMailboxContactEmail, ce: CustomEvent) {
         void InlinePopupControl.showPopup(ce.target as HTMLElement, <div
             data-click-event="none"
             data-click-animate="none">
@@ -260,12 +260,12 @@ export default class ConversationPage extends ContentPage {
     }
 
     @Action({ onEvent: "open-logs"})
-    async openLogs({ emailID }: IMailboxThreadEmail) {
+    async openLogs({ emailID }: IMailboxContactEmail) {
         PageNavigator.pushPage(LogsPage, { emailID });
     }
 
     @Action({ onEvent: ["reply-email", "reply-all-email" ]})
-    async replyEmail({ email }: IMailboxThreadEmail, ce: CustomEvent) {
+    async replyEmail({ email }: IMailboxContactEmail, ce: CustomEvent) {
         const parse = JSON.parse(email.headers);
         const emailAddressText = ((parse?.replyTo?.[0] ?? this.parameters.emailAddress.emailAddress) as string)
             .toLocaleLowerCase();

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

@@ -2,7 +2,7 @@ import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
 import XNode from "@web-atoms/core/dist/core/XNode";
 import MailService from "./service/MailService";
 import AtomRepeater from "@web-atoms/web-controls/dist/basic/AtomRepeater";
-import { IEmail, IMailbox, IMailboxThread } from "../../../model/model";
+import { IEmail, IMailbox, IMailboxContact } from "../../../model/model";
 import InfiniteRepeater from "../../../common/controls/repeater/InfiniteRepeater";
 import Bind from "@web-atoms/core/dist/core/Bind";
 import MasterDetailPage from "@web-atoms/web-controls/dist/mobile-app/MasterDetailPage";
@@ -108,7 +108,7 @@ const css = styled.css `
     }
 `.installLocal();
 
-const displayName = (item: IMailboxThread) => {
+const displayName = (item: IMailboxContact) => {
     const { emailAddress: { emailAddress, name } } = item;
     if(name && name !== emailAddress) {
         return name;
@@ -130,13 +130,13 @@ export default class MailsPage extends MasterDetailPage {
 
     private currentMailbox: IMailbox;
 
-    private mails: IMailboxThread[] = [];
+    private mails: IMailboxContact[] = [];
 
     private search: string = "";
 
-    private selectedThread: IMailboxThread = null;
+    private selectedThread: IMailboxContact = null;
 
-    private previousThread: IMailboxThread = null;
+    private previousThread: IMailboxContact = null;
 
     private showBlocked = false;
 
@@ -209,7 +209,7 @@ export default class MailsPage extends MasterDetailPage {
                     showBlocked: this.showBlocked,
                     cancelToken
                 }))}
-                itemRenderer={(item: IMailboxThread) => {
+                itemRenderer={(item: IMailboxContact) => {
                     const name = displayName(item) + " " + item.emailAddress.emailAddress;
                     const subject = item.lastEmail?.subject;
                     const summary = item.lastEmail?.summary;
@@ -300,7 +300,7 @@ export default class MailsPage extends MasterDetailPage {
     }
 
     @Action({ onEvent: CommonEvents.onThreadMarkedAsBlocked })
-    onThreadMarkedAsBlocked(thread: IMailboxThread) {
+    onThreadMarkedAsBlocked(thread: IMailboxContact) {
         const index = this.mails.findIndex((x) => x.emailAddressID === thread.emailAddressID);
         if (index === -1) {
             return;

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, IEmail, IMailboxThread, IMailboxThreadEmail, MailboxThreadEmail } from "../../../../model/model";
+import { Email, EmailEngagement, IEmail, IMailboxContact, IMailboxContactEmail, MailboxContactEmail } 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";
@@ -17,7 +17,7 @@ export const renderMail = AtomControl.registerProperty("data-html", "html", (c,
         e.innerHTML = "";
         return;
     }
-    const thread = value as IMailboxThreadEmail;
+    const thread = value as IMailboxContactEmail;
     const mail = thread.email;
     const html = mail.htmlBody;
     const msg = document.createElement("div");
@@ -55,7 +55,7 @@ export const renderMail = AtomControl.registerProperty("data-html", "html", (c,
         thread.timeRead = timeRead;
         const control = AtomControl.from(e);
         const entityService = control.app.resolve(EntityService);
-        entityService.save(MailboxThreadEmail.patch(thread, {
+        entityService.save(MailboxContactEmail.patch(thread, {
             timeRead
         })).then(() => {
             CommonEvents.onThreadMarkedAsRead.dispatchEvent(thread);
@@ -111,7 +111,7 @@ export default class ConversationService {
         version = 0,
         cancelToken
     }) {
-        let q = this.entityService.query(MailboxThreadEmail)
+        let q = this.entityService.query(MailboxContactEmail)
             .where({ mailboxID, emailAddressID }, (p) =>
                 (x) => x.mailboxID === p.mailboxID
                     && x.emailAddressID === p.emailAddressID
@@ -172,7 +172,7 @@ export default class ConversationService {
         </div>);
     }
 
-    async block(thread: IMailboxThread) {
+    async block(thread: IMailboxContact) {
         thread.blocked = !thread.blocked;
         const cloner = this.entityService.cloner(thread).copy;
         await this.entityService.save(cloner);

package/src/web/page/mails/service/MailService.ts

@@ -1,7 +1,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 { AppFile, Email, EmailAddress, IEmail, Mailbox, MailboxThread } from "../../../../model/model";
+import { AppFile, Email, EmailAddress, IEmail, Mailbox, MailboxContact } from "../../../../model/model";
 import { Sql } from "../../../../common/Sql";
 
 @DISingleton()
@@ -26,7 +26,7 @@ export default class MailService {
         showBlocked = false,
         cancelToken
     }) {
-        let q = this.entityService.query(MailboxThread)
+        let q = this.entityService.query(MailboxContact)
             .where({ mailboxID, showBlocked }, (p) => (x) => x.mailboxID === p.mailboxID && x.blocked === p.showBlocked)
             .orderByDescending((x) => x.dateUpdated);
         if (search) {