@social-mail/social-mail-client 1.2.781 → 1.2.783

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.2.781",
+  "version": "1.2.783",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/common/FileUrlService.ts

@@ -0,0 +1,27 @@
+import { IAppFile } from "../model/model";
+
+export const FileUrlService = {
+
+    downloadUrl(file: IAppFile) {
+        const url = file.url;
+        return url.replace("/view/", "/download/");
+    },
+
+    webP(file: IAppFile, size = 300) {
+        const url = file.url;
+        return url.replace("/view/", `/webp(${300})/`) + `.${size}.webp`;
+    },
+
+    webM(file: IAppFile) {
+        const url = file.url;
+        return url.replace("/view/", `/webm/`) + `.webm`;
+    },
+
+    webMBranded(file: IAppFile) {
+        const url = file.url;
+        return url.replace("/view/", `/webm-branded/`) + `.branded.webm`;
+    }
+
+
+
+};

package/src/common/controls/file-preview/FilePreview.tsx

@@ -8,6 +8,7 @@ import Command from "@web-atoms/core/dist/core/Command";
 import audioIcon from "@social-mail/social-mail-client/content/images/icons/audio.svg";
 import { apiPath } from "../../apiPath";
 import { fileUrl } from "../../fileUrl";
+import { FileUrlService } from "../../FileUrlService";
 
     styled.css `
         border: solid 2px lightgray;
@@ -66,8 +67,7 @@ export default function FilePreview(a: IAppFile) {
     const size = a.fileSize && toFileSize(a.fileSize);
 
     const { emailID, appFileID, name, fileContentID } = a;
-    let src = fileUrl(a, { action: "webp(300)", ext: ".webp"});
-    const p = { emailID, appFileID, name, fileContentID };
+    let src = FileUrlService.webP(a, 300);
 
     if (/^audio\//i.test(a.contentType)) {
         src = audioIcon;
@@ -76,7 +76,7 @@ export default function FilePreview(a: IAppFile) {
     const command = AppCommands.getPreviewCommand(a);
     if (command) {
         return <a
-            href={command.displayRoute(p)}
+            href={command.displayRoute({ emailID, appFileID, name, fileContentID })}
             data-click-event="route"
             title={size ? `${name} (${size})` : name}
             data-file-preview="file-preview">
@@ -88,7 +88,7 @@ export default function FilePreview(a: IAppFile) {
         </a>;
     }
 
-    return <a href={a.downloadUrl}
+    return <a href={ FileUrlService.downloadUrl(a)}
         title={size ? `${name} (${size})` : name}
         target="_blank" data-file-preview="attachment">
         <i class="fas fa-paperclip"/>

package/src/common/folder-view/FolderViewControl.tsx

@@ -14,6 +14,7 @@ import { apiPath } from "../apiPath";
 import { DeleteIconTextButton } from "../controls/buttons/IconButton";
 import { fileUrl } from "../fileUrl";
 import CloudFileService from "../pages/files/service/CloudFileService";
+import { FileUrlService } from "../FileUrlService";
 
 
     styled.css `
