@strapi/content-manager 0.0.0-next.55dabf6295dfb7987fcab8a6b40212555f0e684c → 0.0.0-next.5d0cd5a1a7d80ae3da90f2331d25161b28f06910
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/_chunks/CardDragPreview-C0QyJgRA.js.map +1 -1
- package/dist/_chunks/CardDragPreview-DOxamsuj.mjs.map +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-FqfsxQ1j.js → ComponentConfigurationPage-CJPoOvy3.js} +5 -6
- package/dist/_chunks/{ComponentConfigurationPage-FqfsxQ1j.js.map → ComponentConfigurationPage-CJPoOvy3.js.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-DfFSZQxe.mjs → ComponentConfigurationPage-CcRDqD0e.mjs} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-DfFSZQxe.mjs.map → ComponentConfigurationPage-CcRDqD0e.mjs.map} +1 -1
- package/dist/_chunks/{ComponentIcon-BXdiCGQp.js → ComponentIcon-CRbtQEUV.js} +2 -3
- package/dist/_chunks/{ComponentIcon-BXdiCGQp.js.map → ComponentIcon-CRbtQEUV.js.map} +1 -1
- package/dist/_chunks/ComponentIcon-u4bIXTFY.mjs.map +1 -1
- package/dist/_chunks/{EditConfigurationPage-DdPNAbl3.mjs → EditConfigurationPage-C1ddZ_zf.mjs} +4 -4
- package/dist/_chunks/{EditConfigurationPage-DdPNAbl3.mjs.map → EditConfigurationPage-C1ddZ_zf.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-Cn0e8t3I.js → EditConfigurationPage-CF3lxOy2.js} +5 -6
- package/dist/_chunks/{EditConfigurationPage-Cn0e8t3I.js.map → EditConfigurationPage-CF3lxOy2.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-B82x_x1b.mjs → EditViewPage-BPFcUbqi.mjs} +38 -8
- package/dist/_chunks/EditViewPage-BPFcUbqi.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-DlxEHhUt.js → EditViewPage-CDyTC6aU.js} +38 -9
- package/dist/_chunks/EditViewPage-CDyTC6aU.js.map +1 -0
- package/dist/_chunks/{Field-COL25JiC.js → Field-DuxAW9q2.js} +172 -120
- package/dist/_chunks/Field-DuxAW9q2.js.map +1 -0
- package/dist/_chunks/{Field-DufHXW17.mjs → Field-fBnTwgU4.mjs} +170 -118
- package/dist/_chunks/Field-fBnTwgU4.mjs.map +1 -0
- package/dist/_chunks/FieldTypeIcon-CMlNO8PE.mjs.map +1 -1
- package/dist/_chunks/FieldTypeIcon-Dnwq_IRF.js.map +1 -1
- package/dist/_chunks/{Form-u_kAOhwB.mjs → Form-BGl7PhlZ.mjs} +3 -3
- package/dist/_chunks/{Form-u_kAOhwB.mjs.map → Form-BGl7PhlZ.mjs.map} +1 -1
- package/dist/_chunks/{Form-BssUwrTO.js → Form-DSGh_zkz.js} +5 -6
- package/dist/_chunks/{Form-BssUwrTO.js.map → Form-DSGh_zkz.js.map} +1 -1
- package/dist/_chunks/{History-DRwA3oMM.mjs → History-DTYB9CSB.mjs} +23 -93
- package/dist/_chunks/History-DTYB9CSB.mjs.map +1 -0
- package/dist/_chunks/{History-C9t9UqpO.js → History-DrDJv698.js} +23 -94
- package/dist/_chunks/History-DrDJv698.js.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-BxfQJzPk.mjs → ListConfigurationPage-qWx8r4D_.mjs} +7 -6
- package/dist/_chunks/ListConfigurationPage-qWx8r4D_.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-BXYPohh-.js → ListConfigurationPage-zurIlUZ7.js} +7 -7
- package/dist/_chunks/ListConfigurationPage-zurIlUZ7.js.map +1 -0
- package/dist/_chunks/{ListViewPage-D2VD8Szg.js → ListViewPage-DTM2uO_S.js} +63 -41
- package/dist/_chunks/ListViewPage-DTM2uO_S.js.map +1 -0
- package/dist/_chunks/{ListViewPage-CELx2ysp.mjs → ListViewPage-GKpL5p8A.mjs} +62 -39
- package/dist/_chunks/ListViewPage-GKpL5p8A.mjs.map +1 -0
- package/dist/_chunks/{NoContentTypePage-DtJ9jcfk.mjs → NoContentTypePage-B5Vc5Cal.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-DtJ9jcfk.mjs.map → NoContentTypePage-B5Vc5Cal.mjs.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-BV9IjJSM.js → NoContentTypePage-BuZlNroO.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-BV9IjJSM.js.map → NoContentTypePage-BuZlNroO.js.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DWleVYK7.mjs → NoPermissionsPage-BAZlWgJ4.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DWleVYK7.mjs.map → NoPermissionsPage-BAZlWgJ4.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-Dp8NpF9I.js → NoPermissionsPage-DLzkS4Hy.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-Dp8NpF9I.js.map → NoPermissionsPage-DLzkS4Hy.js.map} +1 -1
- package/dist/_chunks/Preview-VOJ8RuQp.js +312 -0
- package/dist/_chunks/Preview-VOJ8RuQp.js.map +1 -0
- package/dist/_chunks/Preview-Zzjg2_K_.mjs +294 -0
- package/dist/_chunks/Preview-Zzjg2_K_.mjs.map +1 -0
- package/dist/_chunks/{Relations-BTcf5xaw.mjs → Relations-BVdRfDkW.mjs} +47 -22
- package/dist/_chunks/Relations-BVdRfDkW.mjs.map +1 -0
- package/dist/_chunks/{Relations-DR7EUgyC.js → Relations-Dsj0boFJ.js} +47 -23
- package/dist/_chunks/Relations-Dsj0boFJ.js.map +1 -0
- package/dist/_chunks/{en-Bm0D0IWz.js → en-BzQmavmK.js} +21 -4
- package/dist/_chunks/{en-Bm0D0IWz.js.map → en-BzQmavmK.js.map} +1 -1
- package/dist/_chunks/{en-DKV44jRb.mjs → en-CSxLmrh1.mjs} +21 -4
- package/dist/_chunks/{en-DKV44jRb.mjs.map → en-CSxLmrh1.mjs.map} +1 -1
- package/dist/_chunks/{es-EUonQTon.js → es-9K52xZIr.js} +2 -2
- package/dist/_chunks/{ja-CcFe8diO.js.map → es-9K52xZIr.js.map} +1 -1
- package/dist/_chunks/{es-CeXiYflN.mjs → es-D34tqjMw.mjs} +2 -2
- package/dist/_chunks/{es-CeXiYflN.mjs.map → es-D34tqjMw.mjs.map} +1 -1
- package/dist/_chunks/{fr-CD9VFbPM.mjs → fr--pg5jUbt.mjs} +13 -3
- package/dist/_chunks/{fr-CD9VFbPM.mjs.map → fr--pg5jUbt.mjs.map} +1 -1
- package/dist/_chunks/{fr-B7kGGg3E.js → fr-B2Kyv8Z9.js} +13 -3
- package/dist/_chunks/{fr-B7kGGg3E.js.map → fr-B2Kyv8Z9.js.map} +1 -1
- package/dist/_chunks/hooks-BAaaKPS_.js.map +1 -1
- package/dist/_chunks/{index-wnqzm4Q8.mjs → index-Bu_-B7ZA.mjs} +390 -196
- package/dist/_chunks/index-Bu_-B7ZA.mjs.map +1 -0
- package/dist/_chunks/{index-BdMf2lfT.js → index-Ct-GZ0iV.js} +388 -194
- package/dist/_chunks/index-Ct-GZ0iV.js.map +1 -0
- package/dist/_chunks/{ja-CcFe8diO.js → ja-7sfIbjxE.js} +2 -2
- package/dist/_chunks/{es-EUonQTon.js.map → ja-7sfIbjxE.js.map} +1 -1
- package/dist/_chunks/{ja-CtsUxOvk.mjs → ja-BHqhDq4V.mjs} +2 -2
- package/dist/_chunks/{ja-CtsUxOvk.mjs.map → ja-BHqhDq4V.mjs.map} +1 -1
- package/dist/_chunks/{layout-B2MyZU-_.js → layout-CDBEgRsM.js} +5 -6
- package/dist/_chunks/{layout-B2MyZU-_.js.map → layout-CDBEgRsM.js.map} +1 -1
- package/dist/_chunks/{layout-2CfjL0T9.mjs → layout-COzAvgJh.mjs} +4 -4
- package/dist/_chunks/{layout-2CfjL0T9.mjs.map → layout-COzAvgJh.mjs.map} +1 -1
- package/dist/_chunks/{objects-gigeqt7s.js → objects-BcXOv6_9.js} +2 -4
- package/dist/_chunks/{objects-gigeqt7s.js.map → objects-BcXOv6_9.js.map} +1 -1
- package/dist/_chunks/{objects-mKMAmfec.mjs → objects-D6yBsdmx.mjs} +2 -4
- package/dist/_chunks/{objects-mKMAmfec.mjs.map → objects-D6yBsdmx.mjs.map} +1 -1
- package/dist/_chunks/{relations-BH7JJGGe.js → relations-BjiF1Aad.js} +6 -7
- package/dist/_chunks/relations-BjiF1Aad.js.map +1 -0
- package/dist/_chunks/{relations-C0w0GcXi.mjs → relations-BtmMFBpM.mjs} +6 -7
- package/dist/_chunks/relations-BtmMFBpM.mjs.map +1 -0
- package/dist/_chunks/useDebounce-CtcjDB3L.js.map +1 -1
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs.map +1 -1
- package/dist/_chunks/{useDragAndDrop-J0TUUbR6.js → useDragAndDrop-BMtgCYzL.js} +5 -9
- package/dist/_chunks/{useDragAndDrop-J0TUUbR6.js.map → useDragAndDrop-BMtgCYzL.js.map} +1 -1
- package/dist/_chunks/{useDragAndDrop-DdHgKsqq.mjs → useDragAndDrop-DJ6jqvZN.mjs} +4 -7
- package/dist/_chunks/{useDragAndDrop-DdHgKsqq.mjs.map → useDragAndDrop-DJ6jqvZN.mjs.map} +1 -1
- package/dist/admin/index.js +2 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +5 -4
- package/dist/admin/src/content-manager.d.ts +3 -2
- package/dist/admin/src/exports.d.ts +1 -0
- package/dist/admin/src/history/services/historyVersion.d.ts +1 -1
- package/dist/admin/src/pages/EditView/EditViewPage.d.ts +9 -1
- package/dist/admin/src/pages/EditView/components/DocumentActions.d.ts +1 -1
- package/dist/admin/src/pages/EditView/components/DocumentStatus.d.ts +3 -3
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/Blocks/Code.d.ts +7 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/Blocks/utils/prismLanguages.d.ts +49 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/utils/constants.d.ts +1 -0
- package/dist/admin/src/preview/components/PreviewContent.d.ts +2 -0
- package/dist/admin/src/preview/components/PreviewHeader.d.ts +2 -0
- package/dist/admin/src/preview/components/PreviewSidePanel.d.ts +3 -0
- package/dist/admin/src/preview/index.d.ts +4 -0
- package/dist/admin/src/preview/pages/Preview.d.ts +11 -0
- package/dist/admin/src/preview/routes.d.ts +3 -0
- package/dist/admin/src/preview/services/preview.d.ts +3 -0
- package/dist/admin/src/router.d.ts +1 -1
- package/dist/admin/src/services/api.d.ts +1 -1
- package/dist/admin/src/services/components.d.ts +2 -2
- package/dist/admin/src/services/contentTypes.d.ts +3 -3
- package/dist/admin/src/services/documents.d.ts +16 -19
- package/dist/admin/src/services/init.d.ts +1 -1
- package/dist/admin/src/services/relations.d.ts +2 -2
- package/dist/admin/src/services/uid.d.ts +3 -3
- package/dist/server/index.js +482 -243
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +483 -243
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/bootstrap.d.ts.map +1 -1
- package/dist/server/src/controllers/index.d.ts.map +1 -1
- package/dist/server/src/controllers/relations.d.ts.map +1 -1
- package/dist/server/src/controllers/utils/metadata.d.ts +16 -1
- package/dist/server/src/controllers/utils/metadata.d.ts.map +1 -1
- package/dist/server/src/history/services/lifecycles.d.ts.map +1 -1
- package/dist/server/src/history/services/utils.d.ts +2 -3
- package/dist/server/src/history/services/utils.d.ts.map +1 -1
- package/dist/server/src/index.d.ts +7 -6
- package/dist/server/src/index.d.ts.map +1 -1
- package/dist/server/src/preview/controllers/index.d.ts +2 -0
- package/dist/server/src/preview/controllers/index.d.ts.map +1 -0
- package/dist/server/src/preview/controllers/preview.d.ts +13 -0
- package/dist/server/src/preview/controllers/preview.d.ts.map +1 -0
- package/dist/server/src/preview/controllers/validation/preview.d.ts +6 -0
- package/dist/server/src/preview/controllers/validation/preview.d.ts.map +1 -0
- package/dist/server/src/preview/index.d.ts +4 -0
- package/dist/server/src/preview/index.d.ts.map +1 -0
- package/dist/server/src/preview/routes/index.d.ts +8 -0
- package/dist/server/src/preview/routes/index.d.ts.map +1 -0
- package/dist/server/src/preview/routes/preview.d.ts +4 -0
- package/dist/server/src/preview/routes/preview.d.ts.map +1 -0
- package/dist/server/src/preview/services/index.d.ts +16 -0
- package/dist/server/src/preview/services/index.d.ts.map +1 -0
- package/dist/server/src/preview/services/preview-config.d.ts +32 -0
- package/dist/server/src/preview/services/preview-config.d.ts.map +1 -0
- package/dist/server/src/preview/services/preview.d.ts +12 -0
- package/dist/server/src/preview/services/preview.d.ts.map +1 -0
- package/dist/server/src/preview/utils.d.ts +19 -0
- package/dist/server/src/preview/utils.d.ts.map +1 -0
- package/dist/server/src/register.d.ts.map +1 -1
- package/dist/server/src/routes/index.d.ts.map +1 -1
- package/dist/server/src/services/document-manager.d.ts.map +1 -1
- package/dist/server/src/services/document-metadata.d.ts +12 -10
- package/dist/server/src/services/document-metadata.d.ts.map +1 -1
- package/dist/server/src/services/index.d.ts +7 -6
- package/dist/server/src/services/index.d.ts.map +1 -1
- package/dist/server/src/services/utils/populate.d.ts +2 -2
- package/dist/server/src/services/utils/populate.d.ts.map +1 -1
- package/dist/server/src/utils/index.d.ts +2 -0
- package/dist/server/src/utils/index.d.ts.map +1 -1
- package/dist/shared/contracts/index.d.ts +1 -0
- package/dist/shared/contracts/index.d.ts.map +1 -1
- package/dist/shared/contracts/preview.d.ts +27 -0
- package/dist/shared/contracts/preview.d.ts.map +1 -0
- package/dist/shared/index.js +4 -0
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/index.mjs +4 -0
- package/dist/shared/index.mjs.map +1 -1
- package/package.json +13 -11
- package/dist/_chunks/EditViewPage-B82x_x1b.mjs.map +0 -1
- package/dist/_chunks/EditViewPage-DlxEHhUt.js.map +0 -1
- package/dist/_chunks/Field-COL25JiC.js.map +0 -1
- package/dist/_chunks/Field-DufHXW17.mjs.map +0 -1
- package/dist/_chunks/History-C9t9UqpO.js.map +0 -1
- package/dist/_chunks/History-DRwA3oMM.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-BXYPohh-.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-BxfQJzPk.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-CELx2ysp.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-D2VD8Szg.js.map +0 -1
- package/dist/_chunks/Relations-BTcf5xaw.mjs.map +0 -1
- package/dist/_chunks/Relations-DR7EUgyC.js.map +0 -1
- package/dist/_chunks/index-BdMf2lfT.js.map +0 -1
- package/dist/_chunks/index-wnqzm4Q8.mjs.map +0 -1
- package/dist/_chunks/relations-BH7JJGGe.js.map +0 -1
- package/dist/_chunks/relations-C0w0GcXi.mjs.map +0 -1
package/dist/server/index.mjs
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1,
|
2
|
-
import { pick, omit, difference, castArray, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
|
1
|
+
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1, pagination } from "@strapi/utils";
|
2
|
+
import { pick, omit, difference, castArray, mergeWith, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
|
3
3
|
import "@strapi/types";
|
4
4
|
import * as yup from "yup";
|
5
5
|
import { scheduleJob } from "node-schedule";
|
@@ -7,10 +7,10 @@ import isNil from "lodash/isNil";
|
|
7
7
|
import _, { intersection as intersection$1, difference as difference$1 } from "lodash";
|
8
8
|
import qs from "qs";
|
9
9
|
import slugify from "@sindresorhus/slugify";
|
10
|
-
const getService$
|
10
|
+
const getService$2 = (name) => {
|
11
11
|
return strapi.plugin("content-manager").service(name);
|
12
12
|
};
|
13
|
-
function getService(strapi2, name) {
|
13
|
+
function getService$1(strapi2, name) {
|
14
14
|
return strapi2.service(`plugin::content-manager.${name}`);
|
15
15
|
}
|
16
16
|
const historyRestoreVersionSchema = yup.object().shape({
|
@@ -46,7 +46,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
46
46
|
if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {
|
47
47
|
throw new errors.ForbiddenError("contentType and documentId are required");
|
48
48
|
}
|
49
|
-
const permissionChecker2 = getService$
|
49
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
50
50
|
userAbility: ctx.state.userAbility,
|
51
51
|
model: ctx.query.contentType
|
52
52
|
});
|
@@ -54,7 +54,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
54
54
|
return ctx.forbidden();
|
55
55
|
}
|
56
56
|
const query = await permissionChecker2.sanitizeQuery(ctx.query);
|
57
|
-
const { results, pagination: pagination2 } = await getService(strapi2, "history").findVersionsPage({
|
57
|
+
const { results, pagination: pagination2 } = await getService$1(strapi2, "history").findVersionsPage({
|
58
58
|
query: {
|
59
59
|
...query,
|
60
60
|
...getValidPagination({ page: query.page, pageSize: query.pageSize })
|
@@ -79,14 +79,14 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
79
79
|
async restoreVersion(ctx) {
|
80
80
|
const request = ctx.request;
|
81
81
|
await validateRestoreVersion(request.body, "contentType is required");
|
82
|
-
const permissionChecker2 = getService$
|
82
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
83
83
|
userAbility: ctx.state.userAbility,
|
84
84
|
model: request.body.contentType
|
85
85
|
});
|
86
86
|
if (permissionChecker2.cannot.update()) {
|
87
87
|
throw new errors.ForbiddenError();
|
88
88
|
}
|
89
|
-
const restoredDocument = await getService(strapi2, "history").restoreVersion(
|
89
|
+
const restoredDocument = await getService$1(strapi2, "history").restoreVersion(
|
90
90
|
request.params.versionId
|
91
91
|
);
|
92
92
|
return {
|
@@ -95,7 +95,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
95
95
|
}
|
96
96
|
};
|
97
97
|
};
|
98
|
-
const controllers$
|
98
|
+
const controllers$2 = {
|
99
99
|
"history-version": createHistoryVersionController
|
100
100
|
/**
|
101
101
|
* Casting is needed because the types aren't aware that Strapi supports
|
@@ -141,8 +141,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
141
141
|
};
|
142
142
|
const getRelationRestoreValue = async (versionRelationData, attribute) => {
|
143
143
|
if (Array.isArray(versionRelationData)) {
|
144
|
-
if (versionRelationData.length === 0)
|
145
|
-
return versionRelationData;
|
144
|
+
if (versionRelationData.length === 0) return versionRelationData;
|
146
145
|
const existingAndMissingRelations = await Promise.all(
|
147
146
|
versionRelationData.map((relation) => {
|
148
147
|
return strapi2.documents(attribute.target).findOne({
|
@@ -177,8 +176,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
177
176
|
const getDefaultLocale = async () => localesService ? localesService.getDefaultLocale() : null;
|
178
177
|
const isLocalizedContentType = (model) => i18nContentTypeService ? i18nContentTypeService.isLocalizedContentType(model) : false;
|
179
178
|
const getLocaleDictionary = async () => {
|
180
|
-
if (!localesService)
|
181
|
-
return {};
|
179
|
+
if (!localesService) return {};
|
182
180
|
const locales = await localesService.find() || [];
|
183
181
|
return locales.reduce(
|
184
182
|
(acc, locale) => {
|
@@ -202,6 +200,17 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
202
200
|
const meta = await documentMetadataService.getMetadata(contentTypeUid, document);
|
203
201
|
return documentMetadataService.getStatus(document, meta.availableStatus);
|
204
202
|
};
|
203
|
+
const getComponentFields = (componentUID) => {
|
204
|
+
return Object.entries(strapi2.getModel(componentUID).attributes).reduce(
|
205
|
+
(fieldsAcc, [key, attribute]) => {
|
206
|
+
if (!["relation", "media", "component", "dynamiczone"].includes(attribute.type)) {
|
207
|
+
fieldsAcc.push(key);
|
208
|
+
}
|
209
|
+
return fieldsAcc;
|
210
|
+
},
|
211
|
+
[]
|
212
|
+
);
|
213
|
+
};
|
205
214
|
const getDeepPopulate2 = (uid2, useDatabaseSyntax = false) => {
|
206
215
|
const model = strapi2.getModel(uid2);
|
207
216
|
const attributes = Object.entries(model.attributes);
|
@@ -225,13 +234,19 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
225
234
|
}
|
226
235
|
case "component": {
|
227
236
|
const populate = getDeepPopulate2(attribute.component);
|
228
|
-
acc[attributeName] = {
|
237
|
+
acc[attributeName] = {
|
238
|
+
populate,
|
239
|
+
[fieldSelector]: getComponentFields(attribute.component)
|
240
|
+
};
|
229
241
|
break;
|
230
242
|
}
|
231
243
|
case "dynamiczone": {
|
232
244
|
const populatedComponents = (attribute.components || []).reduce(
|
233
245
|
(acc2, componentUID) => {
|
234
|
-
acc2[componentUID] = {
|
246
|
+
acc2[componentUID] = {
|
247
|
+
populate: getDeepPopulate2(componentUID),
|
248
|
+
[fieldSelector]: getComponentFields(componentUID)
|
249
|
+
};
|
235
250
|
return acc2;
|
236
251
|
},
|
237
252
|
{}
|
@@ -344,7 +359,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
344
359
|
const attributeValue = entry.data[attributeKey];
|
345
360
|
const attributeValues = Array.isArray(attributeValue) ? attributeValue : [attributeValue];
|
346
361
|
if (attributeSchema.type === "media") {
|
347
|
-
const permissionChecker2 = getService$
|
362
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
348
363
|
userAbility: params.state.userAbility,
|
349
364
|
model: "plugin::upload.file"
|
350
365
|
});
|
@@ -385,7 +400,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
385
400
|
[attributeKey]: adminUsers
|
386
401
|
};
|
387
402
|
}
|
388
|
-
const permissionChecker2 = getService$
|
403
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
389
404
|
userAbility: params.state.userAbility,
|
390
405
|
model: attributeSchema.target
|
391
406
|
});
|
@@ -561,7 +576,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
561
576
|
onCommit(async () => {
|
562
577
|
for (const entry of localeEntries) {
|
563
578
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
564
|
-
await getService(strapi2, "history").createVersion({
|
579
|
+
await getService$1(strapi2, "history").createVersion({
|
565
580
|
contentType: uid2,
|
566
581
|
data: omit(FIELDS_TO_IGNORE, entry),
|
567
582
|
relatedDocumentId: documentId,
|
@@ -574,15 +589,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
574
589
|
});
|
575
590
|
return result;
|
576
591
|
});
|
577
|
-
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
592
|
+
state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
|
578
593
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
579
594
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
580
595
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
581
596
|
where: {
|
582
597
|
created_at: {
|
583
|
-
$lt: expirationDate
|
598
|
+
$lt: expirationDate
|
584
599
|
}
|
585
600
|
}
|
601
|
+
}).catch((error) => {
|
602
|
+
if (error instanceof Error) {
|
603
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
604
|
+
}
|
586
605
|
});
|
587
606
|
});
|
588
607
|
state.isInitialized = true;
|
@@ -594,17 +613,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
594
613
|
}
|
595
614
|
};
|
596
615
|
};
|
597
|
-
const services$
|
616
|
+
const services$2 = {
|
598
617
|
history: createHistoryService,
|
599
618
|
lifecycles: createLifecyclesService
|
600
619
|
};
|
601
|
-
const info = { pluginName: "content-manager", type: "admin" };
|
620
|
+
const info$1 = { pluginName: "content-manager", type: "admin" };
|
602
621
|
const historyVersionRouter = {
|
603
622
|
type: "admin",
|
604
623
|
routes: [
|
605
624
|
{
|
606
625
|
method: "GET",
|
607
|
-
info,
|
626
|
+
info: info$1,
|
608
627
|
path: "/history-versions",
|
609
628
|
handler: "history-version.findMany",
|
610
629
|
config: {
|
@@ -613,7 +632,7 @@ const historyVersionRouter = {
|
|
613
632
|
},
|
614
633
|
{
|
615
634
|
method: "PUT",
|
616
|
-
info,
|
635
|
+
info: info$1,
|
617
636
|
path: "/history-versions/:versionId/restore",
|
618
637
|
handler: "history-version.restoreVersion",
|
619
638
|
config: {
|
@@ -622,7 +641,7 @@ const historyVersionRouter = {
|
|
622
641
|
}
|
623
642
|
]
|
624
643
|
};
|
625
|
-
const routes$
|
644
|
+
const routes$2 = {
|
626
645
|
"history-version": historyVersionRouter
|
627
646
|
};
|
628
647
|
const historyVersion = {
|
@@ -669,21 +688,21 @@ const historyVersion = {
|
|
669
688
|
}
|
670
689
|
}
|
671
690
|
};
|
672
|
-
const getFeature = () => {
|
691
|
+
const getFeature$1 = () => {
|
673
692
|
if (strapi.ee.features.isEnabled("cms-content-history")) {
|
674
693
|
return {
|
675
694
|
register({ strapi: strapi2 }) {
|
676
695
|
strapi2.get("models").add(historyVersion);
|
677
696
|
},
|
678
697
|
bootstrap({ strapi: strapi2 }) {
|
679
|
-
getService(strapi2, "lifecycles").bootstrap();
|
698
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
680
699
|
},
|
681
700
|
destroy({ strapi: strapi2 }) {
|
682
|
-
getService(strapi2, "lifecycles").destroy();
|
701
|
+
getService$1(strapi2, "lifecycles").destroy();
|
683
702
|
},
|
684
|
-
controllers: controllers$
|
685
|
-
services: services$
|
686
|
-
routes: routes$
|
703
|
+
controllers: controllers$2,
|
704
|
+
services: services$2,
|
705
|
+
routes: routes$2
|
687
706
|
};
|
688
707
|
}
|
689
708
|
return {
|
@@ -692,9 +711,201 @@ const getFeature = () => {
|
|
692
711
|
}
|
693
712
|
};
|
694
713
|
};
|
695
|
-
const history = getFeature();
|
714
|
+
const history = getFeature$1();
|
715
|
+
const info = { pluginName: "content-manager", type: "admin" };
|
716
|
+
const previewRouter = {
|
717
|
+
type: "admin",
|
718
|
+
routes: [
|
719
|
+
{
|
720
|
+
method: "GET",
|
721
|
+
info,
|
722
|
+
path: "/preview/url/:contentType",
|
723
|
+
handler: "preview.getPreviewUrl",
|
724
|
+
config: {
|
725
|
+
policies: ["admin::isAuthenticatedAdmin"]
|
726
|
+
}
|
727
|
+
}
|
728
|
+
]
|
729
|
+
};
|
730
|
+
const routes$1 = {
|
731
|
+
preview: previewRouter
|
732
|
+
};
|
733
|
+
function getService(strapi2, name) {
|
734
|
+
return strapi2.service(`plugin::content-manager.${name}`);
|
735
|
+
}
|
736
|
+
const getPreviewUrlSchema = yup.object().shape({
|
737
|
+
// Will be undefined for single types
|
738
|
+
documentId: yup.string(),
|
739
|
+
locale: yup.string().nullable(),
|
740
|
+
status: yup.string()
|
741
|
+
}).required();
|
742
|
+
const validatePreviewUrl = async (strapi2, uid2, params) => {
|
743
|
+
await validateYupSchema(getPreviewUrlSchema)(params);
|
744
|
+
const newParams = pick(["documentId", "locale", "status"], params);
|
745
|
+
const model = strapi2.getModel(uid2);
|
746
|
+
if (!model || model.modelType !== "contentType") {
|
747
|
+
throw new errors.ValidationError("Invalid content type");
|
748
|
+
}
|
749
|
+
const isSingleType = model?.kind === "singleType";
|
750
|
+
if (!isSingleType && !params.documentId) {
|
751
|
+
throw new errors.ValidationError("documentId is required for Collection Types");
|
752
|
+
}
|
753
|
+
if (isSingleType) {
|
754
|
+
const doc = await strapi2.documents(uid2).findFirst();
|
755
|
+
if (!doc) {
|
756
|
+
throw new errors.NotFoundError("Document not found");
|
757
|
+
}
|
758
|
+
newParams.documentId = doc?.documentId;
|
759
|
+
}
|
760
|
+
if (!newParams.status) {
|
761
|
+
const isDPEnabled = model?.options?.draftAndPublish;
|
762
|
+
newParams.status = isDPEnabled ? "draft" : "published";
|
763
|
+
}
|
764
|
+
return newParams;
|
765
|
+
};
|
766
|
+
const createPreviewController = () => {
|
767
|
+
return {
|
768
|
+
/**
|
769
|
+
* Transforms an entry into a preview URL, so that it can be previewed
|
770
|
+
* in the Content Manager.
|
771
|
+
*/
|
772
|
+
async getPreviewUrl(ctx) {
|
773
|
+
const uid2 = ctx.params.contentType;
|
774
|
+
const query = ctx.request.query;
|
775
|
+
const params = await validatePreviewUrl(strapi, uid2, query);
|
776
|
+
const previewService = getService(strapi, "preview");
|
777
|
+
const url = await previewService.getPreviewUrl(uid2, params);
|
778
|
+
if (!url) {
|
779
|
+
ctx.status = 204;
|
780
|
+
}
|
781
|
+
return {
|
782
|
+
data: { url }
|
783
|
+
};
|
784
|
+
}
|
785
|
+
};
|
786
|
+
};
|
787
|
+
const controllers$1 = {
|
788
|
+
preview: createPreviewController
|
789
|
+
/**
|
790
|
+
* Casting is needed because the types aren't aware that Strapi supports
|
791
|
+
* passing a controller factory as the value, instead of a controller object directly
|
792
|
+
*/
|
793
|
+
};
|
794
|
+
const createPreviewService = ({ strapi: strapi2 }) => {
|
795
|
+
const config = getService(strapi2, "preview-config");
|
796
|
+
return {
|
797
|
+
async getPreviewUrl(uid2, params) {
|
798
|
+
const handler = config.getPreviewHandler();
|
799
|
+
try {
|
800
|
+
return handler(uid2, params);
|
801
|
+
} catch (error) {
|
802
|
+
strapi2.log.error(`Failed to get preview URL: ${error}`);
|
803
|
+
throw new errors.ApplicationError("Failed to get preview URL");
|
804
|
+
}
|
805
|
+
return;
|
806
|
+
}
|
807
|
+
};
|
808
|
+
};
|
809
|
+
const extendMiddlewareConfiguration = (middleware = { name: "", config: {} }) => {
|
810
|
+
const middlewares = strapi.config.get("middlewares");
|
811
|
+
const configuredMiddlewares = middlewares.map((currentMiddleware) => {
|
812
|
+
if (currentMiddleware === middleware.name) {
|
813
|
+
return middleware;
|
814
|
+
}
|
815
|
+
if (currentMiddleware.name === middleware.name) {
|
816
|
+
return mergeWith(
|
817
|
+
(objValue, srcValue) => {
|
818
|
+
if (Array.isArray(objValue)) {
|
819
|
+
return objValue.concat(srcValue);
|
820
|
+
}
|
821
|
+
return void 0;
|
822
|
+
},
|
823
|
+
currentMiddleware,
|
824
|
+
middleware
|
825
|
+
);
|
826
|
+
}
|
827
|
+
return currentMiddleware;
|
828
|
+
});
|
829
|
+
strapi.config.set("middlewares", configuredMiddlewares);
|
830
|
+
};
|
831
|
+
const createPreviewConfigService = ({ strapi: strapi2 }) => {
|
832
|
+
return {
|
833
|
+
register() {
|
834
|
+
if (!this.isEnabled()) {
|
835
|
+
return;
|
836
|
+
}
|
837
|
+
const config = strapi2.config.get("admin.preview");
|
838
|
+
if (config.config?.allowedOrigins) {
|
839
|
+
extendMiddlewareConfiguration({
|
840
|
+
name: "strapi::security",
|
841
|
+
config: {
|
842
|
+
contentSecurityPolicy: {
|
843
|
+
directives: {
|
844
|
+
"frame-src": config.config.allowedOrigins
|
845
|
+
}
|
846
|
+
}
|
847
|
+
}
|
848
|
+
});
|
849
|
+
}
|
850
|
+
},
|
851
|
+
isEnabled() {
|
852
|
+
const config = strapi2.config.get("admin.preview");
|
853
|
+
if (!config) {
|
854
|
+
return false;
|
855
|
+
}
|
856
|
+
return config?.enabled ?? true;
|
857
|
+
},
|
858
|
+
/**
|
859
|
+
* Validate if the configuration is valid
|
860
|
+
*/
|
861
|
+
validate() {
|
862
|
+
if (!this.isEnabled()) {
|
863
|
+
return;
|
864
|
+
}
|
865
|
+
const handler = this.getPreviewHandler();
|
866
|
+
if (typeof handler !== "function") {
|
867
|
+
throw new errors.ValidationError(
|
868
|
+
"Preview configuration is invalid. Handler must be a function"
|
869
|
+
);
|
870
|
+
}
|
871
|
+
},
|
872
|
+
/**
|
873
|
+
* Utility to get the preview handler from the configuration
|
874
|
+
*/
|
875
|
+
getPreviewHandler() {
|
876
|
+
const config = strapi2.config.get("admin.preview");
|
877
|
+
const emptyHandler = () => {
|
878
|
+
return void 0;
|
879
|
+
};
|
880
|
+
if (!this.isEnabled()) {
|
881
|
+
return emptyHandler;
|
882
|
+
}
|
883
|
+
return config?.config?.handler || emptyHandler;
|
884
|
+
}
|
885
|
+
};
|
886
|
+
};
|
887
|
+
const services$1 = {
|
888
|
+
preview: createPreviewService,
|
889
|
+
"preview-config": createPreviewConfigService
|
890
|
+
};
|
891
|
+
const getFeature = () => {
|
892
|
+
return {
|
893
|
+
register() {
|
894
|
+
const config = getService(strapi, "preview-config");
|
895
|
+
config.validate();
|
896
|
+
config.register();
|
897
|
+
},
|
898
|
+
bootstrap() {
|
899
|
+
},
|
900
|
+
routes: routes$1,
|
901
|
+
controllers: controllers$1,
|
902
|
+
services: services$1
|
903
|
+
};
|
904
|
+
};
|
905
|
+
const preview = getFeature();
|
696
906
|
const register = async ({ strapi: strapi2 }) => {
|
697
907
|
await history.register?.({ strapi: strapi2 });
|
908
|
+
await preview.register?.({ strapi: strapi2 });
|
698
909
|
};
|
699
910
|
const ALLOWED_WEBHOOK_EVENTS = {
|
700
911
|
ENTRY_PUBLISH: "entry.publish",
|
@@ -704,11 +915,12 @@ const bootstrap = async () => {
|
|
704
915
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
705
916
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
706
917
|
});
|
707
|
-
getService$
|
708
|
-
await getService$
|
709
|
-
await getService$
|
710
|
-
await getService$
|
918
|
+
getService$2("field-sizes").setCustomFieldInputSizes();
|
919
|
+
await getService$2("components").syncConfigurations();
|
920
|
+
await getService$2("content-types").syncConfigurations();
|
921
|
+
await getService$2("permission").registerPermissions();
|
711
922
|
await history.bootstrap?.({ strapi });
|
923
|
+
await preview.bootstrap?.({ strapi });
|
712
924
|
};
|
713
925
|
const destroy = async ({ strapi: strapi2 }) => {
|
714
926
|
await history.destroy?.({ strapi: strapi2 });
|
@@ -1198,7 +1410,8 @@ const admin = {
|
|
1198
1410
|
};
|
1199
1411
|
const routes = {
|
1200
1412
|
admin,
|
1201
|
-
...history.routes ? history.routes : {}
|
1413
|
+
...history.routes ? history.routes : {},
|
1414
|
+
...preview.routes ? preview.routes : {}
|
1202
1415
|
};
|
1203
1416
|
const hasPermissionsSchema = yup$1.object({
|
1204
1417
|
actions: yup$1.array().of(yup$1.string()),
|
@@ -1261,8 +1474,7 @@ const isSortable = (schema, name) => {
|
|
1261
1474
|
if (!_.has(schema.attributes, name)) {
|
1262
1475
|
return false;
|
1263
1476
|
}
|
1264
|
-
if (schema.modelType === "component" && name === "id")
|
1265
|
-
return false;
|
1477
|
+
if (schema.modelType === "component" && name === "id") return false;
|
1266
1478
|
const attribute = schema.attributes[name];
|
1267
1479
|
if (NON_SORTABLES.includes(attribute.type)) {
|
1268
1480
|
return false;
|
@@ -1407,8 +1619,7 @@ const createDefaultSettings = async (schema) => {
|
|
1407
1619
|
};
|
1408
1620
|
};
|
1409
1621
|
const syncSettings = async (configuration, schema) => {
|
1410
|
-
if (isEmpty(configuration.settings))
|
1411
|
-
return createDefaultSettings(schema);
|
1622
|
+
if (isEmpty(configuration.settings)) return createDefaultSettings(schema);
|
1412
1623
|
const defaultField = getDefaultMainField(schema);
|
1413
1624
|
const { mainField = defaultField, defaultSortBy = defaultField } = configuration.settings || {};
|
1414
1625
|
return {
|
@@ -1455,7 +1666,7 @@ const createMetadasSchema = (schema) => {
|
|
1455
1666
|
if (!value) {
|
1456
1667
|
return yup$1.string();
|
1457
1668
|
}
|
1458
|
-
const targetSchema = getService$
|
1669
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1459
1670
|
schema.attributes[key].targetModel
|
1460
1671
|
);
|
1461
1672
|
if (!targetSchema) {
|
@@ -1584,8 +1795,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1584
1795
|
}
|
1585
1796
|
switch (attribute.type) {
|
1586
1797
|
case "relation": {
|
1587
|
-
if (canCreate(attributePath))
|
1588
|
-
return body2;
|
1798
|
+
if (canCreate(attributePath)) return body2;
|
1589
1799
|
return set(attributePath, { set: [] }, body2);
|
1590
1800
|
}
|
1591
1801
|
case "component": {
|
@@ -1595,8 +1805,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1595
1805
|
]);
|
1596
1806
|
}
|
1597
1807
|
default: {
|
1598
|
-
if (canCreate(attributePath))
|
1599
|
-
return body2;
|
1808
|
+
if (canCreate(attributePath)) return body2;
|
1600
1809
|
return set(attributePath, null, body2);
|
1601
1810
|
}
|
1602
1811
|
}
|
@@ -1624,7 +1833,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1624
1833
|
}
|
1625
1834
|
};
|
1626
1835
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1627
|
-
const documentMetadata2 = getService$
|
1836
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1628
1837
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1629
1838
|
let {
|
1630
1839
|
meta: { availableLocales, availableStatus }
|
@@ -1650,8 +1859,8 @@ const createDocument = async (ctx, opts) => {
|
|
1650
1859
|
const { userAbility, user } = ctx.state;
|
1651
1860
|
const { model } = ctx.params;
|
1652
1861
|
const { body } = ctx.request;
|
1653
|
-
const documentManager2 = getService$
|
1654
|
-
const permissionChecker2 = getService$
|
1862
|
+
const documentManager2 = getService$2("document-manager");
|
1863
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1655
1864
|
if (permissionChecker2.cannot.create()) {
|
1656
1865
|
throw new errors.ForbiddenError();
|
1657
1866
|
}
|
@@ -1671,13 +1880,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1671
1880
|
const { userAbility, user } = ctx.state;
|
1672
1881
|
const { id, model } = ctx.params;
|
1673
1882
|
const { body } = ctx.request;
|
1674
|
-
const documentManager2 = getService$
|
1675
|
-
const permissionChecker2 = getService$
|
1883
|
+
const documentManager2 = getService$2("document-manager");
|
1884
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1676
1885
|
if (permissionChecker2.cannot.update()) {
|
1677
1886
|
throw new errors.ForbiddenError();
|
1678
1887
|
}
|
1679
1888
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1680
|
-
const populate = await getService$
|
1889
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1681
1890
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1682
1891
|
const [documentVersion, documentExists] = await Promise.all([
|
1683
1892
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1708,14 +1917,14 @@ const collectionTypes = {
|
|
1708
1917
|
const { userAbility } = ctx.state;
|
1709
1918
|
const { model } = ctx.params;
|
1710
1919
|
const { query } = ctx.request;
|
1711
|
-
const documentMetadata2 = getService$
|
1712
|
-
const documentManager2 = getService$
|
1713
|
-
const permissionChecker2 = getService$
|
1920
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1921
|
+
const documentManager2 = getService$2("document-manager");
|
1922
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1714
1923
|
if (permissionChecker2.cannot.read()) {
|
1715
1924
|
return ctx.forbidden();
|
1716
1925
|
}
|
1717
1926
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1718
|
-
const populate = await getService$
|
1927
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1719
1928
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1720
1929
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1721
1930
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1744,13 +1953,13 @@ const collectionTypes = {
|
|
1744
1953
|
async findOne(ctx) {
|
1745
1954
|
const { userAbility } = ctx.state;
|
1746
1955
|
const { model, id } = ctx.params;
|
1747
|
-
const documentManager2 = getService$
|
1748
|
-
const permissionChecker2 = getService$
|
1956
|
+
const documentManager2 = getService$2("document-manager");
|
1957
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1749
1958
|
if (permissionChecker2.cannot.read()) {
|
1750
1959
|
return ctx.forbidden();
|
1751
1960
|
}
|
1752
1961
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1753
|
-
const populate = await getService$
|
1962
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1754
1963
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1755
1964
|
const version = await documentManager2.findOne(id, model, {
|
1756
1965
|
populate,
|
@@ -1781,7 +1990,7 @@ const collectionTypes = {
|
|
1781
1990
|
async create(ctx) {
|
1782
1991
|
const { userAbility } = ctx.state;
|
1783
1992
|
const { model } = ctx.params;
|
1784
|
-
const permissionChecker2 = getService$
|
1993
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1785
1994
|
const [totalEntries, document] = await Promise.all([
|
1786
1995
|
strapi.db.query(model).count(),
|
1787
1996
|
createDocument(ctx)
|
@@ -1802,7 +2011,7 @@ const collectionTypes = {
|
|
1802
2011
|
async update(ctx) {
|
1803
2012
|
const { userAbility } = ctx.state;
|
1804
2013
|
const { model } = ctx.params;
|
1805
|
-
const permissionChecker2 = getService$
|
2014
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1806
2015
|
const updatedVersion = await updateDocument(ctx);
|
1807
2016
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1808
2017
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1811,13 +2020,13 @@ const collectionTypes = {
|
|
1811
2020
|
const { userAbility, user } = ctx.state;
|
1812
2021
|
const { model, sourceId: id } = ctx.params;
|
1813
2022
|
const { body } = ctx.request;
|
1814
|
-
const documentManager2 = getService$
|
1815
|
-
const permissionChecker2 = getService$
|
2023
|
+
const documentManager2 = getService$2("document-manager");
|
2024
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1816
2025
|
if (permissionChecker2.cannot.create()) {
|
1817
2026
|
return ctx.forbidden();
|
1818
2027
|
}
|
1819
2028
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1820
|
-
const populate = await getService$
|
2029
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1821
2030
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1822
2031
|
const document = await documentManager2.findOne(id, model, {
|
1823
2032
|
populate,
|
@@ -1856,13 +2065,13 @@ const collectionTypes = {
|
|
1856
2065
|
async delete(ctx) {
|
1857
2066
|
const { userAbility } = ctx.state;
|
1858
2067
|
const { id, model } = ctx.params;
|
1859
|
-
const documentManager2 = getService$
|
1860
|
-
const permissionChecker2 = getService$
|
2068
|
+
const documentManager2 = getService$2("document-manager");
|
2069
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1861
2070
|
if (permissionChecker2.cannot.delete()) {
|
1862
2071
|
return ctx.forbidden();
|
1863
2072
|
}
|
1864
2073
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1865
|
-
const populate = await getService$
|
2074
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1866
2075
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1867
2076
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1868
2077
|
if (documentLocales.length === 0) {
|
@@ -1884,14 +2093,14 @@ const collectionTypes = {
|
|
1884
2093
|
const { userAbility } = ctx.state;
|
1885
2094
|
const { id, model } = ctx.params;
|
1886
2095
|
const { body } = ctx.request;
|
1887
|
-
const documentManager2 = getService$
|
1888
|
-
const permissionChecker2 = getService$
|
2096
|
+
const documentManager2 = getService$2("document-manager");
|
2097
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1889
2098
|
if (permissionChecker2.cannot.publish()) {
|
1890
2099
|
return ctx.forbidden();
|
1891
2100
|
}
|
1892
2101
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1893
2102
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1894
|
-
const populate = await getService$
|
2103
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1895
2104
|
let document;
|
1896
2105
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1897
2106
|
const isCreate = isNil$1(id);
|
@@ -1939,13 +2148,13 @@ const collectionTypes = {
|
|
1939
2148
|
const { body } = ctx.request;
|
1940
2149
|
const { documentIds } = body;
|
1941
2150
|
await validateBulkActionInput(body);
|
1942
|
-
const documentManager2 = getService$
|
1943
|
-
const permissionChecker2 = getService$
|
2151
|
+
const documentManager2 = getService$2("document-manager");
|
2152
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1944
2153
|
if (permissionChecker2.cannot.publish()) {
|
1945
2154
|
return ctx.forbidden();
|
1946
2155
|
}
|
1947
2156
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1948
|
-
const populate = await getService$
|
2157
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1949
2158
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1950
2159
|
allowMultipleLocales: true
|
1951
2160
|
});
|
@@ -1970,8 +2179,8 @@ const collectionTypes = {
|
|
1970
2179
|
const { body } = ctx.request;
|
1971
2180
|
const { documentIds } = body;
|
1972
2181
|
await validateBulkActionInput(body);
|
1973
|
-
const documentManager2 = getService$
|
1974
|
-
const permissionChecker2 = getService$
|
2182
|
+
const documentManager2 = getService$2("document-manager");
|
2183
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1975
2184
|
if (permissionChecker2.cannot.unpublish()) {
|
1976
2185
|
return ctx.forbidden();
|
1977
2186
|
}
|
@@ -2000,8 +2209,8 @@ const collectionTypes = {
|
|
2000
2209
|
const {
|
2001
2210
|
body: { discardDraft, ...body }
|
2002
2211
|
} = ctx.request;
|
2003
|
-
const documentManager2 = getService$
|
2004
|
-
const permissionChecker2 = getService$
|
2212
|
+
const documentManager2 = getService$2("document-manager");
|
2213
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2005
2214
|
if (permissionChecker2.cannot.unpublish()) {
|
2006
2215
|
return ctx.forbidden();
|
2007
2216
|
}
|
@@ -2009,7 +2218,7 @@ const collectionTypes = {
|
|
2009
2218
|
return ctx.forbidden();
|
2010
2219
|
}
|
2011
2220
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2012
|
-
const populate = await getService$
|
2221
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2013
2222
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2014
2223
|
const document = await documentManager2.findOne(id, model, {
|
2015
2224
|
populate,
|
@@ -2040,13 +2249,13 @@ const collectionTypes = {
|
|
2040
2249
|
const { userAbility } = ctx.state;
|
2041
2250
|
const { id, model } = ctx.params;
|
2042
2251
|
const { body } = ctx.request;
|
2043
|
-
const documentManager2 = getService$
|
2044
|
-
const permissionChecker2 = getService$
|
2252
|
+
const documentManager2 = getService$2("document-manager");
|
2253
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2045
2254
|
if (permissionChecker2.cannot.discard()) {
|
2046
2255
|
return ctx.forbidden();
|
2047
2256
|
}
|
2048
2257
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2049
|
-
const populate = await getService$
|
2258
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2050
2259
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2051
2260
|
const document = await documentManager2.findOne(id, model, {
|
2052
2261
|
populate,
|
@@ -2071,13 +2280,13 @@ const collectionTypes = {
|
|
2071
2280
|
const { query, body } = ctx.request;
|
2072
2281
|
const { documentIds } = body;
|
2073
2282
|
await validateBulkActionInput(body);
|
2074
|
-
const documentManager2 = getService$
|
2075
|
-
const permissionChecker2 = getService$
|
2283
|
+
const documentManager2 = getService$2("document-manager");
|
2284
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2076
2285
|
if (permissionChecker2.cannot.delete()) {
|
2077
2286
|
return ctx.forbidden();
|
2078
2287
|
}
|
2079
2288
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2080
|
-
const populate = await getService$
|
2289
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2081
2290
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2082
2291
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2083
2292
|
populate,
|
@@ -2098,13 +2307,13 @@ const collectionTypes = {
|
|
2098
2307
|
async countDraftRelations(ctx) {
|
2099
2308
|
const { userAbility } = ctx.state;
|
2100
2309
|
const { model, id } = ctx.params;
|
2101
|
-
const documentManager2 = getService$
|
2102
|
-
const permissionChecker2 = getService$
|
2310
|
+
const documentManager2 = getService$2("document-manager");
|
2311
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2103
2312
|
if (permissionChecker2.cannot.read()) {
|
2104
2313
|
return ctx.forbidden();
|
2105
2314
|
}
|
2106
2315
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2107
|
-
const populate = await getService$
|
2316
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2108
2317
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2109
2318
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2110
2319
|
if (!entity) {
|
@@ -2123,8 +2332,8 @@ const collectionTypes = {
|
|
2123
2332
|
const ids = ctx.request.query.documentIds;
|
2124
2333
|
const locale = ctx.request.query.locale;
|
2125
2334
|
const { model } = ctx.params;
|
2126
|
-
const documentManager2 = getService$
|
2127
|
-
const permissionChecker2 = getService$
|
2335
|
+
const documentManager2 = getService$2("document-manager");
|
2336
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2128
2337
|
if (permissionChecker2.cannot.read()) {
|
2129
2338
|
return ctx.forbidden();
|
2130
2339
|
}
|
@@ -2148,13 +2357,13 @@ const collectionTypes = {
|
|
2148
2357
|
};
|
2149
2358
|
const components$1 = {
|
2150
2359
|
findComponents(ctx) {
|
2151
|
-
const components2 = getService$
|
2152
|
-
const { toDto } = getService$
|
2360
|
+
const components2 = getService$2("components").findAllComponents();
|
2361
|
+
const { toDto } = getService$2("data-mapper");
|
2153
2362
|
ctx.body = { data: components2.map(toDto) };
|
2154
2363
|
},
|
2155
2364
|
async findComponentConfiguration(ctx) {
|
2156
2365
|
const { uid: uid2 } = ctx.params;
|
2157
|
-
const componentService = getService$
|
2366
|
+
const componentService = getService$2("components");
|
2158
2367
|
const component = componentService.findComponent(uid2);
|
2159
2368
|
if (!component) {
|
2160
2369
|
return ctx.notFound("component.notFound");
|
@@ -2171,7 +2380,7 @@ const components$1 = {
|
|
2171
2380
|
async updateComponentConfiguration(ctx) {
|
2172
2381
|
const { uid: uid2 } = ctx.params;
|
2173
2382
|
const { body } = ctx.request;
|
2174
|
-
const componentService = getService$
|
2383
|
+
const componentService = getService$2("components");
|
2175
2384
|
const component = componentService.findComponent(uid2);
|
2176
2385
|
if (!component) {
|
2177
2386
|
return ctx.notFound("component.notFound");
|
@@ -2205,12 +2414,12 @@ const contentTypes = {
|
|
2205
2414
|
} catch (error) {
|
2206
2415
|
return ctx.send({ error }, 400);
|
2207
2416
|
}
|
2208
|
-
const contentTypes2 = getService$
|
2209
|
-
const { toDto } = getService$
|
2417
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2418
|
+
const { toDto } = getService$2("data-mapper");
|
2210
2419
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2211
2420
|
},
|
2212
2421
|
async findContentTypesSettings(ctx) {
|
2213
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2422
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2214
2423
|
const contentTypes2 = await findAllContentTypes();
|
2215
2424
|
const configurations = await Promise.all(
|
2216
2425
|
contentTypes2.map(async (contentType) => {
|
@@ -2224,7 +2433,7 @@ const contentTypes = {
|
|
2224
2433
|
},
|
2225
2434
|
async findContentTypeConfiguration(ctx) {
|
2226
2435
|
const { uid: uid2 } = ctx.params;
|
2227
|
-
const contentTypeService = getService$
|
2436
|
+
const contentTypeService = getService$2("content-types");
|
2228
2437
|
const contentType = await contentTypeService.findContentType(uid2);
|
2229
2438
|
if (!contentType) {
|
2230
2439
|
return ctx.notFound("contentType.notFound");
|
@@ -2246,13 +2455,13 @@ const contentTypes = {
|
|
2246
2455
|
const { userAbility } = ctx.state;
|
2247
2456
|
const { uid: uid2 } = ctx.params;
|
2248
2457
|
const { body } = ctx.request;
|
2249
|
-
const contentTypeService = getService$
|
2250
|
-
const metricsService = getService$
|
2458
|
+
const contentTypeService = getService$2("content-types");
|
2459
|
+
const metricsService = getService$2("metrics");
|
2251
2460
|
const contentType = await contentTypeService.findContentType(uid2);
|
2252
2461
|
if (!contentType) {
|
2253
2462
|
return ctx.notFound("contentType.notFound");
|
2254
2463
|
}
|
2255
|
-
if (!getService$
|
2464
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2256
2465
|
return ctx.forbidden();
|
2257
2466
|
}
|
2258
2467
|
let input;
|
@@ -2285,10 +2494,10 @@ const contentTypes = {
|
|
2285
2494
|
};
|
2286
2495
|
const init = {
|
2287
2496
|
getInitData(ctx) {
|
2288
|
-
const { toDto } = getService$
|
2289
|
-
const { findAllComponents } = getService$
|
2290
|
-
const { getAllFieldSizes } = getService$
|
2291
|
-
const { findAllContentTypes } = getService$
|
2497
|
+
const { toDto } = getService$2("data-mapper");
|
2498
|
+
const { findAllComponents } = getService$2("components");
|
2499
|
+
const { getAllFieldSizes } = getService$2("field-sizes");
|
2500
|
+
const { findAllContentTypes } = getService$2("content-types");
|
2292
2501
|
ctx.body = {
|
2293
2502
|
data: {
|
2294
2503
|
fieldSizes: getAllFieldSizes(),
|
@@ -2324,7 +2533,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2324
2533
|
params.filters.$and.push(filtersClause);
|
2325
2534
|
};
|
2326
2535
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2327
|
-
const permissionChecker2 = getService$
|
2536
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2328
2537
|
userAbility,
|
2329
2538
|
model: model.uid
|
2330
2539
|
});
|
@@ -2338,15 +2547,27 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2338
2547
|
}
|
2339
2548
|
return mainField;
|
2340
2549
|
};
|
2341
|
-
const addStatusToRelations = async (
|
2342
|
-
if (!contentTypes$1.hasDraftAndPublish(strapi.
|
2550
|
+
const addStatusToRelations = async (targetUid, relations2) => {
|
2551
|
+
if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2343
2552
|
return relations2;
|
2344
2553
|
}
|
2345
|
-
const documentMetadata2 = getService$
|
2346
|
-
|
2554
|
+
const documentMetadata2 = getService$2("document-metadata");
|
2555
|
+
if (!relations2.length) {
|
2556
|
+
return relations2;
|
2557
|
+
}
|
2558
|
+
const firstRelation = relations2[0];
|
2559
|
+
const filters = {
|
2560
|
+
documentId: { $in: relations2.map((r) => r.documentId) },
|
2561
|
+
// NOTE: find the "opposite" status
|
2562
|
+
publishedAt: firstRelation.publishedAt !== null ? { $null: true } : { $notNull: true }
|
2563
|
+
};
|
2564
|
+
const availableStatus = await strapi.query(targetUid).findMany({
|
2565
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"],
|
2566
|
+
filters
|
2567
|
+
});
|
2347
2568
|
return relations2.map((relation) => {
|
2348
|
-
const availableStatuses =
|
2349
|
-
(availableDocument) => availableDocument.documentId === relation.documentId
|
2569
|
+
const availableStatuses = availableStatus.filter(
|
2570
|
+
(availableDocument) => availableDocument.documentId === relation.documentId && (relation.locale ? availableDocument.locale === relation.locale : true)
|
2350
2571
|
);
|
2351
2572
|
return {
|
2352
2573
|
...relation,
|
@@ -2377,8 +2598,7 @@ const validateStatus = (sourceUid, status) => {
|
|
2377
2598
|
const sourceModel = strapi.getModel(sourceUid);
|
2378
2599
|
const isDP = contentTypes$1.hasDraftAndPublish;
|
2379
2600
|
const isSourceDP = isDP(sourceModel);
|
2380
|
-
if (!isSourceDP)
|
2381
|
-
return { status: void 0 };
|
2601
|
+
if (!isSourceDP) return { status: void 0 };
|
2382
2602
|
switch (status) {
|
2383
2603
|
case "published":
|
2384
2604
|
return { status: "published" };
|
@@ -2408,7 +2628,7 @@ const relations = {
|
|
2408
2628
|
ctx.request?.query?.locale
|
2409
2629
|
);
|
2410
2630
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2411
|
-
const permissionChecker2 = getService$
|
2631
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2412
2632
|
userAbility,
|
2413
2633
|
model
|
2414
2634
|
});
|
@@ -2433,7 +2653,7 @@ const relations = {
|
|
2433
2653
|
where.id = id;
|
2434
2654
|
}
|
2435
2655
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2436
|
-
const populate = await getService$
|
2656
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2437
2657
|
const currentEntity = await strapi.db.query(model).findOne({
|
2438
2658
|
where,
|
2439
2659
|
populate
|
@@ -2448,7 +2668,7 @@ const relations = {
|
|
2448
2668
|
}
|
2449
2669
|
entryId = currentEntity.id;
|
2450
2670
|
}
|
2451
|
-
const modelConfig = isComponent2 ? await getService$
|
2671
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2452
2672
|
const targetSchema = strapi.getModel(targetUid);
|
2453
2673
|
const mainField = flow(
|
2454
2674
|
prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2502,7 +2722,7 @@ const relations = {
|
|
2502
2722
|
}
|
2503
2723
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2504
2724
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2505
|
-
const permissionChecker2 = getService$
|
2725
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2506
2726
|
userAbility: ctx.state.userAbility,
|
2507
2727
|
model: targetUid
|
2508
2728
|
});
|
@@ -2575,21 +2795,33 @@ const relations = {
|
|
2575
2795
|
attribute,
|
2576
2796
|
targetField,
|
2577
2797
|
fieldsToSelect,
|
2578
|
-
|
2579
|
-
|
2580
|
-
}
|
2581
|
-
target: {
|
2582
|
-
schema: { uid: targetUid }
|
2583
|
-
}
|
2798
|
+
status,
|
2799
|
+
source: { schema: sourceSchema },
|
2800
|
+
target: { schema: targetSchema }
|
2584
2801
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2585
|
-
const
|
2802
|
+
const { uid: sourceUid } = sourceSchema;
|
2803
|
+
const { uid: targetUid } = targetSchema;
|
2804
|
+
const permissionQuery = await getService$2("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
|
2586
2805
|
const dbQuery = strapi.db.query(sourceUid);
|
2587
2806
|
const loadRelations = relations$1.isAnyToMany(attribute) ? (...args) => dbQuery.loadPages(...args) : (...args) => dbQuery.load(...args).then((res2) => ({ results: res2 ? [res2] : [] }));
|
2807
|
+
const filters = {};
|
2808
|
+
if (sourceSchema?.options?.draftAndPublish) {
|
2809
|
+
if (targetSchema?.options?.draftAndPublish) {
|
2810
|
+
if (status === "published") {
|
2811
|
+
filters.publishedAt = { $notNull: true };
|
2812
|
+
} else {
|
2813
|
+
filters.publishedAt = { $null: true };
|
2814
|
+
}
|
2815
|
+
}
|
2816
|
+
} else if (targetSchema?.options?.draftAndPublish) {
|
2817
|
+
filters.publishedAt = { $null: true };
|
2818
|
+
}
|
2588
2819
|
const res = await loadRelations({ id: entryId }, targetField, {
|
2589
|
-
select: ["id", "documentId", "locale", "publishedAt"],
|
2820
|
+
select: ["id", "documentId", "locale", "publishedAt", "updatedAt"],
|
2590
2821
|
ordering: "desc",
|
2591
2822
|
page: ctx.request.query.page,
|
2592
|
-
pageSize: ctx.request.query.pageSize
|
2823
|
+
pageSize: ctx.request.query.pageSize,
|
2824
|
+
filters
|
2593
2825
|
});
|
2594
2826
|
const loadedIds = res.results.map((item) => item.id);
|
2595
2827
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
@@ -2610,10 +2842,10 @@ const relations = {
|
|
2610
2842
|
}
|
2611
2843
|
};
|
2612
2844
|
const buildPopulateFromQuery = async (query, model) => {
|
2613
|
-
return getService$
|
2845
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2614
2846
|
};
|
2615
2847
|
const findDocument = async (query, uid2, opts = {}) => {
|
2616
|
-
const documentManager2 = getService$
|
2848
|
+
const documentManager2 = getService$2("document-manager");
|
2617
2849
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2618
2850
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2619
2851
|
};
|
@@ -2621,8 +2853,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2621
2853
|
const { user, userAbility } = ctx.state;
|
2622
2854
|
const { model } = ctx.params;
|
2623
2855
|
const { body, query } = ctx.request;
|
2624
|
-
const documentManager2 = getService$
|
2625
|
-
const permissionChecker2 = getService$
|
2856
|
+
const documentManager2 = getService$2("document-manager");
|
2857
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2626
2858
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2627
2859
|
throw new errors.ForbiddenError();
|
2628
2860
|
}
|
@@ -2663,7 +2895,7 @@ const singleTypes = {
|
|
2663
2895
|
const { userAbility } = ctx.state;
|
2664
2896
|
const { model } = ctx.params;
|
2665
2897
|
const { query = {} } = ctx.request;
|
2666
|
-
const permissionChecker2 = getService$
|
2898
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2667
2899
|
if (permissionChecker2.cannot.read()) {
|
2668
2900
|
return ctx.forbidden();
|
2669
2901
|
}
|
@@ -2697,7 +2929,7 @@ const singleTypes = {
|
|
2697
2929
|
async createOrUpdate(ctx) {
|
2698
2930
|
const { userAbility } = ctx.state;
|
2699
2931
|
const { model } = ctx.params;
|
2700
|
-
const permissionChecker2 = getService$
|
2932
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2701
2933
|
const document = await createOrUpdateDocument(ctx);
|
2702
2934
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2703
2935
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2706,8 +2938,8 @@ const singleTypes = {
|
|
2706
2938
|
const { userAbility } = ctx.state;
|
2707
2939
|
const { model } = ctx.params;
|
2708
2940
|
const { query = {} } = ctx.request;
|
2709
|
-
const documentManager2 = getService$
|
2710
|
-
const permissionChecker2 = getService$
|
2941
|
+
const documentManager2 = getService$2("document-manager");
|
2942
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2711
2943
|
if (permissionChecker2.cannot.delete()) {
|
2712
2944
|
return ctx.forbidden();
|
2713
2945
|
}
|
@@ -2735,8 +2967,8 @@ const singleTypes = {
|
|
2735
2967
|
const { userAbility } = ctx.state;
|
2736
2968
|
const { model } = ctx.params;
|
2737
2969
|
const { query = {} } = ctx.request;
|
2738
|
-
const documentManager2 = getService$
|
2739
|
-
const permissionChecker2 = getService$
|
2970
|
+
const documentManager2 = getService$2("document-manager");
|
2971
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2740
2972
|
if (permissionChecker2.cannot.publish()) {
|
2741
2973
|
return ctx.forbidden();
|
2742
2974
|
}
|
@@ -2764,8 +2996,8 @@ const singleTypes = {
|
|
2764
2996
|
body: { discardDraft, ...body },
|
2765
2997
|
query = {}
|
2766
2998
|
} = ctx.request;
|
2767
|
-
const documentManager2 = getService$
|
2768
|
-
const permissionChecker2 = getService$
|
2999
|
+
const documentManager2 = getService$2("document-manager");
|
3000
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2769
3001
|
if (permissionChecker2.cannot.unpublish()) {
|
2770
3002
|
return ctx.forbidden();
|
2771
3003
|
}
|
@@ -2799,8 +3031,8 @@ const singleTypes = {
|
|
2799
3031
|
const { userAbility } = ctx.state;
|
2800
3032
|
const { model } = ctx.params;
|
2801
3033
|
const { body, query = {} } = ctx.request;
|
2802
|
-
const documentManager2 = getService$
|
2803
|
-
const permissionChecker2 = getService$
|
3034
|
+
const documentManager2 = getService$2("document-manager");
|
3035
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2804
3036
|
if (permissionChecker2.cannot.discard()) {
|
2805
3037
|
return ctx.forbidden();
|
2806
3038
|
}
|
@@ -2823,8 +3055,8 @@ const singleTypes = {
|
|
2823
3055
|
const { userAbility } = ctx.state;
|
2824
3056
|
const { model } = ctx.params;
|
2825
3057
|
const { query } = ctx.request;
|
2826
|
-
const documentManager2 = getService$
|
2827
|
-
const permissionChecker2 = getService$
|
3058
|
+
const documentManager2 = getService$2("document-manager");
|
3059
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2828
3060
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2829
3061
|
if (permissionChecker2.cannot.read()) {
|
2830
3062
|
return ctx.forbidden();
|
@@ -2848,7 +3080,7 @@ const uid$1 = {
|
|
2848
3080
|
const { query = {} } = ctx.request;
|
2849
3081
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2850
3082
|
await validateUIDField(contentTypeUID, field);
|
2851
|
-
const uidService = getService$
|
3083
|
+
const uidService = getService$2("uid");
|
2852
3084
|
ctx.body = {
|
2853
3085
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2854
3086
|
};
|
@@ -2860,7 +3092,7 @@ const uid$1 = {
|
|
2860
3092
|
const { query = {} } = ctx.request;
|
2861
3093
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2862
3094
|
await validateUIDField(contentTypeUID, field);
|
2863
|
-
const uidService = getService$
|
3095
|
+
const uidService = getService$2("uid");
|
2864
3096
|
const isAvailable = await uidService.checkUIDAvailability({
|
2865
3097
|
contentTypeUID,
|
2866
3098
|
field,
|
@@ -2881,7 +3113,8 @@ const controllers = {
|
|
2881
3113
|
relations,
|
2882
3114
|
"single-types": singleTypes,
|
2883
3115
|
uid: uid$1,
|
2884
|
-
...history.controllers ? history.controllers : {}
|
3116
|
+
...history.controllers ? history.controllers : {},
|
3117
|
+
...preview.controllers ? preview.controllers : {}
|
2885
3118
|
};
|
2886
3119
|
const keys = {
|
2887
3120
|
CONFIGURATION: "configuration"
|
@@ -3010,18 +3243,15 @@ async function syncMetadatas(configuration, schema) {
|
|
3010
3243
|
_.set(updatedMeta, ["list", "searchable"], false);
|
3011
3244
|
_.set(acc, [key], updatedMeta);
|
3012
3245
|
}
|
3013
|
-
if (!_.has(edit, "mainField"))
|
3014
|
-
return acc;
|
3246
|
+
if (!_.has(edit, "mainField")) return acc;
|
3015
3247
|
if (!isRelation$1(attr)) {
|
3016
3248
|
_.set(updatedMeta, "edit", _.omit(edit, ["mainField"]));
|
3017
3249
|
_.set(acc, [key], updatedMeta);
|
3018
3250
|
return acc;
|
3019
3251
|
}
|
3020
|
-
if (edit.mainField === "id")
|
3021
|
-
return acc;
|
3252
|
+
if (edit.mainField === "id") return acc;
|
3022
3253
|
const targetSchema = getTargetSchema(attr.targetModel);
|
3023
|
-
if (!targetSchema)
|
3024
|
-
return acc;
|
3254
|
+
if (!targetSchema) return acc;
|
3025
3255
|
if (!isSortable(targetSchema, edit.mainField) && !isListable(targetSchema, edit.mainField)) {
|
3026
3256
|
_.set(updatedMeta, ["edit", "mainField"], getDefaultMainField(targetSchema));
|
3027
3257
|
_.set(acc, [key], updatedMeta);
|
@@ -3032,12 +3262,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3032
3262
|
return _.assign(metasWithDefaults, updatedMetas);
|
3033
3263
|
}
|
3034
3264
|
const getTargetSchema = (targetModel) => {
|
3035
|
-
return getService$
|
3265
|
+
return getService$2("content-types").findContentType(targetModel);
|
3036
3266
|
};
|
3037
3267
|
const DEFAULT_LIST_LENGTH = 4;
|
3038
3268
|
const MAX_ROW_SIZE = 12;
|
3039
3269
|
const isAllowedFieldSize = (type, size) => {
|
3040
|
-
const { getFieldSize } = getService$
|
3270
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3041
3271
|
const fieldSize = getFieldSize(type);
|
3042
3272
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3043
3273
|
return false;
|
@@ -3045,7 +3275,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3045
3275
|
return size <= MAX_ROW_SIZE;
|
3046
3276
|
};
|
3047
3277
|
const getDefaultFieldSize = (attribute) => {
|
3048
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3278
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3049
3279
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3050
3280
|
};
|
3051
3281
|
async function createDefaultLayouts(schema) {
|
@@ -3066,8 +3296,7 @@ function createDefaultEditLayout(schema) {
|
|
3066
3296
|
return appendToEditLayout([], keys2, schema);
|
3067
3297
|
}
|
3068
3298
|
function syncLayouts(configuration, schema) {
|
3069
|
-
if (_.isEmpty(configuration.layouts))
|
3070
|
-
return createDefaultLayouts(schema);
|
3299
|
+
if (_.isEmpty(configuration.layouts)) return createDefaultLayouts(schema);
|
3071
3300
|
const { list = [], editRelations = [], edit = [] } = configuration.layouts || {};
|
3072
3301
|
let cleanList = list.filter((attr) => isListable(schema, attr));
|
3073
3302
|
const cleanEditRelations = editRelations.filter(
|
@@ -3078,9 +3307,8 @@ function syncLayouts(configuration, schema) {
|
|
3078
3307
|
for (const row of edit) {
|
3079
3308
|
const newRow = [];
|
3080
3309
|
for (const el of row) {
|
3081
|
-
if (!hasEditableAttribute(schema, el.name))
|
3082
|
-
|
3083
|
-
const { hasFieldSize } = getService$1("field-sizes");
|
3310
|
+
if (!hasEditableAttribute(schema, el.name)) continue;
|
3311
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3084
3312
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3085
3313
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3086
3314
|
elementsToReAppend.push(el.name);
|
@@ -3110,8 +3338,7 @@ function syncLayouts(configuration, schema) {
|
|
3110
3338
|
};
|
3111
3339
|
}
|
3112
3340
|
const appendToEditLayout = (layout = [], keysToAppend, schema) => {
|
3113
|
-
if (keysToAppend.length === 0)
|
3114
|
-
return layout;
|
3341
|
+
if (keysToAppend.length === 0) return layout;
|
3115
3342
|
let currentRowIndex = Math.max(layout.length - 1, 0);
|
3116
3343
|
if (!layout[currentRowIndex]) {
|
3117
3344
|
layout[currentRowIndex] = [];
|
@@ -3220,17 +3447,17 @@ const configurationService$1 = createConfigurationService({
|
|
3220
3447
|
isComponent: true,
|
3221
3448
|
prefix: STORE_KEY_PREFIX,
|
3222
3449
|
getModels() {
|
3223
|
-
const { toContentManagerModel } = getService$
|
3450
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3224
3451
|
return mapValues(toContentManagerModel, strapi.components);
|
3225
3452
|
}
|
3226
3453
|
});
|
3227
3454
|
const components = ({ strapi: strapi2 }) => ({
|
3228
3455
|
findAllComponents() {
|
3229
|
-
const { toContentManagerModel } = getService$
|
3456
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3230
3457
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3231
3458
|
},
|
3232
3459
|
findComponent(uid2) {
|
3233
|
-
const { toContentManagerModel } = getService$
|
3460
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3234
3461
|
const component = strapi2.components[uid2];
|
3235
3462
|
return isNil$1(component) ? component : toContentManagerModel(component);
|
3236
3463
|
},
|
@@ -3281,17 +3508,17 @@ const configurationService = createConfigurationService({
|
|
3281
3508
|
storeUtils,
|
3282
3509
|
prefix: "content_types",
|
3283
3510
|
getModels() {
|
3284
|
-
const { toContentManagerModel } = getService$
|
3511
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3285
3512
|
return mapValues(toContentManagerModel, strapi.contentTypes);
|
3286
3513
|
}
|
3287
3514
|
});
|
3288
3515
|
const service = ({ strapi: strapi2 }) => ({
|
3289
3516
|
findAllContentTypes() {
|
3290
|
-
const { toContentManagerModel } = getService$
|
3517
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3291
3518
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3292
3519
|
},
|
3293
3520
|
findContentType(uid2) {
|
3294
|
-
const { toContentManagerModel } = getService$
|
3521
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3295
3522
|
const contentType = strapi2.contentTypes[uid2];
|
3296
3523
|
return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
|
3297
3524
|
},
|
@@ -3320,7 +3547,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3320
3547
|
return this.findConfiguration(contentType);
|
3321
3548
|
},
|
3322
3549
|
findComponentsConfigurations(contentType) {
|
3323
|
-
return getService$
|
3550
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3324
3551
|
},
|
3325
3552
|
syncConfigurations() {
|
3326
3553
|
return configurationService.syncConfigurations();
|
@@ -3592,7 +3819,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3592
3819
|
return userAbility.can(action);
|
3593
3820
|
},
|
3594
3821
|
async registerPermissions() {
|
3595
|
-
const displayedContentTypes = getService$
|
3822
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3596
3823
|
const contentTypesUids = displayedContentTypes.map(prop("uid"));
|
3597
3824
|
const actions = [
|
3598
3825
|
{
|
@@ -3677,6 +3904,12 @@ function getPopulateForRelation(attribute, model, attributeName, { countMany, co
|
|
3677
3904
|
if (initialPopulate) {
|
3678
3905
|
return initialPopulate;
|
3679
3906
|
}
|
3907
|
+
if (attributeName === "localizations") {
|
3908
|
+
const validationPopulate = getPopulateForValidation(model.uid);
|
3909
|
+
return {
|
3910
|
+
populate: validationPopulate.populate
|
3911
|
+
};
|
3912
|
+
}
|
3680
3913
|
if (!isVisibleAttribute$1(model, attributeName)) {
|
3681
3914
|
return true;
|
3682
3915
|
}
|
@@ -3736,6 +3969,9 @@ const getDeepPopulate = (uid2, {
|
|
3736
3969
|
return {};
|
3737
3970
|
}
|
3738
3971
|
const model = strapi.getModel(uid2);
|
3972
|
+
if (!model) {
|
3973
|
+
return {};
|
3974
|
+
}
|
3739
3975
|
return Object.keys(model.attributes).reduce(
|
3740
3976
|
(populateAcc, attributeName) => merge(
|
3741
3977
|
populateAcc,
|
@@ -3755,40 +3991,46 @@ const getDeepPopulate = (uid2, {
|
|
3755
3991
|
{}
|
3756
3992
|
);
|
3757
3993
|
};
|
3758
|
-
const
|
3759
|
-
|
3760
|
-
|
3761
|
-
countOne = false,
|
3762
|
-
maxLevel = Infinity
|
3763
|
-
} = {}, level = 1) => {
|
3764
|
-
if (level > maxLevel) {
|
3994
|
+
const getPopulateForValidation = (uid2) => {
|
3995
|
+
const model = strapi.getModel(uid2);
|
3996
|
+
if (!model) {
|
3765
3997
|
return {};
|
3766
3998
|
}
|
3767
|
-
const model = strapi.getModel(uid2);
|
3768
3999
|
return Object.entries(model.attributes).reduce((populateAcc, [attributeName, attribute]) => {
|
3769
|
-
if (
|
4000
|
+
if (isScalarAttribute(attribute)) {
|
4001
|
+
if (getDoesAttributeRequireValidation(attribute)) {
|
4002
|
+
populateAcc.fields = populateAcc.fields || [];
|
4003
|
+
populateAcc.fields.push(attributeName);
|
4004
|
+
}
|
3770
4005
|
return populateAcc;
|
3771
4006
|
}
|
3772
|
-
if (
|
3773
|
-
|
3774
|
-
|
3775
|
-
|
4007
|
+
if (isComponent(attribute)) {
|
4008
|
+
const component = attribute.component;
|
4009
|
+
const componentResult = getPopulateForValidation(component);
|
4010
|
+
if (Object.keys(componentResult).length > 0) {
|
4011
|
+
populateAcc.populate = populateAcc.populate || {};
|
4012
|
+
populateAcc.populate[attributeName] = componentResult;
|
4013
|
+
}
|
4014
|
+
return populateAcc;
|
3776
4015
|
}
|
3777
|
-
|
3778
|
-
|
3779
|
-
|
3780
|
-
|
3781
|
-
|
3782
|
-
|
3783
|
-
|
3784
|
-
|
3785
|
-
|
3786
|
-
countOne,
|
3787
|
-
maxLevel
|
4016
|
+
if (isDynamicZone(attribute)) {
|
4017
|
+
const components2 = attribute.components;
|
4018
|
+
const componentsResult = (components2 || []).reduce(
|
4019
|
+
(acc, componentUID) => {
|
4020
|
+
const componentResult = getPopulateForValidation(componentUID);
|
4021
|
+
if (Object.keys(componentResult).length > 0) {
|
4022
|
+
acc[componentUID] = componentResult;
|
4023
|
+
}
|
4024
|
+
return acc;
|
3788
4025
|
},
|
3789
|
-
|
3790
|
-
)
|
3791
|
-
|
4026
|
+
{}
|
4027
|
+
);
|
4028
|
+
if (Object.keys(componentsResult).length > 0) {
|
4029
|
+
populateAcc.populate = populateAcc.populate || {};
|
4030
|
+
populateAcc.populate[attributeName] = { on: componentsResult };
|
4031
|
+
}
|
4032
|
+
}
|
4033
|
+
return populateAcc;
|
3792
4034
|
}, {});
|
3793
4035
|
};
|
3794
4036
|
const getDeepPopulateDraftCount = (uid2) => {
|
@@ -3868,7 +4110,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3868
4110
|
return populateQuery;
|
3869
4111
|
};
|
3870
4112
|
const buildDeepPopulate = (uid2) => {
|
3871
|
-
return getService$
|
4113
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3872
4114
|
};
|
3873
4115
|
const populateBuilder = (uid2) => {
|
3874
4116
|
let getInitialPopulate = async () => {
|
@@ -4030,7 +4272,6 @@ const AVAILABLE_LOCALES_FIELDS = [
|
|
4030
4272
|
"locale",
|
4031
4273
|
"updatedAt",
|
4032
4274
|
"createdAt",
|
4033
|
-
"status",
|
4034
4275
|
"publishedAt",
|
4035
4276
|
"documentId"
|
4036
4277
|
];
|
@@ -4051,34 +4292,20 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4051
4292
|
/**
|
4052
4293
|
* Returns available locales of a document for the current status
|
4053
4294
|
*/
|
4054
|
-
async getAvailableLocales(uid2, version, allVersions
|
4295
|
+
async getAvailableLocales(uid2, version, allVersions) {
|
4055
4296
|
const versionsByLocale = groupBy("locale", allVersions);
|
4056
|
-
|
4297
|
+
if (version.locale) {
|
4298
|
+
delete versionsByLocale[version.locale];
|
4299
|
+
}
|
4057
4300
|
const model = strapi2.getModel(uid2);
|
4058
|
-
const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
|
4059
|
-
const traversalFunction = async (localeVersion) => traverseEntity(
|
4060
|
-
({ key }, { remove }) => {
|
4061
|
-
if (keysToKeep.includes(key)) {
|
4062
|
-
return;
|
4063
|
-
}
|
4064
|
-
remove(key);
|
4065
|
-
},
|
4066
|
-
{ schema: model, getModel: strapi2.getModel.bind(strapi2) },
|
4067
|
-
// @ts-expect-error fix types DocumentVersion incompatible with Data
|
4068
|
-
localeVersion
|
4069
|
-
);
|
4070
4301
|
const mappingResult = await async.map(
|
4071
4302
|
Object.values(versionsByLocale),
|
4072
4303
|
async (localeVersions) => {
|
4073
|
-
const mappedLocaleVersions = await async.map(
|
4074
|
-
localeVersions,
|
4075
|
-
traversalFunction
|
4076
|
-
);
|
4077
4304
|
if (!contentTypes$1.hasDraftAndPublish(model)) {
|
4078
|
-
return
|
4305
|
+
return localeVersions[0];
|
4079
4306
|
}
|
4080
|
-
const draftVersion =
|
4081
|
-
const otherVersions =
|
4307
|
+
const draftVersion = localeVersions.find((v) => v.publishedAt === null);
|
4308
|
+
const otherVersions = localeVersions.filter((v) => v.id !== draftVersion?.id);
|
4082
4309
|
if (!draftVersion) {
|
4083
4310
|
return;
|
4084
4311
|
}
|
@@ -4100,8 +4327,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4100
4327
|
const matchStatus = status === "published" ? v.publishedAt !== null : v.publishedAt === null;
|
4101
4328
|
return matchLocale && matchStatus;
|
4102
4329
|
});
|
4103
|
-
if (!availableStatus)
|
4104
|
-
return availableStatus;
|
4330
|
+
if (!availableStatus) return availableStatus;
|
4105
4331
|
return pick(AVAILABLE_STATUS_FIELDS, availableStatus);
|
4106
4332
|
},
|
4107
4333
|
/**
|
@@ -4111,18 +4337,19 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4111
4337
|
* @returns
|
4112
4338
|
*/
|
4113
4339
|
async getManyAvailableStatus(uid2, documents) {
|
4114
|
-
if (!documents.length)
|
4115
|
-
return [];
|
4340
|
+
if (!documents.length) return [];
|
4116
4341
|
const status = documents[0].publishedAt !== null ? "published" : "draft";
|
4117
|
-
const
|
4118
|
-
const
|
4119
|
-
|
4120
|
-
|
4121
|
-
|
4122
|
-
|
4123
|
-
|
4124
|
-
|
4125
|
-
|
4342
|
+
const locales = documents.map((d) => d.locale).filter(Boolean);
|
4343
|
+
const where = {
|
4344
|
+
documentId: { $in: documents.map((d) => d.documentId).filter(Boolean) },
|
4345
|
+
publishedAt: { $null: status === "published" }
|
4346
|
+
};
|
4347
|
+
if (locales.length) {
|
4348
|
+
where.locale = { $in: locales };
|
4349
|
+
}
|
4350
|
+
return strapi2.query(uid2).findMany({
|
4351
|
+
where,
|
4352
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"]
|
4126
4353
|
});
|
4127
4354
|
},
|
4128
4355
|
getStatus(version, otherDocumentStatuses) {
|
@@ -4139,10 +4366,8 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4139
4366
|
} else if (otherVersion) {
|
4140
4367
|
draftVersion = otherVersion;
|
4141
4368
|
}
|
4142
|
-
if (!draftVersion)
|
4143
|
-
|
4144
|
-
if (!publishedVersion)
|
4145
|
-
return CONTENT_MANAGER_STATUS.DRAFT;
|
4369
|
+
if (!draftVersion) return CONTENT_MANAGER_STATUS.PUBLISHED;
|
4370
|
+
if (!publishedVersion) return CONTENT_MANAGER_STATUS.DRAFT;
|
4146
4371
|
const isDraftModified = getIsVersionLatestModification(draftVersion, publishedVersion);
|
4147
4372
|
return isDraftModified ? CONTENT_MANAGER_STATUS.MODIFIED : CONTENT_MANAGER_STATUS.PUBLISHED;
|
4148
4373
|
},
|
@@ -4150,11 +4375,9 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4150
4375
|
// We could refactor this so the locales are only loaded when they're
|
4151
4376
|
// needed. e.g. in the bulk locale action modal.
|
4152
4377
|
async getMetadata(uid2, version, { availableLocales = true, availableStatus = true } = {}) {
|
4153
|
-
const populate =
|
4154
|
-
const
|
4155
|
-
where: { documentId: version.documentId },
|
4378
|
+
const { populate = {}, fields = [] } = getPopulateForValidation(uid2);
|
4379
|
+
const params = {
|
4156
4380
|
populate: {
|
4157
|
-
// Populate only fields that require validation for bulk locale actions
|
4158
4381
|
...populate,
|
4159
4382
|
// NOTE: creator fields are selected in this way to avoid exposing sensitive data
|
4160
4383
|
createdBy: {
|
@@ -4163,9 +4386,15 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4163
4386
|
updatedBy: {
|
4164
4387
|
select: ["id", "firstname", "lastname", "email"]
|
4165
4388
|
}
|
4389
|
+
},
|
4390
|
+
fields: uniq([...AVAILABLE_LOCALES_FIELDS, ...fields]),
|
4391
|
+
filters: {
|
4392
|
+
documentId: version.documentId
|
4166
4393
|
}
|
4167
|
-
}
|
4168
|
-
const
|
4394
|
+
};
|
4395
|
+
const dbParams = strapi2.get("query-params").transform(uid2, params);
|
4396
|
+
const versions = await strapi2.db.query(uid2).findMany(dbParams);
|
4397
|
+
const availableLocalesResult = availableLocales ? await this.getAvailableLocales(uid2, version, versions) : [];
|
4169
4398
|
const availableStatusResult = availableStatus ? this.getAvailableStatus(version, versions) : null;
|
4170
4399
|
return {
|
4171
4400
|
availableLocales: availableLocalesResult,
|
@@ -4192,6 +4421,16 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4192
4421
|
opts.availableStatus = false;
|
4193
4422
|
}
|
4194
4423
|
const meta = await this.getMetadata(uid2, document, opts);
|
4424
|
+
if (document.localizations) {
|
4425
|
+
const otherStatus = await this.getManyAvailableStatus(uid2, document.localizations);
|
4426
|
+
document.localizations = document.localizations.map((d) => {
|
4427
|
+
const status = otherStatus.find((s) => s.documentId === d.documentId);
|
4428
|
+
return {
|
4429
|
+
...d,
|
4430
|
+
status: this.getStatus(d, status ? [status] : [])
|
4431
|
+
};
|
4432
|
+
});
|
4433
|
+
}
|
4195
4434
|
return {
|
4196
4435
|
data: {
|
4197
4436
|
...document,
|
@@ -4409,7 +4648,8 @@ const services = {
|
|
4409
4648
|
permission,
|
4410
4649
|
"populate-builder": populateBuilder$1,
|
4411
4650
|
uid,
|
4412
|
-
...history.services ? history.services : {}
|
4651
|
+
...history.services ? history.services : {},
|
4652
|
+
...preview.services ? preview.services : {}
|
4413
4653
|
};
|
4414
4654
|
const index = () => {
|
4415
4655
|
return {
|