@social-mail/social-mail-client 1.2.209 → 1.2.211

package/src/services/store/StoreService.ts

@@ -0,0 +1,49 @@
+import DISingleton from "@web-atoms/core/dist/di/DISingleton";
+import { Inject } from "@web-atoms/core/dist/di/Inject";
+import EntityService from "../EntityService";
+import { IStore, Store } from "../../model/model";
+import { Sql } from "../../common/Sql";
+
+@DISingleton()
+export default class StoreService {
+
+    @Inject
+    private entityService: EntityService;
+
+    async get(storeID) {
+        return this.entityService.query(Store)
+            .where({ storeID }, (p) => (x) => x.storeID === p.storeID)
+            .include((x) => [x.storeUsers, x.storeWebsites.forEach((w) => w.website.folder)])
+            .firstOrDefault();
+    }
+
+    async top() {
+        const { items } = await this.stores({ size: 3, cancelToken: null });
+        return items;
+    }
+
+    async stores({
+        search = "",
+        start = 0,
+        size = 100,
+        cancelToken
+    }) {
+        let q = this.entityService.query(Store);
+        if (search) {
+            search = search + "%";
+            q = q.where({ search }, (p) => (x) => Sql.text.like(x.name, p.search));
+        }
+        return q
+            .orderByDescending((x) => x.storeID)
+            .toPagedList({
+                start,
+                size,
+                cancelToken
+            });
+    }
+
+    async save(store: IStore) {
+        await this.entityService.save(store, (x) => x);
+    }
+
+}

package/src/web/drawer/AppDrawer.tsx

@@ -13,6 +13,7 @@ import { toFileSize } from "../../common/NumberFormats";
 import Action from "@web-atoms/core/dist/view-model/Action";
 import CommonCommands from "../../common/commands/CommonCommands";
 import LoginService from "../../services/LoginService";
+import StoreService from "../../services/store/StoreService";
 
 const css = styled.css `
     min-width: 300px;
@@ -49,7 +50,7 @@ export default class AppDrawer extends Drawer {
 
         this.user = SocialMailApp.user;
 
-        const { mailboxes, channels, drives, websites } = await this.getItems();
+        const { mailboxes, channels, drives, websites, stores } = await this.getItems();
 
         this.renderer = <div>
             <div
@@ -128,6 +129,17 @@ export default class AppDrawer extends Drawer {
                         commandLink={AppCommands.openWebSiteList.displayRoute({})}
                     />
                 </ExpanderMenu> }
+                {stores.length && <ExpanderMenu isExpanded={false}>
+                    <MenuItem
+                        icon="fas fa-dollar"
+                        label="Stores"
+                        commandLink={null}
+                        />
+                    { ... stores.map((s) => <MenuItem
+                        label={s.name}
+                        commandLink={AppCommands.editStore.displayRoute({ id: s.storeID})}
+                        />)}
+                </ExpanderMenu>}
                 { mailboxes.length && <MenuItem
                     icon="fas fa-money-check-pen"
                     label="Templates"
@@ -174,13 +186,15 @@ export default class AppDrawer extends Drawer {
     async getItems() {
         const ms = this.resolve(MailboxService);
         const fs = this.resolve(CloudFileService);
-        const [mailboxes, channels, drives, websites] = await Promise.all([
+        const ss = this.resolve(StoreService);
+        const [mailboxes, channels, drives, websites, stores] = await Promise.all([
             ms.top(),
             ms.top({ isChannel: true }),
             fs.top(),
-            fs.top(true)
+            fs.top(true),
+            ss.top()
         ]);
-        return { mailboxes, channels, drives, websites };
+        return { mailboxes, channels, drives, websites, stores };
     }
 
     @Action({ onEvent: "user-logout"})

package/src/web/page/channels/detail/ChannelDetailPage.tsx

@@ -156,7 +156,7 @@ export default class ChannelDetailPage extends ContentPage {
                     label="Details"
                     />
                 <MenuItem
-                    href={ apiPath(`/api/files/download/${email.originalFileID}`)}
+                    href={ apiPath(`/api/emails/logs//${email.mimeFileID}/${email.emailID}.eml`)}
                     icon="fas fa-download"
                     label="Download"
                     />

package/src/web/page/files/service/CloudFileService.ts

@@ -50,6 +50,7 @@ export default class CloudFileService {
         size = 50,
         search = "",
         version = 1,
+        contentType = void 0 as string,
         cancelToken
     }) {
         const userID = SocialMailApp.user.userID;
@@ -58,6 +59,9 @@ export default class CloudFileService {
         if (search) {
             q = q.where({ search }, (p) => (x) => Sql.text.includes(x.creator.userName, p.search));
         }
+        if (contentType) {
+            q = q.where({ contentType }, (p) => (x) => x.contentType === p.contentType);
+        }
         return q.include((x) => x.creator)
             .orderByDescending({userID} , (p) => (x) => x.userPins.some((s) => p.userID === s.userID))
             .thenByDescending((x) => x.fileSize)

package/src/web/page/mails/service/ConversationService.tsx

@@ -164,7 +164,7 @@ export default class ConversationService {
             q = q.where({ search }, (p) => (x) =>
                 Sql.text.iLike(x.email.subject, p.search)
                 || Sql.text.iLike(x.email.textBody, p.search)
-                || Sql.text.iLike(x.email.originalFile.fileContent.textDocument.searchable, p.search)
+                || x.email.attachments.some((a) => Sql.text.iLike(a.fileContent.textDocument.searchable, p.search))
             );
         }
         const emails = await q

package/src/web/page/mails/service/MailService.ts

@@ -56,14 +56,8 @@ export default class MailService {
     }
 
     async raw(email: IEmail) {
-        const { mimeFileID, originalFileID } = email;
-
-        if (mimeFileID) {
-            return FetchBuilder.get( apiPath(`/api/emails/logs/${mimeFileID}/${email.emailID}.eml`)).responseAsText();
-        }
-
-        const file = await this.entityService.query(AppFile).where({ originalFileID }, (p) => (x) => x.appFileID === p.originalFileID).firstOrDefault();
-        return FetchBuilder.get(file.url).responseAsText();
+        const { mimeFileID } = email;
+        return FetchBuilder.get( apiPath(`/api/emails/logs/${mimeFileID}/${email.emailID}.eml`)).responseAsText();
     }
 
     async send(email: IEmail) {

package/src/web/page/users/SignupPage.tsx

@@ -6,7 +6,6 @@ import MaskedInput from "@web-atoms/web-controls/dist/basic/MaskedInput";
 import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
 import Action from "@web-atoms/core/dist/view-model/Action";
 import styled from "@web-atoms/core/dist/style/styled";
-import Pack from "@web-atoms/core/dist/Pack";
 import { ContentPage } from "@web-atoms/web-controls/dist/mobile-app/MobileApp";
 import { CountrySelect, formatForCountry, isdForCountry } from "../../../common/controls/countries/CountrySelect";
 
@@ -46,7 +45,6 @@ interface IVerification {
     verified?: string;
 }
 
-@Pack
 export default class SignupPage extends ContentPage {
 
     termsAgreed = false;