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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"WebSiteEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAExD,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAG3F,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAI/D,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAEzF,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAM7F,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IAGnE,eAAe,EAAE,eAAe,CAAC;IAGjC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,iBAAiB,EAAE,iBAAiB,CAAC;IAGrC,GAAG,EAAE,eAAe,CAAC;IAGrB,OAAO,EAAE,eAAe,CAAC;IAGzB,SAAS;IAOH,UAAU,CAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM;;;IAUnD,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;IAWnC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;IAW7B,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;IAWxD,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;IAOxD,cAAc,CAAC,MAAM,EAAE,OAAO;IAmB9B,YAAY,CAAC,MAAM,EAAE,OAAO;IAkBlC,OAAO,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAOpC"}
1
+ {"version":3,"file":"WebSiteEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAC7C,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAG3D,OAAO,iBAAiB,MAAM,yBAAyB,CAAC;AAExD,OAAO,eAAe,MAAM,8DAA8D,CAAC;AAG3F,OAAO,iBAAiB,MAAM,gDAAgD,CAAC;AAC/E,OAAO,eAAe,MAAM,kCAAkC,CAAC;AAI/D,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAEzF,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAO7F,MAAM,CAAC,OAAO,OAAO,aAAc,SAAQ,mBAAmB,CAAC,OAAO,CAAC;IAGnE,eAAe,EAAE,eAAe,CAAC;IAGjC,EAAE,EAAE,iBAAiB,CAAC;IAGtB,iBAAiB,EAAE,iBAAiB,CAAC;IAGrC,GAAG,EAAE,eAAe,CAAC;IAGrB,OAAO,EAAE,eAAe,CAAC;IAGzB,SAAS;IAOH,UAAU,CAAE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM;;;IAUnD,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;IAWnC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,OAAO,CAAC;IAW7B,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;IAWxD,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,CAAC,OAAO,CAAC;IAOxD,cAAc,CAAC,MAAM,EAAE,OAAO;IAK9B,YAAY,CAAC,MAAM,EAAE,OAAO;IAkBlC,OAAO,CAAC,MAAM,EAAE,OAAO,GAAG,OAAO;CAOpC"}
@@ -21,8 +21,7 @@ import EntityAccessError from "@entity-access/entity-access/dist/common/EntityAc
21
21
  import WorkflowContext from "@entity-access/entity-access/dist/workflows/WorkflowContext.js";
22
22
  import CopyTemplateWorkflow from "../../workflows/site/CopyTemplateWorkflow.js";
23
23
  import DeleteWebsiteWorkflow from "../../workflows/web-site/DeleteWebSiteWorkflow.js";
