@social-mail/social-mail-client 1.4.160 → 1.4.162

package/dist/admin/AdminAppIndex.pack.js

@@ -31740,30 +31740,37 @@ System.register(["tslib", "@web-atoms/core/dist/di/Inject", "../EntityService",
         }
         search(mailboxID, search, cancelToken) {
           return __awaiter(this, void 0, void 0, function* () {
-            const [contacts, emails] = yield Promise.all([this.searchContacts(mailboxID, search, cancelToken), this.searchEmails(search, cancelToken)]);
-            for (const e of emails) {
-              if (contacts.some(c => c.emailAddressID === e.emailAddressID)) {
-                continue;
-              }
-              contacts.push(e);
-            }
+            const contacts = [];
+            const set = new Set();
+            yield this.populateContacts(set, contacts, mailboxID, search, true, cancelToken);
+            (() => __awaiter(this, void 0, void 0, function* () {
+              yield this.populateEmails(set, contacts, search, true, cancelToken);
+              yield Promise.all([this.populateContacts(set, contacts, mailboxID, search, false, cancelToken), this.populateEmails(set, contacts, search, false, cancelToken)]);
+            }))().catch(console.error);
             return contacts;
           });
         }
-        searchContacts(mailboxID, search, cancelToken) {
+        populateContacts(set, contacts, mailboxID, search, exact, cancelToken) {
           return __awaiter(this, void 0, void 0, function* () {
             if (!search) {
-              return [];
+              return;
             }
-            let q = this.entityService.query(MailboxContact);
+            let q = this.entityService.query(MailboxContact).where({
+              mailboxID
+            }, p => x => x.mailboxID === p.mailboxID);
             if (!/\%$/.test(search)) {
               search = `${search}%`.toLocaleLowerCase();
             }
-            q = q.where({
-              search,
-              mailboxID
-            }, p => x => x.mailboxID === p.mailboxID && (Sql.text.like(x.emailAddress.emailAddress, p.search) || Sql.text.like(x.emailAddress.name, p.search) || x.emailAddress.names.some(n => Sql.text.like(n.nameToken.word, p.search))));
-            const list = yield q.include(x => x.emailAddress).orderByDescending(x => x.dateUpdated).toPagedList({
+            if (exact) {
+              q = q.where({
+                search
+              }, p => x => Sql.text.like(x.emailAddress.emailAddress, p.search) || Sql.text.like(x.emailAddress.name, p.search));
+            } else {
+              q = q.where({
+                search
+              }, p => x => x.emailAddress.names.some(n => Sql.text.like(n.nameToken.word, p.search)));
+            }
+            const list = yield q.include(x => x.emailAddress).orderBy(x => x.blocked).thenBy(x => x.dateUpdated).toPagedList({
               start: 0,
               size: 10,
               count: false,
@@ -31772,26 +31779,36 @@ System.register(["tslib", "@web-atoms/core/dist/di/Inject", "../EntityService",
               cancelToken,
               hideActivityIndicator
             });
-            return list.items.map(x => x.emailAddress);
+            for (const {
+              emailAddress
+            } of list.items) {
+              if (set.has(emailAddress.emailAddressID)) {
+                continue;
+              }
+              set.add(emailAddress.emailAddressID);
+              contacts.add(emailAddress);
+            }
           });
         }
-        searchEmails(search, cancelToken) {
+        populateEmails(set, contacts, search, exact, cancelToken) {
           return __awaiter(this, void 0, void 0, function* () {
             if (!search) {
-              return [];
+              return;
             }
             let q = this.entityService.query(EmailAddress);
             if (!/\%$/.test(search)) {
               search = `${search}%`.toLocaleLowerCase();
+            }
+            if (exact) {
               q = q.where({
                 search
               }, p => x => Sql.text.like(x.emailAddress, p.search) || Sql.text.like(x.name, p.search));
             } else {
               q = q.where({
                 search
-              }, p => x => Sql.text.iLike(x.emailAddress, p.search) || Sql.text.iLike(x.name, p.search));
+              }, p => x => x.names.some(n => Sql.text.like(n.nameToken.word, p.search)));
             }
-            const list = yield q.orderBy(x => x.emailAddress).toPagedList({
+            const list = yield q.orderBy(x => x.name).toPagedList({
               start: 0,
               size: 10,
               count: false,
@@ -31800,7 +31817,13 @@ System.register(["tslib", "@web-atoms/core/dist/di/Inject", "../EntityService",
               cancelToken,
               hideActivityIndicator
             });
-            return list.items;
+            for (const emailAddress of list.items) {
+              if (set.has(emailAddress.emailAddressID)) {
+                continue;
+              }
+              set.add(emailAddress.emailAddressID);
+              contacts.add(emailAddress);
+            }
           });
         }
       };
@@ -34385,7 +34408,7 @@ System.register(["tslib", "@web-atoms/core/dist/core/InjectProperty", "@web-atom
               cacheVersion,
               cancelToken
             });
-            return items.items;
+            return items.items.filter(x => x.emailAddress);
           });
         }
       });