@social-mail/social-mail-web-server 1.7.366 → 1.7.368

package/dist/wwwroot/routes/social-mail/site/download/files/get.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/download/files/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,qBAAqB,MAAM,kEAAkE,CAAC;AACrG,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAEpF,OAAO,iBAAiB,MAAM,mEAAmE,CAAC;AAIlG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,GAAG,EAAE,qBAAqB,CAAC;IAG3B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,iBAAiB,CAAC;IAEjB,GAAG;CAuEZ"}
+{"version":3,"file":"get.d.ts","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/download/files/get.tsx"],"names":[],"mappings":"AACA,OAAO,IAAI,MAAM,0CAA0C,CAAC;AAC5D,OAAO,qBAAqB,MAAM,kEAAkE,CAAC;AACrG,OAAO,iBAAiB,MAAM,qDAAqD,CAAC;AAEpF,OAAO,iBAAiB,MAAM,mEAAmE,CAAC;AAIlG,MAAM,CAAC,OAAO,MAAO,SAAQ,IAAI;IAG7B,GAAG,EAAE,qBAAqB,CAAC;IAG3B,EAAE,EAAE,iBAAiB,CAAC;IAGtB,GAAG,EAAE,iBAAiB,CAAC;IAEjB,GAAG;CA+CZ"}

package/dist/wwwroot/routes/social-mail/site/download/files/get.js

@@ -19,30 +19,6 @@ export default class default_1 extends Page {
         if (!snapshot.isTemplate) {
             return this.notFound();
         }
-        // this will be handled by the site route
-        // if (snapshot.remoteUrl) {
-        //     // proxy remote url
-        //     const url = snapshot.remoteUrl + this.request.URL.pathname + this.request.URL.search;
-        //     const r = await fetch(url);
-        //     if (r.status >= 400) {
-        //         return this.content({
-        //             body: await r.text(),
-        //             contentType: "text/plain"
-        //         });
-        //     }
-        //     const buffer = await r.arrayBuffer();
-        //     const contentType = r.headers.get("content-type") || "text/plain";
-        //     let compress = false;
-        //     if (/text|json/i.test(contentType)) {
-        //         compress = true;
-        //     }
-        //     return this.content({
-        //         status: r.status,
-        //         body: Buffer.from(buffer),
-        //         compress,
-        //         contentType
-        //     });
-        // }
         const path = this.childPath ?? [];
         const file = path?.length
             ? await this.wcs.getFileInfo(snapshot.snapshotFolderID, ...path)
@@ -67,9 +43,10 @@ export default class default_1 extends Page {
                 "x-content-type": "folder"
             });
         }
-        const appFile = await this.wcs.getSnapshotFile(snapshot, path);
+        const appFile = await this.wcs.getFileFromInfo(file);
         return new TempFileResult(appFile, {
             contentDisposition: "inline",
+            contentType: file.contentType
         });
     }
 }

package/dist/wwwroot/routes/social-mail/site/download/files/get.js.map

@@ -1 +1 @@
-{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/download/files/get.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"get.js","sourceRoot":"","sources":["../../../../../../../src/wwwroot/routes/social-mail/site/download/files/get.tsx"],"names":[],"mappings":"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"}

package/package.json

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

package/src/server/model/entities/WebSiteVersion.ts

@@ -45,6 +45,10 @@ export class WebSiteVersion {
     @JsonProperty({})
     public publish: boolean;
 
+    @JsonProperty({})
+    public clearHistory: boolean;
+
+
     @JsonProperty({ enum: ["major", "minor", "patch"] })
     public versionType: "major" | "minor" | "patch";
 

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

@@ -86,20 +86,21 @@ export default class WebSiteEvents extends AuthenticatedEvents<WebSite> {
         }
         if (entity.remoteUrl) {
             // create an empty snapshot
-            await this.ensureSnapshot(entity);
+            await this.ensureSnapshot(entry);
         }
     }
 
     async afterUpdate(entity: WebSite, entry: ChangeEntry<WebSite>) {
         if (entity.remoteUrl) {
             // create an empty snapshot
-            await this.ensureSnapshot(entity);
+            await this.ensureSnapshot(entry);
         }
     }
 
