@rakun-kit/core 1.5.0 → 1.5.2
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/README.md +33 -24
- package/dist/cjs/api/operations/manager-contract.js +13 -5
- package/dist/cjs/api/operations/manager-contract.js.map +1 -1
- package/dist/cjs/api/operations/manager-manifest.js +7 -2
- package/dist/cjs/api/operations/manager-manifest.js.map +1 -1
- package/dist/cjs/api/operations/manager.js +6 -3
- package/dist/cjs/api/operations/manager.js.map +1 -1
- package/dist/cjs/api/routes/manager/create.js +3 -78
- package/dist/cjs/api/routes/manager/create.js.map +1 -1
- package/dist/cjs/api/routes/manager/delete.js +2 -2
- package/dist/cjs/api/routes/manager/delete.js.map +1 -1
- package/dist/cjs/api/routes/manager/duplicate.js +2 -2
- package/dist/cjs/api/routes/manager/duplicate.js.map +1 -1
- package/dist/cjs/api/routes/manager/get.js +3 -4
- package/dist/cjs/api/routes/manager/get.js.map +1 -1
- package/dist/cjs/api/routes/manager/list.js +2 -2
- package/dist/cjs/api/routes/manager/list.js.map +1 -1
- package/dist/cjs/api/routes/manager/preview/create.js +21 -0
- package/dist/cjs/api/routes/manager/preview/create.js.map +1 -1
- package/dist/cjs/api/routes/manager/template.js +111 -0
- package/dist/cjs/api/routes/manager/template.js.map +1 -0
- package/dist/cjs/api/routes/manager/translateDocument.js +2 -45
- package/dist/cjs/api/routes/manager/translateDocument.js.map +1 -1
- package/dist/cjs/api/routes/manager/trash.js +2 -2
- package/dist/cjs/api/routes/manager/trash.js.map +1 -1
- package/dist/cjs/api/routes/manager/update.js +3 -73
- package/dist/cjs/api/routes/manager/update.js.map +1 -1
- package/dist/cjs/api/routes/web/page.js +80 -29
- package/dist/cjs/api/routes/web/page.js.map +1 -1
- package/dist/cjs/api/routes/web/previewPage.js +3 -1
- package/dist/cjs/api/routes/web/previewPage.js.map +1 -1
- package/dist/cjs/api/utils/contentTemplate.js +205 -0
- package/dist/cjs/api/utils/contentTemplate.js.map +1 -0
- package/dist/cjs/client.js +2 -2
- package/dist/cjs/client.js.map +1 -1
- package/dist/cjs/contracts.js +1 -0
- package/dist/cjs/contracts.js.map +1 -1
- package/dist/cjs/index.js +6 -2
- package/dist/cjs/index.js.map +1 -1
- package/dist/cjs/internal-content-types/{LinkedIteratorTemplate.js → ContentTemplate.js} +5 -5
- package/dist/cjs/internal-content-types/ContentTemplate.js.map +1 -0
- package/dist/cjs/internal-content-types/PreviewSnapshot.js +1 -0
- package/dist/cjs/internal-content-types/PreviewSnapshot.js.map +1 -1
- package/dist/cjs/internal-content-types/TemplateContent.js +18 -0
- package/dist/cjs/internal-content-types/TemplateContent.js.map +1 -0
- package/dist/cjs/internal-content-types/index.js +2 -1
- package/dist/cjs/internal-content-types/index.js.map +1 -1
- package/dist/cjs/lib/ContentType.js +15 -24
- package/dist/cjs/lib/ContentType.js.map +1 -1
- package/dist/cjs/lib/Registry.js +26 -10
- package/dist/cjs/lib/Registry.js.map +1 -1
- package/dist/cjs/lib/systemFields.js +2 -2
- package/dist/cjs/lib/systemFields.js.map +1 -1
- package/dist/cjs/schemas/manager/create.js +0 -2
- package/dist/cjs/schemas/manager/create.js.map +1 -1
- package/dist/cjs/schemas/manager/preview.js +1 -0
- package/dist/cjs/schemas/manager/preview.js.map +1 -1
- package/dist/cjs/schemas/manager/template.js +24 -0
- package/dist/cjs/schemas/manager/template.js.map +1 -0
- package/dist/cjs/schemas/manager/update.js +0 -2
- package/dist/cjs/schemas/manager/update.js.map +1 -1
- package/dist/cjs/schemas/web/page.js +1 -0
- package/dist/cjs/schemas/web/page.js.map +1 -1
- package/dist/docs/index.md +17 -4
- package/dist/esm/api/operations/index.d.ts +21 -16
- package/dist/esm/api/operations/index.d.ts.map +1 -1
- package/dist/esm/api/operations/manager-contract.d.ts +19 -16
- package/dist/esm/api/operations/manager-contract.d.ts.map +1 -1
- package/dist/esm/api/operations/manager-contract.js +13 -5
- package/dist/esm/api/operations/manager-contract.js.map +1 -1
- package/dist/esm/api/operations/manager-manifest.d.ts +6 -1
- package/dist/esm/api/operations/manager-manifest.d.ts.map +1 -1
- package/dist/esm/api/operations/manager-manifest.js +7 -2
- package/dist/esm/api/operations/manager-manifest.js.map +1 -1
- package/dist/esm/api/operations/manager.d.ts +19 -16
- package/dist/esm/api/operations/manager.d.ts.map +1 -1
- package/dist/esm/api/operations/manager.js +6 -3
- package/dist/esm/api/operations/manager.js.map +1 -1
- package/dist/esm/api/operations/web-contract.d.ts +2 -0
- package/dist/esm/api/operations/web-contract.d.ts.map +1 -1
- package/dist/esm/api/operations/web.d.ts +2 -0
- package/dist/esm/api/operations/web.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/auth/markTourSeen.d.ts +0 -2
- package/dist/esm/api/routes/manager/auth/markTourSeen.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/auth/updateAccount.d.ts +0 -2
- package/dist/esm/api/routes/manager/auth/updateAccount.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/auth/updateTutorialPreferences.d.ts +0 -2
- package/dist/esm/api/routes/manager/auth/updateTutorialPreferences.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/contentType.d.ts +10 -1
- package/dist/esm/api/routes/manager/contentType.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/contentTypes.d.ts +10 -1
- package/dist/esm/api/routes/manager/contentTypes.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/create.d.ts +0 -1
- package/dist/esm/api/routes/manager/create.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/create.js +3 -78
- package/dist/esm/api/routes/manager/create.js.map +1 -1
- package/dist/esm/api/routes/manager/delete.js +2 -2
- package/dist/esm/api/routes/manager/delete.js.map +1 -1
- package/dist/esm/api/routes/manager/duplicate.d.ts +0 -1
- package/dist/esm/api/routes/manager/duplicate.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/duplicate.js +2 -2
- package/dist/esm/api/routes/manager/duplicate.js.map +1 -1
- package/dist/esm/api/routes/manager/get.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/get.js +3 -4
- package/dist/esm/api/routes/manager/get.js.map +1 -1
- package/dist/esm/api/routes/manager/languages.d.ts +0 -1
- package/dist/esm/api/routes/manager/languages.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/list.js +2 -2
- package/dist/esm/api/routes/manager/list.js.map +1 -1
- package/dist/esm/api/routes/manager/localeVariants.d.ts +0 -5
- package/dist/esm/api/routes/manager/localeVariants.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/preview/create.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/preview/create.js +21 -0
- package/dist/esm/api/routes/manager/preview/create.js.map +1 -1
- package/dist/esm/api/routes/manager/template.d.ts +13 -0
- package/dist/esm/api/routes/manager/template.d.ts.map +1 -0
- package/dist/esm/api/routes/manager/template.js +105 -0
- package/dist/esm/api/routes/manager/template.js.map +1 -0
- package/dist/esm/api/routes/manager/translateDocument.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/translateDocument.js +2 -45
- package/dist/esm/api/routes/manager/translateDocument.js.map +1 -1
- package/dist/esm/api/routes/manager/trash.js +2 -2
- package/dist/esm/api/routes/manager/trash.js.map +1 -1
- package/dist/esm/api/routes/manager/update.d.ts +0 -1
- package/dist/esm/api/routes/manager/update.d.ts.map +1 -1
- package/dist/esm/api/routes/manager/update.js +3 -73
- package/dist/esm/api/routes/manager/update.js.map +1 -1
- package/dist/esm/api/routes/web/page.d.ts +2 -2
- package/dist/esm/api/routes/web/page.d.ts.map +1 -1
- package/dist/esm/api/routes/web/page.js +80 -29
- package/dist/esm/api/routes/web/page.js.map +1 -1
- package/dist/esm/api/routes/web/previewPage.d.ts +1 -0
- package/dist/esm/api/routes/web/previewPage.d.ts.map +1 -1
- package/dist/esm/api/routes/web/previewPage.js +3 -1
- package/dist/esm/api/routes/web/previewPage.js.map +1 -1
- package/dist/esm/api/utils/contentTemplate.d.ts +31 -0
- package/dist/esm/api/utils/contentTemplate.d.ts.map +1 -0
- package/dist/esm/api/utils/contentTemplate.js +194 -0
- package/dist/esm/api/utils/contentTemplate.js.map +1 -0
- package/dist/esm/api/utils/getUser.d.ts +0 -2
- package/dist/esm/api/utils/getUser.d.ts.map +1 -1
- package/dist/esm/api/utils/managerNotifications.d.ts +0 -1
- package/dist/esm/api/utils/managerNotifications.d.ts.map +1 -1
- package/dist/esm/api/utils/reviews.d.ts +0 -2
- package/dist/esm/api/utils/reviews.d.ts.map +1 -1
- package/dist/esm/api/utils/routes/routeMapHelpers.d.ts +0 -1
- package/dist/esm/api/utils/routes/routeMapHelpers.d.ts.map +1 -1
- package/dist/esm/client.d.ts +2 -2
- package/dist/esm/client.d.ts.map +1 -1
- package/dist/esm/client.js +1 -1
- package/dist/esm/client.js.map +1 -1
- package/dist/esm/contracts.d.ts +1 -0
- package/dist/esm/contracts.d.ts.map +1 -1
- package/dist/esm/contracts.js +1 -0
- package/dist/esm/contracts.js.map +1 -1
- package/dist/esm/index.d.ts +1 -1
- package/dist/esm/index.d.ts.map +1 -1
- package/dist/esm/index.js +5 -1
- package/dist/esm/index.js.map +1 -1
- package/dist/esm/internal-content-types/ContentComment.d.ts +0 -5
- package/dist/esm/internal-content-types/ContentComment.d.ts.map +1 -1
- package/dist/esm/internal-content-types/ContentCommentReadState.d.ts +0 -4
- package/dist/esm/internal-content-types/ContentCommentReadState.d.ts.map +1 -1
- package/dist/esm/internal-content-types/ContentReview.d.ts +0 -13
- package/dist/esm/internal-content-types/ContentReview.d.ts.map +1 -1
- package/dist/esm/internal-content-types/ContentReviewDecision.d.ts +0 -4
- package/dist/esm/internal-content-types/ContentReviewDecision.d.ts.map +1 -1
- package/dist/esm/internal-content-types/ContentReviewPolicy.d.ts +0 -2
- package/dist/esm/internal-content-types/ContentReviewPolicy.d.ts.map +1 -1
- package/dist/esm/internal-content-types/{LinkedIteratorTemplate.d.ts → ContentTemplate.d.ts} +5 -5
- package/dist/esm/internal-content-types/ContentTemplate.d.ts.map +1 -0
- package/dist/esm/internal-content-types/{LinkedIteratorTemplate.js → ContentTemplate.js} +4 -4
- package/dist/esm/internal-content-types/ContentTemplate.js.map +1 -0
- package/dist/esm/internal-content-types/ManagerFavorite.d.ts +0 -4
- package/dist/esm/internal-content-types/ManagerFavorite.d.ts.map +1 -1
- package/dist/esm/internal-content-types/ManagerNotification.d.ts +0 -8
- package/dist/esm/internal-content-types/ManagerNotification.d.ts.map +1 -1
- package/dist/esm/internal-content-types/ManagerUser.d.ts +0 -1
- package/dist/esm/internal-content-types/ManagerUser.d.ts.map +1 -1
- package/dist/esm/internal-content-types/MfaChallenge.d.ts +0 -4
- package/dist/esm/internal-content-types/MfaChallenge.d.ts.map +1 -1
- package/dist/esm/internal-content-types/PasswordResetToken.d.ts +0 -4
- package/dist/esm/internal-content-types/PasswordResetToken.d.ts.map +1 -1
- package/dist/esm/internal-content-types/PreviewSnapshot.d.ts +1 -0
- package/dist/esm/internal-content-types/PreviewSnapshot.d.ts.map +1 -1
- package/dist/esm/internal-content-types/PreviewSnapshot.js +1 -0
- package/dist/esm/internal-content-types/PreviewSnapshot.js.map +1 -1
- package/dist/esm/internal-content-types/Session.d.ts +0 -4
- package/dist/esm/internal-content-types/Session.d.ts.map +1 -1
- package/dist/esm/internal-content-types/TemplateContent.d.ts +5 -0
- package/dist/esm/internal-content-types/TemplateContent.d.ts.map +1 -0
- package/dist/esm/internal-content-types/TemplateContent.js +12 -0
- package/dist/esm/internal-content-types/TemplateContent.js.map +1 -0
- package/dist/esm/internal-content-types/UserMfa.d.ts +0 -4
- package/dist/esm/internal-content-types/UserMfa.d.ts.map +1 -1
- package/dist/esm/internal-content-types/WebAuthnCredential.d.ts +0 -4
- package/dist/esm/internal-content-types/WebAuthnCredential.d.ts.map +1 -1
- package/dist/esm/internal-content-types/WebAuthnRegChallenge.d.ts +0 -4
- package/dist/esm/internal-content-types/WebAuthnRegChallenge.d.ts.map +1 -1
- package/dist/esm/internal-content-types/index.d.ts +2 -1
- package/dist/esm/internal-content-types/index.d.ts.map +1 -1
- package/dist/esm/internal-content-types/index.js +2 -1
- package/dist/esm/internal-content-types/index.js.map +1 -1
- package/dist/esm/internal-content-types/syncAdminRole.d.ts +0 -1
- package/dist/esm/internal-content-types/syncAdminRole.d.ts.map +1 -1
- package/dist/esm/lib/ContentType.d.ts +12 -19
- package/dist/esm/lib/ContentType.d.ts.map +1 -1
- package/dist/esm/lib/ContentType.js +16 -25
- package/dist/esm/lib/ContentType.js.map +1 -1
- package/dist/esm/lib/Registry.d.ts +5 -3
- package/dist/esm/lib/Registry.d.ts.map +1 -1
- package/dist/esm/lib/Registry.js +26 -10
- package/dist/esm/lib/Registry.js.map +1 -1
- package/dist/esm/lib/systemFields.d.ts +1 -1
- package/dist/esm/lib/systemFields.d.ts.map +1 -1
- package/dist/esm/lib/systemFields.js +1 -1
- package/dist/esm/lib/systemFields.js.map +1 -1
- package/dist/esm/manager.d.ts +6 -1
- package/dist/esm/manager.d.ts.map +1 -1
- package/dist/esm/schemas/manager/create.d.ts +0 -11
- package/dist/esm/schemas/manager/create.d.ts.map +1 -1
- package/dist/esm/schemas/manager/create.js +0 -2
- package/dist/esm/schemas/manager/create.js.map +1 -1
- package/dist/esm/schemas/manager/preview.d.ts +1 -0
- package/dist/esm/schemas/manager/preview.d.ts.map +1 -1
- package/dist/esm/schemas/manager/preview.js +1 -0
- package/dist/esm/schemas/manager/preview.js.map +1 -1
- package/dist/esm/schemas/manager/template.d.ts +21 -0
- package/dist/esm/schemas/manager/template.d.ts.map +1 -0
- package/dist/esm/schemas/manager/template.js +18 -0
- package/dist/esm/schemas/manager/template.js.map +1 -0
- package/dist/esm/schemas/manager/update.d.ts +0 -11
- package/dist/esm/schemas/manager/update.d.ts.map +1 -1
- package/dist/esm/schemas/manager/update.js +0 -2
- package/dist/esm/schemas/manager/update.js.map +1 -1
- package/dist/esm/schemas/web/page.d.ts +1 -0
- package/dist/esm/schemas/web/page.d.ts.map +1 -1
- package/dist/esm/schemas/web/page.js +1 -0
- package/dist/esm/schemas/web/page.js.map +1 -1
- package/dist/esm/schemas/web/previewPage.d.ts +1 -0
- package/dist/esm/schemas/web/previewPage.d.ts.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/dist/cjs/api/routes/manager/linkedIterator.js +0 -69
- package/dist/cjs/api/routes/manager/linkedIterator.js.map +0 -1
- package/dist/cjs/api/utils/linkedIterator.js +0 -167
- package/dist/cjs/api/utils/linkedIterator.js.map +0 -1
- package/dist/cjs/internal-content-types/LinkedIteratorTemplate.js.map +0 -1
- package/dist/cjs/schemas/manager/linkedIterator.js +0 -27
- package/dist/cjs/schemas/manager/linkedIterator.js.map +0 -1
- package/dist/esm/api/routes/manager/linkedIterator.d.ts +0 -11
- package/dist/esm/api/routes/manager/linkedIterator.d.ts.map +0 -1
- package/dist/esm/api/routes/manager/linkedIterator.js +0 -62
- package/dist/esm/api/routes/manager/linkedIterator.js.map +0 -1
- package/dist/esm/api/utils/linkedIterator.d.ts +0 -41
- package/dist/esm/api/utils/linkedIterator.d.ts.map +0 -1
- package/dist/esm/api/utils/linkedIterator.js +0 -157
- package/dist/esm/api/utils/linkedIterator.js.map +0 -1
- package/dist/esm/internal-content-types/LinkedIteratorTemplate.d.ts.map +0 -1
- package/dist/esm/internal-content-types/LinkedIteratorTemplate.js.map +0 -1
- package/dist/esm/schemas/manager/linkedIterator.d.ts +0 -41
- package/dist/esm/schemas/manager/linkedIterator.d.ts.map +0 -1
- package/dist/esm/schemas/manager/linkedIterator.js +0 -21
- package/dist/esm/schemas/manager/linkedIterator.js.map +0 -1
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { z } from "zod";
|
|
2
|
+
import { ContentTemplate, TemplateContent } from "../../../internal-content-types/index.js";
|
|
3
|
+
import { throwAppError } from "../../../lib/errors/index.js";
|
|
4
|
+
import { getContentPermission, hasPermissions } from "../../../lib/Permissions.js";
|
|
5
|
+
import { getMongoService } from "../../../orm/index.js";
|
|
6
|
+
import { DbErrorConflict } from "../../../orm/dbService.js";
|
|
7
|
+
import { ContentTemplateValidationError, createTemplateContentSlot, getContentTemplate, saveContentTemplate, } from "../../utils/contentTemplate.js";
|
|
8
|
+
import { checkPermissions } from "../../utils/checkPermissions.js";
|
|
9
|
+
import { checkOwnership } from "../../utils/checkOwnership.js";
|
|
10
|
+
import { requireContentType } from "../../utils/requireContentType.js";
|
|
11
|
+
import { revalidateContentTypePaths } from "../../utils/routes/revalidatePath.js";
|
|
12
|
+
export const forbidContentTemplateAccess = (contentType) => {
|
|
13
|
+
if (contentType.name === ContentTemplate.name ||
|
|
14
|
+
contentType.name === TemplateContent.name) {
|
|
15
|
+
throwAppError("FORBIDDEN", {
|
|
16
|
+
reason: "Content templates can only be changed through template operations",
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
};
|
|
20
|
+
const canUpdateTemplate = (contentType, ctx) => {
|
|
21
|
+
const permission = getContentPermission(contentType, "updateAny");
|
|
22
|
+
return !permission || hasPermissions(ctx.getUser(), [permission]);
|
|
23
|
+
};
|
|
24
|
+
const requireTemplateUpdate = (contentType, ctx) => {
|
|
25
|
+
const permission = getContentPermission(contentType, "updateAny");
|
|
26
|
+
if (permission)
|
|
27
|
+
checkPermissions(ctx.getUser(), [permission]);
|
|
28
|
+
};
|
|
29
|
+
export const templateGetHandler = async ({ input, ctx, }) => {
|
|
30
|
+
const contentType = requireContentType(input.contentType);
|
|
31
|
+
if (!contentType.hasTemplate) {
|
|
32
|
+
return {
|
|
33
|
+
enabled: false,
|
|
34
|
+
configured: false,
|
|
35
|
+
modules: [],
|
|
36
|
+
canUpdate: false,
|
|
37
|
+
};
|
|
38
|
+
}
|
|
39
|
+
if (input.documentId) {
|
|
40
|
+
await checkOwnership({
|
|
41
|
+
ctx,
|
|
42
|
+
contentType,
|
|
43
|
+
id: input.documentId,
|
|
44
|
+
permission: "readAny",
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
else {
|
|
48
|
+
const createPermission = getContentPermission(contentType, "own");
|
|
49
|
+
if (createPermission)
|
|
50
|
+
checkPermissions(ctx.getUser(), [createPermission]);
|
|
51
|
+
}
|
|
52
|
+
const template = await getContentTemplate(await getMongoService(), contentType);
|
|
53
|
+
return {
|
|
54
|
+
enabled: true,
|
|
55
|
+
configured: template.configured,
|
|
56
|
+
modules: template.modules ?? [createTemplateContentSlot()],
|
|
57
|
+
revision: template.revision,
|
|
58
|
+
canUpdate: canUpdateTemplate(contentType, ctx),
|
|
59
|
+
};
|
|
60
|
+
};
|
|
61
|
+
export const templateUpdateHandler = async ({ input, ctx, }) => {
|
|
62
|
+
const contentType = requireContentType(input.contentType);
|
|
63
|
+
if (!contentType.hasTemplate) {
|
|
64
|
+
throwAppError("FEATURE_UNSUPPORTED", { feature: "template" });
|
|
65
|
+
}
|
|
66
|
+
requireTemplateUpdate(contentType, ctx);
|
|
67
|
+
try {
|
|
68
|
+
const saved = await saveContentTemplate({
|
|
69
|
+
contentType,
|
|
70
|
+
db: await getMongoService(),
|
|
71
|
+
expectedRevision: input.revision,
|
|
72
|
+
modules: input.modules,
|
|
73
|
+
options: {
|
|
74
|
+
actorId: ctx.getUser()._id,
|
|
75
|
+
reason: "content template update",
|
|
76
|
+
},
|
|
77
|
+
});
|
|
78
|
+
await revalidateContentTypePaths(contentType.name);
|
|
79
|
+
return {
|
|
80
|
+
enabled: true,
|
|
81
|
+
configured: true,
|
|
82
|
+
modules: saved.modules ?? [],
|
|
83
|
+
revision: saved.revision,
|
|
84
|
+
canUpdate: true,
|
|
85
|
+
};
|
|
86
|
+
}
|
|
87
|
+
catch (error) {
|
|
88
|
+
if (error instanceof z.ZodError) {
|
|
89
|
+
throwAppError("VALIDATION", { errors: error.issues });
|
|
90
|
+
}
|
|
91
|
+
if (error instanceof ContentTemplateValidationError) {
|
|
92
|
+
throwAppError("VALIDATION", {
|
|
93
|
+
errors: [{ path: ["modules"], message: error.message }],
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
if (error instanceof DbErrorConflict) {
|
|
97
|
+
throwAppError("CONFLICT", {
|
|
98
|
+
message: error.message,
|
|
99
|
+
key: "CONTENT_TEMPLATE_REVISION_CONFLICT",
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
throw error;
|
|
103
|
+
}
|
|
104
|
+
};
|
|
105
|
+
//# sourceMappingURL=template.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"template.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/template.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translateDocument.d.ts","sourceRoot":"","sources":["../../../../../src/api/routes/manager/translateDocument.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"translateDocument.d.ts","sourceRoot":"","sources":["../../../../../src/api/routes/manager/translateDocument.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,EACV,sBAAsB,EACtB,uBAAuB,EACxB,MAAM,4CAA4C,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AA+BzD,eAAO,MAAM,wBAAwB,GAAU,iBAG5C;IACD,KAAK,EAAE,sBAAsB,CAAC;IAC9B,GAAG,EAAE,mBAAmB,CAAC;CAC1B,KAAG,OAAO,CAAC,uBAAuB,CAsHlC,CAAC"}
|
|
@@ -8,10 +8,6 @@ import { checkOwnership } from "../../utils/checkOwnership.js";
|
|
|
8
8
|
import { getLanguages } from "../../utils/getLanguages.js";
|
|
9
9
|
import { requireContentType } from "../../utils/requireContentType.js";
|
|
10
10
|
import { checkRevalidatePath } from "../../utils/routes/revalidatePath.js";
|
|
11
|
-
import { applyEffectiveIterator, getLinkedIteratorTemplate, isIteratorUnlinked, saveLinkedIteratorTemplate, } from "../../utils/linkedIterator.js";
|
|
12
|
-
import { ITERATOR_FIELD_NAME } from "../../../lib/systemFields.js";
|
|
13
|
-
import { canUpdateLinkedIterator, requireLinkedIteratorUpdate, } from "./linkedIterator.js";
|
|
14
|
-
import { revalidateContentTypePaths } from "../../utils/routes/revalidatePath.js";
|
|
15
11
|
import { isRouteableContentType } from "../../../lib/routeableContent.js";
|
|
16
12
|
import { getRelationId, getReviewPolicyForRole, } from "../../utils/reviews.js";
|
|
17
13
|
const unique = (values) => Array.from(new Set(values));
|
|
@@ -68,14 +64,7 @@ export const translateDocumentHandler = async ({ input, ctx, }) => {
|
|
|
68
64
|
message: "Create a draft version before translating this published document",
|
|
69
65
|
});
|
|
70
66
|
}
|
|
71
|
-
const current =
|
|
72
|
-
db,
|
|
73
|
-
contentType,
|
|
74
|
-
document: storedCurrent,
|
|
75
|
-
});
|
|
76
|
-
const canTranslateSharedIterator = contentType.linkedIterator &&
|
|
77
|
-
!isIteratorUnlinked(storedCurrent) &&
|
|
78
|
-
canUpdateLinkedIterator(contentType, ctx);
|
|
67
|
+
const current = storedCurrent;
|
|
79
68
|
const effectiveInputData = contentType.name === "Route" ? normalizeRouteData(input.data) : input.data;
|
|
80
69
|
try {
|
|
81
70
|
const parsedData = effectiveInputData === undefined
|
|
@@ -85,11 +74,6 @@ export const translateDocumentHandler = async ({ input, ctx, }) => {
|
|
|
85
74
|
...current,
|
|
86
75
|
...parsedData,
|
|
87
76
|
};
|
|
88
|
-
if (contentType.linkedIterator &&
|
|
89
|
-
!isIteratorUnlinked(storedCurrent) &&
|
|
90
|
-
!canTranslateSharedIterator) {
|
|
91
|
-
delete document[ITERATOR_FIELD_NAME];
|
|
92
|
-
}
|
|
93
77
|
const service = getTranslationService();
|
|
94
78
|
const { patch, summary } = await createDocumentTranslationPatch({
|
|
95
79
|
contentType,
|
|
@@ -104,26 +88,6 @@ export const translateDocumentHandler = async ({ input, ctx, }) => {
|
|
|
104
88
|
...patch,
|
|
105
89
|
updatedBy: user._id,
|
|
106
90
|
};
|
|
107
|
-
let linkedIteratorChanged = false;
|
|
108
|
-
if (canTranslateSharedIterator &&
|
|
109
|
-
ITERATOR_FIELD_NAME in patch) {
|
|
110
|
-
requireLinkedIteratorUpdate(contentType, ctx);
|
|
111
|
-
const template = await getLinkedIteratorTemplate(db, contentType);
|
|
112
|
-
if (template.configured) {
|
|
113
|
-
await saveLinkedIteratorTemplate({
|
|
114
|
-
action: "update",
|
|
115
|
-
contentType,
|
|
116
|
-
db,
|
|
117
|
-
expectedRevision: template.revision,
|
|
118
|
-
iterator: data[ITERATOR_FIELD_NAME],
|
|
119
|
-
options: {
|
|
120
|
-
actorId: user._id,
|
|
121
|
-
reason: "linked iterator translation",
|
|
122
|
-
},
|
|
123
|
-
});
|
|
124
|
-
linkedIteratorChanged = true;
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
91
|
if (Object.keys(data).length === 1 && "updatedBy" in data) {
|
|
128
92
|
return { item: current, summary };
|
|
129
93
|
}
|
|
@@ -142,15 +106,8 @@ export const translateDocumentHandler = async ({ input, ctx, }) => {
|
|
|
142
106
|
contentTypeId: updated._id,
|
|
143
107
|
operation: "update",
|
|
144
108
|
});
|
|
145
|
-
if (linkedIteratorChanged) {
|
|
146
|
-
await revalidateContentTypePaths(contentType.name);
|
|
147
|
-
}
|
|
148
109
|
return {
|
|
149
|
-
item:
|
|
150
|
-
db,
|
|
151
|
-
contentType,
|
|
152
|
-
document: updated,
|
|
153
|
-
}),
|
|
110
|
+
item: updated,
|
|
154
111
|
summary,
|
|
155
112
|
};
|
|
156
113
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translateDocument.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/translateDocument.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EACL,8BAA8B,EAC9B,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,
|
|
1
|
+
{"version":3,"file":"translateDocument.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/translateDocument.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EACL,8BAA8B,EAC9B,qBAAqB,EACrB,qBAAqB,GACtB,MAAM,sBAAsB,CAAC;AAM9B,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EACL,aAAa,EACb,sBAAsB,GACvB,MAAM,qBAAqB,CAAC;AAE7B,MAAM,MAAM,GAAG,CAAI,MAAW,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;AAE/D,MAAM,kBAAkB,GAAG,CAAC,IAAa,EAAE,EAAE;IAC3C,IAAI,CAAC,IAAI,IAAI,OAAO,IAAI,KAAK,QAAQ;QAAE,OAAO,IAAI,CAAC;IAEnD,MAAM,SAAS,GAAG,IAA+B,CAAC;IAClD,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAC/C,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,UAAU,CAC5B,CAAC;IAEF,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3B,aAAa,CAAC,WAAW,EAAE;YACzB,MAAM,EACJ,2EAA2E;SAC9E,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC;AAC1C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,EAAE,EAC7C,KAAK,EACL,GAAG,GAIJ,EAAoC,EAAE;IACrC,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC;QAC7B,aAAa,CAAC,qBAAqB,EAAE;YACnC,OAAO,EAAE,aAAa;YACtB,OAAO,EAAE,uCAAuC;SACjD,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,GAAG,MAAM,eAAe,EAAE,CAAC;IACnC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,WAAW,GAAG,kBAAkB,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAE1D,MAAM,cAAc,CAAC;QACnB,GAAG;QACH,WAAW;QACX,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,UAAU,EAAE,WAAW;KACxB,CAAC,CAAC;IAEH,MAAM,SAAS,GAAG,MAAM,YAAY,EAAE,CAAC;IACvC,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC;IACxE,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC;SACxB,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,KAAK,CAAC,IAAI,CAAC;SACrC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC;IAEvE,IAAI,CAAC,IAAI,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9C,aAAa,CAAC,YAAY,EAAE;YAC1B,MAAM,EAAE,8BAA8B;SACvC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,eAAe,GAAG,EAAE,CAAC,MAAM,CAC/B,CAAC,QAAQ,EAA4C,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,CAC1E,CAAC;IACF,MAAM,aAAa,GAAG,MAAM,EAAE,CAAC,GAAG,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,CAAC;IAC1D,MAAM,WAAW,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC7C,IACE,aAAa,CAAC,WAAW,KAAK,WAAW;QACzC,sBAAsB,CAAC,WAAW,CAAC,IAAI,CAAC;QACxC,WAAW;QACX,CAAC,MAAM,sBAAsB,CAAC;YAC5B,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,MAAM,EAAE,WAAW;SACpB,CAAC,CAAC,EACH,CAAC;QACD,aAAa,CAAC,UAAU,EAAE;YACxB,GAAG,EAAE,wBAAwB;YAC7B,OAAO,EAAE,mEAAmE;SAC7E,CAAC,CAAC;IACL,CAAC;IACD,MAAM,OAAO,GAAG,aAAa,CAAC;IAC9B,MAAM,kBAAkB,GACtB,WAAW,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;IAE7E,IAAI,CAAC;QACH,MAAM,UAAU,GACd,kBAAkB,KAAK,SAAS;YAC9B,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,WAAW,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;QACtD,MAAM,QAAQ,GAAG;YACf,GAAG,OAAO;YACV,GAAI,UAAkD;SACvD,CAAC;QACF,MAAM,OAAO,GAAG,qBAAqB,EAAE,CAAC;QACxC,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,8BAA8B,CAAC;YAC9D,WAAW;YACX,QAAQ;YACR,IAAI;YACJ,EAAE,EAAE,eAAe;YACnB,SAAS,EAAE,KAAK,CAAC,SAAS;YAC1B,OAAO;SACR,CAAC,CAAC;QACH,MAAM,IAAI,GAA4B;YACpC,GAAI,UAAkD;YACtD,GAAG,KAAK;YACR,SAAS,EAAE,IAAI,CAAC,GAAG;SACpB,CAAC;QACF,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,IAAI,WAAW,IAAI,IAAI,EAAE,CAAC;YAC1D,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC;QACpC,CAAC;QAED,MAAM,YAAY,GAAG,WAAW,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;QACvD,MAAM,CAAC,QAAQ,CAAC,4CAA4C,CAAC,CAAC;QAE9D,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,EAAE,EAAE,YAAY,EAAE;YACnE,OAAO,EAAE,IAAI,CAAC,GAAG;YACjB,MAAM,EAAE,mBAAmB;SAC5B,CAAC,CAAC;QACH,MAAM,CAAC,QAAQ,CAAC,8CAA8C,EAAE;YAC9D,EAAE,EAAE,OAAO,CAAC,GAAG;YACf,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;SAC/C,CAAC,CAAC;QAEH,MAAM,mBAAmB,CAAC;YACxB,WAAW,EAAE,WAAW,CAAC,IAAI;YAC7B,aAAa,EAAE,OAAO,CAAC,GAAG;YAC1B,SAAS,EAAE,QAAQ;SACpB,CAAC,CAAC;QACH,OAAO;YACL,IAAI,EAAE,OAAO;YACb,OAAO;SACR,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,CAAC,CAAC,QAAQ,IAAI,KAAK,YAAY,kBAAkB,EAAE,CAAC;YACvE,aAAa,CAAC,YAAY,EAAE;gBAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;aACrB,CAAC,CAAC;QACL,CAAC;QAED,IAAI,KAAK,YAAY,eAAe,EAAE,CAAC;YACrC,aAAa,CAAC,UAAU,EAAE;gBACxB,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,GAAG,EAAE,KAAK,CAAC,OAAiB;aAC7B,CAAC,CAAC;QACL,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;AACH,CAAC,CAAC"}
|
|
@@ -6,7 +6,7 @@ import { getMongoService } from "../../../orm/index.js";
|
|
|
6
6
|
import { checkOwnership } from "../../utils/checkOwnership.js";
|
|
7
7
|
import { requireContentType } from "../../utils/requireContentType.js";
|
|
8
8
|
import { checkRevalidatePath } from "../../utils/routes/revalidatePath.js";
|
|
9
|
-
import {
|
|
9
|
+
import { forbidContentTemplateAccess } from "./template.js";
|
|
10
10
|
const isRestorableVisibility = (value) => value === "draft" || value === "hidden" || value === "published";
|
|
11
11
|
export const buildTrashUpdate = ({ contentType, document, userId, }) => {
|
|
12
12
|
const currentVisibility = document._visibility ?? "published";
|
|
@@ -33,7 +33,7 @@ export const trashHandler = async ({ input, ctx, }) => {
|
|
|
33
33
|
const db = await getMongoService();
|
|
34
34
|
const { contentType: contentTypeName, id } = input;
|
|
35
35
|
const contentType = requireContentType(contentTypeName);
|
|
36
|
-
|
|
36
|
+
forbidContentTemplateAccess(contentType);
|
|
37
37
|
if (contentType.name === "Route") {
|
|
38
38
|
throwAppError("FORBIDDEN", {
|
|
39
39
|
reason: "Routes are defined in the API and cannot be moved to trash from manager",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"trash.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/trash.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,wBAAwB,EAAE,MAAM,yBAAyB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAE7C,OAAO,EACL,uBAAuB,EACvB,0BAA0B,GAC3B,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/C,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"trash.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/trash.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../src/api/routes/manager/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAK9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"update.d.ts","sourceRoot":"","sources":["../../../../../src/api/routes/manager/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAK9D,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAoBpD,eAAO,MAAM,aAAa,GAAU,iBAGjC;IACD,KAAK,EAAE,WAAW,CAAC;IACnB,GAAG,EAAE,mBAAmB,CAAC;CAC1B;;;;;;;;;;;;;;;;;;EAoLA,CAAC"}
|
|
@@ -7,11 +7,8 @@ import { checkOwnership } from "../../utils/checkOwnership.js";
|
|
|
7
7
|
import { requireContentType } from "../../utils/requireContentType.js";
|
|
8
8
|
import { checkRevalidatePath } from "../../utils/routes/revalidatePath.js";
|
|
9
9
|
import { sanitizeManagerOutput } from "../../utils/sanitizeManagerOutput.js";
|
|
10
|
-
import { applyEffectiveIterator, getEffectiveIterator, getLinkedIteratorTemplate, isIteratorUnlinked, saveLinkedIteratorTemplate, } from "../../utils/linkedIterator.js";
|
|
11
|
-
import { ITERATOR_FIELD_NAME, ITERATOR_UNLINKED_FIELD_NAME, } from "../../../lib/systemFields.js";
|
|
12
10
|
import { getLocaleVariantGroupId, getLocaleVariantRole, LOCALE_VARIANT_GROUP_FIELD, } from "../../../lib/localeVariants.js";
|
|
13
|
-
import {
|
|
14
|
-
import { revalidateContentTypePaths } from "../../utils/routes/revalidatePath.js";
|
|
11
|
+
import { forbidContentTemplateAccess } from "./template.js";
|
|
15
12
|
import { isRouteableContentType } from "../../../lib/routeableContent.js";
|
|
16
13
|
import { getDocumentReviewPolicy, getRelationId, getReviewPolicyForRole, } from "../../utils/reviews.js";
|
|
17
14
|
import { createSlugChangeRedirects } from "../../utils/redirects/createSlugChangeRedirects.js";
|
|
@@ -21,7 +18,7 @@ export const updateHandler = async ({ input, ctx, }) => {
|
|
|
21
18
|
const { contentType: contentTypeName, id } = input;
|
|
22
19
|
const user = ctx.getUser();
|
|
23
20
|
const contentType = requireContentType(contentTypeName);
|
|
24
|
-
|
|
21
|
+
forbidContentTemplateAccess(contentType);
|
|
25
22
|
const data = { ...input.data };
|
|
26
23
|
await checkOwnership({
|
|
27
24
|
ctx,
|
|
@@ -93,65 +90,6 @@ export const updateHandler = async ({ input, ctx, }) => {
|
|
|
93
90
|
});
|
|
94
91
|
}
|
|
95
92
|
try {
|
|
96
|
-
let linkedIteratorChanged = false;
|
|
97
|
-
if (contentType.linkedIterator) {
|
|
98
|
-
const current = await db.get(contentType, id);
|
|
99
|
-
const control = input.linkedIterator;
|
|
100
|
-
const mode = control?.mode ?? (isIteratorUnlinked(current) ? "unlinked" : "linked");
|
|
101
|
-
const template = await getLinkedIteratorTemplate(db, contentType);
|
|
102
|
-
delete effectiveData[ITERATOR_UNLINKED_FIELD_NAME];
|
|
103
|
-
if (mode === "unlinked") {
|
|
104
|
-
if (control?.action) {
|
|
105
|
-
throwAppError("VALIDATION", {
|
|
106
|
-
errors: [
|
|
107
|
-
{
|
|
108
|
-
path: ["linkedIterator", "action"],
|
|
109
|
-
message: "A local iterator cannot initialize or update the shared template",
|
|
110
|
-
},
|
|
111
|
-
],
|
|
112
|
-
});
|
|
113
|
-
}
|
|
114
|
-
effectiveData[ITERATOR_UNLINKED_FIELD_NAME] = true;
|
|
115
|
-
if (!(ITERATOR_FIELD_NAME in effectiveData)) {
|
|
116
|
-
effectiveData[ITERATOR_FIELD_NAME] = await getEffectiveIterator({
|
|
117
|
-
db,
|
|
118
|
-
contentType,
|
|
119
|
-
document: current,
|
|
120
|
-
});
|
|
121
|
-
}
|
|
122
|
-
}
|
|
123
|
-
else {
|
|
124
|
-
effectiveData[ITERATOR_UNLINKED_FIELD_NAME] = null;
|
|
125
|
-
if (control?.action) {
|
|
126
|
-
requireLinkedIteratorUpdate(contentType, ctx);
|
|
127
|
-
contentType.partialValidate({
|
|
128
|
-
...effectiveData,
|
|
129
|
-
updatedBy: user._id,
|
|
130
|
-
});
|
|
131
|
-
const savedTemplate = await saveLinkedIteratorTemplate({
|
|
132
|
-
action: control.action,
|
|
133
|
-
contentType,
|
|
134
|
-
db,
|
|
135
|
-
expectedRevision: control.revision,
|
|
136
|
-
iterator: effectiveData[ITERATOR_FIELD_NAME] ?? [],
|
|
137
|
-
options: {
|
|
138
|
-
actorId: user._id,
|
|
139
|
-
reason: `linked iterator ${control.action}`,
|
|
140
|
-
},
|
|
141
|
-
});
|
|
142
|
-
effectiveData[ITERATOR_FIELD_NAME] = savedTemplate.iterator;
|
|
143
|
-
linkedIteratorChanged = true;
|
|
144
|
-
}
|
|
145
|
-
else if (template.iterator) {
|
|
146
|
-
effectiveData[ITERATOR_FIELD_NAME] = template.iterator;
|
|
147
|
-
}
|
|
148
|
-
}
|
|
149
|
-
}
|
|
150
|
-
else if (input.linkedIterator) {
|
|
151
|
-
throwAppError("FEATURE_UNSUPPORTED", {
|
|
152
|
-
feature: "linkedIterator",
|
|
153
|
-
});
|
|
154
|
-
}
|
|
155
93
|
const parsedInput = contentType.partialValidate({
|
|
156
94
|
...effectiveData,
|
|
157
95
|
updatedBy: user._id,
|
|
@@ -197,15 +135,7 @@ export const updateHandler = async ({ input, ctx, }) => {
|
|
|
197
135
|
sourceDocumentId: updated._id,
|
|
198
136
|
});
|
|
199
137
|
}
|
|
200
|
-
|
|
201
|
-
await revalidateContentTypePaths(contentType.name);
|
|
202
|
-
}
|
|
203
|
-
const effective = await applyEffectiveIterator({
|
|
204
|
-
db,
|
|
205
|
-
contentType,
|
|
206
|
-
document: updated,
|
|
207
|
-
});
|
|
208
|
-
return sanitizeManagerOutput(effective, contentType);
|
|
138
|
+
return sanitizeManagerOutput(updated, contentType);
|
|
209
139
|
}
|
|
210
140
|
catch (error) {
|
|
211
141
|
if (error instanceof z.ZodError || error instanceof DbErrorInvalidData) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/update.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAC7C,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,kBAAkB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mCAAmC,CAAC;AAC1E,OAAO,EACL,
|
|
1
|
+
{"version":3,"file":"update.js","sourceRoot":"","sources":["../../../../../src/api/routes/manager/update.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ type PageContentData = Record<string, unknown> & {
|
|
|
10
10
|
_trashed?: boolean;
|
|
11
11
|
_visibility?: string;
|
|
12
12
|
};
|
|
13
|
-
export declare const buildPageOutput: ({ path, route, contentType, contentTypeId, variantGroupId, data, language, tracePrefix,
|
|
13
|
+
export declare const buildPageOutput: ({ path, route, contentType, contentTypeId, variantGroupId, data, language, tracePrefix, templateModules, }: {
|
|
14
14
|
path: string;
|
|
15
15
|
route: DBOutput<Route>;
|
|
16
16
|
contentType: ContentType;
|
|
@@ -19,7 +19,7 @@ export declare const buildPageOutput: ({ path, route, contentType, contentTypeId
|
|
|
19
19
|
data: PageContentData;
|
|
20
20
|
language: DBOutput<Language>;
|
|
21
21
|
tracePrefix?: string;
|
|
22
|
-
|
|
22
|
+
templateModules?: unknown[];
|
|
23
23
|
}) => Promise<PageOutput>;
|
|
24
24
|
export declare const getPage: (input: PageInput) => Promise<PageOutput>;
|
|
25
25
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../src/api/routes/web/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EAGL,QAAQ,EAGT,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,WAAW,MAAM,0BAA0B,CAAC;AAKxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,EACL,UAAU,EACV,SAAS,EAEV,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../../src/api/routes/web/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,KAAK,EAGL,QAAQ,EAGT,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,WAAW,MAAM,0BAA0B,CAAC;AAKxD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAInD,OAAO,EACL,UAAU,EACV,SAAS,EAEV,MAAM,2BAA2B,CAAC;AAiBnC,eAAO,MAAM,gBAAgB,EAAE,UAS9B,CAAC;AASF,eAAO,MAAM,iBAAiB,GAAI,MAAM,MAAM,KAAG,MAUhD,CAAC;AAEF,KAAK,eAAe,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAC/C,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAmDF,eAAO,MAAM,eAAe,GAAU,4GAUnC;IACD,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;IACvB,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,eAAe,CAAC;IACtB,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC7B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,EAAE,CAAC;CAC7B,KAAG,OAAO,CAAC,UAAU,CAgUrB,CAAC;AAEF,eAAO,MAAM,OAAO,GAAU,OAAO,SAAS,KAAG,OAAO,CAAC,UAAU,CA6ElE,CAAC"}
|
|
@@ -14,8 +14,7 @@ import { populateRelations } from "../../utils/populates/populateRelations.js";
|
|
|
14
14
|
import { resolveRedirect } from "../../utils/redirects/resolveRedirect.js";
|
|
15
15
|
import { validateModule } from "../../utils/validateModule.js";
|
|
16
16
|
import { resolveSeo } from "./seo.js";
|
|
17
|
-
import {
|
|
18
|
-
import { ITERATOR_UNLINKED_FIELD_NAME } from "../../../lib/systemFields.js";
|
|
17
|
+
import { applyContentTemplate, getContentTemplate, isTemplateContentSlot, } from "../../utils/contentTemplate.js";
|
|
19
18
|
import { isIteratorItemVisible } from "../../utils/iteratorVisibility.js";
|
|
20
19
|
export const NotFoundResponse = {
|
|
21
20
|
renderMode: "static",
|
|
@@ -67,20 +66,34 @@ const getSeoAlternatePaths = async ({ contentType, contentTypeId, variantGroupId
|
|
|
67
66
|
.sort(([a], [b]) => a.localeCompare(b));
|
|
68
67
|
return entries.length > 0 ? Object.fromEntries(entries) : undefined;
|
|
69
68
|
};
|
|
70
|
-
export const buildPageOutput = async ({ path, route, contentType, contentTypeId, variantGroupId, data, language, tracePrefix = "web.page",
|
|
69
|
+
export const buildPageOutput = async ({ path, route, contentType, contentTypeId, variantGroupId, data, language, tracePrefix = "web.page", templateModules, }) => {
|
|
71
70
|
const db = await getMongoService();
|
|
72
71
|
const surface = tracePrefix === "web.previewPage" ? "preview" : "web";
|
|
73
72
|
const localeCode = language.code || "en";
|
|
74
|
-
const effectiveData = await applyEffectiveIterator({
|
|
75
|
-
db,
|
|
76
|
-
contentType,
|
|
77
|
-
document: data,
|
|
78
|
-
preferDocument: preferDocumentIterator,
|
|
79
|
-
});
|
|
80
73
|
const iterator = contentType.hasIterator
|
|
81
|
-
?
|
|
74
|
+
? data[ITERATOR_FIELD_NAME]
|
|
82
75
|
: [];
|
|
83
76
|
const iteratorModules = Array.isArray(iterator) ? iterator : [];
|
|
77
|
+
const configuredTemplate = contentType.hasTemplate
|
|
78
|
+
? templateModules ?? (await getContentTemplate(db, contentType)).modules
|
|
79
|
+
: undefined;
|
|
80
|
+
const templateModuleIndexes = new Set();
|
|
81
|
+
if (configuredTemplate) {
|
|
82
|
+
let outputIndex = 0;
|
|
83
|
+
for (const entry of configuredTemplate) {
|
|
84
|
+
if (isTemplateContentSlot(entry)) {
|
|
85
|
+
outputIndex += iteratorModules.length;
|
|
86
|
+
continue;
|
|
87
|
+
}
|
|
88
|
+
templateModuleIndexes.add(outputIndex++);
|
|
89
|
+
}
|
|
90
|
+
}
|
|
91
|
+
const sourceData = configuredTemplate
|
|
92
|
+
? {
|
|
93
|
+
...data,
|
|
94
|
+
[ITERATOR_FIELD_NAME]: applyContentTemplate(configuredTemplate, iteratorModules),
|
|
95
|
+
}
|
|
96
|
+
: data;
|
|
84
97
|
return runContentHookContext({
|
|
85
98
|
locale: localeCode,
|
|
86
99
|
surface,
|
|
@@ -91,7 +104,7 @@ export const buildPageOutput = async ({ path, route, contentType, contentTypeId,
|
|
|
91
104
|
type: contentType.name,
|
|
92
105
|
},
|
|
93
106
|
}, async () => {
|
|
94
|
-
const linksPopulated = await populateLinks(
|
|
107
|
+
const linksPopulated = await populateLinks(sourceData);
|
|
95
108
|
Logger.addTrace(`${tracePrefix}: links populated`);
|
|
96
109
|
const populated = await populateRelations(linksPopulated);
|
|
97
110
|
Logger.addTrace(`${tracePrefix}: relations populated`);
|
|
@@ -122,7 +135,7 @@ export const buildPageOutput = async ({ path, route, contentType, contentTypeId,
|
|
|
122
135
|
locale: localeCode,
|
|
123
136
|
count: Object.keys(literalMap).length,
|
|
124
137
|
});
|
|
125
|
-
const { [ITERATOR_FIELD_NAME]: modules = iteratorModules, [
|
|
138
|
+
const { [ITERATOR_FIELD_NAME]: modules = iteratorModules, [SEO_FIELD_NAME]: seo, _iteratorUnlinked: _legacyIteratorUnlinked, ...info } = populatedTranslated;
|
|
126
139
|
const contentModulesSource = Array.isArray(modules) ? modules : [];
|
|
127
140
|
return runContentHookContext({
|
|
128
141
|
locale: localeCode,
|
|
@@ -197,23 +210,60 @@ export const buildPageOutput = async ({ path, route, contentType, contentTypeId,
|
|
|
197
210
|
validateModule(layoutTranslated),
|
|
198
211
|
];
|
|
199
212
|
})));
|
|
200
|
-
const
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
}
|
|
216
|
-
}
|
|
213
|
+
const resolveEntry = async (entry, templateEntry = false) => {
|
|
214
|
+
if (isTemplateContentSlot(entry))
|
|
215
|
+
return entry;
|
|
216
|
+
const moduleContentType = getContentTypeByName(entry.value._type);
|
|
217
|
+
const resolved = moduleContentType
|
|
218
|
+
? await resolveContentOutput({
|
|
219
|
+
db,
|
|
220
|
+
contentType: moduleContentType,
|
|
221
|
+
data: entry.value,
|
|
222
|
+
surface,
|
|
223
|
+
})
|
|
224
|
+
: entry.value;
|
|
225
|
+
if (!templateEntry) {
|
|
226
|
+
return { ...entry, value: validateModule(resolved) };
|
|
227
|
+
}
|
|
228
|
+
return { ...entry, value: resolved };
|
|
229
|
+
};
|
|
230
|
+
const visible = (item) => isIteratorItemVisible(item, info);
|
|
231
|
+
const filterNestedVisibleItems = (value) => {
|
|
232
|
+
if (Array.isArray(value)) {
|
|
233
|
+
return value.flatMap((item) => {
|
|
234
|
+
if (item &&
|
|
235
|
+
typeof item === "object" &&
|
|
236
|
+
"name" in item &&
|
|
237
|
+
"value" in item &&
|
|
238
|
+
!visible(item)) {
|
|
239
|
+
return [];
|
|
240
|
+
}
|
|
241
|
+
return [filterNestedVisibleItems(item)];
|
|
242
|
+
});
|
|
243
|
+
}
|
|
244
|
+
if (!value || typeof value !== "object")
|
|
245
|
+
return value;
|
|
246
|
+
return Object.fromEntries(Object.entries(value).map(([key, item]) => [
|
|
247
|
+
key,
|
|
248
|
+
filterNestedVisibleItems(item),
|
|
249
|
+
]));
|
|
250
|
+
};
|
|
251
|
+
const assembledEntries = await Promise.all(contentModulesSource
|
|
252
|
+
.map((entry, index) => ({ entry, index }))
|
|
253
|
+
.filter(({ entry }) => visible(entry))
|
|
254
|
+
.map(async ({ entry, index }) => ({
|
|
255
|
+
entry: await resolveEntry({
|
|
256
|
+
...entry,
|
|
257
|
+
value: filterNestedVisibleItems(entry.value),
|
|
258
|
+
}, templateModuleIndexes.has(index)),
|
|
259
|
+
index,
|
|
260
|
+
})));
|
|
261
|
+
const contentModules = assembledEntries.map(({ entry }) => entry.value);
|
|
262
|
+
const templateModuleIds = configuredTemplate
|
|
263
|
+
? assembledEntries.flatMap(({ entry, index }) => templateModuleIndexes.has(index)
|
|
264
|
+
? [entry.value._id]
|
|
265
|
+
: [])
|
|
266
|
+
: undefined;
|
|
217
267
|
const layout = [
|
|
218
268
|
...layoutModuleSelections
|
|
219
269
|
.sort((a, b) => a.order - b.order)
|
|
@@ -235,6 +285,7 @@ export const buildPageOutput = async ({ path, route, contentType, contentTypeId,
|
|
|
235
285
|
renderMode: route.dynamic ? "dynamic" : "static",
|
|
236
286
|
ttl: route.dynamic ? undefined : 86400,
|
|
237
287
|
modules: contentModules,
|
|
288
|
+
templateModuleIds,
|
|
238
289
|
language,
|
|
239
290
|
seo: resolvedSeo,
|
|
240
291
|
layout,
|