@@ -236,7 +237,7 @@ export default class FolderViewControl extends AtomControl {
             </div>
             <div>{item.isShared && <i title="Shared" class="fas fa-folder-user"/>}</div>
             <div text={toFileSize(item.fileSize)}/>
-            <div><a href={item.downloadUrl} target="_blank" download={true}><i class="fas fa-download"/></a></div>
+            <div><a href={FileUrlService.downloadUrl(item)} target="_blank" download={true}><i class="fas fa-download"/></a></div>
             <div><i
                 data-click-event="edit-shares"
                 class="fas fa-share"/></div>

package/src/common/pages/files/FolderPage.tsx

@@ -17,6 +17,7 @@ import EditSharesPage from "./shares/EditSharesPage";
 import InlinePopup from "@web-atoms/web-controls/dist/basic/InlinePopup";
 import EditTemplatePage from "../../../web/page/templates/EditTemplatePage";
 import FileHistoryPage from "./FileHistoryPage";
+import { FileUrlService } from "../../FileUrlService";
 
 const css = styled.css `
     display: grid;
@@ -226,7 +227,7 @@ export default class FolderPage extends ContentPage {
                 </div>
                 <div>{item.isShared && <i title="Shared" class="fas fa-folder-user"/>}</div>
                 <div text={toFileSize(item.fileSize)}/>
-                <div><a href={item.downloadUrl} target="_blank" download={true}><i class="fas fa-download"/></a></div>
+                <div><a href={FileUrlService.downloadUrl(item)} target="_blank" download={true}><i class="fas fa-download"/></a></div>
                 <div><i
                     data-click-event="edit-shares"
                     class="fas fa-share"/></div>
@@ -245,7 +246,7 @@ export default class FolderPage extends ContentPage {
             </div>
             <div>{item.isShared && <i title="Shared" class="fas fa-folder-user"/>}</div>
             <div text={toFileSize(item.fileSize)}/>
-            <div><a href={item.downloadUrl} target="_blank" download={true}><i class="fas fa-download"/></a></div>
+            <div><a href={FileUrlService.downloadUrl(item)} target="_blank" download={true}><i class="fas fa-download"/></a></div>
             <div><i
                 data-click-event="edit-shares"
                 class="fas fa-share"/></div>

package/src/common/pages/files/media/ChooseMediaPage.tsx

@@ -13,6 +13,7 @@ import UploadEvent from "@web-atoms/web-controls/dist/basic/UploadEvent";
 import { SaveIconTextButton } from "../../../../common/controls/buttons/IconButton";
 import { apiPath } from "../../../../common/apiPath";
 import { fileUrl } from "../../../../common/fileUrl";
+import { FileUrlService } from "../../../FileUrlService";
 
 
 const css = styled.css `
@@ -198,7 +199,7 @@ export default class ChooseMediaPage extends PopupWindowPage<
                             <label class="file-name" title={item.name} text={item.name}/>
                             <img
                                 class="file-preview"
-                                src={ fileUrl.webp(item, 300)} />
+                                src={ FileUrlService.webP(item, 300)} />
                         </div>;
                         }
                     }

package/src/model/model.ts