-    async ensureSnapshot(entity: WebSite) {
+    async ensureSnapshot(entry: ChangeEntry<WebSite>) {
+        await entry.loadNavigationAsync((x) => x.folder);
         const vs = ServiceProvider.resolve(this, WebSiteVersionService);
-        await vs.ensureNewVersion(entity);
+        await vs.ensureNewVersion(entry.entity);
     }
 
     async copyTemplate(entity: WebSite) {

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

@@ -11,6 +11,8 @@ import { ForeignKeyFilter } from "@entity-access/entity-access/dist/model/events
 import FileDeleteService from "../../services/files/FileDeleteService.js";
 import SnapshotService from "../../services/files/SnapshotService.js";
 import WebSiteVersionService from "../../services/files/WebSiteVersionService.js";
+import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
+import DeleteWebSiteVersionWorkflow from "../../workflows/web-site/DeleteWebSiteVersionWorkflow.js";
 
 
 
@@ -94,6 +96,12 @@ export class WebSiteVersionEvents extends AuthenticatedEvents<WebSiteVersion> {
                     isModified: false
                 }));
         }
+
+        if(entity.clearHistory) {
+            const context = ServiceProvider.resolve(this, WorkflowContext);
+            const { folderID, snapshotFolderID } = entity;
+            await context.queue(DeleteWebSiteVersionWorkflow, { folderID, snapshotFolderID });
+        }
     }
 
     onForeignKeyFilter(filter: ForeignKeyFilter<WebSiteVersion, any>): IEntityQuery<any> {

package/src/server/seed/ui/seed-ui.ts

@@ -5,7 +5,7 @@ export default async function seedUI(config: DBConfig) {
     await config.saveVersion(UIPackageConfig, {
         package: "@social-mail/social-mail-client",
         view: "dist/web/AppIndex",
-        version: "1.4.214"
+        version: "1.4.215"
     });
 
     await config.saveVersion(WebComponentsPackageConfig, {

package/src/server/services/files/SnapshotService.ts

@@ -1,19 +1,15 @@
 /* eslint-disable no-console */
-import Inject, { RegisterScoped, RegisterTransient } from "@entity-access/entity-access/dist/di/di.js";
-import { JSDOM } from 'jsdom';
+import Inject, { RegisterTransient } from "@entity-access/entity-access/dist/di/di.js";
 import SocialMailContext from "../../model/SocialMailContext.js";
 import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
 import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
 import AppFile from "../../model/entities/AppFile.js";
 import BaseStorage from "../../storage/BaseStorage.js";
 import TempFileService from "../../storage/TempFileService.js";
-import { join } from "path";
-import {ICacheContainer, ObjectCache, cacheFor } from "../../../common/cacheFor.js";
+import {ICacheContainer, ObjectCache } from "../../../common/cacheFor.js";
 import { globalEnv } from "../../../common/globalEnv.js";
 import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
 import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAccessError.js";
-import type { LocalFile } from "@entity-access/server-pages/dist/core/LocalFile.js";
-import { tokenizeCssUrl } from "../../../protocols/core/tokenizer.js";
 import MessagingService from "../message-events/MessagingService.js";
 
 
@@ -22,25 +18,6 @@ if (cdn) {
     cdn = `//${cdn}`;
 }
 
-const joinPath = (root: string, path: string) => {
-    const roots = root.split("/");
-    let paths = path.split("/");
-
-    for(;;) {
-        const [f, ... rest] = paths;
-        if (f === ".") {
-            return roots.join("/") + rest.join("/");
-        }
-        if (f === "..") {
-            roots.pop();
-            paths = rest;
-            continue;
-        }
-        return roots.join("/") + "/" + paths.join("/");
-    }
-
-};
-
 @RegisterTransient
 export default class SnapshotService
     implements Disposable, ICacheContainer<SnapshotService> {
@@ -61,17 +38,10 @@ export default class SnapshotService
 
     root: AppFile;
 
-    // htmlFiles: { source: AppFile, dest: AppFile, siteRoot: string, filePromise: Promise<LocalFile> } [] = [];
-
-    // derivedFiles: { source: AppFile, dest: AppFile, siteRoot: string, html: string } [] = [];
-
-    // cssFiles: { source: AppFile, dest: AppFile, siteRoot: string, filePromise: Promise<LocalFile> } [] = [];
     snapshotRoot: AppFile;
 
     allFiles: AppFile[] = null;
 
-    // snapshotFiles: AppFile[] = [];
-
     fileMap = new Map<number, any>();
 
     snapshotSize: number = 0;
@@ -134,65 +104,6 @@ export default class SnapshotService
 
         await this.copyChildren(db, folder, snapshotRoot);
 
-        // for (const { source, dest, siteRoot, filePromise } of this.cssFiles) {
-        //     const file = await filePromise;
-
-        //     let html = await file.readAsText();
-
-        //     html = await this.updateCssContent(html, siteRoot);
-
-        //     if (html) {
-        //         const htmlFile = await this.tempFileService.createFrom(source.name, Buffer.from(html, "utf-8"), "text/html");
-        //         await this.storage.updateFile(dest, htmlFile);
-        //         await db.appFiles.statements.update({
-        //             fileContentID: dest.fileContentID
-        //         }, {
-        //             appFileID: dest.appFileID
-        //         });
-        //     }
-        // }
-
-        // for (const { source, dest, siteRoot, filePromise } of this.htmlFiles) {
-        //     const file = await filePromise;
-
-        //     let html = await file.readAsText();
-
-        //     if (/\<inject\s/i.test(html)) {
-        //         // this is derived file..
-        //         this.derivedFiles.push({ source, dest, siteRoot, html });
-        //         continue;
-        //     }
-
-        //     html = await this.updateHtmlContent(html, siteRoot, file.fileName);
-
-        //     if (html) {
-        //         const htmlFile = await this.tempFileService.createFrom(source.name, Buffer.from(html, "utf-8"), "text/html");
-        //         await this.storage.updateFile(dest, htmlFile);
-        //         await db.appFiles.statements.update({
-        //             fileContentID: dest.fileContentID
-        //         }, {
-        //             appFileID: dest.appFileID
-        //         });
-        //     }
-        // }
-
-        // for (const df of this.derivedFiles) {
-        //     const { source, dest, siteRoot } = df;
-        //     let { html } = df;
-
-        //     html = await this.updateHtmlContent(html, siteRoot, source.name);
-
-        //     if (html) {
-        //         const htmlFile = await this.tempFileService.createFrom(source.name, Buffer.from(html, "utf-8"), "text/html");
-        //         await this.storage.updateFile(dest, htmlFile);
-        //         await db.appFiles.statements.update({
-        //             fileContentID: dest.fileContentID
-        //         }, {
-        //             appFileID: dest.appFileID
-        //         });
-        //     }
-        // }
-
         await db.saveChanges();
 
         await this.db.appFiles.where(this.snapshotRoot, (p) => (x) => x.appFileID === p.appFileID)
@@ -243,7 +154,6 @@ export default class SnapshotService
             });
 
             dest.children.push(destChild);
-            // this.snapshotFiles.push(destChild);
 
             const path = `${dest.path}${destChild.appFileID}/`;
             destChild.path = path;
@@ -253,18 +163,6 @@ export default class SnapshotService
                 appFileID: destChild.appFileID
             });
 
-            // if (/text\/css/i.test(srcChild.contentType) || /\.css$/i.test(srcChild.name)) {
-            //     await db.changeSet.getEntry(srcChild).loadNavigationAsync((x) => x.fileContent);
-            //     const filePromise = this.tempFileService.downloadAppFile(srcChild);
-            //     this.cssFiles.push({ source: srcChild, dest: destChild, siteRoot, filePromise });
-            // }
-
-            // if (/text\/html/i.test(srcChild.contentType) || /\.html?$/i.test(srcChild.name)) {
-            //     await db.changeSet.getEntry(srcChild).loadNavigationAsync((x) => x.fileContent);
-            //     const filePromise = this.tempFileService.downloadAppFile(srcChild);
-            //     this.htmlFiles.push({ source: srcChild, dest: destChild, siteRoot, filePromise });
-            // }
-
 
             if (srcChild.isFolder) {
                 await this.copyChildren(db, srcChild, destChild, siteRoot + "/" + srcChild.name );
@@ -274,284 +172,4 @@ export default class SnapshotService
         }
     }
 
