@social-mail/social-mail-client 1.2.91 → 1.2.93

package/dist/web/page/mails/service/ConversationService.d.ts

@@ -16,7 +16,7 @@ export default class ConversationService {
         cancelToken: any;
     }): Promise<import("@web-atoms/entity/dist/models/IPagedList").default<IMailboxContactEmail>>;
     stopEmail(mce: IMailboxContactEmail): Promise<void>;
-    downloadEmailContent(email: IEmail): Promise<void>;
+    downloadEmailContent(mce: IMailboxContactEmail): Promise<void>;
     renderText(html: string): string;
     renderHtml(html: string): string;
     toHtml(textBody: string): string;

package/dist/web/page/mails/service/ConversationService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../../../src/web/page/mails/service/ConversationService.tsx"],"names":[],"mappings":"AAIA,OAAO,EAA0C,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAqC,MAAM,yBAAyB,CAAC;AAYnK,eAAO,MAAM,UAAU,8EA+DrB,CAAC;AAmCH,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAGpC,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,sBAAsB,CAAyB;IAGvD,OAAO,CAAC,iBAAiB,CAAoB;IAEhC,QAAQ,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,oBAAoB;IAYnE,KAAK,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,oBAAoB,EAAE,MAAM,UAAQ;IAwChF,IAAI,CAAC,EACd,MAAW,EACX,SAAS,EACT,cAAc,EACd,KAAS,EACT,IAAU,EACV,OAAW,EACX,WAAW,EACd;;;;;;;;KAAA;IA8CK,SAAS,CAAC,GAAG,EAAE,oBAAoB;IAOnC,oBAAoB,CAAC,KAAK,EAAE,MAAM;IAmBjC,UAAU,CAAC,IAAI,EAAE,MAAM;IAMvB,UAAU,CAAC,IAAI,EAAE,MAAM;IAQvB,MAAM,CAAC,QAAQ,EAAE,MAAM;IAMxB,KAAK,CAAC,MAAM,EAAE,eAAe;IAO7B,MAAM,CAAC,KAAK,EAAE,MAAM;CAS7B"}
+{"version":3,"file":"ConversationService.d.ts","sourceRoot":"","sources":["../../../../../src/web/page/mails/service/ConversationService.tsx"],"names":[],"mappings":"AAIA,OAAO,EAA0C,MAAM,EAAE,eAAe,EAAE,oBAAoB,EAAqC,MAAM,yBAAyB,CAAC;AAYnK,eAAO,MAAM,UAAU,8EA+DrB,CAAC;AAGH,MAAM,CAAC,OAAO,OAAO,mBAAmB;IAGpC,OAAO,CAAC,aAAa,CAAgB;IAGrC,OAAO,CAAC,sBAAsB,CAAyB;IAGvD,OAAO,CAAC,iBAAiB,CAAoB;IAEhC,QAAQ,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,oBAAoB;IAYnE,KAAK,CAAC,EAAE,SAAS,EAAE,cAAc,EAAE,KAAK,EAAE,EAAE,oBAAoB,EAAE,MAAM,UAAQ;IAwChF,IAAI,CAAC,EACd,MAAW,EACX,SAAS,EACT,cAAc,EACd,KAAS,EACT,IAAU,EACV,OAAW,EACX,WAAW,EACd;;;;;;;;KAAA;IA+CK,SAAS,CAAC,GAAG,EAAE,oBAAoB;IAOnC,oBAAoB,CAAC,GAAG,EAAE,oBAAoB;IAoB7C,UAAU,CAAC,IAAI,EAAE,MAAM;IAMvB,UAAU,CAAC,IAAI,EAAE,MAAM;IAQvB,MAAM,CAAC,QAAQ,EAAE,MAAM;IAMxB,KAAK,CAAC,MAAM,EAAE,eAAe;IAO7B,MAAM,CAAC,KAAK,EAAE,MAAM;CAS7B"}

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", "../../../../common/events/CommonEvents", "../../../../services/BusyProgress", "../../../../services/email/EmailContentDownloader", "./EngagementService"], function (_export, _context) {
   "use strict";
 