@@ -40,7 +40,6 @@ export interface IAppFile extends IClrEntity {
 	sourceEmailLogID?: number;
 	postID?: string;
 	url?: string;
-	downloadUrl?: string;
 	fileContent?: IFileContent;
 	creator?: IUser;
 	parent?: IAppFile;
@@ -64,11 +63,11 @@ export interface IAppFile extends IClrEntity {
 
 export const AppFileContentDispositionArray = [{"label":"attachment","value":"attachment"},{"label":"inline","value":"inline"}];
 
-export const AppFile: IModel<IAppFile,{"storeItemFiles":"external","channelEmailFiles":"external","channelFiles":"external","children":"external","templateSnapshot":"external"},{"download":"external"}> = new Model<IAppFile>(
+export const AppFile: IModel<IAppFile,{"storeItemFiles":"external","channelEmailFiles":"external","channelFiles":"external","children":"external","templateSnapshot":"external"},any> = new Model<IAppFile>(
 "AppFile",
 ["appFileID"],
 { isFolder: false,name: "",fileSize: 0,contentType: "",isDeleted: false,isShared: false,dateCreated: new DefaultFactory(() => new DateTime()) },
-{"name":"app_files","keys":[{"name":"appFileID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"path","type":"string","dataType":"AsciiChar","length":400,"default":["path","\"\""]},{"name":"isFolder","type":"boolean","dataType":"Boolean","default":["isFolder","false"]},{"name":"name","type":"string","dataType":"Char","length":400,"default":["name","\"\""]},{"name":"fileSize","type":"number","dataType":"BigInt","default":["fileSize","0"]},{"name":"contentType","type":"string","dataType":"Char","length":200,"default":["contentType","\"\""]},{"name":"contentDisposition","type":"string","dataType":"AsciiChar","length":10,"default":["contentDisposition","\"attachment\""]},{"name":"contentID","type":"string","dataType":"Char","default":["contentID","\"\""]},{"name":"fileContentID","type":"number","dataType":"BigInt"},{"name":"creatorID","type":"number","dataType":"BigInt"},{"name":"parentID","type":"number","dataType":"BigInt"},{"name":"emailID","type":"number","dataType":"BigInt"},{"name":"isDeleted","type":"boolean","dataType":"Boolean","default":["isDeleted","false"]},{"name":"isShared","type":"boolean","dataType":"Boolean","default":["isShared","false"]},{"name":"dateCreated","type":"DateTime","dataType":"DateTimeOffset","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","dataType":"DateTimeOffset","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"versions","type":"number","dataType":"Int","default":["versions","0"]}],"relations":[{"name":"fileContent","fkMap":[{"fk":"fileContentID","relatedKey":"fileContentID"}],"relatedName":"FileContent"},{"name":"creator","fkMap":[{"fk":"creatorID","relatedKey":"userID"}],"relatedName":"User"},{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"AppFile"},{"name":"email","fkMap":[{"fk":"emailID","relatedKey":"emailID"}],"relatedName":"Email"},{"name":"mailboxLogos","isCollection":true,"isInverse":true,"relatedName":"Mailbox"},{"name":"websiteFolder","isCollection":false,"isInverse":true,"relatedName":"WebSite"},{"name":"currentVersionWebSites","isCollection":true,"isInverse":true,"relatedName":"WebSite"},{"name":"storeItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"fileVersions","isCollection":true,"isInverse":true,"relatedName":"AppFileVersion"},{"name":"folderVersions","isCollection":true,"isInverse":true,"relatedName":"AppFileVersion"},{"name":"accessList","isCollection":true,"isInverse":true,"relatedName":"AppFileAccess"},{"name":"tags","isCollection":true,"isInverse":true,"relatedName":"AppFileTag"},{"name":"previewContacts","isCollection":true,"isInverse":true,"relatedName":"Contact"},{"name":"templates","isCollection":true,"isInverse":true,"relatedName":"EmailTemplate"},{"name":"storeJournals","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"storeMediaFiles","isCollection":true,"isInverse":true,"relatedName":"StoreMediaFile"},{"name":"userPins","isCollection":true,"isInverse":true,"relatedName":"UserPin"},{"name":"websiteVersions","isCollection":true,"isInverse":true,"relatedName":"WebSiteVersion"}],"queries":{"storeItemFiles":"external","channelEmailFiles":"external","channelFiles":"external","children":"external","templateSnapshot":"external"},"actions":{"download":"external"}}
+{"name":"app_files","keys":[{"name":"appFileID","type":"number","generated":"identity","dataType":"BigInt"}],"properties":[{"name":"path","type":"string","dataType":"AsciiChar","length":400,"default":["path","\"\""]},{"name":"isFolder","type":"boolean","dataType":"Boolean","default":["isFolder","false"]},{"name":"name","type":"string","dataType":"Char","length":400,"default":["name","\"\""]},{"name":"fileSize","type":"number","dataType":"BigInt","default":["fileSize","0"]},{"name":"contentType","type":"string","dataType":"Char","length":200,"default":["contentType","\"\""]},{"name":"contentDisposition","type":"string","dataType":"AsciiChar","length":10,"default":["contentDisposition","\"attachment\""]},{"name":"contentID","type":"string","dataType":"Char","default":["contentID","\"\""]},{"name":"fileContentID","type":"number","dataType":"BigInt"},{"name":"creatorID","type":"number","dataType":"BigInt"},{"name":"parentID","type":"number","dataType":"BigInt"},{"name":"emailID","type":"number","dataType":"BigInt"},{"name":"isDeleted","type":"boolean","dataType":"Boolean","default":["isDeleted","false"]},{"name":"isShared","type":"boolean","dataType":"Boolean","default":["isShared","false"]},{"name":"dateCreated","type":"DateTime","dataType":"DateTimeOffset","default":["dateCreated","new DefaultFactory(() => new DateTime())"]},{"name":"dateUpdated","type":"DateTime","dataType":"DateTimeOffset","default":["dateUpdated","new DefaultFactory(() => new DateTime())"]},{"name":"versions","type":"number","dataType":"Int","default":["versions","0"]}],"relations":[{"name":"fileContent","fkMap":[{"fk":"fileContentID","relatedKey":"fileContentID"}],"relatedName":"FileContent"},{"name":"creator","fkMap":[{"fk":"creatorID","relatedKey":"userID"}],"relatedName":"User"},{"name":"parent","fkMap":[{"fk":"parentID","relatedKey":"appFileID"}],"relatedName":"AppFile"},{"name":"children","isCollection":true,"isInverse":true,"relatedName":"AppFile"},{"name":"email","fkMap":[{"fk":"emailID","relatedKey":"emailID"}],"relatedName":"Email"},{"name":"mailboxLogos","isCollection":true,"isInverse":true,"relatedName":"Mailbox"},{"name":"websiteFolder","isCollection":false,"isInverse":true,"relatedName":"WebSite"},{"name":"currentVersionWebSites","isCollection":true,"isInverse":true,"relatedName":"WebSite"},{"name":"storeItems","isCollection":true,"isInverse":true,"relatedName":"StoreItem"},{"name":"fileVersions","isCollection":true,"isInverse":true,"relatedName":"AppFileVersion"},{"name":"folderVersions","isCollection":true,"isInverse":true,"relatedName":"AppFileVersion"},{"name":"accessList","isCollection":true,"isInverse":true,"relatedName":"AppFileAccess"},{"name":"tags","isCollection":true,"isInverse":true,"relatedName":"AppFileTag"},{"name":"previewContacts","isCollection":true,"isInverse":true,"relatedName":"Contact"},{"name":"templates","isCollection":true,"isInverse":true,"relatedName":"EmailTemplate"},{"name":"storeJournals","isCollection":true,"isInverse":true,"relatedName":"StoreJournal"},{"name":"storeMediaFiles","isCollection":true,"isInverse":true,"relatedName":"StoreMediaFile"},{"name":"userPins","isCollection":true,"isInverse":true,"relatedName":"UserPin"},{"name":"websiteVersions","isCollection":true,"isInverse":true,"relatedName":"WebSiteVersion"}],"queries":{"storeItemFiles":"external","channelEmailFiles":"external","channelFiles":"external","children":"external","templateSnapshot":"external"}}
 );
 modelEntitySchemas["AppFile"] = AppFile;
 
@@ -2095,4 +2094,3 @@ iterator.relatedModel = schema[iterator.relatedName];
 }
 };
 fixRelatedSchemas(modelEntitySchemas);
-

package/src/services/store/StoreItemService.ts

@@ -112,7 +112,6 @@ export default class StoreItemService {
                 });
                 file.url = url;
                 file.fileContentID = fileContentID;
-                file.downloadUrl = url;
             }
         }
 