-    // async updateCssContent(css: string, parentPath: string) {
-
-    //     let updated = false;
-
-    //     for (const fg of tokenizeCssUrl(css)) {
-    //         let link = fg;
-    //         const first = link[0];
-    //         const encoded = first === '"' || first === "'";
-    //         if (encoded) {
-    //             link = link.substring(1, link.length - 1);
-    //         }
-    //         link = await this.rewriteLink(link, parentPath);
-    //         if (!link) {
-    //             continue;
-    //         }
-    //         css = css.replaceAll(fg, link);
-    //         updated = true;
-    //     }
-
-    //     if (updated) {
-    //         return css;
-    //     }
-    // }
-
-    // /**
-    //  * This method cannot use local file cache as it may reference some different
-    //  * snapshot or different website folder if user has copied and pasted content
-    //  * from somewhere else
-    //  * @param fileID
-    //  * @returns
-    //  */
-    // @cacheFor()
-    // async getRelativePath(fileID, link,fileName) {
-    //     try {
-    //         const file = await this.db.appFiles
-    //             .where({ fileID }, (p) => (x) => x.appFileID === p.fileID)
-    //             .first();
-    //         if (!file) {
-    //             console.warn(`File ${fileID} not found for ${link} in ${fileName}`);
-    //             return;
-    //         }
-    //         const [ ignore , ... fileIDs] = file.path.split("/").filter((x) => x) as any[];
-    //         const files = await this.db.appFiles
-    //             .where({ fileIDs }, (p) => (x) => x.appFileID in p.fileIDs)
-    //             .toArray();
-    //         const pathFragments = [] as string[];
-    //         for (const iterator of fileIDs) {
-    //             const f = files.find((x) => BigInt(x.appFileID) === BigInt(iterator));
-    //             if (!f) {
-    //                 console.log(`File not found for ${iterator} in ${fileIDs} for ${fileID}`);
-    //             }
-    //             pathFragments.push(f.name);
-    //         }
-    //         return pathFragments;
-    //     } catch (error) {
-    //         console.warn(error);
-    //     }
-    // }
-
-    // parseLink(link: string) {
-    //     let index = link.indexOf("#");
-    //     if (index !== -1) {
-    //         link = link.substring(0, index);
-    //     }
-    //     let query = "";
-    //     index = link.indexOf("?");
-    //     if (index !== -1) {
-    //         query = link.substring(index);
-    //         link = link.substring(0, index);
-    //     }
-    //     return { query, link };
-    // }
-
-    // async rewriteLink(link: string, parentPath: string, srcFileName?: string) {
-    //     if (!link) {
-    //         return;
-    //     }
-
-    //     if (/^((https?\:\/\/)|(data\:)|(\/\/))/i.test(link)) {
-    //         return;
-    //     }
-
-    //     const originalLink = link;
-
-    //     if (link.startsWith("/api/site/snapshot/")) {
-    //         link = `${cdn}${link}`;
-    //         return link;
-    //     }
-
-    //     let paths: string[];
-    //     let transform = "download";
-    //     let fileName: string;
-    //     let query = "";
-
-    //     if (!link.startsWith("/api/site/asset/")) {
-    //         // we already have the path...
-    //         link = joinPath(parentPath, link);
-    //         if (link.startsWith("/")) {
-    //             link = link.substring(1);
-    //         }
-    //         let index = link.indexOf("#");
-    //         if (index !== -1) {
-    //             link = link.substring(0, index);
-    //         }
-    //         index = link.indexOf("?");
-    //         if (index !== -1) {
-    //             query = link.substring(index);
-    //             link = link.substring(0, index);
-    //         }
-    //         paths = link.split("/");
-    //     } else {
-    //         // find the path...
-    //         // /api[0]/site[1]/asset[2]/transform[3]/siteID[4]/fileID[5]/fileContentID[6]/fileName[7]
-    //         if (link.startsWith("/")) {
-    //             link = link.substring(1);
-    //         }
-    //         const tokens = link.split("/");
-    //         transform = tokens[3];
-    //         paths = await this.getRelativePath(tokens[5], originalLink + "\n" + link, srcFileName);
-    //         if (!paths) {
-    //             return;
-    //         }
-    //         fileName = tokens[7];
-    //     }
-
-    //     const child = await this.findSnapshotChildren(paths);
-    //     if (!child) {
-    //         console.warn(`No link found for ${link} with path ${paths.join("/")} in ${this.root.appFileID}, original: ${originalLink}, ${parentPath}, ${srcFileName}`);
-    //         return;
-    //     }
-
-    //     fileName ??= child.name;
-    //     // we should not put snapshot id here
-    //     // as snapshot id will be re-generated each time...
-    //     link = `${cdn}/api/site/snapshot/${transform}/${this.root.appFileID}/${child.fileContentID}/${fileName}${query}`;
-    //     return link;
-
-    // }
-
-    // async updateHtmlContent(html: string, parentPath: string,fileName: string) {
-
-    //     const { root } = this;
-
-    //     const dom = new JSDOM(html);
-
-    //     const { window } = dom;
-    //     const { document } = window;
-
-    //     let updated = false;
-
-    //     for (const e of Array.from(document.querySelectorAll("*"))) {
-
-    //         let link: string;
-    //         let attributeName: string;
-    //         let attributeSet: string[];
-
-    //         if(e.tagName === "STYLE") {
-    //             const text = e.textContent;
-    //             const modified = await this.updateCssContent(text, parentPath);
-    //             if (modified) {
-    //                 e.textContent = modified;
-    //                 updated = true;
-    //             }
-    //             continue;
-    //         }
-
-    //         if (e.tagName === "INJECT") {
-    //             link = e.getAttribute("src");
-
-    //             link = await this.rewriteLink(link, parentPath, fileName);
-    //             if (link) {
-    //                 // get file content...
-    //                 const url = new URL(link, "https://a");
-    //                 const tokens = url.pathname.substring(1).split("/");
-    //                 const fileContentID = tokens[5];
-    //                 const fileContent = await this.downloadSnapshotContent(fileContentID, link);
-    //                 const parent = e.parentElement;
-    //                 for (const iterator of fileContent) {
-    //                     parent.insertBefore(iterator, e);
-    //                 }
-    //                 e.remove();
-    //                 updated = true;
-    //             }
-
-    //             continue;
-    //         }
-
-    //         if (/^(VIDEO|PDF|IMG$|INLINE-SVG$|SOURCE)/.test(e.tagName)) {
-    //             attributeName = "src";
-    //             attributeSet = ["data-src-set", "srcset"];
-    //         }
-
-    //         if (/^LINK$/.test(e.tagName) && /^stylesheet$/i.test(e.getAttribute("rel"))) {
-    //             attributeName = "href";
-    //         }
-    //         if (!attributeName) {
-    //             continue;
-    //         }
-    //         link = e.getAttribute(attributeName);
-    //         link = await this.rewriteLink(link, parentPath, fileName);
-    //         if (link) {
-    //             updated = true;
-    //             e.setAttribute(attributeName, link);
-    //         }
-
-    //         if (attributeSet) {
-    //             for (const setName of attributeSet) {
-    //                 const srcSet = e.getAttribute(setName);
-    //                 if (srcSet) {
-    //                     const changedSet = [];
-    //                     for (const url of srcSet.split(/\,\;/)) {
-    //                         const tokens = url?.split(" ");
-    //                         if (!(tokens?.length > 0)) {
-    //                             continue;
-    //                         }
-    //                         link = tokens[0];
-    //                         if (!link) {
-    //                             continue;
-    //                         }
-    //                         link = await this.rewriteLink(link, parentPath, fileName);
-    //                         if (link) {
-    //                             changedSet.push(`${link} ${tokens[1]}`);
-    //                         }
-    //                     }
-    //                     if (changedSet.length) {
-    //                         updated = true;
-    //                         e.setAttribute(setName, changedSet.join(","));
-    //                     }
-    //                 }
-    //             }
-    //         }
-    //     }
-
-    //     if (updated) {
-    //         return document.documentElement.outerHTML;
-    //     }
-    // }
-
-    // @cacheFor()
-    // async downloadSnapshotContent(fileContentID, link) {
-    //     const file = await this.db.appFiles.where({ fileContentID }, (p) => (x) => x.fileContentID === p.fileContentID
-    //         )
-    //         .include((x) => x.fileContent)
-    //         .first();
-    //     if (!file?.fileContent) {
-    //         console.error(`File ${fileContentID} not found for ${link}`);
-    //     }
-    //     const localFile = await this.tempFileService.downloadAppFile(file);
-    //     const text = await localFile.readAsText();
-    //     await localFile.delete();
-    //     const dom = new JSDOM(text);
-    //     return Array.from(dom.window.document.body.children) as HTMLElement[];
-    // }
-
-    // @cacheFor()
-    // async findSnapshotChildren(paths: string[], folderID = this.snapshotRoot.appFileID): Promise<AppFile> {
-    //     const child = await this._findSnapshotChildren(paths, folderID);
-    //     if (!child)  {
-    //         console.log(`File ${paths.join("/")} not found in folder ${folderID}\n${new Error().stack}`);
-    //     }
-    //     return child;
-    // }
-
-    // async _findSnapshotChildren(paths: string[], folderID): Promise<AppFile> {
-    //     const [ first, ... rest ] = paths;
-    //     if (!first) {
-    //         if (rest.length) {
-    //             return this.findSnapshotChildren(rest, folderID);
-    //         }
-    //         return null;
-    //     }
-    //     const child = this.snapshotFiles.find((x) => x.parentID === folderID && x.name === first);
-    //     if (!child) {
-    //         return null;
-    //     }
-    //     if (rest.length === 0) {
-    //         return child;
-    //     }
-    //     return this.findSnapshotChildren(rest, child.appFileID);
-    // }
 }

