@social-mail/social-mail-client 1.2.397 → 1.2.399

package/dist/admin/AdminAppIndex.pack.js

@@ -26928,6 +26928,22 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
               mailboxID
             }, p => x => x.mailboxID === p.mailboxID && x.emailAddressID === null).firstOrDefault();
             mb.notify = !!notify;
+            mb.folders.remove(x => !x.count);
+            const index = x => {
+              switch (x.tag.name.toLocaleLowerCase()) {
+                case "contacts":
+                  return 1;
+                case "new":
+                  return 2;
+                case "spam":
+                  return 3;
+                case "blocked":
+                  return 4;
+              }
+              return 100;
+            };
+            mb.folders.sort((a, b) => index(a) - index(b));
+            mb.folders[0].main = true;
             return mb;
           });
         }
@@ -44269,23 +44285,21 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
       _export("default", MailsPage = class MailsPage extends MasterDetailPage {
         constructor() {
           super(...arguments);
+          this.folders = [];
           this.mails = [];
           this.search = "";
           this.selectedThread = null;
           this.previousThread = null;
           this.version = 1;
           this.conversationType = "all";
-          this.folderID = null;
-          this.nonContactFolderIDs = [];
+          this.folder = null;
         }
         init() {
           var _a;
           return __awaiter(this, void 0, void 0, function* () {
             const mailboxID = this.parameters.id;
             const mailbox = this.currentMailbox = yield this.mailService.mailbox(mailboxID);
-            const contactFolderID = mailbox.folders.find(x => /contacts/i.test(x.tag.name)).tagID;
-            this.folderID = contactFolderID;
-            this.nonContactFolderIDs = mailbox.folders.filter(x => x.tagID !== contactFolderID).map(x => x.tagID);
+            this.folder = mailbox.folders[0];
             if (mailbox.isExternal) {
               const es = this.resolve(EntityService);
               es.invoke(Mailbox, "fetch", mailbox).catch(console.error);
@@ -44321,11 +44335,10 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
               class: "blocked-bar"
             }, XNode.create(ToggleButtonBar, {
               items: mailbox.folders,
-              labelPath: x => toSentenceCase(x.tag.name),
-              valuePath: x => x.tagID,
-              value: Bind.sourceTwoWays(this, x => x.source.folderID)
+              labelPath: x => x.main ? toSentenceCase(x.tag.name) : `${toSentenceCase(x.tag.name)} (${x.count})`,
+              selectedItem: Bind.sourceTwoWays(this, x => x.source.folder)
             }), XNode.create(ToggleButtonBar, {
-              "style-display": Bind.oneWay(() => !this.nonContactFolderIDs.includes(this.folderID)),
+              "style-display": Bind.oneWay(() => this.folder.main),
               items: conversationTypes,
               itemRenderer: item => XNode.create("div", {
                 "data-item-type": "toggle-button",
@@ -44353,7 +44366,7 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
               conversationType: this.conversationType,
               mailboxID: this.currentMailbox.mailboxID,
               version: this.version,
-              folderID: this.folderID,
+              folderID: this.folder.tagID,
               cancelToken
             })), {
               itemRenderer: item => {