@social-mail/social-mail-client 1.8.440 → 1.8.441

package/dist/site-editor-app/SiteEditorApp.pack.js

@@ -28242,9 +28242,9 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
         }
         list(_a) {
           return __awaiter(this, arguments, void 0, function* ({
+            mailbox = void 0,
             search = "",
             searchInMessages = false,
-            mailboxID,
             conversationType = "all",
             start = 0,
             size = 20,
@@ -28252,6 +28252,10 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
             folderID = null,
             cancelToken
           }) {
+            var _b;
+            const {
+              mailboxID
+            } = mailbox;
             let q = this.entityService.query(MailboxContact).where({
               mailboxID
             }, p => x => x.mailboxID === p.mailboxID);
@@ -28288,11 +28292,31 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
             } else {
               q = q.orderByDescending(x => x.dateUpdated);
             }
-            return q.include(x => [x.emailAddress, x.lastEmail]).toPagedList({
+            const query = q.include(x => [x.emailAddress, x.lastEmail]).toPagedList({
               start,
               size,
               cancelToken
             });
+            if (folderID === SocialMailApp.contactsFolderTagID && mailbox && !mailbox.isExternal && ((_b = mailbox.folders) === null || _b === void 0 ? void 0 : _b.some(f => f.tagID === SocialMailApp.newFolderTagID && f.count > 0))) {
+              const newContacts = this.list({
+                mailbox,
+                cancelToken,
+                folderID: SocialMailApp.newFolderTagID,
+                size: 2
+              });
+              const [nc, all] = yield Promise.all([newContacts, query]);
+              if (nc.items.length) {
+                const [i1, i2] = nc.items;
+                if (i2) {
+                  all.items.insert(0, i2);
+                }
+                if (i1) {
+                  all.items.insert(0, i1);
+                }
+              }
+              return all;
+            }
+            return yield query;
           });
         }
         raw(email) {
@@ -42110,10 +42134,10 @@ System.register(["tslib", "@web-atoms/core/dist/core/BindableProperty", "@web-at
 
     AmdLoader.instance.setup("@social-mail/social-mail-client/dist/web/page/mails/contacts/MailboxContacts");
 
-System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atoms/core/dist/core/XNode", "../service/MailService", "@web-atoms/web-controls/dist/basic/AtomRepeater", "../../../../model/model", "../../../../common/controls/repeater/InfiniteRepeater", "@web-atoms/core/dist/core/Bind", "@web-atoms/web-controls/dist/mobile-app/MasterDetailPage", "@web-atoms/core/dist/view-model/Action", "../ConversationPage", "@web-atoms/web-controls/dist/PageNavigator", "../../../../services/socket/sockets", "../ChooseMailboxPage", "../../../../common/pages/folders/ChooseTemplatePage", "@web-atoms/web-controls/dist/mobile-app/MobileApp", "@web-atoms/web-controls/dist/basic/Resizable", "../../../../common/events/CommonEvents", "@web-atoms/web-controls/dist/basic/Checkbox", "@web-atoms/web-controls/dist/basic/ToggleButtonBar", "@web-atoms/core/dist/web/services/PopupService", "../../../../common/pages/mailboxes/services/MailboxService", "../../../../common/NumberFormats", "../../../commands/MailAppEvents", "../../../../services/EntityService", "../../../../common/StringFormat", "../../../../common/menu/MenuService", "../web-hooks/WebHookListPage", "../../../../common/date/DateFormats", "../mini-compose/MiniComposePage", "./MailboxContact.local.css", "../../../../common/controls/badge/Badge", "./ConversationBar"], function (_export, _context) {
+System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atoms/core/dist/core/XNode", "../service/MailService", "@web-atoms/web-controls/dist/basic/AtomRepeater", "../../../../model/model", "../../../../common/controls/repeater/InfiniteRepeater", "@web-atoms/core/dist/core/Bind", "@web-atoms/web-controls/dist/mobile-app/MasterDetailPage", "@web-atoms/core/dist/view-model/Action", "../ConversationPage", "@web-atoms/web-controls/dist/PageNavigator", "../../../../services/socket/sockets", "../ChooseMailboxPage", "../../../../common/pages/folders/ChooseTemplatePage", "@web-atoms/web-controls/dist/mobile-app/MobileApp", "@web-atoms/web-controls/dist/basic/Resizable", "../../../../common/events/CommonEvents", "@web-atoms/web-controls/dist/basic/Checkbox", "@web-atoms/web-controls/dist/basic/ToggleButtonBar", "@web-atoms/core/dist/web/services/PopupService", "../../../../common/pages/mailboxes/services/MailboxService", "../../../../common/NumberFormats", "../../../commands/MailAppEvents", "../../../../services/EntityService", "../../../../common/StringFormat", "../../../../common/menu/MenuService", "../web-hooks/WebHookListPage", "../../../../common/date/DateFormats", "../mini-compose/MiniComposePage", "./MailboxContact.local.css", "../../../../common/controls/badge/Badge", "./ConversationBar", "../../../../common/SocialMailApp"], function (_export, _context) {
   "use strict";
 
-  var __awaiter, __decorate, __metadata, InjectProperty, XNode, MailService, AtomRepeater, Mailbox, MailboxContactEmail, InfiniteRepeater, Bind, MasterDetailPage, Action, ConversationPage, PageNavigator, MailboxSocket, ChooseMailboxPage, ChooserTemplatePage, isMobileView, Resizable, CommonEvents, Checkbox, ToggleButtonBar, PopupService, MailboxService, toKMBString, MailAppEvents, EntityService, toSentenceCase, MenuService, WebHookListPage, DateFormats, MiniComposePage, Badge, ConversationBar, MailsPage, displayName, types, conversationTypes, getConversationNumber;
+  var __awaiter, __decorate, __metadata, InjectProperty, XNode, MailService, AtomRepeater, Mailbox, MailboxContactEmail, InfiniteRepeater, Bind, MasterDetailPage, Action, ConversationPage, PageNavigator, MailboxSocket, ChooseMailboxPage, ChooserTemplatePage, isMobileView, Resizable, CommonEvents, Checkbox, ToggleButtonBar, PopupService, MailboxService, toKMBString, MailAppEvents, EntityService, toSentenceCase, MenuService, WebHookListPage, DateFormats, MiniComposePage, Badge, ConversationBar, SocialMailApp, MailsPage, displayName, types, conversationTypes, getConversationNumber;
   _export("default", void 0);
   return {
     setters: [function (_tslib) {
@@ -42183,6 +42207,8 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
       Badge = _commonControlsBadgeBadge.default;
     }, function (_ConversationBar) {
       ConversationBar = _ConversationBar.default;
+    }, function (_commonSocialMailApp) {
+      SocialMailApp = _commonSocialMailApp.default;
     }],
     execute: function () {
       displayName = item => {
@@ -42286,7 +42312,7 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
             }, XNode.create("div", {
               class: "blocked-bar"
             }, XNode.create(ToggleButtonBar, {
-              items: mailbox.folders,
+              items: Bind.oneWay(() => this.currentMailbox.folders),
               selectedItem: Bind.sourceTwoWays(this, x => x.source.folder),
               itemRenderer: item => XNode.create("div", {
                 "data-item-type": "toggle-button",
@@ -42312,10 +42338,10 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
             }, InfiniteRepeater.pagedItems(start => (c, e, cancelToken) => this.mailService.list({
               start,
               size: 20,
+              mailbox: this.currentMailbox,
               search: this.search,
               searchInMessages: this.searchInMessages,
               conversationType: this.conversationType,
-              mailboxID: this.currentMailbox.mailboxID,
               version: this.version,
               folderID: this.folder.tagID,
               cancelToken
@@ -42329,7 +42355,10 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
                 return XNode.create("div", {
                   class: "mailbox-thread",
                   "data-unread": item.unread > 0
-                }, XNode.create("div", {
+                }, item.folderTagID === SocialMailApp.newFolderTagID && this.folder.tagID === SocialMailApp.contactsFolderTagID && XNode.create("div", {
+                  class: "new",
+                  text: "New"
+                }), XNode.create("div", {
                   class: "name",
                   title: fullName,
                   text: name
@@ -42368,14 +42397,16 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
               class: "fas fa-gears"
             })))));
             this.registerDisposable(yield this.resolve(MailboxSocket).join(this.currentMailbox.mailboxID.toString(), {
-              newMail: (_, emailAddressID, emailID) => {
-                this.version++;
-              }
+              newMail: (_, emailAddressID, emailID) => __awaiter(this, void 0, void 0, function* () {
+                this.currentMailbox = yield this.mailService.mailbox(this.parameters.id);
+              })
             }));
           });
         }
         refreshMailboxContacts() {
-          this.version++;
+          return __awaiter(this, void 0, void 0, function* () {
+            this.currentMailbox = yield this.mailService.mailbox(this.parameters.id);
+          });
         }
         updateMailboxContact(mc) {
           const {
@@ -42400,11 +42431,16 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
         }
         mailsAvailable() {
           return __awaiter(this, void 0, void 0, function* () {
+            var _a;
             if (isMobileView) {
               return;
             }
             if (!this.selectedThread) {
-              this.selectedThread = this.mails[0];
+              if (this.folder.tagID === SocialMailApp.contactsFolderTagID) {
+                this.selectedThread = (_a = this.mails.find(x => x.folderTagID === this.folder.tagID)) !== null && _a !== void 0 ? _a : this.mails[0];
+              } else {
+                this.selectedThread = this.mails[0];
+              }
               if (this.selectedThread) {
                 return this.mailSelected();
               }
@@ -42482,7 +42518,7 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
       __decorate([InjectProperty, __metadata("design:type", MenuService)], MailsPage.prototype, "menuService", void 0);
       __decorate([Action({
         onEvent: MailAppEvents.refreshMailboxContacts
-      }), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", void 0)], MailsPage.prototype, "refreshMailboxContacts", null);
+      }), __metadata("design:type", Function), __metadata("design:paramtypes", []), __metadata("design:returntype", Promise)], MailsPage.prototype, "refreshMailboxContacts", null);
       __decorate([Action({
         onEvent: MailAppEvents.mailboxContactUpdated
       }), __metadata("design:type", Function), __metadata("design:paramtypes", [Object]), __metadata("design:returntype", void 0)], MailsPage.prototype, "updateMailboxContact", null);