@social-mail/social-mail-client 1.2.40 → 1.2.41

package/package.json

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

package/src/common/pages/websites/templates/ChooseWebSiteTemplatePage.tsx

@@ -4,11 +4,21 @@ import XNode from "@web-atoms/core/dist/core/XNode";
 import Action from "@web-atoms/core/dist/view-model/Action";
 import { UMD } from "@web-atoms/core/dist/core/types";
 import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
+import { Inject } from "@web-atoms/core/dist/di/Inject";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import CloudFileService from "../../../../web/page/files/service/CloudFileService";
+import MimeTypeService from "../../../../services/files/MimeTypeService";
 
 export default class ChooseWebSiteTemplatePage extends PopupWindowPage {
 
     parameters: IAppFile;
 
+    @InjectProperty
+    cloudFileService: CloudFileService;
+
+    @InjectProperty
+    mimeTypeService: MimeTypeService;
+
     async init() {
         this.renderer = <div>
             <button
@@ -24,18 +34,23 @@ export default class ChooseWebSiteTemplatePage extends PopupWindowPage {
 
         // upload
         await this.upload("index.html", template);
-        await this.upload("styles/vars.css", template);
+        await this.upload("vars.css", template, "styles");
     }
 
-    async upload(fileName: string, template) {
+    async upload(fileName, template, folder = void 0) {
 
-        const path = UMD.resolvePath(`@social-mail/social-mail-client/content/templates/${template}/${fileName}`);
+        const templatePath = folder ? `${folder}/${fileName}` : fileName;
+        const path = UMD.resolvePath(`@social-mail/social-mail-client/content/templates/${template}/${templatePath}`);
         const content = await FetchBuilder.get(path).responseAsText();
 
-        const url = `/api/upload?parentID=${this.parameters.appFileID}`;
-        const body = new FormData();
-        body.append(fileName, new Blob([content], { type: "text/html"}), fileName);
-        const rs = await fetch(url, { method: "POST", body });
+        const contentType = await this.mimeTypeService.getMimeType(fileName);
+
+        await this.cloudFileService.saveFile({
+            content: new File([content], fileName, { type: contentType }),
+            parentID: this.parameters.appFileID,
+            folder
+        });
+
     }
 
 }

package/src/services/files/MimeTypeService.ts

@@ -0,0 +1,45 @@
+import DISingleton from "@web-atoms/core/dist/di/DISingleton";
+import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
+
+export interface IMimeMap {
+    [key: string]: {
+        extensions?: string[]
+    }
+}
+
+let mimeMap = void 0 as Promise<Map<string,string>>;
+
+@DISingleton()
+export default class MimeTypeService {
+
+    async getMimeType(fileName: string) {
+        mimeMap ??= this.createMap();
+        const map = await mimeMap;
+        const group = /\.([^\.]+)$/.exec(fileName);
+        if (group) {
+            const ct = map.get(group[1]);
+            if (ct) {
+                return ct;
+            }
+        }
+        return "application/octat-stream";
+    }
+
+    async createMap(): Promise<Map<string, string>> {
+        const json = await FetchBuilder.get("https://cdn.jsdelivr.net/gh/jshttp/mime-db@master/db.json").responseAsJson<IMimeMap>();
+        const map = new Map<string,string>();
+        setTimeout(() => mimeMap = null, 60000);
+        for (const key in json) {
+            if (Object.prototype.hasOwnProperty.call(json, key)) {
+                const { extensions } = json[key];
+                if (extensions) {
+                    for (const iterator of extensions) {
+                        map.set(iterator, key);
+                    }
+                }
+            }
+        }
+        return map;
+    }
+
+}