@strapi/content-manager 0.0.0-experimental.0faf8967355707d2684ecb8579b03979ad5df042 → 0.0.0-experimental.110b429be2fc8a677f3a3b140b8322d7df61b596
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-BX0PmIl_.js → ComponentConfigurationPage-CJPoOvy3.js} +5 -6
- package/dist/_chunks/{ComponentConfigurationPage-BX0PmIl_.js.map → ComponentConfigurationPage-CJPoOvy3.js.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-D1l2o3w3.mjs → ComponentConfigurationPage-CcRDqD0e.mjs} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-D1l2o3w3.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-uDsDO3-f.mjs → EditConfigurationPage-C1ddZ_zf.mjs} +4 -4
- package/dist/_chunks/{EditConfigurationPage-uDsDO3-f.mjs.map → EditConfigurationPage-C1ddZ_zf.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-Sed22MMc.js → EditConfigurationPage-CF3lxOy2.js} +5 -6
- package/dist/_chunks/{EditConfigurationPage-Sed22MMc.js.map → EditConfigurationPage-CF3lxOy2.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-Bg7aQ3vS.mjs → EditViewPage-BPFcUbqi.mjs} +38 -8
- package/dist/_chunks/EditViewPage-BPFcUbqi.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-CcWIJyJa.js → EditViewPage-CDyTC6aU.js} +38 -9
- package/dist/_chunks/EditViewPage-CDyTC6aU.js.map +1 -0
- package/dist/_chunks/{Field-BnTZJ0fG.js → Field-DuxAW9q2.js} +180 -124
- package/dist/_chunks/Field-DuxAW9q2.js.map +1 -0
- package/dist/_chunks/{Field-Cf1nzyOi.mjs → Field-fBnTwgU4.mjs} +178 -122
- 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-CXe7dOCt.mjs → Form-BGl7PhlZ.mjs} +4 -4
- package/dist/_chunks/Form-BGl7PhlZ.mjs.map +1 -0
- package/dist/_chunks/{Form-BH04zZdW.js → Form-DSGh_zkz.js} +6 -7
- package/dist/_chunks/Form-DSGh_zkz.js.map +1 -0
- package/dist/_chunks/{History-Cg_rjVg_.mjs → History-DTYB9CSB.mjs} +43 -100
- package/dist/_chunks/History-DTYB9CSB.mjs.map +1 -0
- package/dist/_chunks/{History-CAM3gN3h.js → History-DrDJv698.js} +42 -100
- package/dist/_chunks/History-DrDJv698.js.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-51n8mFbZ.mjs → ListConfigurationPage-qWx8r4D_.mjs} +7 -6
- package/dist/_chunks/ListConfigurationPage-qWx8r4D_.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DMBKzujx.js → ListConfigurationPage-zurIlUZ7.js} +7 -7
- package/dist/_chunks/ListConfigurationPage-zurIlUZ7.js.map +1 -0
- package/dist/_chunks/{ListViewPage-DFzs-3jf.js → ListViewPage-DTM2uO_S.js} +63 -41
- package/dist/_chunks/ListViewPage-DTM2uO_S.js.map +1 -0
- package/dist/_chunks/{ListViewPage-RzuT8-b2.mjs → ListViewPage-GKpL5p8A.mjs} +62 -39
- package/dist/_chunks/ListViewPage-GKpL5p8A.mjs.map +1 -0
- package/dist/_chunks/{NoContentTypePage-CldwfMNH.mjs → NoContentTypePage-B5Vc5Cal.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-CldwfMNH.mjs.map → NoContentTypePage-B5Vc5Cal.mjs.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-BNfF_UU1.js → NoContentTypePage-BuZlNroO.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-BNfF_UU1.js.map → NoContentTypePage-BuZlNroO.js.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DhRIJOX9.mjs → NoPermissionsPage-BAZlWgJ4.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DhRIJOX9.mjs.map → NoPermissionsPage-BAZlWgJ4.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DwcEM1UU.js → NoPermissionsPage-DLzkS4Hy.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DwcEM1UU.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-D3LEWajT.mjs → Relations-BVdRfDkW.mjs} +47 -22
- package/dist/_chunks/Relations-BVdRfDkW.mjs.map +1 -0
- package/dist/_chunks/{Relations-DnFXuS0x.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-CtuQXm7x.mjs → index-Bu_-B7ZA.mjs} +416 -212
- package/dist/_chunks/index-Bu_-B7ZA.mjs.map +1 -0
- package/dist/_chunks/{index-DhdyY1Y8.js → index-Ct-GZ0iV.js} +413 -209
- 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-DeADP3ln.js → layout-CDBEgRsM.js} +5 -6
- package/dist/_chunks/{layout-DeADP3ln.js.map → layout-CDBEgRsM.js.map} +1 -1
- package/dist/_chunks/{layout-BQCvMBx_.mjs → layout-COzAvgJh.mjs} +4 -4
- package/dist/_chunks/{layout-BQCvMBx_.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-BVo_S6No.js → relations-BjiF1Aad.js} +6 -7
- package/dist/_chunks/relations-BjiF1Aad.js.map +1 -0
- package/dist/_chunks/{relations-tS4X2RK8.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 +488 -244
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +489 -244
- 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/history.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 +14 -12
- package/dist/_chunks/EditViewPage-Bg7aQ3vS.mjs.map +0 -1
- package/dist/_chunks/EditViewPage-CcWIJyJa.js.map +0 -1
- package/dist/_chunks/Field-BnTZJ0fG.js.map +0 -1
- package/dist/_chunks/Field-Cf1nzyOi.mjs.map +0 -1
- package/dist/_chunks/Form-BH04zZdW.js.map +0 -1
- package/dist/_chunks/Form-CXe7dOCt.mjs.map +0 -1
- package/dist/_chunks/History-CAM3gN3h.js.map +0 -1
- package/dist/_chunks/History-Cg_rjVg_.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-51n8mFbZ.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-DMBKzujx.js.map +0 -1
- package/dist/_chunks/ListViewPage-DFzs-3jf.js.map +0 -1
- package/dist/_chunks/ListViewPage-RzuT8-b2.mjs.map +0 -1
- package/dist/_chunks/Relations-D3LEWajT.mjs.map +0 -1
- package/dist/_chunks/Relations-DnFXuS0x.js.map +0 -1
- package/dist/_chunks/index-CtuQXm7x.mjs.map +0 -1
- package/dist/_chunks/index-DhdyY1Y8.js.map +0 -1
- package/dist/_chunks/relations-BVo_S6No.js.map +0 -1
- package/dist/_chunks/relations-tS4X2RK8.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
|
});
|
@@ -367,7 +382,12 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
367
382
|
if (userToPopulate == null) {
|
368
383
|
return null;
|
369
384
|
}
|
370
|
-
return strapi2.query("admin::user").findOne({
|
385
|
+
return strapi2.query("admin::user").findOne({
|
386
|
+
where: {
|
387
|
+
...userToPopulate.id ? { id: userToPopulate.id } : {},
|
388
|
+
...userToPopulate.documentId ? { documentId: userToPopulate.documentId } : {}
|
389
|
+
}
|
390
|
+
});
|
371
391
|
})
|
372
392
|
);
|
373
393
|
return {
|
@@ -380,7 +400,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
380
400
|
[attributeKey]: adminUsers
|
381
401
|
};
|
382
402
|
}
|
383
|
-
const permissionChecker2 = getService$
|
403
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
384
404
|
userAbility: params.state.userAbility,
|
385
405
|
model: attributeSchema.target
|
386
406
|
});
|
@@ -556,7 +576,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
556
576
|
onCommit(async () => {
|
557
577
|
for (const entry of localeEntries) {
|
558
578
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
559
|
-
await getService(strapi2, "history").createVersion({
|
579
|
+
await getService$1(strapi2, "history").createVersion({
|
560
580
|
contentType: uid2,
|
561
581
|
data: omit(FIELDS_TO_IGNORE, entry),
|
562
582
|
relatedDocumentId: documentId,
|
@@ -569,15 +589,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
569
589
|
});
|
570
590
|
return result;
|
571
591
|
});
|
572
|
-
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
592
|
+
state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
|
573
593
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
574
594
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
575
595
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
576
596
|
where: {
|
577
597
|
created_at: {
|
578
|
-
$lt: expirationDate
|
598
|
+
$lt: expirationDate
|
579
599
|
}
|
580
600
|
}
|
601
|
+
}).catch((error) => {
|
602
|
+
if (error instanceof Error) {
|
603
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
604
|
+
}
|
581
605
|
});
|
582
606
|
});
|
583
607
|
state.isInitialized = true;
|
@@ -589,17 +613,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
589
613
|
}
|
590
614
|
};
|
591
615
|
};
|
592
|
-
const services$
|
616
|
+
const services$2 = {
|
593
617
|
history: createHistoryService,
|
594
618
|
lifecycles: createLifecyclesService
|
595
619
|
};
|
596
|
-
const info = { pluginName: "content-manager", type: "admin" };
|
620
|
+
const info$1 = { pluginName: "content-manager", type: "admin" };
|
597
621
|
const historyVersionRouter = {
|
598
622
|
type: "admin",
|
599
623
|
routes: [
|
600
624
|
{
|
601
625
|
method: "GET",
|
602
|
-
info,
|
626
|
+
info: info$1,
|
603
627
|
path: "/history-versions",
|
604
628
|
handler: "history-version.findMany",
|
605
629
|
config: {
|
@@ -608,7 +632,7 @@ const historyVersionRouter = {
|
|
608
632
|
},
|
609
633
|
{
|
610
634
|
method: "PUT",
|
611
|
-
info,
|
635
|
+
info: info$1,
|
612
636
|
path: "/history-versions/:versionId/restore",
|
613
637
|
handler: "history-version.restoreVersion",
|
614
638
|
config: {
|
@@ -617,7 +641,7 @@ const historyVersionRouter = {
|
|
617
641
|
}
|
618
642
|
]
|
619
643
|
};
|
620
|
-
const routes$
|
644
|
+
const routes$2 = {
|
621
645
|
"history-version": historyVersionRouter
|
622
646
|
};
|
623
647
|
const historyVersion = {
|
@@ -664,21 +688,21 @@ const historyVersion = {
|
|
664
688
|
}
|
665
689
|
}
|
666
690
|
};
|
667
|
-
const getFeature = () => {
|
691
|
+
const getFeature$1 = () => {
|
668
692
|
if (strapi.ee.features.isEnabled("cms-content-history")) {
|
669
693
|
return {
|
670
694
|
register({ strapi: strapi2 }) {
|
671
695
|
strapi2.get("models").add(historyVersion);
|
672
696
|
},
|
673
697
|
bootstrap({ strapi: strapi2 }) {
|
674
|
-
getService(strapi2, "lifecycles").bootstrap();
|
698
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
675
699
|
},
|
676
700
|
destroy({ strapi: strapi2 }) {
|
677
|
-
getService(strapi2, "lifecycles").destroy();
|
701
|
+
getService$1(strapi2, "lifecycles").destroy();
|
678
702
|
},
|
679
|
-
controllers: controllers$
|
680
|
-
services: services$
|
681
|
-
routes: routes$
|
703
|
+
controllers: controllers$2,
|
704
|
+
services: services$2,
|
705
|
+
routes: routes$2
|
682
706
|
};
|
683
707
|
}
|
684
708
|
return {
|
@@ -687,9 +711,201 @@ const getFeature = () => {
|
|
687
711
|
}
|
688
712
|
};
|
689
713
|
};
|
690
|
-
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();
|
691
906
|
const register = async ({ strapi: strapi2 }) => {
|
692
907
|
await history.register?.({ strapi: strapi2 });
|
908
|
+
await preview.register?.({ strapi: strapi2 });
|
693
909
|
};
|
694
910
|
const ALLOWED_WEBHOOK_EVENTS = {
|
695
911
|
ENTRY_PUBLISH: "entry.publish",
|
@@ -699,11 +915,12 @@ const bootstrap = async () => {
|
|
699
915
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
700
916
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
701
917
|
});
|
702
|
-
getService$
|
703
|
-
await getService$
|
704
|
-
await getService$
|
705
|
-
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();
|
706
922
|
await history.bootstrap?.({ strapi });
|
923
|
+
await preview.bootstrap?.({ strapi });
|
707
924
|
};
|
708
925
|
const destroy = async ({ strapi: strapi2 }) => {
|
709
926
|
await history.destroy?.({ strapi: strapi2 });
|
@@ -1193,7 +1410,8 @@ const admin = {
|
|
1193
1410
|
};
|
1194
1411
|
const routes = {
|
1195
1412
|
admin,
|
1196
|
-
...history.routes ? history.routes : {}
|
1413
|
+
...history.routes ? history.routes : {},
|
1414
|
+
...preview.routes ? preview.routes : {}
|
1197
1415
|
};
|
1198
1416
|
const hasPermissionsSchema = yup$1.object({
|
1199
1417
|
actions: yup$1.array().of(yup$1.string()),
|
@@ -1256,8 +1474,7 @@ const isSortable = (schema, name) => {
|
|
1256
1474
|
if (!_.has(schema.attributes, name)) {
|
1257
1475
|
return false;
|
1258
1476
|
}
|
1259
|
-
if (schema.modelType === "component" && name === "id")
|
1260
|
-
return false;
|
1477
|
+
if (schema.modelType === "component" && name === "id") return false;
|
1261
1478
|
const attribute = schema.attributes[name];
|
1262
1479
|
if (NON_SORTABLES.includes(attribute.type)) {
|
1263
1480
|
return false;
|
@@ -1402,8 +1619,7 @@ const createDefaultSettings = async (schema) => {
|
|
1402
1619
|
};
|
1403
1620
|
};
|
1404
1621
|
const syncSettings = async (configuration, schema) => {
|
1405
|
-
if (isEmpty(configuration.settings))
|
1406
|
-
return createDefaultSettings(schema);
|
1622
|
+
if (isEmpty(configuration.settings)) return createDefaultSettings(schema);
|
1407
1623
|
const defaultField = getDefaultMainField(schema);
|
1408
1624
|
const { mainField = defaultField, defaultSortBy = defaultField } = configuration.settings || {};
|
1409
1625
|
return {
|
@@ -1450,7 +1666,7 @@ const createMetadasSchema = (schema) => {
|
|
1450
1666
|
if (!value) {
|
1451
1667
|
return yup$1.string();
|
1452
1668
|
}
|
1453
|
-
const targetSchema = getService$
|
1669
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1454
1670
|
schema.attributes[key].targetModel
|
1455
1671
|
);
|
1456
1672
|
if (!targetSchema) {
|
@@ -1579,8 +1795,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1579
1795
|
}
|
1580
1796
|
switch (attribute.type) {
|
1581
1797
|
case "relation": {
|
1582
|
-
if (canCreate(attributePath))
|
1583
|
-
return body2;
|
1798
|
+
if (canCreate(attributePath)) return body2;
|
1584
1799
|
return set(attributePath, { set: [] }, body2);
|
1585
1800
|
}
|
1586
1801
|
case "component": {
|
@@ -1590,8 +1805,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1590
1805
|
]);
|
1591
1806
|
}
|
1592
1807
|
default: {
|
1593
|
-
if (canCreate(attributePath))
|
1594
|
-
return body2;
|
1808
|
+
if (canCreate(attributePath)) return body2;
|
1595
1809
|
return set(attributePath, null, body2);
|
1596
1810
|
}
|
1597
1811
|
}
|
@@ -1619,7 +1833,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1619
1833
|
}
|
1620
1834
|
};
|
1621
1835
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1622
|
-
const documentMetadata2 = getService$
|
1836
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1623
1837
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1624
1838
|
let {
|
1625
1839
|
meta: { availableLocales, availableStatus }
|
@@ -1645,8 +1859,8 @@ const createDocument = async (ctx, opts) => {
|
|
1645
1859
|
const { userAbility, user } = ctx.state;
|
1646
1860
|
const { model } = ctx.params;
|
1647
1861
|
const { body } = ctx.request;
|
1648
|
-
const documentManager2 = getService$
|
1649
|
-
const permissionChecker2 = getService$
|
1862
|
+
const documentManager2 = getService$2("document-manager");
|
1863
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1650
1864
|
if (permissionChecker2.cannot.create()) {
|
1651
1865
|
throw new errors.ForbiddenError();
|
1652
1866
|
}
|
@@ -1666,13 +1880,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1666
1880
|
const { userAbility, user } = ctx.state;
|
1667
1881
|
const { id, model } = ctx.params;
|
1668
1882
|
const { body } = ctx.request;
|
1669
|
-
const documentManager2 = getService$
|
1670
|
-
const permissionChecker2 = getService$
|
1883
|
+
const documentManager2 = getService$2("document-manager");
|
1884
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1671
1885
|
if (permissionChecker2.cannot.update()) {
|
1672
1886
|
throw new errors.ForbiddenError();
|
1673
1887
|
}
|
1674
1888
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1675
|
-
const populate = await getService$
|
1889
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1676
1890
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1677
1891
|
const [documentVersion, documentExists] = await Promise.all([
|
1678
1892
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1703,14 +1917,14 @@ const collectionTypes = {
|
|
1703
1917
|
const { userAbility } = ctx.state;
|
1704
1918
|
const { model } = ctx.params;
|
1705
1919
|
const { query } = ctx.request;
|
1706
|
-
const documentMetadata2 = getService$
|
1707
|
-
const documentManager2 = getService$
|
1708
|
-
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 });
|
1709
1923
|
if (permissionChecker2.cannot.read()) {
|
1710
1924
|
return ctx.forbidden();
|
1711
1925
|
}
|
1712
1926
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1713
|
-
const populate = await getService$
|
1927
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1714
1928
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1715
1929
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1716
1930
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1739,13 +1953,13 @@ const collectionTypes = {
|
|
1739
1953
|
async findOne(ctx) {
|
1740
1954
|
const { userAbility } = ctx.state;
|
1741
1955
|
const { model, id } = ctx.params;
|
1742
|
-
const documentManager2 = getService$
|
1743
|
-
const permissionChecker2 = getService$
|
1956
|
+
const documentManager2 = getService$2("document-manager");
|
1957
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1744
1958
|
if (permissionChecker2.cannot.read()) {
|
1745
1959
|
return ctx.forbidden();
|
1746
1960
|
}
|
1747
1961
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1748
|
-
const populate = await getService$
|
1962
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1749
1963
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1750
1964
|
const version = await documentManager2.findOne(id, model, {
|
1751
1965
|
populate,
|
@@ -1776,7 +1990,7 @@ const collectionTypes = {
|
|
1776
1990
|
async create(ctx) {
|
1777
1991
|
const { userAbility } = ctx.state;
|
1778
1992
|
const { model } = ctx.params;
|
1779
|
-
const permissionChecker2 = getService$
|
1993
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1780
1994
|
const [totalEntries, document] = await Promise.all([
|
1781
1995
|
strapi.db.query(model).count(),
|
1782
1996
|
createDocument(ctx)
|
@@ -1797,7 +2011,7 @@ const collectionTypes = {
|
|
1797
2011
|
async update(ctx) {
|
1798
2012
|
const { userAbility } = ctx.state;
|
1799
2013
|
const { model } = ctx.params;
|
1800
|
-
const permissionChecker2 = getService$
|
2014
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1801
2015
|
const updatedVersion = await updateDocument(ctx);
|
1802
2016
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1803
2017
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1806,13 +2020,13 @@ const collectionTypes = {
|
|
1806
2020
|
const { userAbility, user } = ctx.state;
|
1807
2021
|
const { model, sourceId: id } = ctx.params;
|
1808
2022
|
const { body } = ctx.request;
|
1809
|
-
const documentManager2 = getService$
|
1810
|
-
const permissionChecker2 = getService$
|
2023
|
+
const documentManager2 = getService$2("document-manager");
|
2024
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1811
2025
|
if (permissionChecker2.cannot.create()) {
|
1812
2026
|
return ctx.forbidden();
|
1813
2027
|
}
|
1814
2028
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1815
|
-
const populate = await getService$
|
2029
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1816
2030
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1817
2031
|
const document = await documentManager2.findOne(id, model, {
|
1818
2032
|
populate,
|
@@ -1851,13 +2065,13 @@ const collectionTypes = {
|
|
1851
2065
|
async delete(ctx) {
|
1852
2066
|
const { userAbility } = ctx.state;
|
1853
2067
|
const { id, model } = ctx.params;
|
1854
|
-
const documentManager2 = getService$
|
1855
|
-
const permissionChecker2 = getService$
|
2068
|
+
const documentManager2 = getService$2("document-manager");
|
2069
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1856
2070
|
if (permissionChecker2.cannot.delete()) {
|
1857
2071
|
return ctx.forbidden();
|
1858
2072
|
}
|
1859
2073
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1860
|
-
const populate = await getService$
|
2074
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1861
2075
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1862
2076
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1863
2077
|
if (documentLocales.length === 0) {
|
@@ -1879,14 +2093,14 @@ const collectionTypes = {
|
|
1879
2093
|
const { userAbility } = ctx.state;
|
1880
2094
|
const { id, model } = ctx.params;
|
1881
2095
|
const { body } = ctx.request;
|
1882
|
-
const documentManager2 = getService$
|
1883
|
-
const permissionChecker2 = getService$
|
2096
|
+
const documentManager2 = getService$2("document-manager");
|
2097
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1884
2098
|
if (permissionChecker2.cannot.publish()) {
|
1885
2099
|
return ctx.forbidden();
|
1886
2100
|
}
|
1887
2101
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1888
2102
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1889
|
-
const populate = await getService$
|
2103
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1890
2104
|
let document;
|
1891
2105
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1892
2106
|
const isCreate = isNil$1(id);
|
@@ -1934,13 +2148,13 @@ const collectionTypes = {
|
|
1934
2148
|
const { body } = ctx.request;
|
1935
2149
|
const { documentIds } = body;
|
1936
2150
|
await validateBulkActionInput(body);
|
1937
|
-
const documentManager2 = getService$
|
1938
|
-
const permissionChecker2 = getService$
|
2151
|
+
const documentManager2 = getService$2("document-manager");
|
2152
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1939
2153
|
if (permissionChecker2.cannot.publish()) {
|
1940
2154
|
return ctx.forbidden();
|
1941
2155
|
}
|
1942
2156
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1943
|
-
const populate = await getService$
|
2157
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1944
2158
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1945
2159
|
allowMultipleLocales: true
|
1946
2160
|
});
|
@@ -1965,8 +2179,8 @@ const collectionTypes = {
|
|
1965
2179
|
const { body } = ctx.request;
|
1966
2180
|
const { documentIds } = body;
|
1967
2181
|
await validateBulkActionInput(body);
|
1968
|
-
const documentManager2 = getService$
|
1969
|
-
const permissionChecker2 = getService$
|
2182
|
+
const documentManager2 = getService$2("document-manager");
|
2183
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1970
2184
|
if (permissionChecker2.cannot.unpublish()) {
|
1971
2185
|
return ctx.forbidden();
|
1972
2186
|
}
|
@@ -1995,8 +2209,8 @@ const collectionTypes = {
|
|
1995
2209
|
const {
|
1996
2210
|
body: { discardDraft, ...body }
|
1997
2211
|
} = ctx.request;
|
1998
|
-
const documentManager2 = getService$
|
1999
|
-
const permissionChecker2 = getService$
|
2212
|
+
const documentManager2 = getService$2("document-manager");
|
2213
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2000
2214
|
if (permissionChecker2.cannot.unpublish()) {
|
2001
2215
|
return ctx.forbidden();
|
2002
2216
|
}
|
@@ -2004,7 +2218,7 @@ const collectionTypes = {
|
|
2004
2218
|
return ctx.forbidden();
|
2005
2219
|
}
|
2006
2220
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2007
|
-
const populate = await getService$
|
2221
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2008
2222
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2009
2223
|
const document = await documentManager2.findOne(id, model, {
|
2010
2224
|
populate,
|
@@ -2035,13 +2249,13 @@ const collectionTypes = {
|
|
2035
2249
|
const { userAbility } = ctx.state;
|
2036
2250
|
const { id, model } = ctx.params;
|
2037
2251
|
const { body } = ctx.request;
|
2038
|
-
const documentManager2 = getService$
|
2039
|
-
const permissionChecker2 = getService$
|
2252
|
+
const documentManager2 = getService$2("document-manager");
|
2253
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2040
2254
|
if (permissionChecker2.cannot.discard()) {
|
2041
2255
|
return ctx.forbidden();
|
2042
2256
|
}
|
2043
2257
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2044
|
-
const populate = await getService$
|
2258
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2045
2259
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2046
2260
|
const document = await documentManager2.findOne(id, model, {
|
2047
2261
|
populate,
|
@@ -2066,13 +2280,13 @@ const collectionTypes = {
|
|
2066
2280
|
const { query, body } = ctx.request;
|
2067
2281
|
const { documentIds } = body;
|
2068
2282
|
await validateBulkActionInput(body);
|
2069
|
-
const documentManager2 = getService$
|
2070
|
-
const permissionChecker2 = getService$
|
2283
|
+
const documentManager2 = getService$2("document-manager");
|
2284
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2071
2285
|
if (permissionChecker2.cannot.delete()) {
|
2072
2286
|
return ctx.forbidden();
|
2073
2287
|
}
|
2074
2288
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2075
|
-
const populate = await getService$
|
2289
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2076
2290
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2077
2291
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2078
2292
|
populate,
|
@@ -2093,13 +2307,13 @@ const collectionTypes = {
|
|
2093
2307
|
async countDraftRelations(ctx) {
|
2094
2308
|
const { userAbility } = ctx.state;
|
2095
2309
|
const { model, id } = ctx.params;
|
2096
|
-
const documentManager2 = getService$
|
2097
|
-
const permissionChecker2 = getService$
|
2310
|
+
const documentManager2 = getService$2("document-manager");
|
2311
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2098
2312
|
if (permissionChecker2.cannot.read()) {
|
2099
2313
|
return ctx.forbidden();
|
2100
2314
|
}
|
2101
2315
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2102
|
-
const populate = await getService$
|
2316
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2103
2317
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2104
2318
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2105
2319
|
if (!entity) {
|
@@ -2118,8 +2332,8 @@ const collectionTypes = {
|
|
2118
2332
|
const ids = ctx.request.query.documentIds;
|
2119
2333
|
const locale = ctx.request.query.locale;
|
2120
2334
|
const { model } = ctx.params;
|
2121
|
-
const documentManager2 = getService$
|
2122
|
-
const permissionChecker2 = getService$
|
2335
|
+
const documentManager2 = getService$2("document-manager");
|
2336
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2123
2337
|
if (permissionChecker2.cannot.read()) {
|
2124
2338
|
return ctx.forbidden();
|
2125
2339
|
}
|
@@ -2143,13 +2357,13 @@ const collectionTypes = {
|
|
2143
2357
|
};
|
2144
2358
|
const components$1 = {
|
2145
2359
|
findComponents(ctx) {
|
2146
|
-
const components2 = getService$
|
2147
|
-
const { toDto } = getService$
|
2360
|
+
const components2 = getService$2("components").findAllComponents();
|
2361
|
+
const { toDto } = getService$2("data-mapper");
|
2148
2362
|
ctx.body = { data: components2.map(toDto) };
|
2149
2363
|
},
|
2150
2364
|
async findComponentConfiguration(ctx) {
|
2151
2365
|
const { uid: uid2 } = ctx.params;
|
2152
|
-
const componentService = getService$
|
2366
|
+
const componentService = getService$2("components");
|
2153
2367
|
const component = componentService.findComponent(uid2);
|
2154
2368
|
if (!component) {
|
2155
2369
|
return ctx.notFound("component.notFound");
|
@@ -2166,7 +2380,7 @@ const components$1 = {
|
|
2166
2380
|
async updateComponentConfiguration(ctx) {
|
2167
2381
|
const { uid: uid2 } = ctx.params;
|
2168
2382
|
const { body } = ctx.request;
|
2169
|
-
const componentService = getService$
|
2383
|
+
const componentService = getService$2("components");
|
2170
2384
|
const component = componentService.findComponent(uid2);
|
2171
2385
|
if (!component) {
|
2172
2386
|
return ctx.notFound("component.notFound");
|
@@ -2200,12 +2414,12 @@ const contentTypes = {
|
|
2200
2414
|
} catch (error) {
|
2201
2415
|
return ctx.send({ error }, 400);
|
2202
2416
|
}
|
2203
|
-
const contentTypes2 = getService$
|
2204
|
-
const { toDto } = getService$
|
2417
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2418
|
+
const { toDto } = getService$2("data-mapper");
|
2205
2419
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2206
2420
|
},
|
2207
2421
|
async findContentTypesSettings(ctx) {
|
2208
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2422
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2209
2423
|
const contentTypes2 = await findAllContentTypes();
|
2210
2424
|
const configurations = await Promise.all(
|
2211
2425
|
contentTypes2.map(async (contentType) => {
|
@@ -2219,7 +2433,7 @@ const contentTypes = {
|
|
2219
2433
|
},
|
2220
2434
|
async findContentTypeConfiguration(ctx) {
|
2221
2435
|
const { uid: uid2 } = ctx.params;
|
2222
|
-
const contentTypeService = getService$
|
2436
|
+
const contentTypeService = getService$2("content-types");
|
2223
2437
|
const contentType = await contentTypeService.findContentType(uid2);
|
2224
2438
|
if (!contentType) {
|
2225
2439
|
return ctx.notFound("contentType.notFound");
|
@@ -2241,13 +2455,13 @@ const contentTypes = {
|
|
2241
2455
|
const { userAbility } = ctx.state;
|
2242
2456
|
const { uid: uid2 } = ctx.params;
|
2243
2457
|
const { body } = ctx.request;
|
2244
|
-
const contentTypeService = getService$
|
2245
|
-
const metricsService = getService$
|
2458
|
+
const contentTypeService = getService$2("content-types");
|
2459
|
+
const metricsService = getService$2("metrics");
|
2246
2460
|
const contentType = await contentTypeService.findContentType(uid2);
|
2247
2461
|
if (!contentType) {
|
2248
2462
|
return ctx.notFound("contentType.notFound");
|
2249
2463
|
}
|
2250
|
-
if (!getService$
|
2464
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2251
2465
|
return ctx.forbidden();
|
2252
2466
|
}
|
2253
2467
|
let input;
|
@@ -2280,10 +2494,10 @@ const contentTypes = {
|
|
2280
2494
|
};
|
2281
2495
|
const init = {
|
2282
2496
|
getInitData(ctx) {
|
2283
|
-
const { toDto } = getService$
|
2284
|
-
const { findAllComponents } = getService$
|
2285
|
-
const { getAllFieldSizes } = getService$
|
2286
|
-
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");
|
2287
2501
|
ctx.body = {
|
2288
2502
|
data: {
|
2289
2503
|
fieldSizes: getAllFieldSizes(),
|
@@ -2319,7 +2533,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2319
2533
|
params.filters.$and.push(filtersClause);
|
2320
2534
|
};
|
2321
2535
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2322
|
-
const permissionChecker2 = getService$
|
2536
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2323
2537
|
userAbility,
|
2324
2538
|
model: model.uid
|
2325
2539
|
});
|
@@ -2333,15 +2547,27 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2333
2547
|
}
|
2334
2548
|
return mainField;
|
2335
2549
|
};
|
2336
|
-
const addStatusToRelations = async (
|
2337
|
-
if (!contentTypes$1.hasDraftAndPublish(strapi.
|
2550
|
+
const addStatusToRelations = async (targetUid, relations2) => {
|
2551
|
+
if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2338
2552
|
return relations2;
|
2339
2553
|
}
|
2340
|
-
const documentMetadata2 = getService$
|
2341
|
-
|
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
|
+
});
|
2342
2568
|
return relations2.map((relation) => {
|
2343
|
-
const availableStatuses =
|
2344
|
-
(availableDocument) => availableDocument.documentId === relation.documentId
|
2569
|
+
const availableStatuses = availableStatus.filter(
|
2570
|
+
(availableDocument) => availableDocument.documentId === relation.documentId && (relation.locale ? availableDocument.locale === relation.locale : true)
|
2345
2571
|
);
|
2346
2572
|
return {
|
2347
2573
|
...relation,
|
@@ -2372,8 +2598,7 @@ const validateStatus = (sourceUid, status) => {
|
|
2372
2598
|
const sourceModel = strapi.getModel(sourceUid);
|
2373
2599
|
const isDP = contentTypes$1.hasDraftAndPublish;
|
2374
2600
|
const isSourceDP = isDP(sourceModel);
|
2375
|
-
if (!isSourceDP)
|
2376
|
-
return { status: void 0 };
|
2601
|
+
if (!isSourceDP) return { status: void 0 };
|
2377
2602
|
switch (status) {
|
2378
2603
|
case "published":
|
2379
2604
|
return { status: "published" };
|
@@ -2403,7 +2628,7 @@ const relations = {
|
|
2403
2628
|
ctx.request?.query?.locale
|
2404
2629
|
);
|
2405
2630
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2406
|
-
const permissionChecker2 = getService$
|
2631
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2407
2632
|
userAbility,
|
2408
2633
|
model
|
2409
2634
|
});
|
@@ -2428,7 +2653,7 @@ const relations = {
|
|
2428
2653
|
where.id = id;
|
2429
2654
|
}
|
2430
2655
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2431
|
-
const populate = await getService$
|
2656
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2432
2657
|
const currentEntity = await strapi.db.query(model).findOne({
|
2433
2658
|
where,
|
2434
2659
|
populate
|
@@ -2443,7 +2668,7 @@ const relations = {
|
|
2443
2668
|
}
|
2444
2669
|
entryId = currentEntity.id;
|
2445
2670
|
}
|
2446
|
-
const modelConfig = isComponent2 ? await getService$
|
2671
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2447
2672
|
const targetSchema = strapi.getModel(targetUid);
|
2448
2673
|
const mainField = flow(
|
2449
2674
|
prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2497,7 +2722,7 @@ const relations = {
|
|
2497
2722
|
}
|
2498
2723
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2499
2724
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2500
|
-
const permissionChecker2 = getService$
|
2725
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2501
2726
|
userAbility: ctx.state.userAbility,
|
2502
2727
|
model: targetUid
|
2503
2728
|
});
|
@@ -2570,21 +2795,33 @@ const relations = {
|
|
2570
2795
|
attribute,
|
2571
2796
|
targetField,
|
2572
2797
|
fieldsToSelect,
|
2573
|
-
|
2574
|
-
|
2575
|
-
}
|
2576
|
-
target: {
|
2577
|
-
schema: { uid: targetUid }
|
2578
|
-
}
|
2798
|
+
status,
|
2799
|
+
source: { schema: sourceSchema },
|
2800
|
+
target: { schema: targetSchema }
|
2579
2801
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2580
|
-
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 });
|
2581
2805
|
const dbQuery = strapi.db.query(sourceUid);
|
2582
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
|
+
}
|
2583
2819
|
const res = await loadRelations({ id: entryId }, targetField, {
|
2584
|
-
select: ["id", "documentId", "locale", "publishedAt"],
|
2820
|
+
select: ["id", "documentId", "locale", "publishedAt", "updatedAt"],
|
2585
2821
|
ordering: "desc",
|
2586
2822
|
page: ctx.request.query.page,
|
2587
|
-
pageSize: ctx.request.query.pageSize
|
2823
|
+
pageSize: ctx.request.query.pageSize,
|
2824
|
+
filters
|
2588
2825
|
});
|
2589
2826
|
const loadedIds = res.results.map((item) => item.id);
|
2590
2827
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
@@ -2605,10 +2842,10 @@ const relations = {
|
|
2605
2842
|
}
|
2606
2843
|
};
|
2607
2844
|
const buildPopulateFromQuery = async (query, model) => {
|
2608
|
-
return getService$
|
2845
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2609
2846
|
};
|
2610
2847
|
const findDocument = async (query, uid2, opts = {}) => {
|
2611
|
-
const documentManager2 = getService$
|
2848
|
+
const documentManager2 = getService$2("document-manager");
|
2612
2849
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2613
2850
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2614
2851
|
};
|
@@ -2616,8 +2853,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2616
2853
|
const { user, userAbility } = ctx.state;
|
2617
2854
|
const { model } = ctx.params;
|
2618
2855
|
const { body, query } = ctx.request;
|
2619
|
-
const documentManager2 = getService$
|
2620
|
-
const permissionChecker2 = getService$
|
2856
|
+
const documentManager2 = getService$2("document-manager");
|
2857
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2621
2858
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2622
2859
|
throw new errors.ForbiddenError();
|
2623
2860
|
}
|
@@ -2658,7 +2895,7 @@ const singleTypes = {
|
|
2658
2895
|
const { userAbility } = ctx.state;
|
2659
2896
|
const { model } = ctx.params;
|
2660
2897
|
const { query = {} } = ctx.request;
|
2661
|
-
const permissionChecker2 = getService$
|
2898
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2662
2899
|
if (permissionChecker2.cannot.read()) {
|
2663
2900
|
return ctx.forbidden();
|
2664
2901
|
}
|
@@ -2692,7 +2929,7 @@ const singleTypes = {
|
|
2692
2929
|
async createOrUpdate(ctx) {
|
2693
2930
|
const { userAbility } = ctx.state;
|
2694
2931
|
const { model } = ctx.params;
|
2695
|
-
const permissionChecker2 = getService$
|
2932
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2696
2933
|
const document = await createOrUpdateDocument(ctx);
|
2697
2934
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2698
2935
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2701,8 +2938,8 @@ const singleTypes = {
|
|
2701
2938
|
const { userAbility } = ctx.state;
|
2702
2939
|
const { model } = ctx.params;
|
2703
2940
|
const { query = {} } = ctx.request;
|
2704
|
-
const documentManager2 = getService$
|
2705
|
-
const permissionChecker2 = getService$
|
2941
|
+
const documentManager2 = getService$2("document-manager");
|
2942
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2706
2943
|
if (permissionChecker2.cannot.delete()) {
|
2707
2944
|
return ctx.forbidden();
|
2708
2945
|
}
|
@@ -2730,8 +2967,8 @@ const singleTypes = {
|
|
2730
2967
|
const { userAbility } = ctx.state;
|
2731
2968
|
const { model } = ctx.params;
|
2732
2969
|
const { query = {} } = ctx.request;
|
2733
|
-
const documentManager2 = getService$
|
2734
|
-
const permissionChecker2 = getService$
|
2970
|
+
const documentManager2 = getService$2("document-manager");
|
2971
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2735
2972
|
if (permissionChecker2.cannot.publish()) {
|
2736
2973
|
return ctx.forbidden();
|
2737
2974
|
}
|
@@ -2759,8 +2996,8 @@ const singleTypes = {
|
|
2759
2996
|
body: { discardDraft, ...body },
|
2760
2997
|
query = {}
|
2761
2998
|
} = ctx.request;
|
2762
|
-
const documentManager2 = getService$
|
2763
|
-
const permissionChecker2 = getService$
|
2999
|
+
const documentManager2 = getService$2("document-manager");
|
3000
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2764
3001
|
if (permissionChecker2.cannot.unpublish()) {
|
2765
3002
|
return ctx.forbidden();
|
2766
3003
|
}
|
@@ -2794,8 +3031,8 @@ const singleTypes = {
|
|
2794
3031
|
const { userAbility } = ctx.state;
|
2795
3032
|
const { model } = ctx.params;
|
2796
3033
|
const { body, query = {} } = ctx.request;
|
2797
|
-
const documentManager2 = getService$
|
2798
|
-
const permissionChecker2 = getService$
|
3034
|
+
const documentManager2 = getService$2("document-manager");
|
3035
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2799
3036
|
if (permissionChecker2.cannot.discard()) {
|
2800
3037
|
return ctx.forbidden();
|
2801
3038
|
}
|
@@ -2818,8 +3055,8 @@ const singleTypes = {
|
|
2818
3055
|
const { userAbility } = ctx.state;
|
2819
3056
|
const { model } = ctx.params;
|
2820
3057
|
const { query } = ctx.request;
|
2821
|
-
const documentManager2 = getService$
|
2822
|
-
const permissionChecker2 = getService$
|
3058
|
+
const documentManager2 = getService$2("document-manager");
|
3059
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2823
3060
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2824
3061
|
if (permissionChecker2.cannot.read()) {
|
2825
3062
|
return ctx.forbidden();
|
@@ -2843,7 +3080,7 @@ const uid$1 = {
|
|
2843
3080
|
const { query = {} } = ctx.request;
|
2844
3081
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2845
3082
|
await validateUIDField(contentTypeUID, field);
|
2846
|
-
const uidService = getService$
|
3083
|
+
const uidService = getService$2("uid");
|
2847
3084
|
ctx.body = {
|
2848
3085
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2849
3086
|
};
|
@@ -2855,7 +3092,7 @@ const uid$1 = {
|
|
2855
3092
|
const { query = {} } = ctx.request;
|
2856
3093
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2857
3094
|
await validateUIDField(contentTypeUID, field);
|
2858
|
-
const uidService = getService$
|
3095
|
+
const uidService = getService$2("uid");
|
2859
3096
|
const isAvailable = await uidService.checkUIDAvailability({
|
2860
3097
|
contentTypeUID,
|
2861
3098
|
field,
|
@@ -2876,7 +3113,8 @@ const controllers = {
|
|
2876
3113
|
relations,
|
2877
3114
|
"single-types": singleTypes,
|
2878
3115
|
uid: uid$1,
|
2879
|
-
...history.controllers ? history.controllers : {}
|
3116
|
+
...history.controllers ? history.controllers : {},
|
3117
|
+
...preview.controllers ? preview.controllers : {}
|
2880
3118
|
};
|
2881
3119
|
const keys = {
|
2882
3120
|
CONFIGURATION: "configuration"
|
@@ -3005,18 +3243,15 @@ async function syncMetadatas(configuration, schema) {
|
|
3005
3243
|
_.set(updatedMeta, ["list", "searchable"], false);
|
3006
3244
|
_.set(acc, [key], updatedMeta);
|
3007
3245
|
}
|
3008
|
-
if (!_.has(edit, "mainField"))
|
3009
|
-
return acc;
|
3246
|
+
if (!_.has(edit, "mainField")) return acc;
|
3010
3247
|
if (!isRelation$1(attr)) {
|
3011
3248
|
_.set(updatedMeta, "edit", _.omit(edit, ["mainField"]));
|
3012
3249
|
_.set(acc, [key], updatedMeta);
|
3013
3250
|
return acc;
|
3014
3251
|
}
|
3015
|
-
if (edit.mainField === "id")
|
3016
|
-
return acc;
|
3252
|
+
if (edit.mainField === "id") return acc;
|
3017
3253
|
const targetSchema = getTargetSchema(attr.targetModel);
|
3018
|
-
if (!targetSchema)
|
3019
|
-
return acc;
|
3254
|
+
if (!targetSchema) return acc;
|
3020
3255
|
if (!isSortable(targetSchema, edit.mainField) && !isListable(targetSchema, edit.mainField)) {
|
3021
3256
|
_.set(updatedMeta, ["edit", "mainField"], getDefaultMainField(targetSchema));
|
3022
3257
|
_.set(acc, [key], updatedMeta);
|
@@ -3027,12 +3262,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3027
3262
|
return _.assign(metasWithDefaults, updatedMetas);
|
3028
3263
|
}
|
3029
3264
|
const getTargetSchema = (targetModel) => {
|
3030
|
-
return getService$
|
3265
|
+
return getService$2("content-types").findContentType(targetModel);
|
3031
3266
|
};
|
3032
3267
|
const DEFAULT_LIST_LENGTH = 4;
|
3033
3268
|
const MAX_ROW_SIZE = 12;
|
3034
3269
|
const isAllowedFieldSize = (type, size) => {
|
3035
|
-
const { getFieldSize } = getService$
|
3270
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3036
3271
|
const fieldSize = getFieldSize(type);
|
3037
3272
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3038
3273
|
return false;
|
@@ -3040,7 +3275,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3040
3275
|
return size <= MAX_ROW_SIZE;
|
3041
3276
|
};
|
3042
3277
|
const getDefaultFieldSize = (attribute) => {
|
3043
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3278
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3044
3279
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3045
3280
|
};
|
3046
3281
|
async function createDefaultLayouts(schema) {
|
@@ -3061,8 +3296,7 @@ function createDefaultEditLayout(schema) {
|
|
3061
3296
|
return appendToEditLayout([], keys2, schema);
|
3062
3297
|
}
|
3063
3298
|
function syncLayouts(configuration, schema) {
|
3064
|
-
if (_.isEmpty(configuration.layouts))
|
3065
|
-
return createDefaultLayouts(schema);
|
3299
|
+
if (_.isEmpty(configuration.layouts)) return createDefaultLayouts(schema);
|
3066
3300
|
const { list = [], editRelations = [], edit = [] } = configuration.layouts || {};
|
3067
3301
|
let cleanList = list.filter((attr) => isListable(schema, attr));
|
3068
3302
|
const cleanEditRelations = editRelations.filter(
|
@@ -3073,9 +3307,8 @@ function syncLayouts(configuration, schema) {
|
|
3073
3307
|
for (const row of edit) {
|
3074
3308
|
const newRow = [];
|
3075
3309
|
for (const el of row) {
|
3076
|
-
if (!hasEditableAttribute(schema, el.name))
|
3077
|
-
|
3078
|
-
const { hasFieldSize } = getService$1("field-sizes");
|
3310
|
+
if (!hasEditableAttribute(schema, el.name)) continue;
|
3311
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3079
3312
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3080
3313
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3081
3314
|
elementsToReAppend.push(el.name);
|
@@ -3105,8 +3338,7 @@ function syncLayouts(configuration, schema) {
|
|
3105
3338
|
};
|
3106
3339
|
}
|
3107
3340
|
const appendToEditLayout = (layout = [], keysToAppend, schema) => {
|
3108
|
-
if (keysToAppend.length === 0)
|
3109
|
-
return layout;
|
3341
|
+
if (keysToAppend.length === 0) return layout;
|
3110
3342
|
let currentRowIndex = Math.max(layout.length - 1, 0);
|
3111
3343
|
if (!layout[currentRowIndex]) {
|
3112
3344
|
layout[currentRowIndex] = [];
|
@@ -3215,17 +3447,17 @@ const configurationService$1 = createConfigurationService({
|
|
3215
3447
|
isComponent: true,
|
3216
3448
|
prefix: STORE_KEY_PREFIX,
|
3217
3449
|
getModels() {
|
3218
|
-
const { toContentManagerModel } = getService$
|
3450
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3219
3451
|
return mapValues(toContentManagerModel, strapi.components);
|
3220
3452
|
}
|
3221
3453
|
});
|
3222
3454
|
const components = ({ strapi: strapi2 }) => ({
|
3223
3455
|
findAllComponents() {
|
3224
|
-
const { toContentManagerModel } = getService$
|
3456
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3225
3457
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3226
3458
|
},
|
3227
3459
|
findComponent(uid2) {
|
3228
|
-
const { toContentManagerModel } = getService$
|
3460
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3229
3461
|
const component = strapi2.components[uid2];
|
3230
3462
|
return isNil$1(component) ? component : toContentManagerModel(component);
|
3231
3463
|
},
|
@@ -3276,17 +3508,17 @@ const configurationService = createConfigurationService({
|
|
3276
3508
|
storeUtils,
|
3277
3509
|
prefix: "content_types",
|
3278
3510
|
getModels() {
|
3279
|
-
const { toContentManagerModel } = getService$
|
3511
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3280
3512
|
return mapValues(toContentManagerModel, strapi.contentTypes);
|
3281
3513
|
}
|
3282
3514
|
});
|
3283
3515
|
const service = ({ strapi: strapi2 }) => ({
|
3284
3516
|
findAllContentTypes() {
|
3285
|
-
const { toContentManagerModel } = getService$
|
3517
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3286
3518
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3287
3519
|
},
|
3288
3520
|
findContentType(uid2) {
|
3289
|
-
const { toContentManagerModel } = getService$
|
3521
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3290
3522
|
const contentType = strapi2.contentTypes[uid2];
|
3291
3523
|
return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
|
3292
3524
|
},
|
@@ -3315,7 +3547,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3315
3547
|
return this.findConfiguration(contentType);
|
3316
3548
|
},
|
3317
3549
|
findComponentsConfigurations(contentType) {
|
3318
|
-
return getService$
|
3550
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3319
3551
|
},
|
3320
3552
|
syncConfigurations() {
|
3321
3553
|
return configurationService.syncConfigurations();
|
@@ -3587,7 +3819,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3587
3819
|
return userAbility.can(action);
|
3588
3820
|
},
|
3589
3821
|
async registerPermissions() {
|
3590
|
-
const displayedContentTypes = getService$
|
3822
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3591
3823
|
const contentTypesUids = displayedContentTypes.map(prop("uid"));
|
3592
3824
|
const actions = [
|
3593
3825
|
{
|
@@ -3672,6 +3904,12 @@ function getPopulateForRelation(attribute, model, attributeName, { countMany, co
|
|
3672
3904
|
if (initialPopulate) {
|
3673
3905
|
return initialPopulate;
|
3674
3906
|
}
|
3907
|
+
if (attributeName === "localizations") {
|
3908
|
+
const validationPopulate = getPopulateForValidation(model.uid);
|
3909
|
+
return {
|
3910
|
+
populate: validationPopulate.populate
|
3911
|
+
};
|
3912
|
+
}
|
3675
3913
|
if (!isVisibleAttribute$1(model, attributeName)) {
|
3676
3914
|
return true;
|
3677
3915
|
}
|
@@ -3731,6 +3969,9 @@ const getDeepPopulate = (uid2, {
|
|
3731
3969
|
return {};
|
3732
3970
|
}
|
3733
3971
|
const model = strapi.getModel(uid2);
|
3972
|
+
if (!model) {
|
3973
|
+
return {};
|
3974
|
+
}
|
3734
3975
|
return Object.keys(model.attributes).reduce(
|
3735
3976
|
(populateAcc, attributeName) => merge(
|
3736
3977
|
populateAcc,
|
@@ -3750,40 +3991,46 @@ const getDeepPopulate = (uid2, {
|
|
3750
3991
|
{}
|
3751
3992
|
);
|
3752
3993
|
};
|
3753
|
-
const
|
3754
|
-
|
3755
|
-
|
3756
|
-
countOne = false,
|
3757
|
-
maxLevel = Infinity
|
3758
|
-
} = {}, level = 1) => {
|
3759
|
-
if (level > maxLevel) {
|
3994
|
+
const getPopulateForValidation = (uid2) => {
|
3995
|
+
const model = strapi.getModel(uid2);
|
3996
|
+
if (!model) {
|
3760
3997
|
return {};
|
3761
3998
|
}
|
3762
|
-
const model = strapi.getModel(uid2);
|
3763
3999
|
return Object.entries(model.attributes).reduce((populateAcc, [attributeName, attribute]) => {
|
3764
|
-
if (
|
4000
|
+
if (isScalarAttribute(attribute)) {
|
4001
|
+
if (getDoesAttributeRequireValidation(attribute)) {
|
4002
|
+
populateAcc.fields = populateAcc.fields || [];
|
4003
|
+
populateAcc.fields.push(attributeName);
|
4004
|
+
}
|
3765
4005
|
return populateAcc;
|
3766
4006
|
}
|
3767
|
-
if (
|
3768
|
-
|
3769
|
-
|
3770
|
-
|
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;
|
3771
4015
|
}
|
3772
|
-
|
3773
|
-
|
3774
|
-
|
3775
|
-
|
3776
|
-
|
3777
|
-
|
3778
|
-
|
3779
|
-
|
3780
|
-
|
3781
|
-
countOne,
|
3782
|
-
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;
|
3783
4025
|
},
|
3784
|
-
|
3785
|
-
)
|
3786
|
-
|
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;
|
3787
4034
|
}, {});
|
3788
4035
|
};
|
3789
4036
|
const getDeepPopulateDraftCount = (uid2) => {
|
@@ -3863,7 +4110,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3863
4110
|
return populateQuery;
|
3864
4111
|
};
|
3865
4112
|
const buildDeepPopulate = (uid2) => {
|
3866
|
-
return getService$
|
4113
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3867
4114
|
};
|
3868
4115
|
const populateBuilder = (uid2) => {
|
3869
4116
|
let getInitialPopulate = async () => {
|
@@ -4025,7 +4272,6 @@ const AVAILABLE_LOCALES_FIELDS = [
|
|
4025
4272
|
"locale",
|
4026
4273
|
"updatedAt",
|
4027
4274
|
"createdAt",
|
4028
|
-
"status",
|
4029
4275
|
"publishedAt",
|
4030
4276
|
"documentId"
|
4031
4277
|
];
|
@@ -4046,34 +4292,20 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4046
4292
|
/**
|
4047
4293
|
* Returns available locales of a document for the current status
|
4048
4294
|
*/
|
4049
|
-
async getAvailableLocales(uid2, version, allVersions
|
4295
|
+
async getAvailableLocales(uid2, version, allVersions) {
|
4050
4296
|
const versionsByLocale = groupBy("locale", allVersions);
|
4051
|
-
|
4297
|
+
if (version.locale) {
|
4298
|
+
delete versionsByLocale[version.locale];
|
4299
|
+
}
|
4052
4300
|
const model = strapi2.getModel(uid2);
|
4053
|
-
const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
|
4054
|
-
const traversalFunction = async (localeVersion) => traverseEntity(
|
4055
|
-
({ key }, { remove }) => {
|
4056
|
-
if (keysToKeep.includes(key)) {
|
4057
|
-
return;
|
4058
|
-
}
|
4059
|
-
remove(key);
|
4060
|
-
},
|
4061
|
-
{ schema: model, getModel: strapi2.getModel.bind(strapi2) },
|
4062
|
-
// @ts-expect-error fix types DocumentVersion incompatible with Data
|
4063
|
-
localeVersion
|
4064
|
-
);
|
4065
4301
|
const mappingResult = await async.map(
|
4066
4302
|
Object.values(versionsByLocale),
|
4067
4303
|
async (localeVersions) => {
|
4068
|
-
const mappedLocaleVersions = await async.map(
|
4069
|
-
localeVersions,
|
4070
|
-
traversalFunction
|
4071
|
-
);
|
4072
4304
|
if (!contentTypes$1.hasDraftAndPublish(model)) {
|
4073
|
-
return
|
4305
|
+
return localeVersions[0];
|
4074
4306
|
}
|
4075
|
-
const draftVersion =
|
4076
|
-
const otherVersions =
|
4307
|
+
const draftVersion = localeVersions.find((v) => v.publishedAt === null);
|
4308
|
+
const otherVersions = localeVersions.filter((v) => v.id !== draftVersion?.id);
|
4077
4309
|
if (!draftVersion) {
|
4078
4310
|
return;
|
4079
4311
|
}
|
@@ -4095,8 +4327,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4095
4327
|
const matchStatus = status === "published" ? v.publishedAt !== null : v.publishedAt === null;
|
4096
4328
|
return matchLocale && matchStatus;
|
4097
4329
|
});
|
4098
|
-
if (!availableStatus)
|
4099
|
-
return availableStatus;
|
4330
|
+
if (!availableStatus) return availableStatus;
|
4100
4331
|
return pick(AVAILABLE_STATUS_FIELDS, availableStatus);
|
4101
4332
|
},
|
4102
4333
|
/**
|
@@ -4106,18 +4337,19 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4106
4337
|
* @returns
|
4107
4338
|
*/
|
4108
4339
|
async getManyAvailableStatus(uid2, documents) {
|
4109
|
-
if (!documents.length)
|
4110
|
-
return [];
|
4340
|
+
if (!documents.length) return [];
|
4111
4341
|
const status = documents[0].publishedAt !== null ? "published" : "draft";
|
4112
|
-
const
|
4113
|
-
const
|
4114
|
-
|
4115
|
-
|
4116
|
-
|
4117
|
-
|
4118
|
-
|
4119
|
-
|
4120
|
-
|
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"]
|
4121
4353
|
});
|
4122
4354
|
},
|
4123
4355
|
getStatus(version, otherDocumentStatuses) {
|
@@ -4134,10 +4366,8 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4134
4366
|
} else if (otherVersion) {
|
4135
4367
|
draftVersion = otherVersion;
|
4136
4368
|
}
|
4137
|
-
if (!draftVersion)
|
4138
|
-
|
4139
|
-
if (!publishedVersion)
|
4140
|
-
return CONTENT_MANAGER_STATUS.DRAFT;
|
4369
|
+
if (!draftVersion) return CONTENT_MANAGER_STATUS.PUBLISHED;
|
4370
|
+
if (!publishedVersion) return CONTENT_MANAGER_STATUS.DRAFT;
|
4141
4371
|
const isDraftModified = getIsVersionLatestModification(draftVersion, publishedVersion);
|
4142
4372
|
return isDraftModified ? CONTENT_MANAGER_STATUS.MODIFIED : CONTENT_MANAGER_STATUS.PUBLISHED;
|
4143
4373
|
},
|
@@ -4145,11 +4375,9 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4145
4375
|
// We could refactor this so the locales are only loaded when they're
|
4146
4376
|
// needed. e.g. in the bulk locale action modal.
|
4147
4377
|
async getMetadata(uid2, version, { availableLocales = true, availableStatus = true } = {}) {
|
4148
|
-
const populate =
|
4149
|
-
const
|
4150
|
-
where: { documentId: version.documentId },
|
4378
|
+
const { populate = {}, fields = [] } = getPopulateForValidation(uid2);
|
4379
|
+
const params = {
|
4151
4380
|
populate: {
|
4152
|
-
// Populate only fields that require validation for bulk locale actions
|
4153
4381
|
...populate,
|
4154
4382
|
// NOTE: creator fields are selected in this way to avoid exposing sensitive data
|
4155
4383
|
createdBy: {
|
@@ -4158,9 +4386,15 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4158
4386
|
updatedBy: {
|
4159
4387
|
select: ["id", "firstname", "lastname", "email"]
|
4160
4388
|
}
|
4389
|
+
},
|
4390
|
+
fields: uniq([...AVAILABLE_LOCALES_FIELDS, ...fields]),
|
4391
|
+
filters: {
|
4392
|
+
documentId: version.documentId
|
4161
4393
|
}
|
4162
|
-
}
|
4163
|
-
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) : [];
|
4164
4398
|
const availableStatusResult = availableStatus ? this.getAvailableStatus(version, versions) : null;
|
4165
4399
|
return {
|
4166
4400
|
availableLocales: availableLocalesResult,
|
@@ -4187,6 +4421,16 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4187
4421
|
opts.availableStatus = false;
|
4188
4422
|
}
|
4189
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
|
+
}
|
4190
4434
|
return {
|
4191
4435
|
data: {
|
4192
4436
|
...document,
|
@@ -4404,7 +4648,8 @@ const services = {
|
|
4404
4648
|
permission,
|
4405
4649
|
"populate-builder": populateBuilder$1,
|
4406
4650
|
uid,
|
4407
|
-
...history.services ? history.services : {}
|
4651
|
+
...history.services ? history.services : {},
|
4652
|
+
...preview.services ? preview.services : {}
|
4408
4653
|
};
|
4409
4654
|
const index = () => {
|
4410
4655
|
return {
|