@social-mail/social-mail-client 1.8.120 → 1.8.121

package/dist/public/channel/ChannelApp.pack.js

@@ -26926,7 +26926,6 @@ System.register(["tslib", "../../BlogService", "../../../../model/model", "@web-
             if (tag) {
               tag = tag.toLowerCase();
               q = q.where({
-                emailID,
                 tag
               }, p => x => x.email.emailTags.some(t => t.tag.lowerCaseName === p.tag));
             }
@@ -26935,22 +26934,20 @@ System.register(["tslib", "../../BlogService", "../../../../model/model", "@web-
                 author
               }, p => x => x.email.senderName === p.author);
             }
-            if (emailID) {
-              q = q.union({
-                emailID
-              }, p => x => x.emailID === p.emailID);
-              q = q.orderByDescending({
-                emailID
-              }, p => x => x.emailID === p.emailID).thenByDescending(x => x.datePublished);
-              start = 0;
-            } else {
-              q = q.orderByDescending(x => x.datePublished);
-            }
+            q = q.orderByDescending(x => x.datePublished);
             const size = this.size;
+            const emailLoader = emailID && this.entityService.query(ChannelEmail, "channelEmails").where({
+              emailID
+            }, p => x => x.emailID === p.emailID).include(x => [x.mailbox.emailAddress, x.email.engagements, x.email.attachments]).firstOrDefault();
             const result = yield q.include(x => [x.mailbox.emailAddress, x.email.engagements, x.email.attachments]).toPagedList({
               start,
               size
             });
+            if (emailLoader) {
+              const e = yield emailLoader;
+              result.items.remove(i => i.emailID === e.emailID);
+              result.items.splice(0, 0, e);
+            }
             const tasks = [];
             for (const {
               postID,