24
- import SnapshotService from "../../services/files/SnapshotService.js";
25
- import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
24
+ import WebSiteVersionService from "../../services/files/WebSiteVersionService.js";
26
25
  export default class WebSiteEvents extends AuthenticatedEvents {
27
26
  templates() {
28
27
  const { db } = this;
@@ -73,19 +72,8 @@ export default class WebSiteEvents extends AuthenticatedEvents {
73
72
  }
74
73
  }
75
74
  async ensureSnapshot(entity) {
76
- const hasVersion = await this.db.websiteVersions.statements.select({}, { folderID: entity.folderID });
77
- if (hasVersion) {
78
- return;
79
- }
80
- const snapshotService = ServiceProvider.resolve(this, SnapshotService);
81
- const snapshot = await snapshotService.createSnapshot(entity.folderID, this.sessionUser);
82
- const version = this.db.websiteVersions.add({
83
- folderID: entity.folderID
84
- });
85
- version.snapshotFolderID = snapshot.appFileID;
86
- version.dateCreated = DateTime.now;
87
- version.name = "1.0.0";
88
- await this.db.saveChanges();
75
+ const vs = ServiceProvider.resolve(this, WebSiteVersionService);
76
+ await vs.ensureNewVersion(entity);
89
77
  }
90
78
  async copyTemplate(entity) {
91
79
  const { db } = this;
@@ -1 +1 @@
1
- {"version":3,"file":"WebSiteEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteEvents.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebSiteEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteEvents.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"WebSiteHostEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteHostEvents.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAM/F,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,qBAAa,iBAAkB,SAAQ,mBAAmB,CAAC,WAAW,CAAC;IAEnE,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC;IAWvC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC;IAWjC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC;IAWtE,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM;CAI3E"}
1
+ {"version":3,"file":"WebSiteHostEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteHostEvents.ts"],"names":[],"mappings":"AACA,OAAO,WAAW,MAAM,gEAAgE,CAAC;AACzF,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAM/F,OAAO,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AACzD,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAI3D,qBAAa,iBAAkB,SAAQ,mBAAmB,CAAC,WAAW,CAAC;IAEnE,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC;IAWvC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC;IAWjC,WAAW,CAAC,MAAM,EAAE,WAAW,EAAE,KAAK,EAAE,WAAW,CAAC,WAAW,CAAC;IActE,aAAa,CAAC,KAAK,EAAE,YAAY,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC,EAAE,MAAM;CAI3E"}
@@ -5,6 +5,7 @@ import ApexDomain from "../../../common/ApexDomain.js";
5
5
  import EmailAddressService from "../../services/EmailAddressService.js";
6
6
  import SyncDnsZoneRecordsWorkflow from "../../workflows/dns/SyncDnsZoneRecordsWorkflow.js";
7
7
  import AuthenticatedEvents from "./AuthenticatedEvents.js";
8
+ import WebSiteVersionService from "../../services/files/WebSiteVersionService.js";
8
9
  export class WebSiteHostEvents extends AuthenticatedEvents {
9
10
  filter(query) {
10
11
  if (this.sessionUser.isAdmin) {
@@ -32,6 +33,8 @@ export class WebSiteHostEvents extends AuthenticatedEvents {
32
33
  const domain = ApexDomain.getApexDomain(entity.host);
33
34
  const zoneID = await eas.getOrCreateDomain(domain);
34
35
  await SyncDnsZoneRecordsWorkflow.enqueue(wc, zoneID);
36
+ const vs = ServiceProvider.resolve(this, WebSiteVersionService);
37
+ await vs.ensureNewVersionForRemote(entity.folderID);
35
38
  }
36
39
  includeFilter(query, type, key) {
37
40
  return query;
@@ -1 +1 @@
1
- {"version":3,"file":"WebSiteHostEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteHostEvents.ts"],"names":[],"mappings":"AAAA,OAAe,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAGrF,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAC7F,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,0BAA0B,MAAM,mDAAmD,CAAC;AAE3F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,MAAM,OAAO,iBAAkB,SAAQ,mBAAgC;IAEnE,MAAM,CAAC,KAAgC;QACnC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,CAAE,CAAC,CAAC;IACpH,CAAC;IAED,MAAM,CAAC,KAAgC;QACnC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAC7C,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAE,CAAC,CAAC;IACtH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAmB,EAAE,KAA+B;QAClE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAErD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAEnD,MAAM,0BAA0B,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IACzD,CAAC;IAED,aAAa,CAAC,KAAgC,EAAE,IAAU,EAAE,GAAY;QACpE,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ"}
1
+ {"version":3,"file":"WebSiteHostEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteHostEvents.ts"],"names":[],"mappings":"AAAA,OAAe,EAAE,eAAe,EAAE,MAAM,4CAA4C,CAAC;AAGrF,OAAO,GAAG,MAAM,8CAA8C,CAAC;AAC/D,OAAO,eAAe,MAAM,gEAAgE,CAAC;AAC7F,OAAO,UAAU,MAAM,+BAA+B,CAAC;AACvD,OAAO,mBAAmB,MAAM,uCAAuC,CAAC;AACxE,OAAO,0BAA0B,MAAM,mDAAmD,CAAC;AAE3F,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,qBAAqB,MAAM,+CAA+C,CAAC;AAElF,MAAM,OAAO,iBAAkB,SAAQ,mBAAgC;IAEnE,MAAM,CAAC,KAAgC;QACnC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAC5C,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,cAAc,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,cAAc,CAAE,CAAC,CAAC;IACpH,CAAC;IAED,MAAM,CAAC,KAAgC;QACnC,IAAI,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3B,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACf,OAAO,KAAK,CAAC;QACjB,CAAC;QACD,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC;QAC7C,OAAO,KAAK,CAAC,KAAK,CAAC,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,eAAe,CAAE,CAAC,CAAC;IACtH,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,MAAmB,EAAE,KAA+B;QAClE,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAC1D,MAAM,GAAG,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;QAE/D,MAAM,MAAM,GAAG,UAAU,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QAErD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC;QAEnD,MAAM,0BAA0B,CAAC,OAAO,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAErD,MAAM,EAAE,GAAG,eAAe,CAAC,OAAO,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;QAChE,MAAM,EAAE,CAAC,yBAAyB,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACxD,CAAC;IAED,aAAa,CAAC,KAAgC,EAAE,IAAU,EAAE,GAAY;QACpE,OAAO,KAAK,CAAC;IACjB,CAAC;CAEJ"}
@@ -1 +1 @@
1
- {"version":3,"file":"WebSiteVersionEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteVersionEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAKzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAMlG,qBAAa,oBAAqB,SAAQ,mBAAmB,CAAC,cAAc,CAAC;IAIzE,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,eAAe,CAAkB;IAEzC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC;IAW1C,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC;IAW1C,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC;IAKpC,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAoBtE,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAsBvE,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAY5E,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,cAAc,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC;CAMvF"}
1
+ {"version":3,"file":"WebSiteVersionEvents.d.ts","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteVersionEvents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,iEAAiE,CAAC;AAC/F,OAAO,EAAE,cAAc,EAAE,MAAM,+BAA+B,CAAC;AAC/D,OAAO,mBAAmB,MAAM,0BAA0B,CAAC;AAE3D,OAAO,WAAW,MAAM,gEAAgE,CAAC;AAKzF,OAAO,EAAE,gBAAgB,EAAE,MAAM,gEAAgE,CAAC;AAOlG,qBAAa,oBAAqB,SAAQ,mBAAmB,CAAC,cAAc,CAAC;IAIzE,OAAO,CAAC,EAAE,CAAoB;IAG9B,OAAO,CAAC,eAAe,CAAkB;IAEzC,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC;IAW1C,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC;IAW1C,MAAM,CAAC,KAAK,EAAE,YAAY,CAAC,cAAc,CAAC;IAKpC,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAoBtE,YAAY,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAcvE,WAAW,CAAC,MAAM,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,CAAC,cAAc,CAAC;IAY5E,kBAAkB,CAAC,MAAM,EAAE,gBAAgB,CAAC,cAAc,EAAE,GAAG,CAAC,GAAG,YAAY,CAAC,GAAG,CAAC;CAMvF"}
@@ -12,9 +12,9 @@ import Sql from "@entity-access/entity-access/dist/sql/Sql.js";
12
12
  import Inject, { ServiceProvider } from "@entity-access/entity-access/dist/di/di.js";
13
13
  import SocialMailContext from "../SocialMailContext.js";
14
14
  import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
15
- import * as semver from "semver";
16
15
  import FileDeleteService from "../../services/files/FileDeleteService.js";
17
16
  import SnapshotService from "../../services/files/SnapshotService.js";
17
+ import WebSiteVersionService from "../../services/files/WebSiteVersionService.js";
18
18
  export class WebSiteVersionEvents extends AuthenticatedEvents {
19
19
  filter(query) {
20
20
  if (this.sessionUser.isAdmin) {
@@ -66,16 +66,8 @@ export class WebSiteVersionEvents extends AuthenticatedEvents {
66
66
  entity.authorID = this.sessionUser.userID;
67
67
  }
68
68
  if (!entity.name) {
69
- const previous = await this.db.websiteVersions.where(entity, (p) => (x) => x.folderID === p.folderID
70
- && x.snapshotFolderID !== p.snapshotFolderID)
71
- .orderByDescending(void 0, (p) => (x) => x.dateCreated)
72
- .first();
73
- if (!previous) {
74
- entity.name = "1.0.0";
75
- }
76
- else {
77
- entity.name = semver.inc(previous.name, entity.versionType || "patch");
78
- }
69
+ const vs = ServiceProvider.resolve(this, WebSiteVersionService);
70
+ entity.name = await vs.getNewVersion(entity.folderID, entity.versionType || "patch");
79
71
  }
80
72
  }
81
73
  async afterInsert(entity, entry) {
@@ -1 +1 @@
1
- {"version":3,"file":"WebSiteVersionEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteVersionEvents.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"WebSiteVersionEvents.js","sourceRoot":"","sources":["../../../../src/server/model/events/WebSiteVersionEvents.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,12 @@
1
+ import * as semver from "semver";
2
+ import SocialMailContext from "../../model/SocialMailContext.js";
3
+ import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
4
+ import WebSite from "../../model/entities/WebSite.js";
5
+ export default class WebSiteVersionService {
6
+ db: SocialMailContext;
7
+ user: SessionUser;
8
+ getNewVersion(folderID: any, versionType?: semver.ReleaseType): Promise<string>;
9
+ ensureNewVersionForRemote(folderID: any): Promise<void>;
10
+ ensureNewVersion(site: WebSite): Promise<void>;
11
+ }
12
+ //# sourceMappingURL=WebSiteVersionService.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"WebSiteVersionService.d.ts","sourceRoot":"","sources":["../../../../src/server/services/files/WebSiteVersionService.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,WAAW,EAAE,MAAM,sDAAsD,CAAC;AAEnF,OAAO,OAAO,MAAM,iCAAiC,CAAC;AAGtD,MAAM,CAAC,OAAO,OAAO,qBAAqB;IAE9B,EAAE,EAAE,iBAAiB,CAAC;IAEtB,IAAI,EAAE,WAAW,CAAC;IAEpB,aAAa,CAAC,QAAQ,KAAA,EAAE,WAAW,GAAE,MAAM,CAAC,WAAqB;IAWjE,yBAAyB,CAAC,QAAQ,KAAA;IAYlC,gBAAgB,CAAC,IAAI,EAAE,OAAO;CA8CvC"}
@@ -0,0 +1,86 @@
1
+ var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
2
+ var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
3
+ if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
4
+ else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
5
+ return c > 3 && r && Object.defineProperty(target, key, r), r;
6
+ };
7
+ var __metadata = (this && this.__metadata) || function (k, v) {
8
+ if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
9
+ };
10
+ import Inject, { RegisterScoped } from "@entity-access/entity-access/dist/di/di.js";
11
+ import * as semver from "semver";
12
+ import SocialMailContext from "../../model/SocialMailContext.js";
13
+ import { SessionUser } from "@entity-access/server-pages/dist/core/SessionUser.js";
14
+ import DateTime from "@entity-access/entity-access/dist/types/DateTime.js";
15
+ let WebSiteVersionService = class WebSiteVersionService {
16
+ async getNewVersion(folderID, versionType = "patch") {
17
+ const previous = await this.db.websiteVersions.where({ folderID }, (p) => (x) => x.folderID === p.folderID)
18
+ .orderByDescending(void 0, (p) => (x) => x.dateCreated)
19
+ .first();
20
+ if (!previous) {
21
+ return "1.0.0";
22
+ }
23
+ else {
24
+ return semver.inc(previous.name, versionType);
25
+ }
26
+ }
27
+ async ensureNewVersionForRemote(folderID) {
28
+ const site = await this.db.websiteFolders.where({ folderID }, (p) => (x) => x.folderID === p.folderID
29
+ && x.remoteUrl !== null)
30
+ .include((x) => x.folder)
31
+ .first();
32
+ if (!site) {
33
+ return;
34
+ }
35
+ return this.ensureNewVersion(site);
36
+ }
37
+ async ensureNewVersion(site) {
38
+ const dateCreated = DateTime.now;
39
+ const { folderID } = site;
40
+ const creatorID = this.user.userID;
41
+ const snapshotRoot = await this.db.appFiles.statements.insert({
42
+ ...site.folder,
43
+ contentType: "snapshot",
44
+ appFileID: void 0,
45
+ parentID: null,
46
+ creatorID,
47
+ path: null,
48
+ dateCreated,
49
+ dateUpdated: dateCreated,
50
+ fileSize: 0,
51
+ });
52
+ const path = `${snapshotRoot.appFileID}/`;
53
+ snapshotRoot.path = path;
54
+ await this.db.appFiles.statements.update({
55
+ path
56
+ }, {
57
+ appFileID: snapshotRoot.appFileID
58
+ });
59
+ const version = await this.db.websiteVersions.statements.insert({
60
+ authorID: creatorID,
61
+ dateCreated,
62
+ folderID,
63
+ snapshotFolderID: snapshotRoot.appFileID
64
+ });
65
+ // delete previous versions...
66
+ await this.db.appFiles
67
+ .asQuery()
68
+ .delete(version, (p) => (x) => x.websiteVersions.some((w) => w.folderID === p.folderID && w.snapshotFolderID !== p.snapshotFolderID));
69
+ await this.db.websiteVersions
70
+ .asQuery()
71
+ .delete(version, (p) => (x) => x.folderID === p.folderID && x.snapshotFolderID !== p.snapshotFolderID);
72
+ }
73
+ };
74
+ __decorate([
75
+ Inject,
76
+ __metadata("design:type", SocialMailContext)
77
+ ], WebSiteVersionService.prototype, "db", void 0);
78
+ __decorate([
79
+ Inject,
80
+ __metadata("design:type", SessionUser)
81
+ ], WebSiteVersionService.prototype, "user", void 0);
82
+ WebSiteVersionService = __decorate([
83
+ RegisterScoped
84
+ ], WebSiteVersionService);
85
+ export default WebSiteVersionService;
86
+ //# sourceMappingURL=WebSiteVersionService.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"WebSiteVersionService.js","sourceRoot":"","sources":["../../../../src/server/services/files/WebSiteVersionService.ts"],"names":[],"mappings":"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"}