@social-mail/social-mail-client 1.8.333 → 1.8.335

package/package.json

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

package/src/code-editor/svg/SvgCodeEditorWindow.tsx

@@ -109,7 +109,7 @@ export default class SvgCodeEditorWindow extends PopupWindowPage<{
     async onDrop(_, e: CustomEvent) {
         const file = e.detail.files[0];
         if (file) {
-            if(file.type.startsWith("image/svg") || file.type.startsWith("text/svg")) {
+            if(file.type.startsWith("image/svg+xml")) {
                 this.code = await file.text();
                 this.svgContainer.srcdoc = this.code;
                 this.textModel.setValue(this.code);
@@ -149,7 +149,7 @@ export default class SvgCodeEditorWindow extends PopupWindowPage<{
 
         await this.cloudFileService.saveFile({
             parentID: this.parameters.folderID,
-            content: new File([this.code], fileName, { type: "text/svg"}),
+            content: new File([this.code], fileName, { type: "image/svg+xml"}),
             folder: path.join("/")
         });
 

package/src/site-editor/tools/ToolService.ts

@@ -0,0 +1,32 @@
+import DISingleton from "@web-atoms/core/dist/di/DISingleton";
+import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
+import IPagedList from "@web-atoms/entity/dist/models/IPagedList";
+
+export interface ISiteTemplate {
+    id: any;
+    tags: string[];
+    name: string;
+    host: string;
+    preview: string;
+    previewMobile: string;
+    template: string;
+    url: string;
+}
+
+@DISingleton()
+export default class ToolService {
+
+
+    designs({ search, tags, start = 0, size = 50, cancelToken }) {
+        return FetchBuilder.get(`https://tools.esocialmail.com/social-mail/site/list/designs`)
+            .queries({
+                search,
+                tags,
+                start,
+                size
+            })
+            .cancelToken(cancelToken)
+            .asJson<IPagedList<ISiteTemplate>>();
+    }
+
+}

package/src/site-editor/tools/basic/BasicShapes.tsx

@@ -1,59 +1,33 @@
 import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
 import { CacheTTL } from "../../../common/cache/CacheTTL";
 import { packageVersion } from "../../../common/PackageInfo";
-import { Sql } from "../../../common/Sql";
-import { ChannelEmail, IChannelEmail } from "../../../model/model";
 import ToolSection, { IToolItem } from "../section/ToolSection";
+import ToolService, { ISiteTemplate } from "../ToolService";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
 
 const cacheVersion = packageVersion;
 const cacheSeconds = CacheTTL.seconds.oneDay;
 
 
-export default class BasicShapes extends ToolSection<IChannelEmail> {
+export default class BasicShapes extends ToolSection<ISiteTemplate> {
+
+    @InjectProperty
+    tools: ToolService;
 
     get headerName() {
         return "Shapes";
     }
 
     async searchItems({ start, search, cancelToken }) {
-        const contentTypes = ["image/%", "text/html"];
-        const shape = "shape";
-        let q = this.entityService.query(ChannelEmail, "libraryEmails")
-            .where({ contentTypes, shape }, (p) =>  (x) => x.email.attachments.some((e) =>
-                Sql.text.iLikeAny(e.contentType, p.contentTypes)
-                && e.email.emailTags.some((t) => t.tag.parent.lowerCaseName === p.shape)
-            ))
-            ;
-        if(search) {
-            search += "%";
-            q = q.where({ search }, (p) => (x) => Sql.text.iLike(x.email.subject, p.search));
-        }
-        return q
-            .include((x) => [x.email.attachments, x.email.emailTags.forEach((t) => t.tag)])
-            .toPagedList({
-                start,
-                cancelToken,
-                size: 25,
-                cacheSeconds,
-                cacheVersion
-            });
+        return this.tools.designs({ search, tags: "Shape", start, cancelToken, size: 50 });
     }
 
-    asToolItem(x: IChannelEmail): IToolItem {
-
-        const { email, emailID: id } = x;
-        const { attachments: files, subject: title } = email;
+    asToolItem(x: ISiteTemplate): IToolItem {
 
-        const preview = this.getFileType("preview.", ... files);
-        const { src, href } = this.getFileType("template.", ... files);
+        const { id, preview, name: title, template: templateUrl } = x;
 
         const template = async () => {
-            if (src) {
-                const img = document.createElement("img");
-                img.src = src;
-                return img;
-            }
-            const text = await FetchBuilder.get(href).asText();
+            const text = await FetchBuilder.get(templateUrl).asText();
             const parser = new DOMParser();
             const d = parser.parseFromString(text, "text/html");
             const t = d.body.querySelector("template");
@@ -64,10 +38,13 @@ export default class BasicShapes extends ToolSection<IChannelEmail> {
 
         return {
             title,
-            files,
+            files: [],
             id,
             copyAssets: true,
-            preview,
+            preview: {
+                src: preview,
+                href: void 0
+            },
             template
         };
     }

package/src/site-editor/tools/designs/Designs.tsx

@@ -1,59 +1,33 @@
 import FetchBuilder from "@web-atoms/core/dist/services/FetchBuilder";
 import { CacheTTL } from "../../../common/cache/CacheTTL";
 import { packageVersion } from "../../../common/PackageInfo";
-import { Sql } from "../../../common/Sql";
-import { ChannelEmail, IChannelEmail } from "../../../model/model";
 import ToolSection, { IToolItem } from "../section/ToolSection";
+import InjectProperty from "@web-atoms/core/dist/core/InjectProperty";
+import ToolService, { ISiteTemplate } from "../ToolService";
 
 const cacheVersion = packageVersion;
 const cacheSeconds = CacheTTL.seconds.oneDay;
 
 
-export default class Designs extends ToolSection<IChannelEmail> {
+export default class Designs extends ToolSection<ISiteTemplate> {
+
+     @InjectProperty
+    tools: ToolService;
 
     get headerName() {
         return "Designs";
     }
 
     async searchItems({ start, search, cancelToken }) {
-        const contentTypes = ["image/%", "text/html"];
-        const shape = "design";
-        let q = this.entityService.query(ChannelEmail, "libraryEmails")
-            .where({ contentTypes, shape }, (p) =>  (x) => x.email.attachments.some((e) =>
-                Sql.text.iLikeAny(e.contentType, p.contentTypes)
-                && e.email.emailTags.some((t) => t.tag.lowerCaseName === p.shape)
-            ))
-            ;
-        if(search) {
-            search += "%";
-            q = q.where({ search }, (p) => (x) => Sql.text.iLike(x.email.subject, p.search));
-        }
-        return q
-            .include((x) => [x.email.attachments, x.email.emailTags.forEach((t) => t.tag)])
-            .toPagedList({
-                start,
-                cancelToken,
-                size: 25,
-                cacheSeconds,
-                cacheVersion
-            });
+        return this.tools.designs({ search, tags: "Shape", start, cancelToken, size: 50 });
     }
 
-    asToolItem(x: IChannelEmail): IToolItem {
-
-        const { email, emailID: id } = x;
-        const { attachments: files, subject: title } = email;
+    asToolItem(x: ISiteTemplate): IToolItem {
 
-        const preview = this.getFileType("preview.", ... files);
-        const { src, href } = this.getFileType("template.", ... files);
+        const { id, preview, name: title, template: templateUrl } = x;
 
         const template = async () => {
-            if (src) {
-                const img = document.createElement("img");
-                img.src = src;
-                return img;
-            }
-            const text = await FetchBuilder.get(href).asText();
+            const text = await FetchBuilder.get(templateUrl).asText();
             const parser = new DOMParser();
             const d = parser.parseFromString(text, "text/html");
             const t = d.body.querySelector("template");
@@ -64,10 +38,13 @@ export default class Designs extends ToolSection<IChannelEmail> {
 
         return {
             title,
-            files,
+            files: [],
             id,
             copyAssets: true,
-            preview,
+            preview: {
+                src: preview,
+                href: void 0
+            },
             template
         };
     }