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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-web-server",
-  "version": "1.7.366",
+  "version": "1.7.367",
   "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/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/WebSiteVersionService.ts

@@ -70,7 +70,8 @@ export default class WebSiteVersionService {
             authorID: creatorID,
             dateCreated,
             folderID,
-            snapshotFolderID: snapshotRoot.appFileID
+            snapshotFolderID: snapshotRoot.appFileID,
+            name: await this.getNewVersion(site)
         });
 
         // 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
             });

package/src/server/workflows/files/DeleteFileWorkflow.ts

@@ -31,6 +31,7 @@ export default class DeleteFileWorkflow extends Workflow<{ fileID }> {
 
     @UniqueActivity
     async deleteFile(@Inject db?: SocialMailContext) {
+        await db.websiteVersions.asQuery().delete(this.input, (p) => (x) => x.snapshotFolderID === p.fileID);
         await db.websiteFolders.asQuery().delete(this.input, (p) => (x) => x.folderID === p.fileID);
         await db.appFiles.statements.delete({ appFileID: this.input.fileID});
     }

package/src/server/workflows/web-site/DeleteWebSiteVersionWorkflow.ts

@@ -0,0 +1,54 @@
+import Workflow, { UniqueActivity } from "@entity-access/entity-access/dist/workflows/Workflow.js";
+import { WebSiteVersion } from "../../model/entities/WebSiteVersion.js";
+import Inject from "@entity-access/entity-access/dist/di/di.js";
+import SocialMailContext from "../../model/SocialMailContext.js";
+import DeleteFileWorkflow from "../files/DeleteFileWorkflow.js";
+
+export default class DeleteWebSiteVersionWorkflow extends Workflow<Partial<WebSiteVersion>> {
+
+    async run() {
+        let start = 0;
+        do {
+            const { start: startNext, children }  = await this.deleteChildren(start);
+
+            if (!startNext) {
+                break;
+            }
+
+            start = startNext;
+            const all = children.map((fileID) => this.runChild(DeleteFileWorkflow, { fileID }));
+            await this.all(all);
+
+        } while(BigInt(start) > 0);
+    }
+
+    @UniqueActivity
+    async deleteChildren(
+        start: number,
+        @Inject db?: SocialMailContext
+    ) {
+
+        const { folderID, snapshotFolderID } = this.input;
+        const files = await db.websiteVersions.where({ folderID, snapshotFolderID , start }, (p) => (x) =>
+                x.folderID === p.folderID
+                && x.snapshotFolderID !== p.snapshotFolderID
+                && x.snapshotFolderID > p.start
+            )
+            .limit(10)
+            .toArray();
+
+            const children = [];
+
+        if (files.length === 0) {
+            return { start: 0, children };
+        }
+
+        for (const version of files) {
+            start = version.snapshotFolderID;
+            children.push(version.snapshotFolderID);
+        }
+
+        return { start, children };
+
+    }
+}