package/src/server/services/files/WebSiteContentService.ts

@@ -88,6 +88,10 @@ export default class WebSiteContentService
         return this.tfs.downloadFileContent(fileInfo.fileContentID, fileInfo);
     }
 
+    getFileFromInfo(fileInfo: IFileInfo) {
+        return this.tfs.downloadFileContent(fileInfo.fileContentID, fileInfo);
+    }
+
     @cacheFor()
     async getFileInfo(folderID, ... segments: string[]): Promise<IFileInfo> {
         const [top, ... paths] = segments;

package/src/server/services/files/WebSiteVersionService.ts

@@ -13,15 +13,14 @@ export default class WebSiteVersionService {
 
     @Inject user: SessionUser;
 
-    async getNewVersion(folderID, versionType: semver.ReleaseType = "patch") {
+    async getNewVersion(folderID: number, versionType: semver.ReleaseType = "patch") {
         const previous = await this.db.websiteVersions.where({ folderID }, (p) => (x) => x.folderID === p.folderID)
             .orderByDescending(void 0, (p) => (x) => x.dateCreated)
             .first();
         if (!previous) {
             return "1.0.0";
-        } else {
-            return semver.inc(previous.name, versionType);
         }
+        return semver.inc(previous.name, versionType);
     }
 
     async ensureNewVersionForRemote(folderID) {
@@ -40,12 +39,14 @@ export default class WebSiteVersionService {
 
         const dateCreated = DateTime.now;
 
-        const { folderID } = site;
+        const { folderID, folder } = site;
 
         const creatorID = this.user.userID;
 
+        const { name } = folder;
+
         const snapshotRoot = await this.db.appFiles.statements.insert({
-            ... site.folder,
+            name,
             contentType: "snapshot",
             appFileID: void 0,
             parentID: null,
@@ -70,7 +71,8 @@ export default class WebSiteVersionService {
             authorID: creatorID,
             dateCreated,
             folderID,
-            snapshotFolderID: snapshotRoot.appFileID
+            snapshotFolderID: snapshotRoot.appFileID,
+            name: await this.getNewVersion(site.folderID)
         });
 
         // delete previous versions...

package/src/server/workflows/SocialWorkflowContext.ts

@@ -50,6 +50,7 @@ import DeleteHostedDomainWorkflow from "./hosted-domain/DeleteHostedDomainWorkfl
 import DeleteMailboxContactWorkflow from "./mailbox/DeleteMailboxContactWorkflow.js";
 import DownloadExternalAttachmentWorkflow from "./external-body/DownloadExternalAttachmentWorkflow.js";
 import FetchCheckoutResultWorkflow from "./store/FetchCheckoutResultWorkflow.js";
+import DeleteWebSiteVersionWorkflow from "./web-site/DeleteWebSiteVersionWorkflow.js";
 
 @RegisterSingleton
 export default class SocialWorkflowContext extends WorkflowContext {
@@ -102,6 +103,7 @@ export default class SocialWorkflowContext extends WorkflowContext {
         this.register(CopyTemplateWorkflow);
 
         this.register(DeleteWebsiteWorkflow);
+        this.register(DeleteWebSiteVersionWorkflow);
         this.register(DeleteFileWorkflow);
 
         this.register(DeleteMailboxWorkflow);

package/src/server/workflows/clean-up/CleanupDeletedFilesWorkflow.ts

@@ -51,9 +51,7 @@ export default class CleanupDeletedFilesWorkflow extends Workflow {
                     x.tempFiles.some((tf) => tf.rootID === p.tempFileID)
                 )
                 .update(void 0, (p) => (x) => ({ deleted: true }));
-            await db.appTempFiles.statements.delete({
-                rootID: tmpFolder.rootID
-            });
+            await db.appTempFiles.asQuery().delete(tmpFolder, (p) => (x) => x.rootID === p.tempFileID);
             await db.appTempFiles.statements.delete({
                 tempFileID: tmpFolder.tempFileID
             });