-  var __awaiter, __decorate, __metadata, DISingleton, Inject, EntityService, Email, EmailRecipient, MailboxContactEmail, MailboxEmail, Sql, DomToString, XNode, AtomControl, descendentElementIterator, DateTime, CommonEvents, BusyProgress, EmailContentDownloader, EngagementService, renderMail, downloadEmailContent, ConversationService;
+  var __awaiter, __decorate, __metadata, DISingleton, Inject, EntityService, Email, EmailRecipient, MailboxContactEmail, MailboxEmail, Sql, DomToString, XNode, AtomControl, descendentElementIterator, DateTime, CommonEvents, BusyProgress, EmailContentDownloader, EngagementService, renderMail, ConversationService;
   return {
     setters: [function (_tslib) {
       __awaiter = _tslib.__awaiter;
@@ -105,35 +105,6 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
         }
         return;
       }));
-      downloadEmailContent = (es, email) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
-        if (email.replyCount) {
-          const children = yield es.query(Email).where({
-            emailID: email.emailID
-          }, p => x => x.emailID === p.emailID && x.engagement !== null).orderByDescending(x => x.emailID).toPagedList({
-            start: 0,
-            size: 4,
-            cacheVersion: "a",
-            cacheSeconds: 900
-          });
-          email.children = (_a = children === null || children === void 0 ? void 0 : children.items) !== null && _a !== void 0 ? _a : [];
-        } else {
-          (_b = email.children) !== null && _b !== void 0 ? _b : email.children = [];
-        }
-        if (!email.originalFileID) {
-          return;
-        }
-        for (let i = 0; i < 10; i++) {
-          try {
-            const rs = yield fetch(email.htmlBodyUrl);
-            const text = yield rs.text();
-            email.htmlBody = text;
-            return;
-          } catch (error) {
-            console.error(error);
-          }
-        }
-      });
       ConversationService = class ConversationService {
         getDraft({
           mailboxID,
@@ -223,12 +194,13 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
             const tasks = [];
             const d = BusyProgress.create();
             try {
-              for (const {
-                email
-              } of emails.items) {
+              for (const mce of emails.items) {
+                const {
+                  email
+                } = mce;
                 (_a = email.htmlBody) !== null && _a !== void 0 ? _a : email.htmlBody = "";
                 (_b = email.textBody) !== null && _b !== void 0 ? _b : email.textBody = "";
-                tasks.push(this.downloadEmailContent(email));
+                tasks.push(this.downloadEmailContent(mce));
                 tasks.push(this.engagementService.downloadEngagements(email));
               }
               yield Promise.all(tasks);
@@ -248,9 +220,12 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
             CommonEvents.onEmailUnscheduled.dispatchEvent(mce);
           });
         }
-        downloadEmailContent(email) {
+        downloadEmailContent(mce) {
           var _a, _b;
           return __awaiter(this, void 0, void 0, function* () {
+            const {
+              email
+            } = mce;
             if (email.replyCount) {
               const children = yield this.entityService.query(Email).where({
                 emailID: email.emailID
@@ -264,7 +239,7 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
             } else {
               (_b = email.children) !== null && _b !== void 0 ? _b : email.children = [];
             }
-            yield this.emailContentDownloader.download(email);
+            yield this.emailContentDownloader.download(mce);
           });
         }
         renderText(html) {

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

@@ -1 +1 @@
-{"version":3,"names":["DISingleton","_webAtomsCoreDistDiDISingleton","default","_webAtomsCoreDistDiInject","Inject","_servicesEntityService","EntityService","_modelModel","Email","EmailRecipient","MailboxContactEmail","MailboxEmail","_commonSql","Sql","_webAtomsEmailDomDistDomToString","DomToString","_webAtomsCoreDistCoreXNode","XNode","_webAtomsCoreDistWebControlsAtomControl","AtomControl","_webAtomsCoreDistWebCoreAtomUI","descendentElementIterator","_webAtomsDateTimeDistDateTime","DateTime","_commonEventsCommonEvents","CommonEvents","_servicesBusyProgress","BusyProgress","_servicesEmailEmailContentDownloader","EmailContentDownloader","_EngagementService","EngagementService","execute","_export","renderMail","registerProperty","c","e","value","innerHTML","thread","mail","email","html","htmlBody","msg","document","createElement","iterator","split","p","appendChild","createTextNode","cid","getAttribute","a","attachments","find","x","contentID","setAttribute","url","test","tagName","src","startsWith","substring","appFileID","fileContentID","name","target","shadow","attachShadow","mode","timeRead","mailboxID","now","control","from","entityService","app","resolve","save","patch","then","onThreadMarkedAsRead","dispatchEvent","console","error","downloadEmailContent","es","__awaiter","replyCount","children","query","where","emailID","engagement","orderByDescending","toPagedList","start","size","cacheVersion","cacheSeconds","_a","items","_b","originalFileID","i","rs","fetch","htmlBodyUrl","text","ConversationService","getDraft","emailAddressID","draft","status","include","recipients","firstOrDefault","create","textBody","mdBody","subject","cloner","copy","mailboxes","threads","_c","threadEmails","senderID","some","m","push","r","list","search","version","cancelToken","q","iLike","originalFile","fileContent","textDocument","searchable","emails","forEach","emailAddress","senderUser","senderEmail","dateReceived","tasks","d","engagementService","downloadEngagements","Promise","all","dispose","call","stopEmail","mce","onEmailUnscheduled","emailContentDownloader","download","renderText","div","textContent","renderHtml","toHtml","map","block","blocked","onThreadMarkedAsBlocked","delete","onDraftDeleted","__decorate"],"sources":["../../../../../src/web/page/mails/service/ConversationService.tsx"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"names":["DISingleton","_webAtomsCoreDistDiDISingleton","default","_webAtomsCoreDistDiInject","Inject","_servicesEntityService","EntityService","_modelModel","Email","EmailRecipient","MailboxContactEmail","MailboxEmail","_commonSql","Sql","_webAtomsEmailDomDistDomToString","DomToString","_webAtomsCoreDistCoreXNode","XNode","_webAtomsCoreDistWebControlsAtomControl","AtomControl","_webAtomsCoreDistWebCoreAtomUI","descendentElementIterator","_webAtomsDateTimeDistDateTime","DateTime","_commonEventsCommonEvents","CommonEvents","_servicesBusyProgress","BusyProgress","_servicesEmailEmailContentDownloader","EmailContentDownloader","_EngagementService","EngagementService","execute","_export","renderMail","registerProperty","c","e","value","innerHTML","thread","mail","email","html","htmlBody","msg","document","createElement","iterator","split","p","appendChild","createTextNode","cid","getAttribute","a","attachments","find","x","contentID","setAttribute","url","test","tagName","src","startsWith","substring","appFileID","fileContentID","name","target","shadow","attachShadow","mode","timeRead","mailboxID","now","control","from","entityService","app","resolve","save","patch","then","onThreadMarkedAsRead","dispatchEvent","console","error","ConversationService","getDraft","emailAddressID","draft","query","where","status","orderByDescending","emailID","include","recipients","firstOrDefault","create","textBody","mdBody","subject","cloner","copy","_a","mailboxes","_b","threads","_c","threadEmails","senderID","some","m","push","r","list","search","start","size","version","cancelToken","q","engagement","text","iLike","originalFile","fileContent","textDocument","searchable","emails","forEach","emailAddress","senderUser","senderEmail","dateReceived","toPagedList","tasks","d","mce","items","downloadEmailContent","engagementService","downloadEngagements","Promise","all","dispose","call","stopEmail","onEmailUnscheduled","replyCount","children","cacheVersion","cacheSeconds","emailContentDownloader","download","renderText","div","textContent","renderHtml","toHtml","map","block","blocked","onThreadMarkedAsBlocked","delete","onDraftDeleted","__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.2.91",
+  "version": "1.2.93",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/common/pages/logs/LogsPage.tsx

@@ -4,9 +4,9 @@ import { PopupWindowPage } from "@web-atoms/web-controls/dist/mobile-app/MobileA
 import AppLogService from "./services/AppLogService";
 import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
 import InfiniteRepeater from "../../controls/repeater/InfiniteRepeater";
-import { IAppLog } from "../../../model/model";
 import Expander from "@web-atoms/web-controls/dist/basic/Expander";
 import { DateFormats } from "../../date/DateFormats";
+import { IEmailLog } from "../../../model/model";
 
 export default class LogsPage extends PopupWindowPage {
 
@@ -15,7 +15,7 @@ export default class LogsPage extends PopupWindowPage {
     @InjectProperty
     private logService: AppLogService;
 
-    private logs: IAppLog[] = [];
+    private logs: IEmailLog[] = [];
 
     async init() {
         this.title = "Logs";
@@ -29,9 +29,9 @@ export default class LogsPage extends PopupWindowPage {
                 { ... InfiniteRepeater.pagedItems((start) =>
                     (c, e, cancelToken) => this.logService.logs({ emailID, start, cancelToken })
                     )}
-                itemRenderer={(item: IAppLog) =>
+                itemRenderer={(item: IEmailLog) =>
                     <tr>
-                        <td text={item.title} data-flex="stretch-full"/>
+                        <td text={item.fileName} data-flex="stretch-full"/>
                         <td
                             title={DateFormats.withWeekDayAndTime(item.dateCreated)}
                             text={DateFormats.relative.short(item.dateCreated)}/>

package/src/common/pages/logs/services/AppLogService.ts

@@ -1,7 +1,7 @@
 import DITransient from "@web-atoms/core/dist/di/DITransient";
 import EntityService from "../../../../services/EntityService";
 import { Inject } from "@web-atoms/core/dist/di/Inject";
-import { AppLog } from "../../../../model/model";
+import { EmailLog } from "../../../../model/model";
 
 @DITransient()
 export default class AppLogService {
@@ -11,7 +11,7 @@ export default class AppLogService {
 
 
     async logs({ emailID, start, size = 100, cancelToken }) {
-        let q = this.entityService.query(AppLog);
+        let q = this.entityService.query(EmailLog);
         if (emailID) {
             q = q.where({ emailID }, (p) => (x) => x.emailID === p.emailID);
         }

package/src/model/model.ts

@@ -299,7 +299,6 @@ export interface IEmail extends IClrEntity {
 	forwardedID?: number | null;
 	engagement?: string | null;
 	tags?: string | null;
-	htmlBodyUrl?: string;
 	senderEmail?: IEmailAddress;
 	senderUser?: IUser;
 	originalFile?: IAppFile;
@@ -309,7 +308,7 @@ export interface IEmail extends IClrEntity {
 	forwards?: ICollection<IEmail>;
 	attachments?: ICollection<IAppFile>;
 	engagements?: ICollection<IEmailEngagement>;
-	logs?: ICollection<IAppLog>;
+	logs?: ICollection<IEmailLog>;
 	recipients?: ICollection<IEmailRecipient>;
 	emailTags?: ICollection<IEmailTag>;
 	mailboxes?: ICollection<IMailboxEmail>;
@@ -331,21 +330,18 @@ export interface IEmailEngagement extends IClrEntity {
 
 export const EmailEngagement: IModel<IEmailEngagement> = new Model<IEmailEngagement>("EmailEngagement", ["emailID"], { engagement: "",count: 0 });
 
-export interface IAppLog extends IClrEntity {
+export interface IEmailLog extends IClrEntity {
 	readonly logID?: number;
-	emailID?: number | null;
-	dateCreated?: DateTime;
-	title?: string | null;
-	json?: boolean;
-	log?: string;
+	emailID?: number;
 	fileName?: string;
+	compression?: string;
+	dateCreated?: DateTime;
 	cloudPath?: string;
 	url?: string;
-	downloadUrl?: string;
 	email?: IEmail;
 }
 
-export const AppLog: IModel<IAppLog> = new Model<IAppLog>("AppLog", ["logID"], { dateCreated: new DefaultFactory(() => new DateTime()),json: false });
+export const EmailLog: IModel<IEmailLog> = new Model<IEmailLog>("EmailLog", ["logID"], { fileName: "",compression: "",dateCreated: new DefaultFactory(() => new DateTime()),cloudPath: "" });
 
 export interface IEmailRecipient extends IClrEntity {
 	emailID?: number;
@@ -435,6 +431,7 @@ export interface IMailbox extends IClrEntity {
 	subscriberActivities?: ICollection<ISubscriberActivity>;
 	userPins?: ICollection<IUserPin>;
 	userMailboxes?: ICollection<IUserMailbox>;
+	websiteChannels?: ICollection<IWebSiteChannel>;
 }
 
 export const Mailbox: IModel<IMailbox> = new Model<IMailbox>("Mailbox", ["mailboxID"], { storage: 0,maxStorage: 0,indexAttachments: false,indexImageAttachments: false,dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),isChannel: false,isPrivateChannel: false,requireApproval: false,subscriberCount: 0 });
@@ -484,6 +481,8 @@ export interface IMailboxContactEmail extends IClrEntity {
 	dateReceived?: DateTime;
 	timeRead?: DateTime | null;
 	engagement?: string | null;
+	signedFileLogID?: number | null;
+	htmlBodyUrl?: string;
 	mailbox?: IMailbox;
 	email?: IEmail;
 }
@@ -550,8 +549,8 @@ export interface ISubscriberActivity extends IClrEntity {
 	emailAddressID?: number;
 	activity?: string;
 	dateCreated?: DateTime;
-	uid?: number | null;
 	ipAddress?: string | null;
+	accessCode?: string | null;
 	mailbox?: IMailbox;
 	email?: IEmail;
 	subscriber?: IEmailAddress;
@@ -608,7 +607,6 @@ export interface IUser extends IClrEntity {
 	userMailboxes?: ICollection<IUserMailbox>;
 	authFactors?: ICollection<IUserAuthFactor>;
 	publishedWebSiteVersions?: ICollection<IWebSiteFolderVersion>;
-	licenses?: ICollection<IAppLicense>;
 }
 
 export const UserStatusArray = [{"label":"active","value":"active"},{"label":"blocked","value":"blocked"},{"label":"locked","value":"locked"},{"label":"change-password","value":"change-password"},{"label":"external","value":"external"}];
@@ -681,6 +679,7 @@ export interface IWebSiteFolder extends IClrEntity {
 	folder?: IAppFile;
 	hosts?: ICollection<IWebSiteFolderHost>;
 	versions?: ICollection<IWebSiteFolderVersion>;
+	channels?: ICollection<IWebSiteChannel>;
 }
 
 export const WebSiteFolder: IModel<IWebSiteFolder> = new Model<IWebSiteFolder>("WebSiteFolder", ["folderID"], { isStatic: false,isModified: false });
@@ -709,6 +708,15 @@ export interface IWebSiteFolderVersion extends IClrEntity {
 
 export const WebSiteFolderVersion: IModel<IWebSiteFolderVersion> = new Model<IWebSiteFolderVersion>("WebSiteFolderVersion", ["folderID","snapshotFolderID"], { dateCreated: new DefaultFactory(() => new DateTime()),name: "" });
 
+export interface IWebSiteChannel extends IClrEntity {
+	folderID?: number;
+	channelID?: number;
+	website?: IWebSiteFolder;
+	channel?: IMailbox;
+}
+
+export const WebSiteChannel: IModel<IWebSiteChannel> = new Model<IWebSiteChannel>("WebSiteChannel", ["folderID","channelID"], {  });
+
 export interface ILoginSession extends IClrEntity {
 	readonly sessionID?: number;
 	userID?: number;
@@ -753,115 +761,3 @@ export interface ITag extends IClrEntity {
 }
 
 export const Tag: IModel<ITag> = new Model<ITag>("Tag", ["tagID"], { name: "",isSystemTag: false });
-
-export interface IProduct extends IClrEntity {
-	productID?: string;
-	name?: string;
-	description?: string | null;
-	prices?: ICollection<IProductPrice>;
-}
-
-export const Product: IModel<IProduct> = new Model<IProduct>("Product", ["productID"], { name: "" });
-
-export interface IProductPrice extends IClrEntity {
-	priceID?: string;
-	productID?: string;
-	quantity?: number;
-	amount?: number;
-	isActive?: boolean;
-	currency?: string;
-	product?: IProduct;
-	licenses?: ICollection<IAppLicense>;
-}
-
-export const ProductPrice: IModel<IProductPrice> = new Model<IProductPrice>("ProductPrice", ["priceID"], { quantity: 0,amount: 0,isActive: false,currency: "" });
-
-export interface IAppLicense extends IClrEntity {
-	readonly licenseID?: number;
-	customerID?: number;
-	priceID?: string;
-	dateCreated?: DateTime;
-	dateExpiry?: DateTime;
-	dateUpdated?: DateTime;
-	maxCores?: number;
-	licenseCode?: string;
-	customer?: IUser;
-	price?: IProductPrice;
-}
-
-export const AppLicense: IModel<IAppLicense> = new Model<IAppLicense>("AppLicense", ["licenseID","priceID"], { dateCreated: new DefaultFactory(() => new DateTime()),dateExpiry: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),maxCores: 0,licenseCode: "" });
-
-export interface IVirtualServer extends IClrEntity {
-	readonly serverID?: number;
-	serverName?: string;
-	ownerEmailAddress?: string | null;
-	ownerPhoneNumber?: string | null;
-	active?: boolean;
-	bucketName?: string | null;
-	database?: string | null;
-	host?: string;
-	forwardHost?: string | null;
-	forwardPublicKey?: string | null;
-	environmentVariables?: string | null;
-	maxStorageGB?: number;
-	dnsZones?: ICollection<IDnsZone>;
-}
-
-export const VirtualServer: IModel<IVirtualServer> = new Model<IVirtualServer>("VirtualServer", ["serverID"], { serverName: "",active: false,host: "",maxStorageGB: 0 });
-
-export interface IDnsZone extends IClrEntity {
-	readonly zoneID?: number;
-	serverID?: number;
-	zone?: string;
-	keySigningKeyID?: number;
-	zoneSigningKeyID?: number;
-	dateCreated?: DateTime;
-	dateUpdated?: DateTime;
-	signed?: string | null;
-	unsigned?: string | null;
-	virtualServer?: IVirtualServer;
-	ksk?: IDnsSigningKey;
-	zsk?: IDnsSigningKey;
-	records?: ICollection<IDnsZoneRecord>;
-}
-
-export const DnsZone: IModel<IDnsZone> = new Model<IDnsZone>("DnsZone", ["zoneID"], { zone: "",dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()) });
-
-export interface IDnsZoneRecord extends IClrEntity {
-	readonly recordID?: number;
-	zoneID?: number;
-	disabled?: boolean;
-	name?: string;
-	type?: "A" | "AAAA" | "CNAME" | "MX" | "TXT" | "PTR" | "SRV" | "CAA" | "NS" | "SOA";
-	isAlias?: boolean;
-	value?: string;
-	ttl?: number;
-	dateCreated?: DateTime;
-	dateUpdated?: DateTime;
-	notes?: string | null;
-	signature?: string | null;
-	expiryDate?: DateTime | null;
-	readonly fqdn?: string | null;
-	hosted?: boolean;
-	zone?: IDnsZone;
-}
-
-export const DnsZoneRecordTypeArray = [{"label":"A","value":"A"},{"label":"AAAA","value":"AAAA"},{"label":"CNAME","value":"CNAME"},{"label":"MX","value":"MX"},{"label":"TXT","value":"TXT"},{"label":"PTR","value":"PTR"},{"label":"SRV","value":"SRV"},{"label":"CAA","value":"CAA"},{"label":"NS","value":"NS"},{"label":"SOA","value":"SOA"}];
-
-export const DnsZoneRecord: IModel<IDnsZoneRecord> = new Model<IDnsZoneRecord>("DnsZoneRecord", ["recordID"], { disabled: false,name: "",type: "A",isAlias: false,value: "",ttl: 0,dateCreated: new DefaultFactory(() => new DateTime()),dateUpdated: new DefaultFactory(() => new DateTime()),hosted: false });
-
-export interface IDnsSigningKey extends IClrEntity {
-	readonly keyID?: number;
-	publicKey?: string;
-	digestAlgorithm?: number;
-	signingAlgorithm?: number;
-	digest?: string;
-	flags?: number;
-	dateCreated?: DateTime;
-	expiryDate?: DateTime;
-	fileName?: string;
-	kskZones?: ICollection<IDnsZone>;
-	zskZones?: ICollection<IDnsZone>;
-}
-
-export const DnsSigningKey: IModel<IDnsSigningKey> = new Model<IDnsSigningKey>("DnsSigningKey", ["keyID"], { publicKey: "",digestAlgorithm: 0,signingAlgorithm: 0,digest: "",flags: 0,dateCreated: new DefaultFactory(() => new DateTime()),expiryDate: new DefaultFactory(() => new DateTime()),fileName: "" });

package/src/public/channel/BlogService.ts

@@ -21,7 +21,7 @@ export default class BlogService {
     }) {
         const q = this.entityService.query(Email, "channelEmails", channelID)
             .where({ emailID }, (p) => (x) => x.emailID === p.emailID)
-            .include((x) => [x.children]);
+            .include((x) => [x.children, x.engagements]);
         return q.firstOrDefault();
     }
 

package/src/public/channel/ChannelMessage.tsx

@@ -17,15 +17,29 @@ export default class ChannelMessage extends AtomControl {
     @InjectProperty
     blogService: BlogService;
 
+    constructor(app, e = document.createElement("section")) {
+        super(app, e);
+        this.runAfterInit(() => this.app.runAsync(() => this.init()));
+    }
+
     async init() {
-        const { items: [ email ]} = await this.blogService.getEmails({ channelID,  start: 0, size: 1, cancelToken: null});
+
+        const channel = await this.blogService.getChannel(void 0, channelID, void 0);
+
+        const email = await this.blogService.getEmail(emailID);
 
         this.renderer = <section data-element="blog-item">
+            <header>
+                <div styler-display="flex" styler-gap="size-default">
+                    <span text={channel.emailAddress.name}/>
+                    <a href={`mailto:subscribe-${channel.emailAddress.emailAddress}?subject=subscribe`}><button>Follow</button></a>
+                </div>
+            </header>
             <h4 data-element="title">
                 <label text={email.subject}/>
             </h4>
             <h6 data-element="date" text={DateFormats.relative.short(email.dateSent)}/>
-            <h6 text={email.senderName}/>
+            <h5 text={email.senderName}/>
             <section
                 data-element="content">
                 <section { ... renderMail({ email })}/>

package/src/public/channel/ChannelMessageList.tsx

@@ -60,11 +60,11 @@ export default class ChannelView extends AtomControl {
         this.element.className = channelViewStyle;
         this.renderer = <section>
             <header>
-                <div>
+                <div styler-display="flex" styler-gap="size-default">
                     <span text={this.channel.emailAddress.name}/>
                     <a href={`mailto:subscribe-${this.channel.emailAddress.emailAddress}?subject=subscribe`}><button>Follow</button></a>
                 </div>
-                <div>
+                <div styler-display="flex" styler-gap="size-default">
                     <input
                         placeholder="Search..."
                         value={Bind.twoWaysImmediate(() => this.search)}/>
@@ -89,7 +89,7 @@ export default class ChannelView extends AtomControl {
                                 <a href={UrlService.toBlogUrl(channelID, email.emailID, email.subject)} text={email.subject}></a>
                             </h4>
                             <h6 data-element="date" text={DateFormats.relative.short(email.dateSent)}/>
-                            <h6 text={email.senderName}/>
+                            <h5 text={email.senderName}/>
                             <section
                                 data-element="content">
                                 <LimitedText height={200}>

package/src/public/channel/ChannelView.tsx

@@ -16,7 +16,7 @@ import styled from "@web-atoms/core/dist/style/styled";
             border: solid 1px lightgray;
             border-radius: 10px;
             display: grid;
-            grid-template-columns: 1fr auto;
+            grid-template-columns: 1fr auto auto;
             grid-template-rows: auto 1fr;
 
             background-color: gray;
@@ -37,19 +37,26 @@ import styled from "@web-atoms/core/dist/style/styled";
                 }
             }
 
-            & > h6 {
+            & > h5 {
                 grid-row: 1;
                 grid-column: 2;
                 margin-block-start: 0;
                 margin-block-end: 0;
                 padding: 10px;
             }
+            & > h6 {
+                grid-row: 1;
+                grid-column: 3;
+                margin-block-start: 0;
+                margin-block-end: 0;
+                padding: 10px;
+            }
             & > section {
                 padding: 10px;
                 border-bottom-left-radius: 10px;
                 border-bottom-right-radius: 10px;
                 grid-row: 2;
-                grid-column: 1 / span 2;
+                grid-column: 1 / span 3;
                 background-color: canvas;
             }
         }

package/src/services/email/EmailContentDownloader.ts

@@ -1,6 +1,6 @@
 import DISingleton from "@web-atoms/core/dist/di/DISingleton";
 import TaskManager from "@web-atoms/entity/dist/models/TaskManager";
-import { EmailEngagement, IEmail } from "../../model/model";
+import { EmailEngagement, IEmail, IMailboxContactEmail } from "../../model/model";
 import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
 import { Inject } from "@web-atoms/core/dist/di/Inject";
 import EntityService from "../EntityService";
@@ -9,37 +9,29 @@ import DateTime from "@web-atoms/date-time/dist/DateTime";
 @DISingleton({})
 export default class EmailContentDownloader extends TaskManager {
 
-    async download(email: IEmail) {
-
-        if (email.htmlBody) {
-            return email.htmlBody;
-        }
-
-        if (!email.originalFileID) {
-            return;
-        }
+    async download(mce: IMailboxContactEmail) {
 
         const cache = await window.caches.open("email-content-cache");
 
-        const cacheKey = new URL(email.htmlBodyUrl, location.href);
+        const cacheKey = new URL(mce.htmlBodyUrl, location.href);
 
         const content = await cache.match(cacheKey);
 
         if (content) {
-            return email.htmlBody = await content.text();
+            return mce.email.htmlBody = await content.text();
         }
 
         return await this.run(async () => {
 
             for(let i = 0;i<3;i++) {
                 try {
-                    const text = await FetchBuilder.get(email.htmlBodyUrl).responseAsText();
+                    const text = await FetchBuilder.get(mce.htmlBodyUrl).responseAsText();
                     await cache.put(cacheKey, new Response(text, {
                         headers: {
                             "cache-control": "public, max-age=86000"
                         }
                     }));
-                    return email.htmlBody = text;
+                    return mce.email.htmlBody = text;
                 } catch (error){
                     // eslint-disable-next-line no-console
                     console.error(error);