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

package/package.json

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

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

@@ -8,6 +8,7 @@ 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";
+import UpdateFolderSize from "../storage/files/UpdateFolderSize.js";
 
 
 export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateID }> {
@@ -22,8 +23,7 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
     async copy(
         @Inject db?: SocialMailContext,
         @Inject tfs?: TempFileService,
-        @Inject storage?: BaseStorage,
-        @Inject ss?: SnapshotService
+        @Inject storage?: BaseStorage
     ) {
         // delete all files from current folder ..
 
@@ -41,7 +41,7 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
             .where({ folderID, currentPath }, (p) => (x) => Sql.text.like(x.path, p.currentPath) && x.appFileID !== p.folderID )
             .update(void 0, (p) => (x) => ({ isDeleted: true }));
 
-        await this.copyFolder(db, folderID, templateID);
+        await this.copyFolder(db, folderID, templateID, `${folderID}/`);
 
         await tx.commit();
 
@@ -68,7 +68,6 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
                     const v = e.getAttribute(k);
                     switch(k) {
                         case "data-template-part":
-                            console.log(`Changing data-template-part`);
                             switch(v) {
                                 case "name":
                                     e.removeAttribute(k);
@@ -83,7 +82,6 @@ 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);
 
                 let docType = "";
@@ -94,12 +92,11 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
                 await savedFile.writeAllText(docType + document.documentElement.outerHTML);
 
                 await storage.updateFile(htmlFile, savedFile);
-                await db.saveChanges();
+                await db.appFiles.statements.update({ fileContentID: htmlFile.fileContentID}, { appFileID: htmlFile.appFileID });
             }
         }
 
         // publish a snapshot...
-        console.log(`Creating snapshot`);
         db.websiteVersions.add({
             folderID,
             authorID: site.folder.creatorID,
@@ -108,9 +105,11 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
         });
 
         await db.saveChanges();
+
+        await this.context.queue(UpdateFolderSize, folderID);
     }
 
-    async copyFolder(db: SocialMailContext, destFolderID: any, srcFolderID: any) {
+    async copyFolder(db: SocialMailContext, destFolderID: any, srcFolderID: any, parentPath: string) {
         const children = await db.appFiles
             .where({ srcFolderID }, (p) => (x) => x.parentID === p.srcFolderID && x.isDeleted === false)
             .toArray();
@@ -146,7 +145,7 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
                 });
             } else {
 
-                await db.appFiles.statements.update({
+                existing = await db.appFiles.statements.update({
                     fileContentID: element.fileContentID,
                     contentType: element.contentType,
                     dateCreated: element.dateCreated,
@@ -157,8 +156,13 @@ export default class CopyTemplateWorkflow extends Workflow<{ folderID, templateI
                 });
             }
 
+            // update path...
+            const path = `${parentPath}${existing.appFileID}/`;
+
+            await db.appFiles.statements.update({ path }, { appFileID: existing.appFileID});
+
             if (existing.isFolder) {
-                await this.copyFolder(db, existing.appFileID, element.appFileID);
+                await this.copyFolder(db, existing.appFileID, element.appFileID, path);
             } else {
                 if (/^text\/html$/i.test(existing.contentType)) {
                     this.set.add(existing);