@social-mail/social-mail-client 1.9.95 → 1.9.97

package/package.json

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

package/src/common/pages/files/service/CloudFileService.ts

@@ -16,11 +16,13 @@ const hideActivityIndicator = true;
 export type ISaveFileModel = ({
     parentID: number;
     folder?: string;
+    name?: string,
     appFileID?: never;
 } | {
     appFileID: number;
     parentID?: never;
     folder?: never;
+    name?: never;
 }) & { content: File };
 
 @DISingleton()
@@ -127,7 +129,7 @@ export default class CloudFileService {
 
     async getFolder(id, cancelToken = null) {
         const folder = await this.entityService.query(AppFile)
-            .where({id}, (p) => (x) => x.appFileID === p.id)
+            .where({id}, (p) => (x) => x.appFileID === p.id && x.isDeleted === false)
             .include((x) => x.creator)
             .firstOrDefault({ cancelToken });
         folder.children = [];
@@ -152,7 +154,6 @@ export default class CloudFileService {
                 && (x.contentType === "text/html" || x.isFolder === true)
             )
             .include((x) => x.creator)
-            .include((x) => x.children)
             .toArray({ cancelToken });
 
         root.children = [];
@@ -402,8 +403,8 @@ export default class CloudFileService {
 
     async saveFile(fm: ISaveFileModel) {
 
-        const { appFileID, content, parentID, folder  } = fm;
-        return this.localFileService.uploadFile(content, { appFileID, parentID, folder  });
+        const { appFileID, content, parentID, folder, name  } = fm;
+        return this.localFileService.uploadFile(content, { appFileID, parentID, folder, name });
 
         // check if file exists...
 

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

@@ -39,6 +39,7 @@ import StudioLayers from "./layers/StudioLayers";
 import Designs from "../../../../site-editor/tools/designs/Designs";
 import SiteEditorCommands from "../../../commands/SiteEditorCommands";
 import Loader from "../../../../common/controls/Loader";
+import { UMD } from "@web-atoms/core/dist/core/types";
 
 export default class WebSiteStudioPage extends ContentPage {
 
@@ -231,7 +232,13 @@ export default class WebSiteStudioPage extends ContentPage {
                                                 />
                                         ]
                                         : [])
-                                    : void 0}
+                                    : [
+                                            <MenuItem
+                                                icon="fas fa-file"
+                                                data-click-event="new-html-file"
+                                                label="New Html Page"
+                                                />
+                                    ]}
                                 event-selected-item-changing={(ce) => {
                                     if (this.modified) {
                                         if(confirm("Page is modified but not saved, your changes will be lost")) {
@@ -421,6 +428,29 @@ export default class WebSiteStudioPage extends ContentPage {
         }
     }
 
+    @Action({ onEvent: "new-html-file"})
+    async newHtmlPage(file: IAppFile) {
+        let fileName = prompt("Enter name of new file (without .html extension)", "");
+        if (!fileName) {
+            return;
+        }
+
+        if(!fileName.endsWith(".html")) {
+            fileName += ".html";
+        }
+
+        const text = await FetchBuilder.get(UMD.resolvePath("@social-mail/social-mail-client/content/templates/plain/blank.html"))
+            .asText();
+
+        const content = new File([text], fileName, { type: "text/html"} );
+
+        await this.cloudFileService.saveFile({
+            parentID: file.appFileID,
+            name: fileName + ".html",
+            content
+        });
+    }
+
     @Action({
         onEvent: "publish-website",
         success: "Web site published successfully."