@social-mail/social-mail-web-server 1.7.149 → 1.7.151

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.149",
+  "version": "1.7.151",
   "description": "## Phase 1",
   "main": "index.js",
   "type": "module",

package/src/server/model/events/WebSiteVersionEvents.ts

@@ -73,7 +73,9 @@ export class WebSiteVersionEvents extends AuthenticatedEvents<WebSiteVersion> {
         const snapshot = await this.webSiteService.createSnapshot(entity.folderID, this.sessionUser);
         entity.snapshotFolderID = snapshot.appFileID;
         entity.dateCreated = DateTime.now;
-        entity.authorID = this.sessionUser.userID;
+        if (this.sessionUser.userID) {
+            entity.authorID = this.sessionUser.userID;
+        }
         if (!entity.name) {
             const previous = await this.db.websiteVersions.where(entity, (p) => (x) => x.folderID === p.folderID
                 && x.snapshotFolderID !== p.snapshotFolderID

package/src/server/workflows/site/CopyTemplateWorkflow.ts

@@ -7,6 +7,7 @@ import TempFileService from "../../storage/TempFileService.js";
 import { JSDOM } from 'jsdom';
 import BaseStorage from "../../storage/BaseStorage.js";
 import SnapshotService from "../../services/files/SnapshotService.js";
+import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 
 
 export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateID }> {
@@ -30,7 +31,9 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
 
         const currentPath = `${folderID}/%`;
 
-        const site = await db.websiteFolders.where(this.input, (p) => (x) => x.folderID === p.folderID).first();
+        const site = await db.websiteFolders.where(this.input, (p) => (x) => x.folderID === p.folderID)
+            .include((x) => x.folder)
+            .first();
 
         await using tx = await db.connection.createTransaction();
 
@@ -57,12 +60,22 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
 
             // replace template-part...
             const window = new JSDOM(text);
-            for(const e of window.window.document.documentElement.querySelectorAll("*")) {
-                for(const k of e.getAttributeNames()) {
+
+            const document = window.window.document;
+
+            for(const e of document.documentElement.querySelectorAll("*")) {
+                for(const k of Array.from(e.getAttributeNames())) {
+                    const v = e.getAttribute(k);
                     switch(k) {
-                        case "data-template-name":
-                            e.setAttribute(k, title);
-                            modified = true;
+                        case "data-template-part":
+                            console.log(`Changing data-template-part`);
+                            switch(v) {
+                                case "name":
+                                    e.removeAttribute(k);
+                                    e.textContent = title;
+                                    modified = true;
+                                    break;
+                            }
                             break;
                     }
                 }
@@ -70,14 +83,31 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
 
             if (modified) {
 
+                console.log(`Saving ${htmlFile.name}`);
                 const savedFile = await tfs.createTempFile(".html", htmlFile.name, htmlFile.contentType);
 
-                await storage.saveFile(savedFile, htmlFile);
+                let docType = "";
+                if (document.doctype.name === "html") {
+                    docType = "<!DOCTYPE html>\n";
+                }
+
+                await savedFile.writeAllText(docType + document.documentElement.outerHTML);
+
+                await storage.updateFile(htmlFile, savedFile);
+                await db.saveChanges();
             }
         }
 
         // publish a snapshot...
-        await ss.createSnapshot(folderID);
+        console.log(`Creating snapshot`);
+        db.websiteVersions.add({
+            folderID,
+            authorID: site.folder.creatorID,
+            dateCreated: DateTime.now,
+            versionType: "patch"
+        });
+
+        await db.saveChanges();
     }
 
     async copyFolder(db: SocialMailContext, destFolderID: any, srcFolderID: any) {
@@ -120,7 +150,10 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
                     fileContentID: element.fileContentID,
                     contentType: element.contentType,
                     dateCreated: element.dateCreated,
-                    dateUpdated: element.dateUpdated
+                    dateUpdated: element.dateUpdated,
+                    parentID: destFolderID,
+                }, {
+                    appFileID: existing.appFileID
                 });
             }