@social-mail/social-mail-client 1.8.307 → 1.8.308

package/dist/admin/AdminAppIndex.pack.js

@@ -23494,14 +23494,14 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
             const userID = SocialMailApp.user.userID;
             let q = this.entityService.query(WebSite);
             if (search) {
-              search = search + "%";
+              search = "%" + search + "%";
               q = q.where({
                 search
               }, p => x => Sql.text.iLike(x.folder.name, p.search));
             }
-            const top = yield q.orderByDescending({
+            const top = yield (search ? q : q.orderByDescending({
               userID
-            }, p => x => x.folder.userPins.some(s => p.userID === s.userID)).thenByDescending(x => x.currentVersionID).include(x => x.folder.creator).toPagedList({
+            }, p => x => x.folder.userPins.some(s => p.userID === s.userID))).thenByDescending(x => x.currentVersionID).include(x => x.folder.creator).toPagedList({
               size: 3,
               count: false
             });
@@ -23514,17 +23514,17 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
             site = void 0
           } = {}) {
             const userID = SocialMailApp.user.userID;
-            let q = this.entityService.query(AppFile).where(x => x.isFolder === true && x.parentID === null && x.path !== null);
+            let q = this.entityService.query(AppFile).where(x => x.isFolder === true && x.path !== null);
             if (search) {
-              search = search + "%";
+              search = "%" + search + "%";
               q = q.where({
                 search
               }, p => x => Sql.text.iLike(x.name, p.search));
             }
-            q = site ? q.where(x => x.contentType === "application/site") : q.where(x => x.contentType === "folder");
-            const top = yield q.orderByDescending({
+            q = site ? q.where(x => x.contentType === "application/site") : q.where(x => x.contentType === "folder" && x.parentID === null);
+            const top = yield (search ? q : q.orderByDescending({
               userID
-            }, p => x => x.userPins.some(s => p.userID === s.userID)).thenByDescending(x => x.dateUpdated).include(x => x.creator).toPagedList({
+            }, p => x => x.userPins.some(s => p.userID === s.userID))).thenByDescending(x => x.dateUpdated).include(x => x.creator).toPagedList({
               size: 3,
               count: false
             });
@@ -26768,25 +26768,28 @@ System.register(["tslib", "@web-atoms/core/dist/di/DITransient", "@web-atoms/cor
               search = (search + "%").toLowerCase();
               q = q.where({
                 search
-              }, p => x => Sql.text.like(x.emailAddress.name, p.search) || Sql.text.like(x.emailAddress.emailAddress, p.search));
+              }, p => x => Sql.text.like(x.emailAddress.name, p.search) || Sql.text.like(x.emailAddress.emailAddress, p.search) || Sql.text.like(x.emailAddress.domain.name, p.search));
             }
             const {
               userID
             } = SocialMailApp.user;
-            if (isChannel) {
-              const channels = yield q.include(x => x.emailAddress).where({
-                isChannel
-              }, p => x => x.isChannel === p.isChannel).orderByDescending(x => x.pendingModerationCount).toPagedList({
-                size: 3,
-                count: false
-              });
-              return channels.items;
+            if (!search) {
+              if (isChannel) {
+                const channels = yield q.include(x => x.emailAddress).where({
+                  isChannel
+                }, p => x => x.isChannel === p.isChannel).orderByDescending(x => x.pendingModerationCount).toPagedList({
+                  size: 3,
+                  count: false
+                });
+                return channels.items;
+              }
             }
-            const top = yield q.include(x => x.emailAddress).where({
+            q = q.where({
               isChannel
-            }, p => x => x.isChannel === p.isChannel).orderByDescending({
+            }, p => x => x.isChannel === p.isChannel);
+            const top = yield (search ? q.include(x => x.emailAddress) : q.include(x => x.emailAddress).orderByDescending({
               userID
-            }, p => x => x.userPins.some(s => p.userID === s.userID)).thenByDescending(x => x.dateUpdated).toPagedList({
+            }, p => x => x.userPins.some(s => p.userID === s.userID))).thenByDescending(x => x.dateUpdated).toPagedList({
               size: 3,
               count: false
             });
@@ -41188,6 +41191,8 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
           this.drives = [];
           this.selectedObject = null;
           this.search = null;
+          this.showSearch = false;
+          this.lastSearch = void 0;
           setTimeout(() => this.load().catch(console.error), 1);
         }
         load() {
@@ -41196,6 +41201,10 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
               mailboxService: ms,
               cloudFileService: fs
             } = this;
+            if (this.lastSearch === search) {
+              return;
+            }
+            this.lastSearch = search;
             yield sleep(100, cancelToken);
             if (cancelToken === null || cancelToken === void 0 ? void 0 : cancelToken.cancelled) {
               return;
@@ -41210,14 +41219,15 @@ System.register(["tslib", "@web-atoms/core/dist/di/DISingleton", "@web-atoms/cor
             }), fs.topSites({
               search
             })]);
-            this.mailboxes.clear();
-            this.channels.clear();
-            this.drives.clear();
-            this.websites.clear();
+            this.mailboxes.remove(x => x !== this.selectedObject);
+            this.channels.remove(x => x !== this.selectedObject);
+            this.drives.remove(x => x !== this.selectedObject);
+            this.websites.remove(x => x !== this.selectedObject);
             this.add(this.mailboxes, ...mailboxes);
             this.add(this.channels, ...channels);
             this.add(this.drives, ...drives);
             this.add(this.websites, ...websites);
+            this.showSearch = [this.mailboxes, this.channels, this.websites].some(x => x.length > 2);
           });
         }
         addMailbox(mb) {