package/src/site-editor/editor/WebSitePageEditor.tsx

@@ -136,7 +136,7 @@ export default class WebSitePageEditor extends HtmlPageEditor {
     @Action({ onEvent: "open-variables"})
     async openVariables() {
         let file = await this.cloudFileService.children(this.folder.appFileID, "styles/vars.css").firstOrDefault();
-        let content = await FetchBuilder.get(file.downloadUrl).asText();
+        let content = await FetchBuilder.get(file.url).asText();
         const modifiedContent = await PageNavigator.pushPageForResult(CodeEditorPage, { fileName: file.name, content } );
         if (modifiedContent !== content) {
             // save ...
@@ -165,7 +165,7 @@ export default class WebSitePageEditor extends HtmlPageEditor {
             pending.push(async () => {
                 const file = await this.cloudFileService.children(this.folder.appFileID, src)
                     .firstOrDefault();
-                const text = await FetchBuilder.get(file.downloadUrl).asText();
+                const text = await FetchBuilder.get(file.url).asText();
                 const parser = new DOMParser();
                 const dom = parser.parseFromString(text, "text/html");
                 const children = Array.from(dom.body.children);
@@ -185,7 +185,7 @@ export default class WebSitePageEditor extends HtmlPageEditor {
             if (!stylerFile) {
                 stylerFile = await this.createFile("styler.css", StylerSet.instance.toString());
             } else {
-                const stylerContent = await FetchBuilder.get(stylerFile.downloadUrl).asText();
+                const stylerContent = await FetchBuilder.get(stylerFile.url).asText();
                 const newStyle = StylerSet.instance.toString();
                 if (stylerContent !== newStyle) {
                     stylerFile = await this.createFile("styler.css", newStyle);

package/src/site-editor-app/pages/websites/studio/WebSiteStudioPage.tsx

@@ -222,7 +222,7 @@ export default class WebSiteStudioPage extends ContentPage {
             <WebSitePageEditor
                 class="file-list"
                 selectedFile={Bind.oneWay(() => this.selectedFile)}
-                baseUrl={Bind.oneWay(() => apiPath(`/api/site/draft/${this.root.appFileID}/${this.cloudFileService.getFilePath(this.root, this.selectedFile)}`))}
+                baseUrl={Bind.oneWay(() => apiPath(`${this.root.url}${this.cloudFileService.getFilePath(this.root, this.selectedFile)}`))}
                 folder={this.root}
                 presenter={Bind.presenter((c) => this.htmlEditor = c)}
                 event-html-page-changed={(ce: CustomEvent<string>) => this.modified = true}
@@ -240,7 +240,7 @@ export default class WebSiteStudioPage extends ContentPage {
     }
 
     async downloadHtml(file: IAppFile, cancelToken) {
-        const text = await FetchBuilder.get(file.downloadUrl)
+        const text = await FetchBuilder.get(file.url)
             .cancelToken(cancelToken)
             .asText(true);
         this.pageContent = text;
@@ -334,7 +334,6 @@ export default class WebSiteStudioPage extends ContentPage {
         const result = await this.cloudFileService.saveFile({ appFileID: this.selectedFile.appFileID, content });
         this.selectedFile.url = result.url;
         this.selectedFile.fileContentID = result.fileContentID;
-        this.selectedFile.downloadUrl = result.downloadUrl;
         this.webSite.isModified = true;
         this.modified = false;
         this.htmlEditor.undoRedo.changed = false;
@@ -356,13 +355,12 @@ export default class WebSiteStudioPage extends ContentPage {
 
     @Action({ onEvent: "file-history"})
     async fileHistory(file: IAppFile) {
-        const { fileContentID, url, downloadUrl } = await PageNavigator.pushPageForResult(FileHistoryPage, file);
+        const { fileContentID, url } = await PageNavigator.pushPageForResult(FileHistoryPage, file);
         // restore...
         const { selectedFile } = this;
         if (file.appFileID === selectedFile?.appFileID) {
             // refresh...
             selectedFile.url = url;
-            selectedFile.downloadUrl = downloadUrl;
             selectedFile.fileContentID = fileContentID;
         }
     }

package/src/site-editor-app/pages/websites/templates/TemplateService.ts

@@ -89,7 +89,6 @@ export default class TemplateService extends TaskManager {
         if (destFile.fileContentID !== source.fileContentID) {
             destFile.fileContentID = source.fileContentID;
             await this.entityService.save(destFile, (c) => c);
-            destFile.downloadUrl = source.downloadUrl;
             destFile.url = source.url;
         }
 
@@ -116,7 +115,7 @@ export default class TemplateService extends TaskManager {
         }
 
         if (/\.css$/i.test(destFile.name)) {
-            let css = await FetchBuilder.get(destFile.downloadUrl).asText();
+            let css = await FetchBuilder.get(destFile.url).asText();
             css = this.updateCssReferences(source, destFile, css);
             if (css) {
                 await this.cloudFileService.saveFile({
@@ -180,7 +179,7 @@ export default class TemplateService extends TaskManager {
 
     async updateHtmlReferences(source: IAppFile, destFile: IAppFile, siteRoot: string) {
         const parser = new DOMParser();
-        const text = await FetchBuilder.get(destFile.downloadUrl).asText();
+        const text = await FetchBuilder.get(destFile.url).asText();
         const dom = parser.parseFromString(text, "text/html");
 
         let modified = false;