@dosgato/api 1.0.8 → 1.0.10
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.
- package/dist/access/access.resolver.d.ts +0 -2
- package/dist/access/access.resolver.js +2 -13
- package/dist/access/access.resolver.js.map +1 -1
- package/dist/asset/asset.service.js +2 -1
- package/dist/asset/asset.service.js.map +1 -1
- package/dist/assetrule/assetrule.model.js +1 -1
- package/dist/assetrule/assetrule.model.js.map +1 -1
- package/dist/data/data.service.d.ts +1 -1
- package/dist/data/data.service.js +32 -26
- package/dist/data/data.service.js.map +1 -1
- package/dist/datafolder/datafolder.service.d.ts +1 -0
- package/dist/datafolder/datafolder.service.js +17 -23
- package/dist/datafolder/datafolder.service.js.map +1 -1
- package/dist/dataroot/dataroot.model.d.ts +1 -0
- package/dist/dataroot/dataroot.model.js +4 -0
- package/dist/dataroot/dataroot.model.js.map +1 -1
- package/dist/dataroot/dataroot.service.js +2 -2
- package/dist/dataroot/dataroot.service.js.map +1 -1
- package/dist/datarule/datarule.database.js +13 -1
- package/dist/datarule/datarule.database.js.map +1 -1
- package/dist/datarule/datarule.model.d.ts +4 -0
- package/dist/datarule/datarule.model.js +14 -1
- package/dist/datarule/datarule.model.js.map +1 -1
- package/dist/datarule/datarule.service.d.ts +1 -0
- package/dist/datarule/datarule.service.js +20 -4
- package/dist/datarule/datarule.service.js.map +1 -1
- package/dist/migrations.js +8 -0
- package/dist/migrations.js.map +1 -1
- package/dist/page/page.service.d.ts +1 -1
- package/dist/page/page.service.js +18 -29
- package/dist/page/page.service.js.map +1 -1
- package/dist/util/authservice.js +3 -12
- package/dist/util/authservice.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datafolder.service.js","sourceRoot":"","sources":["../../src/datafolder/datafolder.service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"datafolder.service.js","sourceRoot":"","sources":["../../src/datafolder/datafolder.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,6 +54,10 @@ __decorate([
|
|
|
54
54
|
Field(type => Boolean, { nullable: true, description: 'true -> return only dataroots that are not associated with a site; false -> return only dataroots that are associated with a site; null -> return global and non-global dataroots' }),
|
|
55
55
|
__metadata("design:type", Boolean)
|
|
56
56
|
], DataRootFilter.prototype, "global", void 0);
|
|
57
|
+
__decorate([
|
|
58
|
+
Field(type => Boolean, { nullable: true, description: 'Return dataroots the current user should see in the data management UI.' }),
|
|
59
|
+
__metadata("design:type", Boolean)
|
|
60
|
+
], DataRootFilter.prototype, "viewForEdit", void 0);
|
|
57
61
|
DataRootFilter = __decorate([
|
|
58
62
|
InputType()
|
|
59
63
|
], DataRootFilter);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataroot.model.js","sourceRoot":"","sources":["../../src/dataroot/dataroot.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACjF,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAGvD,WAAM,QAAQ,GAAd,MAAM,QAAQ;IAUnB,YAAa,IAAsB,EAAE,QAAkB;QACrD,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,EAAE,EAAE,IAAI,QAAQ,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAA;QAClD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;CACF,CAAA;AAbC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;;oCACR;AAGV;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjC,IAAI;sCAAA;AAGX;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC;8BACd,QAAQ;0CAAA;AARP,QAAQ;IADpB,UAAU,CAAC,EAAE,WAAW,EAAE,gMAAgM,EAAE,CAAC;6CAW7K,QAAQ;GAV5C,QAAQ,CAepB;AAGM,WAAM,cAAc,GAApB,MAAM,cAAc;
|
|
1
|
+
{"version":3,"file":"dataroot.model.js","sourceRoot":"","sources":["../../src/dataroot/dataroot.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAA;AACjF,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAGvD,WAAM,QAAQ,GAAd,MAAM,QAAQ;IAUnB,YAAa,IAAsB,EAAE,QAAkB;QACrD,IAAI,CAAC,EAAE,GAAG,GAAG,IAAI,EAAE,EAAE,IAAI,QAAQ,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAA;QAClD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAA;IAC1B,CAAC;CACF,CAAA;AAbC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;;oCACR;AAGV;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjC,IAAI;sCAAA;AAGX;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC;8BACd,QAAQ;0CAAA;AARP,QAAQ;IADpB,UAAU,CAAC,EAAE,WAAW,EAAE,gMAAgM,EAAE,CAAC;6CAW7K,QAAQ;GAV5C,QAAQ,CAepB;AAGM,WAAM,cAAc,GAApB,MAAM,cAAc;CAoB1B,CAAA;AAlBC;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC1B;AAGd;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,qEAAqE,EAAE,CAAC;;oDACrG;AAKvB;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,mEAAmE,EAAE,CAAC;;+CACxG;AAGlB;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,8LAA8L,EAAE,CAAC;;gDACtO;AAGxB;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,mLAAmL,EAAE,CAAC;;8CAC7N;AAGhB;IADC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,EAAE,yEAAyE,EAAE,CAAC;;mDAC9G;AAnBV,cAAc;IAD1B,SAAS,EAAE;GACC,cAAc,CAoB1B;AAGM,WAAM,mBAAmB,GAAzB,MAAM,mBAAmB;CAAG,CAAA;AAAtB,mBAAmB;IAD/B,UAAU,EAAE;GACA,mBAAmB,CAAG;AAEnC,MAAM,CAAN,IAAY,kBAEX;AAFD,WAAY,kBAAkB;IAC5B,uCAAiB,CAAA;AACnB,CAAC,EAFW,kBAAkB,KAAlB,kBAAkB,QAE7B;AACD,gBAAgB,CAAC,kBAAkB,EAAE;IACnC,IAAI,EAAE,oBAAoB;IAC1B,WAAW,EAAE,6EAA6E;CAC3F,CAAC,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { intersect, isNotNull, keyby } from 'txstate-utils';
|
|
1
|
+
import { filterAsync, intersect, isNotNull, keyby } from 'txstate-utils';
|
|
2
2
|
import { DataRoot, DosGatoService, SiteServiceInternal, TemplateService, TemplateType } from '../internal.js';
|
|
3
3
|
export class DataRootService extends DosGatoService {
|
|
4
4
|
async find(filter) {
|
|
@@ -36,7 +36,7 @@ export class DataRootService extends DosGatoService {
|
|
|
36
36
|
pairs = intersect({ skipEmpty: true }, pairs, idPairs);
|
|
37
37
|
const filledPairs = pairs.map(p => ({ site: sitesById[p.siteId ?? ''], template: this.templatesById.get(p.templateId) }));
|
|
38
38
|
const dataRoots = filledPairs.filter(p => p.template).map(p => new DataRoot(p.site, p.template));
|
|
39
|
-
return await this.removeUnauthorized(dataRoots);
|
|
39
|
+
return filter.viewForEdit ? await filterAsync(dataRoots, async (dr) => await this.mayViewForEdit(dr)) : await this.removeUnauthorized(dataRoots);
|
|
40
40
|
}
|
|
41
41
|
async findBySite(site, filter) {
|
|
42
42
|
return await this.find({ ...filter, siteIds: [site.id], global: false });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dataroot.service.js","sourceRoot":"","sources":["../../src/dataroot/dataroot.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"dataroot.service.js","sourceRoot":"","sources":["../../src/dataroot/dataroot.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACxE,OAAO,EAAmB,QAAQ,EAAuB,cAAc,EAAa,mBAAmB,EAAiB,eAAe,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AAE7K,MAAM,OAAO,eAAgB,SAAQ,cAAwB;IAK3D,KAAK,CAAC,IAAI,CAAE,MAAuB;QACjC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAA;QACjD,IAAI,CAAC,aAAa,KAAlB,IAAI,CAAC,aAAa,GAAK,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,EAAE,QAAQ,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,EAAA;QAClK,IAAI,CAAC,cAAc,KAAnB,IAAI,CAAC,cAAc,GAAK,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,EAAE,IAAI,GAAG,EAAE,CAAC,EAAA;QACrI,MAAM,KAAN,MAAM,GAAK,EAAE,EAAA;QACb,MAAM,OAAO,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE;YAC1C,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;YAC1C,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,EAAE,CAAA;QACzE,CAAC,CAAC,CAAA;QACF,MAAM,CAAC,WAAW,GAAG,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAA;QACvG,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,WAAW,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,aAAc,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;QAC9J,MAAM,CAAC,OAAO,GAAG,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAA;QAE7G,MAAM,SAAS,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM;YAC1C,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,cAAe,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC;YAC7E,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAA;QAC3C,IAAI,KAAK,GAA8C,EAAE,CAAA;QACzD,IAAI,MAAM,CAAC,MAAM,KAAK,KAAK;YAAE,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;QACtF,IAAI,SAAS,GAAyB,EAAE,CAAA;QACxC,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI,EAAE;YAC1B,IAAI,KAAa,CAAA;YACjB,IAAI,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE;gBAC1B,KAAK,GAAG,CAAC,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE,CAAC,MAAM,WAAW,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;aAC9G;iBAAM;gBACL,IAAI,CAAC,QAAQ,KAAb,IAAI,CAAC,QAAQ,GAAK,MAAM,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,CAAC,IAAI,EAAE,EAAA;gBAC5D,KAAK,GAAG,IAAI,CAAC,QAAQ,CAAA;aACtB;YACD,SAAS,GAAG,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;YAC9B,KAAK,MAAM,IAAI,IAAI,KAAK;gBAAE,KAAK,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAA;SACrG;QACD,KAAK,GAAG,SAAS,CAAC,EAAE,SAAS,EAAE,IAAI,EAAE,EAAE,KAAK,EAAE,OAAO,CAAC,CAAA;QACtD,MAAM,WAAW,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,CAAC,aAAc,CAAC,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAA;QAC1H,MAAM,SAAS,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,QAAS,CAAC,CAAC,CAAA;QACjG,OAAO,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,WAAW,CAAC,SAAS,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAA;IAChJ,CAAC;IAED,KAAK,CAAC,UAAU,CAAE,IAAU,EAAE,MAAuB;QACnD,OAAO,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,OAAO,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,CAAA;IAC1E,CAAC;IAED,KAAK,CAAC,YAAY,CAAE,MAAkB;QACpC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM;YAC7B,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC;YAChG,CAAC,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;QACvE,OAAO,SAAS,CAAC,CAAC,CAAC,CAAA;IACrB,CAAC;IAED,KAAK,CAAC,OAAO,CAAE,GAAa;QAC1B,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IACjD,CAAC;IAED,KAAK,CAAC,cAAc,CAAE,GAAa;QACjC,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,aAAa,CAAC,CAAA;IACxD,CAAC;IAED,KAAK,CAAC,SAAS,CAAE,GAAa;QAC5B,OAAO,MAAM,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAA;IACnD,CAAC;CACF"}
|
|
@@ -19,6 +19,9 @@ function processFilters(filter) {
|
|
|
19
19
|
ors.push(`datarules.siteId IN (${db.in(binds, siteIds)})`);
|
|
20
20
|
where.push(ors.join('OR'));
|
|
21
21
|
}
|
|
22
|
+
if (filter?.global != null) {
|
|
23
|
+
where.push('datarules.isGlobal = ' + String(Number(filter.global)));
|
|
24
|
+
}
|
|
22
25
|
if (filter?.templateIds?.length) {
|
|
23
26
|
const ors = [];
|
|
24
27
|
if (filter.templateIds.some(id => !id))
|
|
@@ -34,7 +37,7 @@ export async function getDataRules(filter) {
|
|
|
34
37
|
const { binds, where } = processFilters(filter);
|
|
35
38
|
const rules = await db.getall(`SELECT * FROM datarules
|
|
36
39
|
WHERE (${where.join(') AND (')})
|
|
37
|
-
ORDER BY siteId, path`, binds);
|
|
40
|
+
ORDER BY siteId, isGlobal, path`, binds);
|
|
38
41
|
return rules.map(row => new DataRule(row));
|
|
39
42
|
}
|
|
40
43
|
export async function createDataRule(args) {
|
|
@@ -44,6 +47,8 @@ export async function createDataRule(args) {
|
|
|
44
47
|
throw new Error('Must include a role ID when creating an asset rule');
|
|
45
48
|
}
|
|
46
49
|
binds.push(args.roleId);
|
|
50
|
+
columns.push('isGlobal');
|
|
51
|
+
binds.push(args.global ?? 0);
|
|
47
52
|
if (args.siteId) {
|
|
48
53
|
columns.push('siteId');
|
|
49
54
|
binds.push(args.siteId);
|
|
@@ -99,6 +104,13 @@ export async function updateDataRule(args) {
|
|
|
99
104
|
else {
|
|
100
105
|
binds.push(null);
|
|
101
106
|
}
|
|
107
|
+
updates.push('isGlobal = ?');
|
|
108
|
+
if (args.global) {
|
|
109
|
+
binds.push(1);
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
binds.push(0);
|
|
113
|
+
}
|
|
102
114
|
updates.push('templateId = ?');
|
|
103
115
|
if (args.templateId) {
|
|
104
116
|
const templateId = await db.getval('SELECT id FROM templates WHERE `key` = ?', [args.templateId]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datarule.database.js","sourceRoot":"","sources":["../../src/datarule/datarule.database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AACzC,OAAO,EAAE,QAAQ,EAA2E,MAAM,gBAAgB,CAAA;AAElH,SAAS,cAAc,CAAE,MAAsB;IAC7C,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,MAAM,KAAK,GAAa,EAAE,CAAA;IAC1B,IAAI,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE;QACvB,KAAK,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;KAC5D;IACD,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,KAAK,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;KACpE;IACD,IAAI,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE;QAC3B,MAAM,GAAG,GAAG,EAAE,CAAA;QACd,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAAE,GAAG,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAA;QACxE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAChD,IAAI,OAAO,CAAC,MAAM;YAAE,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QAC9E,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;KAC3B;IACD,IAAI,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE;QAC/B,MAAM,GAAG,GAAG,EAAE,CAAA;QACd,IAAI,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAAE,GAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAA;QAChF,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QACxD,IAAI,WAAW,CAAC,MAAM;YAAE,GAAG,CAAC,IAAI,CAAC,4BAA4B,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,CAAA;QAC1F,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;KAC3B;IACD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;AACzB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAE,MAAsB;IACxD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;IAC/C,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC;0CACU,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"datarule.database.js","sourceRoot":"","sources":["../../src/datarule/datarule.database.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,7 @@ export declare class DataRule {
|
|
|
20
20
|
type: string;
|
|
21
21
|
grants: DataRuleGrants;
|
|
22
22
|
path: string;
|
|
23
|
+
global: boolean;
|
|
23
24
|
templateId?: string;
|
|
24
25
|
roleId: string;
|
|
25
26
|
siteId?: string;
|
|
@@ -29,11 +30,13 @@ export declare class DataRuleFilter {
|
|
|
29
30
|
ids?: string[];
|
|
30
31
|
roleIds?: string[];
|
|
31
32
|
siteIds?: (string | null)[];
|
|
33
|
+
global?: boolean;
|
|
32
34
|
templateIds?: (string | null)[];
|
|
33
35
|
}
|
|
34
36
|
export declare class CreateDataRuleInput {
|
|
35
37
|
roleId: string;
|
|
36
38
|
siteId?: string;
|
|
39
|
+
global?: boolean;
|
|
37
40
|
templateId?: string;
|
|
38
41
|
path?: string;
|
|
39
42
|
grants?: DataRuleGrantsBase;
|
|
@@ -41,6 +44,7 @@ export declare class CreateDataRuleInput {
|
|
|
41
44
|
export declare class UpdateDataRuleInput {
|
|
42
45
|
ruleId: string;
|
|
43
46
|
siteId?: string;
|
|
47
|
+
global?: boolean;
|
|
44
48
|
templateId?: string;
|
|
45
49
|
path?: string;
|
|
46
50
|
grants?: DataRuleGrantsBase;
|
|
@@ -63,7 +63,7 @@ export let DataRuleGrants = class DataRuleGrants extends DataRuleGrantsBase {
|
|
|
63
63
|
if (row) {
|
|
64
64
|
this.view = true;
|
|
65
65
|
this.viewlatest = this.update || this.publish || !!row.viewlatest;
|
|
66
|
-
this.viewForEdit =
|
|
66
|
+
this.viewForEdit = true;
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
};
|
|
@@ -93,6 +93,7 @@ export let DataRule = class DataRule {
|
|
|
93
93
|
this.templateId = optionalString(row.templateId);
|
|
94
94
|
this.grants = new DataRuleGrants(row);
|
|
95
95
|
this.path = row.path;
|
|
96
|
+
this.global = row.isGlobal;
|
|
96
97
|
}
|
|
97
98
|
};
|
|
98
99
|
__decorate([
|
|
@@ -111,6 +112,10 @@ __decorate([
|
|
|
111
112
|
Field({ description: 'Folder to which this rule should apply. We take a path so that it could apply to the same folder name in multiple sites or multiple template types, if site or template is left null.' }),
|
|
112
113
|
__metadata("design:type", String)
|
|
113
114
|
], DataRule.prototype, "path", void 0);
|
|
115
|
+
__decorate([
|
|
116
|
+
Field({ description: 'The rule only applies to global data.' }),
|
|
117
|
+
__metadata("design:type", Boolean)
|
|
118
|
+
], DataRule.prototype, "global", void 0);
|
|
114
119
|
DataRule = __decorate([
|
|
115
120
|
ObjectType({ description: 'A rule that grants data-related privileges. Each role has multiple rules, each rule belonging only to that role.' }),
|
|
116
121
|
__metadata("design:paramtypes", [Object])
|
|
@@ -130,6 +135,10 @@ __decorate([
|
|
|
130
135
|
Field({ nullable: true }),
|
|
131
136
|
__metadata("design:type", String)
|
|
132
137
|
], CreateDataRuleInput.prototype, "siteId", void 0);
|
|
138
|
+
__decorate([
|
|
139
|
+
Field({ nullable: true }),
|
|
140
|
+
__metadata("design:type", Boolean)
|
|
141
|
+
], CreateDataRuleInput.prototype, "global", void 0);
|
|
133
142
|
__decorate([
|
|
134
143
|
Field({ nullable: true }),
|
|
135
144
|
__metadata("design:type", String)
|
|
@@ -155,6 +164,10 @@ __decorate([
|
|
|
155
164
|
Field({ nullable: true }),
|
|
156
165
|
__metadata("design:type", String)
|
|
157
166
|
], UpdateDataRuleInput.prototype, "siteId", void 0);
|
|
167
|
+
__decorate([
|
|
168
|
+
Field({ nullable: true }),
|
|
169
|
+
__metadata("design:type", Boolean)
|
|
170
|
+
], UpdateDataRuleInput.prototype, "global", void 0);
|
|
158
171
|
__decorate([
|
|
159
172
|
Field({ nullable: true }),
|
|
160
173
|
__metadata("design:type", String)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datarule.model.js","sourceRoot":"","sources":["../../src/datarule/datarule.model.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,iBAAiB,EAA8B,MAAM,6BAA6B,CAAA;AAC3F,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAA;AAC9C,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAC/D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AAIlC,WAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAsB7B,YAAa,GAAS;QACpB,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAA;YAC1B,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAA;YAC1B,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,IAAI,CAAA;YACtB,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;YAC5B,IAAI,CAAC,SAAS,GAAG,CAAC,CAAC,GAAG,CAAC,SAAS,CAAA;YAChC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAA;YAC1B,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAA;SAC/B;IACH,CAAC;CACF,CAAA;AA/BC;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,qFAAqF,EAAE,CAAC;;kDAC9F;AAGhB;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,qFAAqF,EAAE,CAAC;;kDAC9F;AAGhB;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,kJAAkJ,EAAE,CAAC;;gDAC7J;AAGd;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,sFAAsF,EAAE,CAAC;;mDAC9F;AAGjB;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,mFAAmF,EAAE,CAAC;;qDACzF;AAGnB;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,qFAAqF,EAAE,CAAC;;kDAC9F;AAGhB;IADC,KAAK,CAAC,EAAE,WAAW,EAAE,kFAAkF,EAAE,CAAC;;oDACzF;AApBP,kBAAkB;IAF9B,UAAU,EAAE;IACZ,SAAS,EAAE;;GACC,kBAAkB,CAiC9B;AAIM,WAAM,cAAc,GAApB,MAAM,cAAe,SAAQ,kBAAkB;IAUpD,YAAa,GAAS;QACpB,KAAK,CAAC,GAAG,CAAC,CAAA;QACV,IAAI,GAAG,EAAE;YACP,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;YAChB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC,GAAG,CAAC,UAAU,CAAA;YACjE,IAAI,CAAC,WAAW,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"datarule.model.js","sourceRoot":"","sources":["../../src/datarule/datarule.model.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ export declare class DataRuleService extends DosGatoService<DataRule> {
|
|
|
19
19
|
update(args: UpdateDataRuleInput, validateOnly?: boolean): Promise<DataRuleResponse>;
|
|
20
20
|
delete(ruleId: string): Promise<ValidatedResponse>;
|
|
21
21
|
static applies(rule: DataRule, itemOrFolder: Data | DataFolder, pathWithoutSite: string): boolean;
|
|
22
|
+
static appliesRaw(r: DataRule, templateId: string, pathWithoutSite: string, siteId?: string): boolean;
|
|
22
23
|
static appliesToSiteAndTemplate(r: DataRule, item: Data | DataFolder): boolean;
|
|
23
24
|
static appliesToPath(r: DataRule, dataPathWithoutSite: string): boolean;
|
|
24
25
|
appliesToFolder(rule: DataRule, folder: DataFolder): Promise<boolean>;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { OneToManyLoader, PrimaryKeyLoader } from 'dataloader-factory';
|
|
2
|
-
import { Cache, isNotNull } from 'txstate-utils';
|
|
2
|
+
import { Cache, isNotNull, pick } from 'txstate-utils';
|
|
3
3
|
import { BaseService, ValidatedResponse } from '@txstate-mws/graphql-server';
|
|
4
4
|
import { tooPowerfulHelper, DosGatoService, getDataRules, DataRule, createDataRule, updateDataRule, deleteDataRule, RoleService, DataRuleResponse, RoleServiceInternal, DataServiceInternal, shiftPath, DataFolderServiceInternal } from '../internal.js';
|
|
5
5
|
const dataRulesByIdLoader = new PrimaryKeyLoader({
|
|
@@ -84,7 +84,9 @@ export class DataRuleService extends DosGatoService {
|
|
|
84
84
|
if (!await this.svc(RoleService).mayCreateRules(role))
|
|
85
85
|
throw new Error('You are not permitted to add rules to this role.');
|
|
86
86
|
const response = new DataRuleResponse({ success: true });
|
|
87
|
-
const newRule = new DataRule({ id: '0',
|
|
87
|
+
const newRule = new DataRule({ id: '0', ...pick(args, 'roleId', 'siteId', 'global', 'templateId'), path: args.path ?? '/', ...args.grants });
|
|
88
|
+
if (newRule.global && newRule.siteId)
|
|
89
|
+
throw new Error('A rule that is limited to global data and also limited to a site cannot logically exist.');
|
|
88
90
|
if (await this.tooPowerful(newRule))
|
|
89
91
|
response.addMessage('The proposed rule would have more privilege than you currently have, so you cannot create it.');
|
|
90
92
|
if (isNotNull(args.path)) {
|
|
@@ -120,10 +122,13 @@ export class DataRuleService extends DosGatoService {
|
|
|
120
122
|
id: '0',
|
|
121
123
|
roleId: rule.roleId,
|
|
122
124
|
siteId: args.siteId,
|
|
125
|
+
global: args.global,
|
|
123
126
|
templateId: args.templateId,
|
|
124
127
|
path: args.path ?? '/',
|
|
125
128
|
...updatedGrants
|
|
126
129
|
});
|
|
130
|
+
if (newRule.global && newRule.siteId)
|
|
131
|
+
throw new Error('A rule that is limited to global data and also limited to a site cannot logically exist.');
|
|
127
132
|
const response = new DataRuleResponse({ success: true });
|
|
128
133
|
if (await this.tooPowerful(newRule))
|
|
129
134
|
response.addMessage('The updated rule would have more privilege than you currently have, so you cannot create it.');
|
|
@@ -157,8 +162,17 @@ export class DataRuleService extends DosGatoService {
|
|
|
157
162
|
static applies(rule, itemOrFolder, pathWithoutSite) {
|
|
158
163
|
return this.appliesToSiteAndTemplate(rule, itemOrFolder) && this.appliesToPath(rule, pathWithoutSite);
|
|
159
164
|
}
|
|
165
|
+
static appliesRaw(r, templateId, pathWithoutSite, siteId) {
|
|
166
|
+
if (siteId && r.global)
|
|
167
|
+
return false;
|
|
168
|
+
if (r.siteId && r.siteId !== siteId)
|
|
169
|
+
return false;
|
|
170
|
+
if (r.templateId && r.templateId !== templateId)
|
|
171
|
+
return false;
|
|
172
|
+
return this.appliesToPath(r, pathWithoutSite);
|
|
173
|
+
}
|
|
160
174
|
static appliesToSiteAndTemplate(r, item) {
|
|
161
|
-
if (
|
|
175
|
+
if (item.siteId && r.global)
|
|
162
176
|
return false;
|
|
163
177
|
if (r.siteId && r.siteId !== item.siteId)
|
|
164
178
|
return false;
|
|
@@ -178,7 +192,9 @@ export class DataRuleService extends DosGatoService {
|
|
|
178
192
|
return folderPath.startsWith(rule.path);
|
|
179
193
|
}
|
|
180
194
|
asOrMorePowerful(ruleA, ruleB) {
|
|
181
|
-
if (ruleA.
|
|
195
|
+
if (ruleA.global && ruleB.siteId)
|
|
196
|
+
return false;
|
|
197
|
+
if (ruleA.siteId && (ruleA.siteId !== ruleB.siteId || ruleB.global))
|
|
182
198
|
return false;
|
|
183
199
|
return ruleB.path.startsWith(ruleA.path);
|
|
184
200
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datarule.service.js","sourceRoot":"","sources":["../../src/datarule/datarule.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AACtE,OAAO,EAAE,KAAK,EAAe,SAAS,EAAE,MAAM,eAAe,CAAA;
|
|
1
|
+
{"version":3,"file":"datarule.service.js","sourceRoot":"","sources":["../../src/datarule/datarule.service.ts"],"names":[],"mappings":"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"}
|
package/dist/migrations.js
CHANGED
|
@@ -33,6 +33,14 @@ const dgMigrations = [
|
|
|
33
33
|
run: async (db) => {
|
|
34
34
|
await db.execute('CREATE INDEX `completed_idx` ON `requestedresizes`(`completed`)');
|
|
35
35
|
}
|
|
36
|
+
},
|
|
37
|
+
{
|
|
38
|
+
id: 20230701053000,
|
|
39
|
+
description: 'add global flag to datarules and index on binaries.mime',
|
|
40
|
+
run: async (db) => {
|
|
41
|
+
await db.execute('ALTER TABLE datarules ADD COLUMN isGlobal TINYINT UNSIGNED NOT NULL DEFAULT 0');
|
|
42
|
+
await db.execute('CREATE INDEX `mime_idx` ON `binaries`(`mime`)');
|
|
43
|
+
}
|
|
36
44
|
}
|
|
37
45
|
];
|
|
38
46
|
export async function migrations(moreMigrations) {
|
package/dist/migrations.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"migrations.js","sourceRoot":"","sources":["../src/migrations.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,iBAAiB,CAAA;AAEhC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AACtC,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA;AACpC,OAAO,EAAoB,gBAAgB,EAAE,MAAM,eAAe,CAAA;AAElE,MAAM,YAAY,GAAkB;IAClC;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,uBAAuB;QACpC,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE;YAChB,MAAM,gBAAgB,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;YAC/B,MAAM,IAAI,CAAC,EAAE,CAAC,CAAA;YACd,MAAM,MAAM,CAAC,EAAE,CAAC,CAAA;QAClB,CAAC;KACF;IACD;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,0CAA0C;QACvD,GAAG,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACd,MAAM,EAAE,CAAC,OAAO,CAAC,mDAAmD,CAAC,CAAA;YACrE,MAAM,EAAE,CAAC,OAAO,CAAC,kDAAkD,CAAC,CAAA;QACtE,CAAC;KACF;IACD;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,wBAAwB;QACrC,GAAG,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACd,MAAM,EAAE,CAAC,OAAO,CAAC,yDAAyD,CAAC,CAAA;QAC7E,CAAC;KACF;IACD;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,qCAAqC;QAClD,GAAG,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACd,MAAM,EAAE,CAAC,OAAO,CAAC,iEAAiE,CAAC,CAAA;QACrF,CAAC;KACF;IACD;QACE,EAAE,EAAE,cAAc;QAClB,WAAW,EAAE,yDAAyD;QACtE,GAAG,EAAE,KAAK,EAAC,EAAE,EAAC,EAAE;YACd,MAAM,EAAE,CAAC,OAAO,CAAC,+EAA+E,CAAC,CAAA;YACjG,MAAM,EAAE,CAAC,OAAO,CAAC,+CAA+C,CAAC,CAAA;QACnE,CAAC;KACF;CACF,CAAA;AAED,MAAM,CAAC,KAAK,UAAU,UAAU,CAAE,cAA8B;IAC9D,MAAM,EAAE,CAAC,IAAI,EAAE,CAAA;IACf,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;IAC9C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE;QACjC,MAAM,EAAE,CAAC,OAAO,CAAC;;;;;KAKhB,CAAC,CAAA;KACH;IAED,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC,OAAO,CAAS,0BAA0B,CAAC,CAAC,CAAA;IAC7E,MAAM,aAAa,GAAG,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,cAAc,IAAI,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;IAC7E,KAAK,MAAM,SAAS,IAAI,aAAa,EAAE;QACrC,IAAI,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;YAAE,SAAQ;QACvC,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;YAC9B,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE;gBAC9B,OAAO,CAAC,IAAI,CAAC,mBAAmB,EAAE,SAAS,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,CAAC,WAAW,CAAC,CAAA;gBAC3E,MAAM,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;gBACvB,MAAM,EAAE,CAAC,MAAM,CAAC,uCAAuC,EAAE,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC,CAAA;gBACxE,OAAO,CAAC,IAAI,CAAC,0BAA0B,EAAE,SAAS,CAAC,EAAE,CAAC,CAAA;aACvD;QACH,CAAC,CAAC,CAAA;KACH;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,OAAO;IAC3B,OAAO,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;IAClC,MAAM,EAAE,CAAC,WAAW,CAAC,KAAK,EAAC,EAAE,EAAC,EAAE;QAC9B,MAAM,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAA;QAC9C,MAAM,OAAO,CAAC,GAAG,CAAC;YAChB,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;YAC9C,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;YAC9C,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC;YACvC,EAAE,CAAC,OAAO,CAAC,0CAA0C,CAAC;YACtD,EAAE,CAAC,OAAO,CAAC,iCAAiC,CAAC;YAC7C,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,sCAAsC,CAAC;YAClD,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC;YAC1C,EAAE,CAAC,OAAO,CAAC,uCAAuC,CAAC;YACnD,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;YAC9C,EAAE,CAAC,OAAO,CAAC,mCAAmC,CAAC;YAC/C,EAAE,CAAC,OAAO,CAAC,mCAAmC,CAAC;YAC/C,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC;YAChD,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC;YACzC,EAAE,CAAC,OAAO,CAAC,qCAAqC,CAAC;YACjD,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC;YAChD,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;YAC9C,EAAE,CAAC,OAAO,CAAC,+BAA+B,CAAC;YAC3C,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC;YACxC,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC;YACxC,EAAE,CAAC,OAAO,CAAC,6BAA6B,CAAC;YACzC,EAAE,CAAC,OAAO,CAAC,+BAA+B,CAAC;YAC3C,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,mCAAmC,CAAC;YAC/C,EAAE,CAAC,OAAO,CAAC,oCAAoC,CAAC;YAChD,EAAE,CAAC,OAAO,CAAC,gCAAgC,CAAC;YAC5C,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC;YAC1C,EAAE,CAAC,OAAO,CAAC,2BAA2B,CAAC;YACvC,EAAE,CAAC,OAAO,CAAC,+BAA+B,CAAC;YAC3C,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC;YACxC,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC;YACxC,EAAE,CAAC,OAAO,CAAC,iCAAiC,CAAC;YAC7C,EAAE,CAAC,OAAO,CAAC,kCAAkC,CAAC;YAC9C,EAAE,CAAC,OAAO,CAAC,8BAA8B,CAAC;SAC3C,CAAC,CAAA;QACF,MAAM,EAAE,CAAC,OAAO,CAAC,4BAA4B,CAAC,CAAA;IAChD,CAAC,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,MAAM,CAAE,MAAiB,EAAE;IAC/C,MAAM,aAAa,GAAG,MAAM,GAAG,CAAC,MAAM,CAAC,+CAA+C,CAAC,CAAA;IACvF,MAAM,CAAC,EAAC,EAAC,EAAC,EAAC,EAAC,EAAC,MAAM,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACvC,GAAG,CAAC,MAAM,CAAC,wJAAwJ,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvM,GAAG,CAAC,MAAM,CAAC,0GAA0G,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACtJ,GAAG,CAAC,MAAM,CAAC,0GAA0G,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACtJ,GAAG,CAAC,MAAM,CAAC,qIAAqI,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvL,GAAG,CAAC,MAAM,CAAC,qIAAqI,EAAE,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvL,GAAG,CAAC,MAAM,CAAC,0DAA0D,EAAE,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC;QAC1F,GAAG,CAAC,MAAM,CAAC,mKAAmK,CAAC;KAChL,CAAC,CAAA;IACF,MAAM,GAAG,CAAC,MAAM,CAAC,wDAAwD,EAAE,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAA;AACrG,CAAC"}
|
|
@@ -14,6 +14,7 @@ export declare class PageServiceInternal extends BaseService {
|
|
|
14
14
|
getRootPage(page: Page): Promise<Page | undefined>;
|
|
15
15
|
getPath(page: Page): Promise<string>;
|
|
16
16
|
getData(page: Page, version?: number, published?: boolean, toSchemaVersion?: DateTime): Promise<PageData>;
|
|
17
|
+
pageExtras(page: Page): Promise<PageExtras>;
|
|
17
18
|
processFilters(filter: PageFilter): Promise<PageFilter>;
|
|
18
19
|
}
|
|
19
20
|
export declare class PageService extends DosGatoService<Page> {
|
|
@@ -63,7 +64,6 @@ export declare class PageService extends DosGatoService<Page> {
|
|
|
63
64
|
updatePage(dataId: string, dataVersion: number, data: PageData, comment?: string, validateOnly?: boolean): Promise<PageResponse>;
|
|
64
65
|
restorePage(dataId: string, restoreVersion: number, validateOnly?: boolean): Promise<PageResponse>;
|
|
65
66
|
checkLatestVersion(dataId: string, dataVersion: number): Promise<void>;
|
|
66
|
-
pageExtras(page: Page): Promise<PageExtras>;
|
|
67
67
|
updatePageProperties(dataId: string, dataVersion: number, editedSchemaVersion: DateTime, data: ComponentData, comment?: string, validateOnly?: boolean): Promise<PageResponse>;
|
|
68
68
|
updateComponent(dataId: string, dataVersion: number, editedSchemaVersion: DateTime, path: string, data: ComponentData, comment?: string, validateOnly?: boolean): Promise<PageResponse>;
|
|
69
69
|
addComponent(dataId: string, dataVersion: number, editedSchemaVersion: DateTime, path: string, data: ComponentData, isCopy?: boolean, comment?: string, validateOnly?: boolean): Promise<PageResponse>;
|
|
@@ -115,24 +115,25 @@ export class PageServiceInternal extends BaseService {
|
|
|
115
115
|
return `/${ancestors.map(a => a.name).join('/')}${ancestors.length ? '/' : ''}${page.name}`;
|
|
116
116
|
}
|
|
117
117
|
async getData(page, version, published, toSchemaVersion = templateRegistry.currentSchemaVersion) {
|
|
118
|
-
const [versioned,
|
|
118
|
+
const [versioned, extras] = await Promise.all([
|
|
119
119
|
this.svc(VersionedService).get(page.intDataId, { tag: published ? 'published' : undefined, version }),
|
|
120
|
-
this.
|
|
121
|
-
page.parentInternalId ? this.findByInternalId(page.parentInternalId) : undefined,
|
|
122
|
-
this.getPath(page)
|
|
120
|
+
this.pageExtras(page)
|
|
123
121
|
]);
|
|
124
122
|
if (!versioned)
|
|
125
123
|
throw new Error('Asked for page data version that does not exist.');
|
|
126
|
-
return await migratePage(versioned.data,
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
124
|
+
return await migratePage(versioned.data, extras, toSchemaVersion);
|
|
125
|
+
}
|
|
126
|
+
async pageExtras(page) {
|
|
127
|
+
return {
|
|
128
|
+
query: this.ctx.query.bind(this.ctx),
|
|
129
|
+
siteId: String(page.siteInternalId),
|
|
130
|
+
pagetreeId: page.pagetreeId,
|
|
131
|
+
parentId: String(page.parentInternalId),
|
|
132
|
+
pagePath: await this.getPath(page),
|
|
132
133
|
pageId: page.id,
|
|
133
134
|
linkId: page.linkId,
|
|
134
135
|
name: page.name
|
|
135
|
-
}
|
|
136
|
+
};
|
|
136
137
|
}
|
|
137
138
|
async processFilters(filter) {
|
|
138
139
|
if (filter.legacyIds?.length) {
|
|
@@ -593,18 +594,6 @@ export class PageService extends DosGatoService {
|
|
|
593
594
|
if (latestVersion.version !== dataVersion)
|
|
594
595
|
throw new Error('Unable to update page. Another user has updated the page since you loaded it. Try again after refreshing.');
|
|
595
596
|
}
|
|
596
|
-
async pageExtras(page) {
|
|
597
|
-
return {
|
|
598
|
-
query: this.ctx.query,
|
|
599
|
-
siteId: String(page.siteInternalId),
|
|
600
|
-
pagetreeId: page.pagetreeId,
|
|
601
|
-
parentId: String(page.parentInternalId),
|
|
602
|
-
pagePath: await this.raw.getPath(page),
|
|
603
|
-
pageId: page.id,
|
|
604
|
-
linkId: page.linkId,
|
|
605
|
-
name: page.name
|
|
606
|
-
};
|
|
607
|
-
}
|
|
608
597
|
async updatePageProperties(dataId, dataVersion, editedSchemaVersion, data, comment, validateOnly) {
|
|
609
598
|
if (!data.templateKey)
|
|
610
599
|
throw new Error('Component must have a templateKey.');
|
|
@@ -616,7 +605,7 @@ export class PageService extends DosGatoService {
|
|
|
616
605
|
throw new Error(`Current user is not permitted to update page ${String(page.name)}`);
|
|
617
606
|
await this.checkLatestVersion(dataId, dataVersion);
|
|
618
607
|
const pageData = await this.raw.getData(page, dataVersion);
|
|
619
|
-
const extras = await this.pageExtras(page);
|
|
608
|
+
const extras = await this.raw.pageExtras(page);
|
|
620
609
|
const migrated = await migratePage(pageData, extras, editedSchemaVersion);
|
|
621
610
|
if (migrated.templateKey !== data.templateKey)
|
|
622
611
|
throw new Error('You may not change page templates while updating properties. Use changePageTemplate instead.');
|
|
@@ -651,7 +640,7 @@ export class PageService extends DosGatoService {
|
|
|
651
640
|
throw new Error(`Current user is not permitted to update page ${String(page.name)}`);
|
|
652
641
|
await this.checkLatestVersion(dataId, dataVersion);
|
|
653
642
|
const pageData = await this.raw.getData(page, dataVersion);
|
|
654
|
-
const extras = await this.pageExtras(page);
|
|
643
|
+
const extras = await this.raw.pageExtras(page);
|
|
655
644
|
const migrated = await migratePage(pageData, extras, editedSchemaVersion);
|
|
656
645
|
const response = new PageResponse({ success: true });
|
|
657
646
|
const existing = get(migrated, path);
|
|
@@ -689,7 +678,7 @@ export class PageService extends DosGatoService {
|
|
|
689
678
|
await this.checkLatestVersion(dataId, dataVersion);
|
|
690
679
|
const pageData = await this.raw.getData(page, dataVersion);
|
|
691
680
|
// migrate the stored page data to match the schemaversion the UI was using
|
|
692
|
-
const extras = await this.pageExtras(page);
|
|
681
|
+
const extras = await this.raw.pageExtras(page);
|
|
693
682
|
const migrated = await migratePage(pageData, extras, editedSchemaVersion);
|
|
694
683
|
// perform the operation to add the component to the requested area or location
|
|
695
684
|
const toParts = path.split('.');
|
|
@@ -774,7 +763,7 @@ export class PageService extends DosGatoService {
|
|
|
774
763
|
await this.checkLatestVersion(dataId, dataVersion);
|
|
775
764
|
const pageData = await this.raw.getData(page, dataVersion);
|
|
776
765
|
// migrate the stored page data to match the schemaversion the UI was using
|
|
777
|
-
const extras = await this.pageExtras(page);
|
|
766
|
+
const extras = await this.raw.pageExtras(page);
|
|
778
767
|
let migrated = await migratePage(pageData, extras, editedSchemaVersion);
|
|
779
768
|
// perform the operation to move the component from one place to another
|
|
780
769
|
const fromObj = get(migrated, fromPath);
|
|
@@ -860,7 +849,7 @@ export class PageService extends DosGatoService {
|
|
|
860
849
|
await this.checkLatestVersion(dataId, dataVersion);
|
|
861
850
|
const pageData = await this.raw.getData(page, dataVersion);
|
|
862
851
|
// migrate the stored page data to match the schemaversion of the admin UI
|
|
863
|
-
const extras = await this.pageExtras(page);
|
|
852
|
+
const extras = await this.raw.pageExtras(page);
|
|
864
853
|
const migrated = await migratePage(pageData, extras, editedSchemaVersion);
|
|
865
854
|
// execute the deletion
|
|
866
855
|
const dataToDelete = get(migrated, path);
|
|
@@ -890,7 +879,7 @@ export class PageService extends DosGatoService {
|
|
|
890
879
|
if (!(await this.mayUpdate(page)))
|
|
891
880
|
throw new Error(`Current user is not permitted to update page ${String(page.name)}`);
|
|
892
881
|
const pageData = await this.raw.getData(page, dataVersion);
|
|
893
|
-
const extras = await this.pageExtras(page);
|
|
882
|
+
const extras = await this.raw.pageExtras(page);
|
|
894
883
|
const fullymigrated = await migratePage(pageData, extras);
|
|
895
884
|
const template = await this.svc(TemplateServiceInternal).findByKey(templateKey);
|
|
896
885
|
if (!template)
|