@strapi/content-manager 0.0.0-experimental.da85533897155e719d784f0271223c866d2f69ab → 0.0.0-experimental.dad3c50630ca4fd9eccdcbe549ee632fc572e23d
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-DyDkPajU.js → ComponentConfigurationPage-BLWQy8ru.js} +5 -6
- package/dist/_chunks/{ComponentConfigurationPage-DyDkPajU.js.map → ComponentConfigurationPage-BLWQy8ru.js.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-9lRmRdIr.mjs → ComponentConfigurationPage-CtIa3aa2.mjs} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-9lRmRdIr.mjs.map → ComponentConfigurationPage-CtIa3aa2.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-Bk893vVY.mjs → EditConfigurationPage-DsPR2DVk.mjs} +4 -4
- package/dist/_chunks/{EditConfigurationPage-Bk893vVY.mjs.map → EditConfigurationPage-DsPR2DVk.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-DValmA0m.js → EditConfigurationPage-RQkymxCy.js} +5 -6
- package/dist/_chunks/{EditConfigurationPage-DValmA0m.js.map → EditConfigurationPage-RQkymxCy.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-Dk7Eaft4.js → EditViewPage-B-kExt8C.js} +50 -11
- package/dist/_chunks/EditViewPage-B-kExt8C.js.map +1 -0
- package/dist/_chunks/{EditViewPage-DiNFdFqP.mjs → EditViewPage-BPyVuPfM.mjs} +50 -10
- package/dist/_chunks/EditViewPage-BPyVuPfM.mjs.map +1 -0
- package/dist/_chunks/{Field-DH2OaqUP.js → Field-DPIsQRre.js} +250 -161
- package/dist/_chunks/Field-DPIsQRre.js.map +1 -0
- package/dist/_chunks/{Field-Dv_HTFTa.mjs → Field-Dltnt1km.mjs} +244 -155
- package/dist/_chunks/Field-Dltnt1km.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-B_dUDizM.js → Form-BFi4MXMT.js} +19 -12
- package/dist/_chunks/Form-BFi4MXMT.js.map +1 -0
- package/dist/_chunks/{Form-Dy6P4HgH.mjs → Form-C1IcWm1u.mjs} +17 -9
- package/dist/_chunks/Form-C1IcWm1u.mjs.map +1 -0
- package/dist/_chunks/{History-DrwsD1Vc.mjs → History-04ChQ4pl.mjs} +71 -104
- package/dist/_chunks/History-04ChQ4pl.mjs.map +1 -0
- package/dist/_chunks/{History-BT4w83Oa.js → History-wjcK4L0C.js} +70 -104
- package/dist/_chunks/History-wjcK4L0C.js.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-BxIP0jRy.mjs → ListConfigurationPage-BYqPYLSU.mjs} +7 -6
- package/dist/_chunks/ListConfigurationPage-BYqPYLSU.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-CuYrMcW3.js → ListConfigurationPage-CRbxIC3J.js} +7 -7
- package/dist/_chunks/ListConfigurationPage-CRbxIC3J.js.map +1 -0
- package/dist/_chunks/{ListViewPage-BvpwNur7.js → ListViewPage-D5NY9183.js} +88 -54
- package/dist/_chunks/ListViewPage-D5NY9183.js.map +1 -0
- package/dist/_chunks/{ListViewPage-5a1vw-OK.mjs → ListViewPage-FU2LBuhl.mjs} +83 -48
- package/dist/_chunks/ListViewPage-FU2LBuhl.mjs.map +1 -0
- package/dist/_chunks/{NoContentTypePage-UqEiWKkM.js → NoContentTypePage-BgQVE_Qb.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-UqEiWKkM.js.map → NoContentTypePage-BgQVE_Qb.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-Bm6tRcd3.mjs → NoContentTypePage-DCKUkwb8.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-Bm6tRcd3.mjs.map → NoContentTypePage-DCKUkwb8.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-C_vGRo8Q.js → NoPermissionsPage-C5jwn70o.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-C_vGRo8Q.js.map → NoPermissionsPage-C5jwn70o.js.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-BHPqn_tQ.mjs → NoPermissionsPage-jqve7C8l.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-BHPqn_tQ.mjs.map → NoPermissionsPage-jqve7C8l.mjs.map} +1 -1
- package/dist/_chunks/Preview-BMYN548c.mjs +294 -0
- package/dist/_chunks/Preview-BMYN548c.mjs.map +1 -0
- package/dist/_chunks/Preview-DaOihysv.js +312 -0
- package/dist/_chunks/Preview-DaOihysv.js.map +1 -0
- package/dist/_chunks/{Relations-CznVF6LS.js → Relations-CTGM7Hv5.js} +75 -42
- package/dist/_chunks/Relations-CTGM7Hv5.js.map +1 -0
- package/dist/_chunks/{Relations-C7fPyh5P.mjs → Relations-gscPkxjF.mjs} +75 -41
- package/dist/_chunks/Relations-gscPkxjF.mjs.map +1 -0
- package/dist/_chunks/{en-otD_UBJi.js → en-BzQmavmK.js} +32 -14
- package/dist/_chunks/{en-otD_UBJi.js.map → en-BzQmavmK.js.map} +1 -1
- package/dist/_chunks/{en-CbaIuYoB.mjs → en-CSxLmrh1.mjs} +32 -14
- package/dist/_chunks/{en-CbaIuYoB.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-D9UmmBcM.js → index-Ca7YWlAA.js} +1063 -754
- package/dist/_chunks/index-Ca7YWlAA.js.map +1 -0
- package/dist/_chunks/{index-BJ6uTqLL.mjs → index-DqasUQ6Q.mjs} +1066 -757
- package/dist/_chunks/index-DqasUQ6Q.mjs.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-kfu5Wtix.js → layout-BW80JSCd.js} +7 -7
- package/dist/_chunks/{layout-kfu5Wtix.js.map → layout-BW80JSCd.js.map} +1 -1
- package/dist/_chunks/{layout-uomiIGbG.mjs → layout-W3clJSCy.mjs} +6 -5
- package/dist/_chunks/{layout-uomiIGbG.mjs.map → layout-W3clJSCy.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-DiDufGSA.mjs → relations-BlDkoeWh.mjs} +6 -7
- package/dist/_chunks/relations-BlDkoeWh.mjs.map +1 -0
- package/dist/_chunks/{relations-DKENrxko.js → relations-C9Usz9k5.js} +6 -7
- package/dist/_chunks/relations-C9Usz9k5.js.map +1 -0
- package/dist/_chunks/{usePrev-B9w_-eYc.js → useDebounce-CtcjDB3L.js} +14 -1
- package/dist/_chunks/useDebounce-CtcjDB3L.js.map +1 -0
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs +29 -0
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs.map +1 -0
- 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 +3 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +5 -3
- package/dist/admin/src/content-manager.d.ts +3 -2
- package/dist/admin/src/exports.d.ts +2 -1
- package/dist/admin/src/history/services/historyVersion.d.ts +1 -1
- package/dist/admin/src/hooks/useDocument.d.ts +32 -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/pages/EditView/components/FormInputs/DynamicZone/DynamicComponent.d.ts +4 -1
- package/dist/admin/src/pages/EditView/components/FormInputs/DynamicZone/Field.d.ts +4 -1
- package/dist/admin/src/pages/EditView/components/Header.d.ts +11 -11
- 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 +19 -20
- 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 +594 -335
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +595 -335
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/bootstrap.d.ts.map +1 -1
- package/dist/server/src/controllers/collection-types.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/controllers/history-version.d.ts +1 -1
- package/dist/server/src/history/controllers/history-version.d.ts.map +1 -1
- package/dist/server/src/history/services/history.d.ts +3 -3
- 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 +6 -11
- 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/collection-types.d.ts +3 -1
- package/dist/shared/contracts/collection-types.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 +17 -15
- package/dist/_chunks/EditViewPage-DiNFdFqP.mjs.map +0 -1
- package/dist/_chunks/EditViewPage-Dk7Eaft4.js.map +0 -1
- package/dist/_chunks/Field-DH2OaqUP.js.map +0 -1
- package/dist/_chunks/Field-Dv_HTFTa.mjs.map +0 -1
- package/dist/_chunks/Form-B_dUDizM.js.map +0 -1
- package/dist/_chunks/Form-Dy6P4HgH.mjs.map +0 -1
- package/dist/_chunks/History-BT4w83Oa.js.map +0 -1
- package/dist/_chunks/History-DrwsD1Vc.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-BxIP0jRy.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-CuYrMcW3.js.map +0 -1
- package/dist/_chunks/ListViewPage-5a1vw-OK.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-BvpwNur7.js.map +0 -1
- package/dist/_chunks/Relations-C7fPyh5P.mjs.map +0 -1
- package/dist/_chunks/Relations-CznVF6LS.js.map +0 -1
- package/dist/_chunks/index-BJ6uTqLL.mjs.map +0 -1
- package/dist/_chunks/index-D9UmmBcM.js.map +0 -1
- package/dist/_chunks/relations-DKENrxko.js.map +0 -1
- package/dist/_chunks/relations-DiDufGSA.mjs.map +0 -1
- package/dist/_chunks/usePrev-B9w_-eYc.js.map +0 -1
- package/dist/_chunks/usePrev-DH6iah0A.mjs +0 -16
- package/dist/_chunks/usePrev-DH6iah0A.mjs.map +0 -1
- package/strapi-server.js +0 -3
package/dist/server/index.js
CHANGED
@@ -10,8 +10,7 @@ const qs = require("qs");
|
|
10
10
|
const slugify = require("@sindresorhus/slugify");
|
11
11
|
const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
|
12
12
|
function _interopNamespace(e) {
|
13
|
-
if (e && e.__esModule)
|
14
|
-
return e;
|
13
|
+
if (e && e.__esModule) return e;
|
15
14
|
const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
|
16
15
|
if (e) {
|
17
16
|
for (const k in e) {
|
@@ -33,10 +32,10 @@ const isNil__default = /* @__PURE__ */ _interopDefault(isNil);
|
|
33
32
|
const ___default = /* @__PURE__ */ _interopDefault(_);
|
34
33
|
const qs__default = /* @__PURE__ */ _interopDefault(qs);
|
35
34
|
const slugify__default = /* @__PURE__ */ _interopDefault(slugify);
|
36
|
-
const getService$
|
35
|
+
const getService$2 = (name) => {
|
37
36
|
return strapi.plugin("content-manager").service(name);
|
38
37
|
};
|
39
|
-
function getService(strapi2, name) {
|
38
|
+
function getService$1(strapi2, name) {
|
40
39
|
return strapi2.service(`plugin::content-manager.${name}`);
|
41
40
|
}
|
42
41
|
const historyRestoreVersionSchema = yup__namespace.object().shape({
|
@@ -72,7 +71,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
72
71
|
if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {
|
73
72
|
throw new strapiUtils.errors.ForbiddenError("contentType and documentId are required");
|
74
73
|
}
|
75
|
-
const permissionChecker2 = getService$
|
74
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
76
75
|
userAbility: ctx.state.userAbility,
|
77
76
|
model: ctx.query.contentType
|
78
77
|
});
|
@@ -80,7 +79,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
80
79
|
return ctx.forbidden();
|
81
80
|
}
|
82
81
|
const query = await permissionChecker2.sanitizeQuery(ctx.query);
|
83
|
-
const { results, pagination } = await getService(strapi2, "history").findVersionsPage({
|
82
|
+
const { results, pagination } = await getService$1(strapi2, "history").findVersionsPage({
|
84
83
|
query: {
|
85
84
|
...query,
|
86
85
|
...getValidPagination({ page: query.page, pageSize: query.pageSize })
|
@@ -105,14 +104,14 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
105
104
|
async restoreVersion(ctx) {
|
106
105
|
const request = ctx.request;
|
107
106
|
await validateRestoreVersion(request.body, "contentType is required");
|
108
|
-
const permissionChecker2 = getService$
|
107
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
109
108
|
userAbility: ctx.state.userAbility,
|
110
109
|
model: request.body.contentType
|
111
110
|
});
|
112
111
|
if (permissionChecker2.cannot.update()) {
|
113
112
|
throw new strapiUtils.errors.ForbiddenError();
|
114
113
|
}
|
115
|
-
const restoredDocument = await getService(strapi2, "history").restoreVersion(
|
114
|
+
const restoredDocument = await getService$1(strapi2, "history").restoreVersion(
|
116
115
|
request.params.versionId
|
117
116
|
);
|
118
117
|
return {
|
@@ -121,7 +120,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
121
120
|
}
|
122
121
|
};
|
123
122
|
};
|
124
|
-
const controllers$
|
123
|
+
const controllers$2 = {
|
125
124
|
"history-version": createHistoryVersionController
|
126
125
|
/**
|
127
126
|
* Casting is needed because the types aren't aware that Strapi supports
|
@@ -167,8 +166,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
167
166
|
};
|
168
167
|
const getRelationRestoreValue = async (versionRelationData, attribute) => {
|
169
168
|
if (Array.isArray(versionRelationData)) {
|
170
|
-
if (versionRelationData.length === 0)
|
171
|
-
return versionRelationData;
|
169
|
+
if (versionRelationData.length === 0) return versionRelationData;
|
172
170
|
const existingAndMissingRelations = await Promise.all(
|
173
171
|
versionRelationData.map((relation) => {
|
174
172
|
return strapi2.documents(attribute.target).findOne({
|
@@ -177,19 +175,16 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
177
175
|
});
|
178
176
|
})
|
179
177
|
);
|
180
|
-
return existingAndMissingRelations.filter(
|
181
|
-
(relation) => relation !== null
|
182
|
-
);
|
178
|
+
return existingAndMissingRelations.filter((relation) => relation !== null);
|
183
179
|
}
|
184
180
|
return strapi2.documents(attribute.target).findOne({
|
185
181
|
documentId: versionRelationData.documentId,
|
186
182
|
locale: versionRelationData.locale || void 0
|
187
183
|
});
|
188
184
|
};
|
189
|
-
const getMediaRestoreValue = async (versionRelationData
|
190
|
-
if (
|
185
|
+
const getMediaRestoreValue = async (versionRelationData) => {
|
186
|
+
if (Array.isArray(versionRelationData)) {
|
191
187
|
const existingAndMissingMedias = await Promise.all(
|
192
|
-
// @ts-expect-error Fix the type definitions so this isn't any
|
193
188
|
versionRelationData.map((media) => {
|
194
189
|
return strapi2.db.query("plugin::upload.file").findOne({ where: { id: media.id } });
|
195
190
|
})
|
@@ -203,8 +198,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
203
198
|
const getDefaultLocale = async () => localesService ? localesService.getDefaultLocale() : null;
|
204
199
|
const isLocalizedContentType = (model) => i18nContentTypeService ? i18nContentTypeService.isLocalizedContentType(model) : false;
|
205
200
|
const getLocaleDictionary = async () => {
|
206
|
-
if (!localesService)
|
207
|
-
return {};
|
201
|
+
if (!localesService) return {};
|
208
202
|
const locales = await localesService.find() || [];
|
209
203
|
return locales.reduce(
|
210
204
|
(acc, locale) => {
|
@@ -228,6 +222,17 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
228
222
|
const meta = await documentMetadataService.getMetadata(contentTypeUid, document);
|
229
223
|
return documentMetadataService.getStatus(document, meta.availableStatus);
|
230
224
|
};
|
225
|
+
const getComponentFields = (componentUID) => {
|
226
|
+
return Object.entries(strapi2.getModel(componentUID).attributes).reduce(
|
227
|
+
(fieldsAcc, [key, attribute]) => {
|
228
|
+
if (!["relation", "media", "component", "dynamiczone"].includes(attribute.type)) {
|
229
|
+
fieldsAcc.push(key);
|
230
|
+
}
|
231
|
+
return fieldsAcc;
|
232
|
+
},
|
233
|
+
[]
|
234
|
+
);
|
235
|
+
};
|
231
236
|
const getDeepPopulate2 = (uid2, useDatabaseSyntax = false) => {
|
232
237
|
const model = strapi2.getModel(uid2);
|
233
238
|
const attributes = Object.entries(model.attributes);
|
@@ -251,13 +256,19 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
251
256
|
}
|
252
257
|
case "component": {
|
253
258
|
const populate = getDeepPopulate2(attribute.component);
|
254
|
-
acc[attributeName] = {
|
259
|
+
acc[attributeName] = {
|
260
|
+
populate,
|
261
|
+
[fieldSelector]: getComponentFields(attribute.component)
|
262
|
+
};
|
255
263
|
break;
|
256
264
|
}
|
257
265
|
case "dynamiczone": {
|
258
266
|
const populatedComponents = (attribute.components || []).reduce(
|
259
267
|
(acc2, componentUID) => {
|
260
|
-
acc2[componentUID] = {
|
268
|
+
acc2[componentUID] = {
|
269
|
+
populate: getDeepPopulate2(componentUID),
|
270
|
+
[fieldSelector]: getComponentFields(componentUID)
|
271
|
+
};
|
261
272
|
return acc2;
|
262
273
|
},
|
263
274
|
{}
|
@@ -342,8 +353,8 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
342
353
|
});
|
343
354
|
},
|
344
355
|
async findVersionsPage(params) {
|
345
|
-
const
|
346
|
-
const isLocalizedContentType = serviceUtils.isLocalizedContentType(
|
356
|
+
const schema = strapi2.getModel(params.query.contentType);
|
357
|
+
const isLocalizedContentType = serviceUtils.isLocalizedContentType(schema);
|
347
358
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
348
359
|
let locale = null;
|
349
360
|
if (isLocalizedContentType) {
|
@@ -364,78 +375,76 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
364
375
|
}),
|
365
376
|
serviceUtils.getLocaleDictionary()
|
366
377
|
]);
|
367
|
-
const
|
368
|
-
|
369
|
-
async (
|
370
|
-
|
371
|
-
|
372
|
-
|
373
|
-
|
374
|
-
|
375
|
-
model: "plugin::upload.file"
|
376
|
-
});
|
377
|
-
const response = await serviceUtils.buildMediaResponse(attributeValues);
|
378
|
-
const sanitizedResults = await Promise.all(
|
379
|
-
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
380
|
-
);
|
381
|
-
return {
|
382
|
-
...await currentDataWithRelations,
|
383
|
-
[attributeKey]: {
|
384
|
-
results: sanitizedResults,
|
385
|
-
meta: response.meta
|
386
|
-
}
|
387
|
-
};
|
378
|
+
const populateEntry = async (entry) => {
|
379
|
+
return strapiUtils.traverseEntity(
|
380
|
+
async (options, utils) => {
|
381
|
+
if (!options.attribute) return;
|
382
|
+
if (!options.value) return;
|
383
|
+
const currentValue = Array.isArray(options.value) ? options.value : [options.value];
|
384
|
+
if (options.attribute.type === "component") {
|
385
|
+
utils.remove("id");
|
388
386
|
}
|
389
|
-
if (
|
390
|
-
|
387
|
+
if (options.attribute.type === "relation" && // TODO: handle polymorphic relations
|
388
|
+
options.attribute.relation !== "morphToOne" && options.attribute.relation !== "morphToMany") {
|
389
|
+
if (options.attribute.target === "admin::user") {
|
391
390
|
const adminUsers = await Promise.all(
|
392
|
-
|
391
|
+
currentValue.map((userToPopulate) => {
|
393
392
|
if (userToPopulate == null) {
|
394
393
|
return null;
|
395
394
|
}
|
396
|
-
return strapi2.query("admin::user").findOne({
|
395
|
+
return strapi2.query("admin::user").findOne({
|
396
|
+
where: {
|
397
|
+
...userToPopulate.id ? { id: userToPopulate.id } : {},
|
398
|
+
...userToPopulate.documentId ? { documentId: userToPopulate.documentId } : {}
|
399
|
+
}
|
400
|
+
});
|
397
401
|
})
|
398
402
|
);
|
399
|
-
|
400
|
-
...await currentDataWithRelations,
|
401
|
-
/**
|
402
|
-
* Ideally we would return the same "{results: [], meta: {}}" shape, however,
|
403
|
-
* when sanitizing the data as a whole in the controller before sending to the client,
|
404
|
-
* the data for admin relation user is completely sanitized if we return an object here as opposed to an array.
|
405
|
-
*/
|
406
|
-
[attributeKey]: adminUsers
|
407
|
-
};
|
403
|
+
utils.set(options.key, adminUsers);
|
408
404
|
}
|
409
|
-
const permissionChecker2 = getService$
|
405
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
410
406
|
userAbility: params.state.userAbility,
|
411
|
-
model:
|
407
|
+
model: options.attribute.target
|
412
408
|
});
|
413
409
|
const response = await serviceUtils.buildRelationReponse(
|
414
|
-
|
415
|
-
|
410
|
+
currentValue,
|
411
|
+
options.attribute
|
416
412
|
);
|
417
413
|
const sanitizedResults = await Promise.all(
|
418
414
|
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
419
415
|
);
|
420
|
-
|
421
|
-
|
422
|
-
|
423
|
-
|
424
|
-
|
425
|
-
|
426
|
-
|
416
|
+
utils.set(options.key, {
|
417
|
+
results: sanitizedResults,
|
418
|
+
meta: response.meta
|
419
|
+
});
|
420
|
+
}
|
421
|
+
if (options.attribute.type === "media") {
|
422
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
423
|
+
userAbility: params.state.userAbility,
|
424
|
+
model: "plugin::upload.file"
|
425
|
+
});
|
426
|
+
const response = await serviceUtils.buildMediaResponse(currentValue);
|
427
|
+
const sanitizedResults = await Promise.all(
|
428
|
+
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
429
|
+
);
|
430
|
+
utils.set(options.key, {
|
431
|
+
results: sanitizedResults,
|
432
|
+
meta: response.meta
|
433
|
+
});
|
427
434
|
}
|
428
|
-
return currentDataWithRelations;
|
429
435
|
},
|
430
|
-
|
436
|
+
{
|
437
|
+
schema,
|
438
|
+
getModel: strapi2.getModel.bind(strapi2)
|
439
|
+
},
|
440
|
+
entry.data
|
431
441
|
);
|
432
|
-
return entryWithRelations;
|
433
442
|
};
|
434
443
|
const formattedResults = await Promise.all(
|
435
444
|
results.map(async (result) => {
|
436
445
|
return {
|
437
446
|
...result,
|
438
|
-
data: await
|
447
|
+
data: await populateEntry(result),
|
439
448
|
meta: {
|
440
449
|
unknownAttributes: serviceUtils.getSchemaAttributesDiff(
|
441
450
|
result.schema,
|
@@ -466,30 +475,44 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
466
475
|
// Clone to avoid mutating the original version data
|
467
476
|
structuredClone(version.data)
|
468
477
|
);
|
469
|
-
const
|
470
|
-
|
471
|
-
|
472
|
-
|
473
|
-
|
474
|
-
|
475
|
-
|
476
|
-
|
477
|
-
|
478
|
-
|
478
|
+
const schema = structuredClone(version.schema);
|
479
|
+
schema.attributes = fp.omit(FIELDS_TO_IGNORE, contentTypeSchemaAttributes);
|
480
|
+
const dataWithoutMissingRelations = await strapiUtils.traverseEntity(
|
481
|
+
async (options, utils) => {
|
482
|
+
if (!options.attribute) return;
|
483
|
+
if (options.attribute.type === "component") {
|
484
|
+
utils.remove("id");
|
485
|
+
if (options.attribute.repeatable && options.value === null) {
|
486
|
+
utils.set(options.key, []);
|
487
|
+
}
|
488
|
+
}
|
489
|
+
if (options.attribute.type === "dynamiczone") {
|
490
|
+
if (options.value === null) {
|
491
|
+
utils.set(options.key, []);
|
492
|
+
}
|
479
493
|
}
|
480
|
-
if (attribute.type === "relation" && // TODO: handle polymorphic relations
|
481
|
-
attribute.relation !== "morphToOne" && attribute.relation !== "morphToMany") {
|
482
|
-
|
483
|
-
|
494
|
+
if (options.attribute.type === "relation" && // TODO: handle polymorphic relations
|
495
|
+
options.attribute.relation !== "morphToOne" && options.attribute.relation !== "morphToMany") {
|
496
|
+
if (!options.value) return;
|
497
|
+
const data2 = await serviceUtils.getRelationRestoreValue(
|
498
|
+
options.value,
|
499
|
+
options.attribute
|
500
|
+
);
|
501
|
+
utils.set(options.key, data2);
|
484
502
|
}
|
485
|
-
if (attribute.type === "media") {
|
486
|
-
|
487
|
-
|
503
|
+
if (options.attribute.type === "media") {
|
504
|
+
if (!options.value) return;
|
505
|
+
const data2 = await serviceUtils.getMediaRestoreValue(
|
506
|
+
options.value
|
507
|
+
);
|
508
|
+
utils.set(options.key, data2);
|
488
509
|
}
|
489
|
-
return previousRelationAttributes;
|
490
510
|
},
|
491
|
-
|
492
|
-
|
511
|
+
{
|
512
|
+
schema,
|
513
|
+
getModel: strapi2.getModel.bind(strapi2)
|
514
|
+
},
|
515
|
+
dataWithoutAddedAttributes
|
493
516
|
);
|
494
517
|
const data = fp.omit(["id", ...Object.keys(schemaDiff.removed)], dataWithoutMissingRelations);
|
495
518
|
const restoredDocument = await strapi2.documents(version.contentType).update({
|
@@ -582,7 +605,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
582
605
|
onCommit(async () => {
|
583
606
|
for (const entry of localeEntries) {
|
584
607
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
585
|
-
await getService(strapi2, "history").createVersion({
|
608
|
+
await getService$1(strapi2, "history").createVersion({
|
586
609
|
contentType: uid2,
|
587
610
|
data: fp.omit(FIELDS_TO_IGNORE, entry),
|
588
611
|
relatedDocumentId: documentId,
|
@@ -595,15 +618,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
595
618
|
});
|
596
619
|
return result;
|
597
620
|
});
|
598
|
-
state.deleteExpiredJob = nodeSchedule.scheduleJob("0 0 * * *", () => {
|
621
|
+
state.deleteExpiredJob = nodeSchedule.scheduleJob("historyDaily", "0 0 * * *", () => {
|
599
622
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
600
623
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
601
624
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
602
625
|
where: {
|
603
626
|
created_at: {
|
604
|
-
$lt: expirationDate
|
627
|
+
$lt: expirationDate
|
605
628
|
}
|
606
629
|
}
|
630
|
+
}).catch((error) => {
|
631
|
+
if (error instanceof Error) {
|
632
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
633
|
+
}
|
607
634
|
});
|
608
635
|
});
|
609
636
|
state.isInitialized = true;
|
@@ -615,17 +642,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
615
642
|
}
|
616
643
|
};
|
617
644
|
};
|
618
|
-
const services$
|
645
|
+
const services$2 = {
|
619
646
|
history: createHistoryService,
|
620
647
|
lifecycles: createLifecyclesService
|
621
648
|
};
|
622
|
-
const info = { pluginName: "content-manager", type: "admin" };
|
649
|
+
const info$1 = { pluginName: "content-manager", type: "admin" };
|
623
650
|
const historyVersionRouter = {
|
624
651
|
type: "admin",
|
625
652
|
routes: [
|
626
653
|
{
|
627
654
|
method: "GET",
|
628
|
-
info,
|
655
|
+
info: info$1,
|
629
656
|
path: "/history-versions",
|
630
657
|
handler: "history-version.findMany",
|
631
658
|
config: {
|
@@ -634,7 +661,7 @@ const historyVersionRouter = {
|
|
634
661
|
},
|
635
662
|
{
|
636
663
|
method: "PUT",
|
637
|
-
info,
|
664
|
+
info: info$1,
|
638
665
|
path: "/history-versions/:versionId/restore",
|
639
666
|
handler: "history-version.restoreVersion",
|
640
667
|
config: {
|
@@ -643,7 +670,7 @@ const historyVersionRouter = {
|
|
643
670
|
}
|
644
671
|
]
|
645
672
|
};
|
646
|
-
const routes$
|
673
|
+
const routes$2 = {
|
647
674
|
"history-version": historyVersionRouter
|
648
675
|
};
|
649
676
|
const historyVersion = {
|
@@ -690,21 +717,21 @@ const historyVersion = {
|
|
690
717
|
}
|
691
718
|
}
|
692
719
|
};
|
693
|
-
const getFeature = () => {
|
720
|
+
const getFeature$1 = () => {
|
694
721
|
if (strapi.ee.features.isEnabled("cms-content-history")) {
|
695
722
|
return {
|
696
723
|
register({ strapi: strapi2 }) {
|
697
724
|
strapi2.get("models").add(historyVersion);
|
698
725
|
},
|
699
726
|
bootstrap({ strapi: strapi2 }) {
|
700
|
-
getService(strapi2, "lifecycles").bootstrap();
|
727
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
701
728
|
},
|
702
729
|
destroy({ strapi: strapi2 }) {
|
703
|
-
getService(strapi2, "lifecycles").destroy();
|
730
|
+
getService$1(strapi2, "lifecycles").destroy();
|
704
731
|
},
|
705
|
-
controllers: controllers$
|
706
|
-
services: services$
|
707
|
-
routes: routes$
|
732
|
+
controllers: controllers$2,
|
733
|
+
services: services$2,
|
734
|
+
routes: routes$2
|
708
735
|
};
|
709
736
|
}
|
710
737
|
return {
|
@@ -713,9 +740,201 @@ const getFeature = () => {
|
|
713
740
|
}
|
714
741
|
};
|
715
742
|
};
|
716
|
-
const history = getFeature();
|
743
|
+
const history = getFeature$1();
|
744
|
+
const info = { pluginName: "content-manager", type: "admin" };
|
745
|
+
const previewRouter = {
|
746
|
+
type: "admin",
|
747
|
+
routes: [
|
748
|
+
{
|
749
|
+
method: "GET",
|
750
|
+
info,
|
751
|
+
path: "/preview/url/:contentType",
|
752
|
+
handler: "preview.getPreviewUrl",
|
753
|
+
config: {
|
754
|
+
policies: ["admin::isAuthenticatedAdmin"]
|
755
|
+
}
|
756
|
+
}
|
757
|
+
]
|
758
|
+
};
|
759
|
+
const routes$1 = {
|
760
|
+
preview: previewRouter
|
761
|
+
};
|
762
|
+
function getService(strapi2, name) {
|
763
|
+
return strapi2.service(`plugin::content-manager.${name}`);
|
764
|
+
}
|
765
|
+
const getPreviewUrlSchema = yup__namespace.object().shape({
|
766
|
+
// Will be undefined for single types
|
767
|
+
documentId: yup__namespace.string(),
|
768
|
+
locale: yup__namespace.string().nullable(),
|
769
|
+
status: yup__namespace.string()
|
770
|
+
}).required();
|
771
|
+
const validatePreviewUrl = async (strapi2, uid2, params) => {
|
772
|
+
await strapiUtils.validateYupSchema(getPreviewUrlSchema)(params);
|
773
|
+
const newParams = fp.pick(["documentId", "locale", "status"], params);
|
774
|
+
const model = strapi2.getModel(uid2);
|
775
|
+
if (!model || model.modelType !== "contentType") {
|
776
|
+
throw new strapiUtils.errors.ValidationError("Invalid content type");
|
777
|
+
}
|
778
|
+
const isSingleType = model?.kind === "singleType";
|
779
|
+
if (!isSingleType && !params.documentId) {
|
780
|
+
throw new strapiUtils.errors.ValidationError("documentId is required for Collection Types");
|
781
|
+
}
|
782
|
+
if (isSingleType) {
|
783
|
+
const doc = await strapi2.documents(uid2).findFirst();
|
784
|
+
if (!doc) {
|
785
|
+
throw new strapiUtils.errors.NotFoundError("Document not found");
|
786
|
+
}
|
787
|
+
newParams.documentId = doc?.documentId;
|
788
|
+
}
|
789
|
+
if (!newParams.status) {
|
790
|
+
const isDPEnabled = model?.options?.draftAndPublish;
|
791
|
+
newParams.status = isDPEnabled ? "draft" : "published";
|
792
|
+
}
|
793
|
+
return newParams;
|
794
|
+
};
|
795
|
+
const createPreviewController = () => {
|
796
|
+
return {
|
797
|
+
/**
|
798
|
+
* Transforms an entry into a preview URL, so that it can be previewed
|
799
|
+
* in the Content Manager.
|
800
|
+
*/
|
801
|
+
async getPreviewUrl(ctx) {
|
802
|
+
const uid2 = ctx.params.contentType;
|
803
|
+
const query = ctx.request.query;
|
804
|
+
const params = await validatePreviewUrl(strapi, uid2, query);
|
805
|
+
const previewService = getService(strapi, "preview");
|
806
|
+
const url = await previewService.getPreviewUrl(uid2, params);
|
807
|
+
if (!url) {
|
808
|
+
ctx.status = 204;
|
809
|
+
}
|
810
|
+
return {
|
811
|
+
data: { url }
|
812
|
+
};
|
813
|
+
}
|
814
|
+
};
|
815
|
+
};
|
816
|
+
const controllers$1 = {
|
817
|
+
preview: createPreviewController
|
818
|
+
/**
|
819
|
+
* Casting is needed because the types aren't aware that Strapi supports
|
820
|
+
* passing a controller factory as the value, instead of a controller object directly
|
821
|
+
*/
|
822
|
+
};
|
823
|
+
const createPreviewService = ({ strapi: strapi2 }) => {
|
824
|
+
const config = getService(strapi2, "preview-config");
|
825
|
+
return {
|
826
|
+
async getPreviewUrl(uid2, params) {
|
827
|
+
const handler = config.getPreviewHandler();
|
828
|
+
try {
|
829
|
+
return handler(uid2, params);
|
830
|
+
} catch (error) {
|
831
|
+
strapi2.log.error(`Failed to get preview URL: ${error}`);
|
832
|
+
throw new strapiUtils.errors.ApplicationError("Failed to get preview URL");
|
833
|
+
}
|
834
|
+
return;
|
835
|
+
}
|
836
|
+
};
|
837
|
+
};
|
838
|
+
const extendMiddlewareConfiguration = (middleware = { name: "", config: {} }) => {
|
839
|
+
const middlewares = strapi.config.get("middlewares");
|
840
|
+
const configuredMiddlewares = middlewares.map((currentMiddleware) => {
|
841
|
+
if (currentMiddleware === middleware.name) {
|
842
|
+
return middleware;
|
843
|
+
}
|
844
|
+
if (currentMiddleware.name === middleware.name) {
|
845
|
+
return fp.mergeWith(
|
846
|
+
(objValue, srcValue) => {
|
847
|
+
if (Array.isArray(objValue)) {
|
848
|
+
return objValue.concat(srcValue);
|
849
|
+
}
|
850
|
+
return void 0;
|
851
|
+
},
|
852
|
+
currentMiddleware,
|
853
|
+
middleware
|
854
|
+
);
|
855
|
+
}
|
856
|
+
return currentMiddleware;
|
857
|
+
});
|
858
|
+
strapi.config.set("middlewares", configuredMiddlewares);
|
859
|
+
};
|
860
|
+
const createPreviewConfigService = ({ strapi: strapi2 }) => {
|
861
|
+
return {
|
862
|
+
register() {
|
863
|
+
if (!this.isEnabled()) {
|
864
|
+
return;
|
865
|
+
}
|
866
|
+
const config = strapi2.config.get("admin.preview");
|
867
|
+
if (config.config?.allowedOrigins) {
|
868
|
+
extendMiddlewareConfiguration({
|
869
|
+
name: "strapi::security",
|
870
|
+
config: {
|
871
|
+
contentSecurityPolicy: {
|
872
|
+
directives: {
|
873
|
+
"frame-src": config.config.allowedOrigins
|
874
|
+
}
|
875
|
+
}
|
876
|
+
}
|
877
|
+
});
|
878
|
+
}
|
879
|
+
},
|
880
|
+
isEnabled() {
|
881
|
+
const config = strapi2.config.get("admin.preview");
|
882
|
+
if (!config) {
|
883
|
+
return false;
|
884
|
+
}
|
885
|
+
return config?.enabled ?? true;
|
886
|
+
},
|
887
|
+
/**
|
888
|
+
* Validate if the configuration is valid
|
889
|
+
*/
|
890
|
+
validate() {
|
891
|
+
if (!this.isEnabled()) {
|
892
|
+
return;
|
893
|
+
}
|
894
|
+
const handler = this.getPreviewHandler();
|
895
|
+
if (typeof handler !== "function") {
|
896
|
+
throw new strapiUtils.errors.ValidationError(
|
897
|
+
"Preview configuration is invalid. Handler must be a function"
|
898
|
+
);
|
899
|
+
}
|
900
|
+
},
|
901
|
+
/**
|
902
|
+
* Utility to get the preview handler from the configuration
|
903
|
+
*/
|
904
|
+
getPreviewHandler() {
|
905
|
+
const config = strapi2.config.get("admin.preview");
|
906
|
+
const emptyHandler = () => {
|
907
|
+
return void 0;
|
908
|
+
};
|
909
|
+
if (!this.isEnabled()) {
|
910
|
+
return emptyHandler;
|
911
|
+
}
|
912
|
+
return config?.config?.handler || emptyHandler;
|
913
|
+
}
|
914
|
+
};
|
915
|
+
};
|
916
|
+
const services$1 = {
|
917
|
+
preview: createPreviewService,
|
918
|
+
"preview-config": createPreviewConfigService
|
919
|
+
};
|
920
|
+
const getFeature = () => {
|
921
|
+
return {
|
922
|
+
register() {
|
923
|
+
const config = getService(strapi, "preview-config");
|
924
|
+
config.validate();
|
925
|
+
config.register();
|
926
|
+
},
|
927
|
+
bootstrap() {
|
928
|
+
},
|
929
|
+
routes: routes$1,
|
930
|
+
controllers: controllers$1,
|
931
|
+
services: services$1
|
932
|
+
};
|
933
|
+
};
|
934
|
+
const preview = getFeature();
|
717
935
|
const register = async ({ strapi: strapi2 }) => {
|
718
936
|
await history.register?.({ strapi: strapi2 });
|
937
|
+
await preview.register?.({ strapi: strapi2 });
|
719
938
|
};
|
720
939
|
const ALLOWED_WEBHOOK_EVENTS = {
|
721
940
|
ENTRY_PUBLISH: "entry.publish",
|
@@ -725,11 +944,12 @@ const bootstrap = async () => {
|
|
725
944
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
726
945
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
727
946
|
});
|
728
|
-
getService$
|
729
|
-
await getService$
|
730
|
-
await getService$
|
731
|
-
await getService$
|
947
|
+
getService$2("field-sizes").setCustomFieldInputSizes();
|
948
|
+
await getService$2("components").syncConfigurations();
|
949
|
+
await getService$2("content-types").syncConfigurations();
|
950
|
+
await getService$2("permission").registerPermissions();
|
732
951
|
await history.bootstrap?.({ strapi });
|
952
|
+
await preview.bootstrap?.({ strapi });
|
733
953
|
};
|
734
954
|
const destroy = async ({ strapi: strapi2 }) => {
|
735
955
|
await history.destroy?.({ strapi: strapi2 });
|
@@ -1219,7 +1439,8 @@ const admin = {
|
|
1219
1439
|
};
|
1220
1440
|
const routes = {
|
1221
1441
|
admin,
|
1222
|
-
...history.routes ? history.routes : {}
|
1442
|
+
...history.routes ? history.routes : {},
|
1443
|
+
...preview.routes ? preview.routes : {}
|
1223
1444
|
};
|
1224
1445
|
const hasPermissionsSchema = strapiUtils.yup.object({
|
1225
1446
|
actions: strapiUtils.yup.array().of(strapiUtils.yup.string()),
|
@@ -1282,8 +1503,7 @@ const isSortable = (schema, name) => {
|
|
1282
1503
|
if (!___default.default.has(schema.attributes, name)) {
|
1283
1504
|
return false;
|
1284
1505
|
}
|
1285
|
-
if (schema.modelType === "component" && name === "id")
|
1286
|
-
return false;
|
1506
|
+
if (schema.modelType === "component" && name === "id") return false;
|
1287
1507
|
const attribute = schema.attributes[name];
|
1288
1508
|
if (NON_SORTABLES.includes(attribute.type)) {
|
1289
1509
|
return false;
|
@@ -1428,8 +1648,7 @@ const createDefaultSettings = async (schema) => {
|
|
1428
1648
|
};
|
1429
1649
|
};
|
1430
1650
|
const syncSettings = async (configuration, schema) => {
|
1431
|
-
if (fp.isEmpty(configuration.settings))
|
1432
|
-
return createDefaultSettings(schema);
|
1651
|
+
if (fp.isEmpty(configuration.settings)) return createDefaultSettings(schema);
|
1433
1652
|
const defaultField = getDefaultMainField(schema);
|
1434
1653
|
const { mainField = defaultField, defaultSortBy = defaultField } = configuration.settings || {};
|
1435
1654
|
return {
|
@@ -1476,7 +1695,7 @@ const createMetadasSchema = (schema) => {
|
|
1476
1695
|
if (!value) {
|
1477
1696
|
return strapiUtils.yup.string();
|
1478
1697
|
}
|
1479
|
-
const targetSchema = getService$
|
1698
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1480
1699
|
schema.attributes[key].targetModel
|
1481
1700
|
);
|
1482
1701
|
if (!targetSchema) {
|
@@ -1605,8 +1824,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1605
1824
|
}
|
1606
1825
|
switch (attribute.type) {
|
1607
1826
|
case "relation": {
|
1608
|
-
if (canCreate(attributePath))
|
1609
|
-
return body2;
|
1827
|
+
if (canCreate(attributePath)) return body2;
|
1610
1828
|
return fp.set(attributePath, { set: [] }, body2);
|
1611
1829
|
}
|
1612
1830
|
case "component": {
|
@@ -1616,8 +1834,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1616
1834
|
]);
|
1617
1835
|
}
|
1618
1836
|
default: {
|
1619
|
-
if (canCreate(attributePath))
|
1620
|
-
return body2;
|
1837
|
+
if (canCreate(attributePath)) return body2;
|
1621
1838
|
return fp.set(attributePath, null, body2);
|
1622
1839
|
}
|
1623
1840
|
}
|
@@ -1645,7 +1862,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1645
1862
|
}
|
1646
1863
|
};
|
1647
1864
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1648
|
-
const documentMetadata2 = getService$
|
1865
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1649
1866
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1650
1867
|
let {
|
1651
1868
|
meta: { availableLocales, availableStatus }
|
@@ -1671,8 +1888,8 @@ const createDocument = async (ctx, opts) => {
|
|
1671
1888
|
const { userAbility, user } = ctx.state;
|
1672
1889
|
const { model } = ctx.params;
|
1673
1890
|
const { body } = ctx.request;
|
1674
|
-
const documentManager2 = getService$
|
1675
|
-
const permissionChecker2 = getService$
|
1891
|
+
const documentManager2 = getService$2("document-manager");
|
1892
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1676
1893
|
if (permissionChecker2.cannot.create()) {
|
1677
1894
|
throw new strapiUtils.errors.ForbiddenError();
|
1678
1895
|
}
|
@@ -1692,13 +1909,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1692
1909
|
const { userAbility, user } = ctx.state;
|
1693
1910
|
const { id, model } = ctx.params;
|
1694
1911
|
const { body } = ctx.request;
|
1695
|
-
const documentManager2 = getService$
|
1696
|
-
const permissionChecker2 = getService$
|
1912
|
+
const documentManager2 = getService$2("document-manager");
|
1913
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1697
1914
|
if (permissionChecker2.cannot.update()) {
|
1698
1915
|
throw new strapiUtils.errors.ForbiddenError();
|
1699
1916
|
}
|
1700
1917
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1701
|
-
const populate = await getService$
|
1918
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1702
1919
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1703
1920
|
const [documentVersion, documentExists] = await Promise.all([
|
1704
1921
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1715,7 +1932,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1715
1932
|
throw new strapiUtils.errors.ForbiddenError();
|
1716
1933
|
}
|
1717
1934
|
const pickPermittedFields = documentVersion ? permissionChecker2.sanitizeUpdateInput(documentVersion) : permissionChecker2.sanitizeCreateInput;
|
1718
|
-
const setCreator = strapiUtils.setCreatorFields({ user, isEdition: true });
|
1935
|
+
const setCreator = documentVersion ? strapiUtils.setCreatorFields({ user, isEdition: true }) : strapiUtils.setCreatorFields({ user });
|
1719
1936
|
const sanitizeFn = strapiUtils.async.pipe(pickPermittedFields, setCreator);
|
1720
1937
|
const sanitizedBody = await sanitizeFn(body);
|
1721
1938
|
return documentManager2.update(documentVersion?.documentId || id, model, {
|
@@ -1729,14 +1946,14 @@ const collectionTypes = {
|
|
1729
1946
|
const { userAbility } = ctx.state;
|
1730
1947
|
const { model } = ctx.params;
|
1731
1948
|
const { query } = ctx.request;
|
1732
|
-
const documentMetadata2 = getService$
|
1733
|
-
const documentManager2 = getService$
|
1734
|
-
const permissionChecker2 = getService$
|
1949
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1950
|
+
const documentManager2 = getService$2("document-manager");
|
1951
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1735
1952
|
if (permissionChecker2.cannot.read()) {
|
1736
1953
|
return ctx.forbidden();
|
1737
1954
|
}
|
1738
1955
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1739
|
-
const populate = await getService$
|
1956
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1740
1957
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1741
1958
|
const { results: documents, pagination } = await documentManager2.findPage(
|
1742
1959
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1765,13 +1982,13 @@ const collectionTypes = {
|
|
1765
1982
|
async findOne(ctx) {
|
1766
1983
|
const { userAbility } = ctx.state;
|
1767
1984
|
const { model, id } = ctx.params;
|
1768
|
-
const documentManager2 = getService$
|
1769
|
-
const permissionChecker2 = getService$
|
1985
|
+
const documentManager2 = getService$2("document-manager");
|
1986
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1770
1987
|
if (permissionChecker2.cannot.read()) {
|
1771
1988
|
return ctx.forbidden();
|
1772
1989
|
}
|
1773
1990
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1774
|
-
const populate = await getService$
|
1991
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1775
1992
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1776
1993
|
const version = await documentManager2.findOne(id, model, {
|
1777
1994
|
populate,
|
@@ -1787,7 +2004,7 @@ const collectionTypes = {
|
|
1787
2004
|
permissionChecker2,
|
1788
2005
|
model,
|
1789
2006
|
// @ts-expect-error TODO: fix
|
1790
|
-
{ id, locale, publishedAt: null },
|
2007
|
+
{ documentId: id, locale, publishedAt: null },
|
1791
2008
|
{ availableLocales: true, availableStatus: false }
|
1792
2009
|
);
|
1793
2010
|
ctx.body = { data: {}, meta };
|
@@ -1802,7 +2019,7 @@ const collectionTypes = {
|
|
1802
2019
|
async create(ctx) {
|
1803
2020
|
const { userAbility } = ctx.state;
|
1804
2021
|
const { model } = ctx.params;
|
1805
|
-
const permissionChecker2 = getService$
|
2022
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1806
2023
|
const [totalEntries, document] = await Promise.all([
|
1807
2024
|
strapi.db.query(model).count(),
|
1808
2025
|
createDocument(ctx)
|
@@ -1823,7 +2040,7 @@ const collectionTypes = {
|
|
1823
2040
|
async update(ctx) {
|
1824
2041
|
const { userAbility } = ctx.state;
|
1825
2042
|
const { model } = ctx.params;
|
1826
|
-
const permissionChecker2 = getService$
|
2043
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1827
2044
|
const updatedVersion = await updateDocument(ctx);
|
1828
2045
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1829
2046
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1832,13 +2049,13 @@ const collectionTypes = {
|
|
1832
2049
|
const { userAbility, user } = ctx.state;
|
1833
2050
|
const { model, sourceId: id } = ctx.params;
|
1834
2051
|
const { body } = ctx.request;
|
1835
|
-
const documentManager2 = getService$
|
1836
|
-
const permissionChecker2 = getService$
|
2052
|
+
const documentManager2 = getService$2("document-manager");
|
2053
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1837
2054
|
if (permissionChecker2.cannot.create()) {
|
1838
2055
|
return ctx.forbidden();
|
1839
2056
|
}
|
1840
2057
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1841
|
-
const populate = await getService$
|
2058
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1842
2059
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1843
2060
|
const document = await documentManager2.findOne(id, model, {
|
1844
2061
|
populate,
|
@@ -1877,13 +2094,13 @@ const collectionTypes = {
|
|
1877
2094
|
async delete(ctx) {
|
1878
2095
|
const { userAbility } = ctx.state;
|
1879
2096
|
const { id, model } = ctx.params;
|
1880
|
-
const documentManager2 = getService$
|
1881
|
-
const permissionChecker2 = getService$
|
2097
|
+
const documentManager2 = getService$2("document-manager");
|
2098
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1882
2099
|
if (permissionChecker2.cannot.delete()) {
|
1883
2100
|
return ctx.forbidden();
|
1884
2101
|
}
|
1885
2102
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1886
|
-
const populate = await getService$
|
2103
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1887
2104
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1888
2105
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1889
2106
|
if (documentLocales.length === 0) {
|
@@ -1905,14 +2122,14 @@ const collectionTypes = {
|
|
1905
2122
|
const { userAbility } = ctx.state;
|
1906
2123
|
const { id, model } = ctx.params;
|
1907
2124
|
const { body } = ctx.request;
|
1908
|
-
const documentManager2 = getService$
|
1909
|
-
const permissionChecker2 = getService$
|
2125
|
+
const documentManager2 = getService$2("document-manager");
|
2126
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1910
2127
|
if (permissionChecker2.cannot.publish()) {
|
1911
2128
|
return ctx.forbidden();
|
1912
2129
|
}
|
1913
2130
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1914
2131
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1915
|
-
const populate = await getService$
|
2132
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1916
2133
|
let document;
|
1917
2134
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1918
2135
|
const isCreate = fp.isNil(id);
|
@@ -1924,11 +2141,17 @@ const collectionTypes = {
|
|
1924
2141
|
}
|
1925
2142
|
const isUpdate = !isCreate;
|
1926
2143
|
if (isUpdate) {
|
1927
|
-
|
1928
|
-
if (!
|
2144
|
+
const documentExists = documentManager2.exists(model, id);
|
2145
|
+
if (!documentExists) {
|
1929
2146
|
throw new strapiUtils.errors.NotFoundError("Document not found");
|
1930
2147
|
}
|
1931
|
-
|
2148
|
+
document = await documentManager2.findOne(id, model, { populate, locale });
|
2149
|
+
if (!document) {
|
2150
|
+
if (permissionChecker2.cannot.create({ locale }) || permissionChecker2.cannot.publish({ locale })) {
|
2151
|
+
throw new strapiUtils.errors.ForbiddenError();
|
2152
|
+
}
|
2153
|
+
document = await updateDocument(ctx);
|
2154
|
+
} else if (permissionChecker2.can.update(document)) {
|
1932
2155
|
await updateDocument(ctx);
|
1933
2156
|
}
|
1934
2157
|
}
|
@@ -1954,13 +2177,13 @@ const collectionTypes = {
|
|
1954
2177
|
const { body } = ctx.request;
|
1955
2178
|
const { documentIds } = body;
|
1956
2179
|
await validateBulkActionInput(body);
|
1957
|
-
const documentManager2 = getService$
|
1958
|
-
const permissionChecker2 = getService$
|
2180
|
+
const documentManager2 = getService$2("document-manager");
|
2181
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1959
2182
|
if (permissionChecker2.cannot.publish()) {
|
1960
2183
|
return ctx.forbidden();
|
1961
2184
|
}
|
1962
2185
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1963
|
-
const populate = await getService$
|
2186
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1964
2187
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1965
2188
|
allowMultipleLocales: true
|
1966
2189
|
});
|
@@ -1985,12 +2208,14 @@ const collectionTypes = {
|
|
1985
2208
|
const { body } = ctx.request;
|
1986
2209
|
const { documentIds } = body;
|
1987
2210
|
await validateBulkActionInput(body);
|
1988
|
-
const documentManager2 = getService$
|
1989
|
-
const permissionChecker2 = getService$
|
2211
|
+
const documentManager2 = getService$2("document-manager");
|
2212
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1990
2213
|
if (permissionChecker2.cannot.unpublish()) {
|
1991
2214
|
return ctx.forbidden();
|
1992
2215
|
}
|
1993
|
-
const { locale } = await getDocumentLocaleAndStatus(body, model
|
2216
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
2217
|
+
allowMultipleLocales: true
|
2218
|
+
});
|
1994
2219
|
const entityPromises = documentIds.map(
|
1995
2220
|
(documentId) => documentManager2.findLocales(documentId, model, { locale, isPublished: true })
|
1996
2221
|
);
|
@@ -2013,8 +2238,8 @@ const collectionTypes = {
|
|
2013
2238
|
const {
|
2014
2239
|
body: { discardDraft, ...body }
|
2015
2240
|
} = ctx.request;
|
2016
|
-
const documentManager2 = getService$
|
2017
|
-
const permissionChecker2 = getService$
|
2241
|
+
const documentManager2 = getService$2("document-manager");
|
2242
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2018
2243
|
if (permissionChecker2.cannot.unpublish()) {
|
2019
2244
|
return ctx.forbidden();
|
2020
2245
|
}
|
@@ -2022,7 +2247,7 @@ const collectionTypes = {
|
|
2022
2247
|
return ctx.forbidden();
|
2023
2248
|
}
|
2024
2249
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2025
|
-
const populate = await getService$
|
2250
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2026
2251
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2027
2252
|
const document = await documentManager2.findOne(id, model, {
|
2028
2253
|
populate,
|
@@ -2053,13 +2278,13 @@ const collectionTypes = {
|
|
2053
2278
|
const { userAbility } = ctx.state;
|
2054
2279
|
const { id, model } = ctx.params;
|
2055
2280
|
const { body } = ctx.request;
|
2056
|
-
const documentManager2 = getService$
|
2057
|
-
const permissionChecker2 = getService$
|
2281
|
+
const documentManager2 = getService$2("document-manager");
|
2282
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2058
2283
|
if (permissionChecker2.cannot.discard()) {
|
2059
2284
|
return ctx.forbidden();
|
2060
2285
|
}
|
2061
2286
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2062
|
-
const populate = await getService$
|
2287
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2063
2288
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2064
2289
|
const document = await documentManager2.findOne(id, model, {
|
2065
2290
|
populate,
|
@@ -2084,13 +2309,13 @@ const collectionTypes = {
|
|
2084
2309
|
const { query, body } = ctx.request;
|
2085
2310
|
const { documentIds } = body;
|
2086
2311
|
await validateBulkActionInput(body);
|
2087
|
-
const documentManager2 = getService$
|
2088
|
-
const permissionChecker2 = getService$
|
2312
|
+
const documentManager2 = getService$2("document-manager");
|
2313
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2089
2314
|
if (permissionChecker2.cannot.delete()) {
|
2090
2315
|
return ctx.forbidden();
|
2091
2316
|
}
|
2092
2317
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2093
|
-
const populate = await getService$
|
2318
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2094
2319
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2095
2320
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2096
2321
|
populate,
|
@@ -2111,13 +2336,13 @@ const collectionTypes = {
|
|
2111
2336
|
async countDraftRelations(ctx) {
|
2112
2337
|
const { userAbility } = ctx.state;
|
2113
2338
|
const { model, id } = ctx.params;
|
2114
|
-
const documentManager2 = getService$
|
2115
|
-
const permissionChecker2 = getService$
|
2339
|
+
const documentManager2 = getService$2("document-manager");
|
2340
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2116
2341
|
if (permissionChecker2.cannot.read()) {
|
2117
2342
|
return ctx.forbidden();
|
2118
2343
|
}
|
2119
2344
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2120
|
-
const populate = await getService$
|
2345
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2121
2346
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2122
2347
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2123
2348
|
if (!entity) {
|
@@ -2136,8 +2361,8 @@ const collectionTypes = {
|
|
2136
2361
|
const ids = ctx.request.query.documentIds;
|
2137
2362
|
const locale = ctx.request.query.locale;
|
2138
2363
|
const { model } = ctx.params;
|
2139
|
-
const documentManager2 = getService$
|
2140
|
-
const permissionChecker2 = getService$
|
2364
|
+
const documentManager2 = getService$2("document-manager");
|
2365
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2141
2366
|
if (permissionChecker2.cannot.read()) {
|
2142
2367
|
return ctx.forbidden();
|
2143
2368
|
}
|
@@ -2161,13 +2386,13 @@ const collectionTypes = {
|
|
2161
2386
|
};
|
2162
2387
|
const components$1 = {
|
2163
2388
|
findComponents(ctx) {
|
2164
|
-
const components2 = getService$
|
2165
|
-
const { toDto } = getService$
|
2389
|
+
const components2 = getService$2("components").findAllComponents();
|
2390
|
+
const { toDto } = getService$2("data-mapper");
|
2166
2391
|
ctx.body = { data: components2.map(toDto) };
|
2167
2392
|
},
|
2168
2393
|
async findComponentConfiguration(ctx) {
|
2169
2394
|
const { uid: uid2 } = ctx.params;
|
2170
|
-
const componentService = getService$
|
2395
|
+
const componentService = getService$2("components");
|
2171
2396
|
const component = componentService.findComponent(uid2);
|
2172
2397
|
if (!component) {
|
2173
2398
|
return ctx.notFound("component.notFound");
|
@@ -2184,7 +2409,7 @@ const components$1 = {
|
|
2184
2409
|
async updateComponentConfiguration(ctx) {
|
2185
2410
|
const { uid: uid2 } = ctx.params;
|
2186
2411
|
const { body } = ctx.request;
|
2187
|
-
const componentService = getService$
|
2412
|
+
const componentService = getService$2("components");
|
2188
2413
|
const component = componentService.findComponent(uid2);
|
2189
2414
|
if (!component) {
|
2190
2415
|
return ctx.notFound("component.notFound");
|
@@ -2218,12 +2443,12 @@ const contentTypes = {
|
|
2218
2443
|
} catch (error) {
|
2219
2444
|
return ctx.send({ error }, 400);
|
2220
2445
|
}
|
2221
|
-
const contentTypes2 = getService$
|
2222
|
-
const { toDto } = getService$
|
2446
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2447
|
+
const { toDto } = getService$2("data-mapper");
|
2223
2448
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2224
2449
|
},
|
2225
2450
|
async findContentTypesSettings(ctx) {
|
2226
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2451
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2227
2452
|
const contentTypes2 = await findAllContentTypes();
|
2228
2453
|
const configurations = await Promise.all(
|
2229
2454
|
contentTypes2.map(async (contentType) => {
|
@@ -2237,7 +2462,7 @@ const contentTypes = {
|
|
2237
2462
|
},
|
2238
2463
|
async findContentTypeConfiguration(ctx) {
|
2239
2464
|
const { uid: uid2 } = ctx.params;
|
2240
|
-
const contentTypeService = getService$
|
2465
|
+
const contentTypeService = getService$2("content-types");
|
2241
2466
|
const contentType = await contentTypeService.findContentType(uid2);
|
2242
2467
|
if (!contentType) {
|
2243
2468
|
return ctx.notFound("contentType.notFound");
|
@@ -2259,13 +2484,13 @@ const contentTypes = {
|
|
2259
2484
|
const { userAbility } = ctx.state;
|
2260
2485
|
const { uid: uid2 } = ctx.params;
|
2261
2486
|
const { body } = ctx.request;
|
2262
|
-
const contentTypeService = getService$
|
2263
|
-
const metricsService = getService$
|
2487
|
+
const contentTypeService = getService$2("content-types");
|
2488
|
+
const metricsService = getService$2("metrics");
|
2264
2489
|
const contentType = await contentTypeService.findContentType(uid2);
|
2265
2490
|
if (!contentType) {
|
2266
2491
|
return ctx.notFound("contentType.notFound");
|
2267
2492
|
}
|
2268
|
-
if (!getService$
|
2493
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2269
2494
|
return ctx.forbidden();
|
2270
2495
|
}
|
2271
2496
|
let input;
|
@@ -2298,10 +2523,10 @@ const contentTypes = {
|
|
2298
2523
|
};
|
2299
2524
|
const init = {
|
2300
2525
|
getInitData(ctx) {
|
2301
|
-
const { toDto } = getService$
|
2302
|
-
const { findAllComponents } = getService$
|
2303
|
-
const { getAllFieldSizes } = getService$
|
2304
|
-
const { findAllContentTypes } = getService$
|
2526
|
+
const { toDto } = getService$2("data-mapper");
|
2527
|
+
const { findAllComponents } = getService$2("components");
|
2528
|
+
const { getAllFieldSizes } = getService$2("field-sizes");
|
2529
|
+
const { findAllContentTypes } = getService$2("content-types");
|
2305
2530
|
ctx.body = {
|
2306
2531
|
data: {
|
2307
2532
|
fieldSizes: getAllFieldSizes(),
|
@@ -2337,7 +2562,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2337
2562
|
params.filters.$and.push(filtersClause);
|
2338
2563
|
};
|
2339
2564
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2340
|
-
const permissionChecker2 = getService$
|
2565
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2341
2566
|
userAbility,
|
2342
2567
|
model: model.uid
|
2343
2568
|
});
|
@@ -2351,15 +2576,27 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2351
2576
|
}
|
2352
2577
|
return mainField;
|
2353
2578
|
};
|
2354
|
-
const addStatusToRelations = async (
|
2355
|
-
if (!strapiUtils.contentTypes.hasDraftAndPublish(strapi.
|
2579
|
+
const addStatusToRelations = async (targetUid, relations2) => {
|
2580
|
+
if (!strapiUtils.contentTypes.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2356
2581
|
return relations2;
|
2357
2582
|
}
|
2358
|
-
const documentMetadata2 = getService$
|
2359
|
-
|
2583
|
+
const documentMetadata2 = getService$2("document-metadata");
|
2584
|
+
if (!relations2.length) {
|
2585
|
+
return relations2;
|
2586
|
+
}
|
2587
|
+
const firstRelation = relations2[0];
|
2588
|
+
const filters = {
|
2589
|
+
documentId: { $in: relations2.map((r) => r.documentId) },
|
2590
|
+
// NOTE: find the "opposite" status
|
2591
|
+
publishedAt: firstRelation.publishedAt !== null ? { $null: true } : { $notNull: true }
|
2592
|
+
};
|
2593
|
+
const availableStatus = await strapi.query(targetUid).findMany({
|
2594
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"],
|
2595
|
+
filters
|
2596
|
+
});
|
2360
2597
|
return relations2.map((relation) => {
|
2361
|
-
const availableStatuses =
|
2362
|
-
(availableDocument) => availableDocument.documentId === relation.documentId
|
2598
|
+
const availableStatuses = availableStatus.filter(
|
2599
|
+
(availableDocument) => availableDocument.documentId === relation.documentId && (relation.locale ? availableDocument.locale === relation.locale : true)
|
2363
2600
|
);
|
2364
2601
|
return {
|
2365
2602
|
...relation,
|
@@ -2380,11 +2617,8 @@ const validateLocale = (sourceUid, targetUid, locale) => {
|
|
2380
2617
|
const isLocalized = strapi.plugin("i18n").service("content-types").isLocalizedContentType;
|
2381
2618
|
const isSourceLocalized = isLocalized(sourceModel);
|
2382
2619
|
const isTargetLocalized = isLocalized(targetModel);
|
2383
|
-
let validatedLocale = locale;
|
2384
|
-
if (!targetModel || !isTargetLocalized)
|
2385
|
-
validatedLocale = void 0;
|
2386
2620
|
return {
|
2387
|
-
locale
|
2621
|
+
locale,
|
2388
2622
|
isSourceLocalized,
|
2389
2623
|
isTargetLocalized
|
2390
2624
|
};
|
@@ -2393,8 +2627,7 @@ const validateStatus = (sourceUid, status) => {
|
|
2393
2627
|
const sourceModel = strapi.getModel(sourceUid);
|
2394
2628
|
const isDP = strapiUtils.contentTypes.hasDraftAndPublish;
|
2395
2629
|
const isSourceDP = isDP(sourceModel);
|
2396
|
-
if (!isSourceDP)
|
2397
|
-
return { status: void 0 };
|
2630
|
+
if (!isSourceDP) return { status: void 0 };
|
2398
2631
|
switch (status) {
|
2399
2632
|
case "published":
|
2400
2633
|
return { status: "published" };
|
@@ -2424,7 +2657,7 @@ const relations = {
|
|
2424
2657
|
ctx.request?.query?.locale
|
2425
2658
|
);
|
2426
2659
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2427
|
-
const permissionChecker2 = getService$
|
2660
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2428
2661
|
userAbility,
|
2429
2662
|
model
|
2430
2663
|
});
|
@@ -2449,7 +2682,7 @@ const relations = {
|
|
2449
2682
|
where.id = id;
|
2450
2683
|
}
|
2451
2684
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2452
|
-
const populate = await getService$
|
2685
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2453
2686
|
const currentEntity = await strapi.db.query(model).findOne({
|
2454
2687
|
where,
|
2455
2688
|
populate
|
@@ -2464,7 +2697,7 @@ const relations = {
|
|
2464
2697
|
}
|
2465
2698
|
entryId = currentEntity.id;
|
2466
2699
|
}
|
2467
|
-
const modelConfig = isComponent2 ? await getService$
|
2700
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2468
2701
|
const targetSchema = strapi.getModel(targetUid);
|
2469
2702
|
const mainField = fp.flow(
|
2470
2703
|
fp.prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2487,7 +2720,7 @@ const relations = {
|
|
2487
2720
|
attribute,
|
2488
2721
|
fieldsToSelect,
|
2489
2722
|
mainField,
|
2490
|
-
source: { schema: sourceSchema },
|
2723
|
+
source: { schema: sourceSchema, isLocalized: isSourceLocalized },
|
2491
2724
|
target: { schema: targetSchema, isLocalized: isTargetLocalized },
|
2492
2725
|
sourceSchema,
|
2493
2726
|
targetSchema,
|
@@ -2509,7 +2742,8 @@ const relations = {
|
|
2509
2742
|
fieldsToSelect,
|
2510
2743
|
mainField,
|
2511
2744
|
source: {
|
2512
|
-
schema: { uid: sourceUid, modelType: sourceModelType }
|
2745
|
+
schema: { uid: sourceUid, modelType: sourceModelType },
|
2746
|
+
isLocalized: isSourceLocalized
|
2513
2747
|
},
|
2514
2748
|
target: {
|
2515
2749
|
schema: { uid: targetUid },
|
@@ -2517,7 +2751,7 @@ const relations = {
|
|
2517
2751
|
}
|
2518
2752
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2519
2753
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2520
|
-
const permissionChecker2 = getService$
|
2754
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2521
2755
|
userAbility: ctx.state.userAbility,
|
2522
2756
|
model: targetUid
|
2523
2757
|
});
|
@@ -2547,12 +2781,16 @@ const relations = {
|
|
2547
2781
|
} else {
|
2548
2782
|
where.id = id;
|
2549
2783
|
}
|
2550
|
-
|
2551
|
-
|
2784
|
+
const publishedAt = getPublishedAtClause(status, targetUid);
|
2785
|
+
if (!fp.isEmpty(publishedAt)) {
|
2786
|
+
where[`${alias}.published_at`] = publishedAt;
|
2552
2787
|
}
|
2553
|
-
if (
|
2788
|
+
if (isTargetLocalized && locale) {
|
2554
2789
|
where[`${alias}.locale`] = locale;
|
2555
2790
|
}
|
2791
|
+
if (isSourceLocalized && locale) {
|
2792
|
+
where.locale = locale;
|
2793
|
+
}
|
2556
2794
|
if ((idsToInclude?.length ?? 0) !== 0) {
|
2557
2795
|
where[`${alias}.id`].$notIn = idsToInclude;
|
2558
2796
|
}
|
@@ -2570,7 +2808,8 @@ const relations = {
|
|
2570
2808
|
id: { $notIn: fp.uniq(idsToOmit) }
|
2571
2809
|
});
|
2572
2810
|
}
|
2573
|
-
const
|
2811
|
+
const dbQuery = strapi.get("query-params").transform(targetUid, queryParams);
|
2812
|
+
const res = await strapi.db.query(targetUid).findPage(dbQuery);
|
2574
2813
|
ctx.body = {
|
2575
2814
|
...res,
|
2576
2815
|
results: await addStatusToRelations(targetUid, res.results)
|
@@ -2585,21 +2824,33 @@ const relations = {
|
|
2585
2824
|
attribute,
|
2586
2825
|
targetField,
|
2587
2826
|
fieldsToSelect,
|
2588
|
-
|
2589
|
-
|
2590
|
-
}
|
2591
|
-
target: {
|
2592
|
-
schema: { uid: targetUid }
|
2593
|
-
}
|
2827
|
+
status,
|
2828
|
+
source: { schema: sourceSchema },
|
2829
|
+
target: { schema: targetSchema }
|
2594
2830
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2595
|
-
const
|
2831
|
+
const { uid: sourceUid } = sourceSchema;
|
2832
|
+
const { uid: targetUid } = targetSchema;
|
2833
|
+
const permissionQuery = await getService$2("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
|
2596
2834
|
const dbQuery = strapi.db.query(sourceUid);
|
2597
2835
|
const loadRelations = strapiUtils.relations.isAnyToMany(attribute) ? (...args) => dbQuery.loadPages(...args) : (...args) => dbQuery.load(...args).then((res2) => ({ results: res2 ? [res2] : [] }));
|
2836
|
+
const filters = {};
|
2837
|
+
if (sourceSchema?.options?.draftAndPublish) {
|
2838
|
+
if (targetSchema?.options?.draftAndPublish) {
|
2839
|
+
if (status === "published") {
|
2840
|
+
filters.publishedAt = { $notNull: true };
|
2841
|
+
} else {
|
2842
|
+
filters.publishedAt = { $null: true };
|
2843
|
+
}
|
2844
|
+
}
|
2845
|
+
} else if (targetSchema?.options?.draftAndPublish) {
|
2846
|
+
filters.publishedAt = { $null: true };
|
2847
|
+
}
|
2598
2848
|
const res = await loadRelations({ id: entryId }, targetField, {
|
2599
|
-
select: ["id", "documentId", "locale", "publishedAt"],
|
2849
|
+
select: ["id", "documentId", "locale", "publishedAt", "updatedAt"],
|
2600
2850
|
ordering: "desc",
|
2601
2851
|
page: ctx.request.query.page,
|
2602
|
-
pageSize: ctx.request.query.pageSize
|
2852
|
+
pageSize: ctx.request.query.pageSize,
|
2853
|
+
filters
|
2603
2854
|
});
|
2604
2855
|
const loadedIds = res.results.map((item) => item.id);
|
2605
2856
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
@@ -2620,10 +2871,10 @@ const relations = {
|
|
2620
2871
|
}
|
2621
2872
|
};
|
2622
2873
|
const buildPopulateFromQuery = async (query, model) => {
|
2623
|
-
return getService$
|
2874
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2624
2875
|
};
|
2625
2876
|
const findDocument = async (query, uid2, opts = {}) => {
|
2626
|
-
const documentManager2 = getService$
|
2877
|
+
const documentManager2 = getService$2("document-manager");
|
2627
2878
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2628
2879
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2629
2880
|
};
|
@@ -2631,8 +2882,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2631
2882
|
const { user, userAbility } = ctx.state;
|
2632
2883
|
const { model } = ctx.params;
|
2633
2884
|
const { body, query } = ctx.request;
|
2634
|
-
const documentManager2 = getService$
|
2635
|
-
const permissionChecker2 = getService$
|
2885
|
+
const documentManager2 = getService$2("document-manager");
|
2886
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2636
2887
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2637
2888
|
throw new strapiUtils.errors.ForbiddenError();
|
2638
2889
|
}
|
@@ -2673,7 +2924,7 @@ const singleTypes = {
|
|
2673
2924
|
const { userAbility } = ctx.state;
|
2674
2925
|
const { model } = ctx.params;
|
2675
2926
|
const { query = {} } = ctx.request;
|
2676
|
-
const permissionChecker2 = getService$
|
2927
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2677
2928
|
if (permissionChecker2.cannot.read()) {
|
2678
2929
|
return ctx.forbidden();
|
2679
2930
|
}
|
@@ -2692,7 +2943,7 @@ const singleTypes = {
|
|
2692
2943
|
permissionChecker2,
|
2693
2944
|
model,
|
2694
2945
|
// @ts-expect-error - fix types
|
2695
|
-
{
|
2946
|
+
{ documentId: document.documentId, locale, publishedAt: null },
|
2696
2947
|
{ availableLocales: true, availableStatus: false }
|
2697
2948
|
);
|
2698
2949
|
ctx.body = { data: {}, meta };
|
@@ -2707,7 +2958,7 @@ const singleTypes = {
|
|
2707
2958
|
async createOrUpdate(ctx) {
|
2708
2959
|
const { userAbility } = ctx.state;
|
2709
2960
|
const { model } = ctx.params;
|
2710
|
-
const permissionChecker2 = getService$
|
2961
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2711
2962
|
const document = await createOrUpdateDocument(ctx);
|
2712
2963
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2713
2964
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2716,8 +2967,8 @@ const singleTypes = {
|
|
2716
2967
|
const { userAbility } = ctx.state;
|
2717
2968
|
const { model } = ctx.params;
|
2718
2969
|
const { query = {} } = ctx.request;
|
2719
|
-
const documentManager2 = getService$
|
2720
|
-
const permissionChecker2 = getService$
|
2970
|
+
const documentManager2 = getService$2("document-manager");
|
2971
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2721
2972
|
if (permissionChecker2.cannot.delete()) {
|
2722
2973
|
return ctx.forbidden();
|
2723
2974
|
}
|
@@ -2745,8 +2996,8 @@ const singleTypes = {
|
|
2745
2996
|
const { userAbility } = ctx.state;
|
2746
2997
|
const { model } = ctx.params;
|
2747
2998
|
const { query = {} } = ctx.request;
|
2748
|
-
const documentManager2 = getService$
|
2749
|
-
const permissionChecker2 = getService$
|
2999
|
+
const documentManager2 = getService$2("document-manager");
|
3000
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2750
3001
|
if (permissionChecker2.cannot.publish()) {
|
2751
3002
|
return ctx.forbidden();
|
2752
3003
|
}
|
@@ -2774,8 +3025,8 @@ const singleTypes = {
|
|
2774
3025
|
body: { discardDraft, ...body },
|
2775
3026
|
query = {}
|
2776
3027
|
} = ctx.request;
|
2777
|
-
const documentManager2 = getService$
|
2778
|
-
const permissionChecker2 = getService$
|
3028
|
+
const documentManager2 = getService$2("document-manager");
|
3029
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2779
3030
|
if (permissionChecker2.cannot.unpublish()) {
|
2780
3031
|
return ctx.forbidden();
|
2781
3032
|
}
|
@@ -2809,8 +3060,8 @@ const singleTypes = {
|
|
2809
3060
|
const { userAbility } = ctx.state;
|
2810
3061
|
const { model } = ctx.params;
|
2811
3062
|
const { body, query = {} } = ctx.request;
|
2812
|
-
const documentManager2 = getService$
|
2813
|
-
const permissionChecker2 = getService$
|
3063
|
+
const documentManager2 = getService$2("document-manager");
|
3064
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2814
3065
|
if (permissionChecker2.cannot.discard()) {
|
2815
3066
|
return ctx.forbidden();
|
2816
3067
|
}
|
@@ -2833,8 +3084,8 @@ const singleTypes = {
|
|
2833
3084
|
const { userAbility } = ctx.state;
|
2834
3085
|
const { model } = ctx.params;
|
2835
3086
|
const { query } = ctx.request;
|
2836
|
-
const documentManager2 = getService$
|
2837
|
-
const permissionChecker2 = getService$
|
3087
|
+
const documentManager2 = getService$2("document-manager");
|
3088
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2838
3089
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2839
3090
|
if (permissionChecker2.cannot.read()) {
|
2840
3091
|
return ctx.forbidden();
|
@@ -2858,7 +3109,7 @@ const uid$1 = {
|
|
2858
3109
|
const { query = {} } = ctx.request;
|
2859
3110
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2860
3111
|
await validateUIDField(contentTypeUID, field);
|
2861
|
-
const uidService = getService$
|
3112
|
+
const uidService = getService$2("uid");
|
2862
3113
|
ctx.body = {
|
2863
3114
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2864
3115
|
};
|
@@ -2870,7 +3121,7 @@ const uid$1 = {
|
|
2870
3121
|
const { query = {} } = ctx.request;
|
2871
3122
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2872
3123
|
await validateUIDField(contentTypeUID, field);
|
2873
|
-
const uidService = getService$
|
3124
|
+
const uidService = getService$2("uid");
|
2874
3125
|
const isAvailable = await uidService.checkUIDAvailability({
|
2875
3126
|
contentTypeUID,
|
2876
3127
|
field,
|
@@ -2891,7 +3142,8 @@ const controllers = {
|
|
2891
3142
|
relations,
|
2892
3143
|
"single-types": singleTypes,
|
2893
3144
|
uid: uid$1,
|
2894
|
-
...history.controllers ? history.controllers : {}
|
3145
|
+
...history.controllers ? history.controllers : {},
|
3146
|
+
...preview.controllers ? preview.controllers : {}
|
2895
3147
|
};
|
2896
3148
|
const keys = {
|
2897
3149
|
CONFIGURATION: "configuration"
|
@@ -3020,18 +3272,15 @@ async function syncMetadatas(configuration, schema) {
|
|
3020
3272
|
___default.default.set(updatedMeta, ["list", "searchable"], false);
|
3021
3273
|
___default.default.set(acc, [key], updatedMeta);
|
3022
3274
|
}
|
3023
|
-
if (!___default.default.has(edit, "mainField"))
|
3024
|
-
return acc;
|
3275
|
+
if (!___default.default.has(edit, "mainField")) return acc;
|
3025
3276
|
if (!isRelation$1(attr)) {
|
3026
3277
|
___default.default.set(updatedMeta, "edit", ___default.default.omit(edit, ["mainField"]));
|
3027
3278
|
___default.default.set(acc, [key], updatedMeta);
|
3028
3279
|
return acc;
|
3029
3280
|
}
|
3030
|
-
if (edit.mainField === "id")
|
3031
|
-
return acc;
|
3281
|
+
if (edit.mainField === "id") return acc;
|
3032
3282
|
const targetSchema = getTargetSchema(attr.targetModel);
|
3033
|
-
if (!targetSchema)
|
3034
|
-
return acc;
|
3283
|
+
if (!targetSchema) return acc;
|
3035
3284
|
if (!isSortable(targetSchema, edit.mainField) && !isListable(targetSchema, edit.mainField)) {
|
3036
3285
|
___default.default.set(updatedMeta, ["edit", "mainField"], getDefaultMainField(targetSchema));
|
3037
3286
|
___default.default.set(acc, [key], updatedMeta);
|
@@ -3042,12 +3291,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3042
3291
|
return ___default.default.assign(metasWithDefaults, updatedMetas);
|
3043
3292
|
}
|
3044
3293
|
const getTargetSchema = (targetModel) => {
|
3045
|
-
return getService$
|
3294
|
+
return getService$2("content-types").findContentType(targetModel);
|
3046
3295
|
};
|
3047
3296
|
const DEFAULT_LIST_LENGTH = 4;
|
3048
3297
|
const MAX_ROW_SIZE = 12;
|
3049
3298
|
const isAllowedFieldSize = (type, size) => {
|
3050
|
-
const { getFieldSize } = getService$
|
3299
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3051
3300
|
const fieldSize = getFieldSize(type);
|
3052
3301
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3053
3302
|
return false;
|
@@ -3055,7 +3304,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3055
3304
|
return size <= MAX_ROW_SIZE;
|
3056
3305
|
};
|
3057
3306
|
const getDefaultFieldSize = (attribute) => {
|
3058
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3307
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3059
3308
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3060
3309
|
};
|
3061
3310
|
async function createDefaultLayouts(schema) {
|
@@ -3076,8 +3325,7 @@ function createDefaultEditLayout(schema) {
|
|
3076
3325
|
return appendToEditLayout([], keys2, schema);
|
3077
3326
|
}
|
3078
3327
|
function syncLayouts(configuration, schema) {
|
3079
|
-
if (___default.default.isEmpty(configuration.layouts))
|
3080
|
-
return createDefaultLayouts(schema);
|
3328
|
+
if (___default.default.isEmpty(configuration.layouts)) return createDefaultLayouts(schema);
|
3081
3329
|
const { list = [], editRelations = [], edit = [] } = configuration.layouts || {};
|
3082
3330
|
let cleanList = list.filter((attr) => isListable(schema, attr));
|
3083
3331
|
const cleanEditRelations = editRelations.filter(
|
@@ -3088,9 +3336,8 @@ function syncLayouts(configuration, schema) {
|
|
3088
3336
|
for (const row of edit) {
|
3089
3337
|
const newRow = [];
|
3090
3338
|
for (const el of row) {
|
3091
|
-
if (!hasEditableAttribute(schema, el.name))
|
3092
|
-
|
3093
|
-
const { hasFieldSize } = getService$1("field-sizes");
|
3339
|
+
if (!hasEditableAttribute(schema, el.name)) continue;
|
3340
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3094
3341
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3095
3342
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3096
3343
|
elementsToReAppend.push(el.name);
|
@@ -3120,8 +3367,7 @@ function syncLayouts(configuration, schema) {
|
|
3120
3367
|
};
|
3121
3368
|
}
|
3122
3369
|
const appendToEditLayout = (layout = [], keysToAppend, schema) => {
|
3123
|
-
if (keysToAppend.length === 0)
|
3124
|
-
return layout;
|
3370
|
+
if (keysToAppend.length === 0) return layout;
|
3125
3371
|
let currentRowIndex = Math.max(layout.length - 1, 0);
|
3126
3372
|
if (!layout[currentRowIndex]) {
|
3127
3373
|
layout[currentRowIndex] = [];
|
@@ -3230,17 +3476,17 @@ const configurationService$1 = createConfigurationService({
|
|
3230
3476
|
isComponent: true,
|
3231
3477
|
prefix: STORE_KEY_PREFIX,
|
3232
3478
|
getModels() {
|
3233
|
-
const { toContentManagerModel } = getService$
|
3479
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3234
3480
|
return fp.mapValues(toContentManagerModel, strapi.components);
|
3235
3481
|
}
|
3236
3482
|
});
|
3237
3483
|
const components = ({ strapi: strapi2 }) => ({
|
3238
3484
|
findAllComponents() {
|
3239
|
-
const { toContentManagerModel } = getService$
|
3485
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3240
3486
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3241
3487
|
},
|
3242
3488
|
findComponent(uid2) {
|
3243
|
-
const { toContentManagerModel } = getService$
|
3489
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3244
3490
|
const component = strapi2.components[uid2];
|
3245
3491
|
return fp.isNil(component) ? component : toContentManagerModel(component);
|
3246
3492
|
},
|
@@ -3291,17 +3537,17 @@ const configurationService = createConfigurationService({
|
|
3291
3537
|
storeUtils,
|
3292
3538
|
prefix: "content_types",
|
3293
3539
|
getModels() {
|
3294
|
-
const { toContentManagerModel } = getService$
|
3540
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3295
3541
|
return fp.mapValues(toContentManagerModel, strapi.contentTypes);
|
3296
3542
|
}
|
3297
3543
|
});
|
3298
3544
|
const service = ({ strapi: strapi2 }) => ({
|
3299
3545
|
findAllContentTypes() {
|
3300
|
-
const { toContentManagerModel } = getService$
|
3546
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3301
3547
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3302
3548
|
},
|
3303
3549
|
findContentType(uid2) {
|
3304
|
-
const { toContentManagerModel } = getService$
|
3550
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3305
3551
|
const contentType = strapi2.contentTypes[uid2];
|
3306
3552
|
return fp.isNil(contentType) ? contentType : toContentManagerModel(contentType);
|
3307
3553
|
},
|
@@ -3330,7 +3576,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3330
3576
|
return this.findConfiguration(contentType);
|
3331
3577
|
},
|
3332
3578
|
findComponentsConfigurations(contentType) {
|
3333
|
-
return getService$
|
3579
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3334
3580
|
},
|
3335
3581
|
syncConfigurations() {
|
3336
3582
|
return configurationService.syncConfigurations();
|
@@ -3602,7 +3848,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3602
3848
|
return userAbility.can(action);
|
3603
3849
|
},
|
3604
3850
|
async registerPermissions() {
|
3605
|
-
const displayedContentTypes = getService$
|
3851
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3606
3852
|
const contentTypesUids = displayedContentTypes.map(fp.prop("uid"));
|
3607
3853
|
const actions = [
|
3608
3854
|
{
|
@@ -3687,6 +3933,12 @@ function getPopulateForRelation(attribute, model, attributeName, { countMany, co
|
|
3687
3933
|
if (initialPopulate) {
|
3688
3934
|
return initialPopulate;
|
3689
3935
|
}
|
3936
|
+
if (attributeName === "localizations") {
|
3937
|
+
const validationPopulate = getPopulateForValidation(model.uid);
|
3938
|
+
return {
|
3939
|
+
populate: validationPopulate.populate
|
3940
|
+
};
|
3941
|
+
}
|
3690
3942
|
if (!isVisibleAttribute$1(model, attributeName)) {
|
3691
3943
|
return true;
|
3692
3944
|
}
|
@@ -3746,6 +3998,9 @@ const getDeepPopulate = (uid2, {
|
|
3746
3998
|
return {};
|
3747
3999
|
}
|
3748
4000
|
const model = strapi.getModel(uid2);
|
4001
|
+
if (!model) {
|
4002
|
+
return {};
|
4003
|
+
}
|
3749
4004
|
return Object.keys(model.attributes).reduce(
|
3750
4005
|
(populateAcc, attributeName) => fp.merge(
|
3751
4006
|
populateAcc,
|
@@ -3765,40 +4020,46 @@ const getDeepPopulate = (uid2, {
|
|
3765
4020
|
{}
|
3766
4021
|
);
|
3767
4022
|
};
|
3768
|
-
const
|
3769
|
-
|
3770
|
-
|
3771
|
-
countOne = false,
|
3772
|
-
maxLevel = Infinity
|
3773
|
-
} = {}, level = 1) => {
|
3774
|
-
if (level > maxLevel) {
|
4023
|
+
const getPopulateForValidation = (uid2) => {
|
4024
|
+
const model = strapi.getModel(uid2);
|
4025
|
+
if (!model) {
|
3775
4026
|
return {};
|
3776
4027
|
}
|
3777
|
-
const model = strapi.getModel(uid2);
|
3778
4028
|
return Object.entries(model.attributes).reduce((populateAcc, [attributeName, attribute]) => {
|
3779
|
-
if (
|
4029
|
+
if (isScalarAttribute(attribute)) {
|
4030
|
+
if (getDoesAttributeRequireValidation(attribute)) {
|
4031
|
+
populateAcc.fields = populateAcc.fields || [];
|
4032
|
+
populateAcc.fields.push(attributeName);
|
4033
|
+
}
|
3780
4034
|
return populateAcc;
|
3781
4035
|
}
|
3782
|
-
if (
|
3783
|
-
|
3784
|
-
|
3785
|
-
|
4036
|
+
if (isComponent(attribute)) {
|
4037
|
+
const component = attribute.component;
|
4038
|
+
const componentResult = getPopulateForValidation(component);
|
4039
|
+
if (Object.keys(componentResult).length > 0) {
|
4040
|
+
populateAcc.populate = populateAcc.populate || {};
|
4041
|
+
populateAcc.populate[attributeName] = componentResult;
|
4042
|
+
}
|
4043
|
+
return populateAcc;
|
3786
4044
|
}
|
3787
|
-
|
3788
|
-
|
3789
|
-
|
3790
|
-
|
3791
|
-
|
3792
|
-
|
3793
|
-
|
3794
|
-
|
3795
|
-
|
3796
|
-
countOne,
|
3797
|
-
maxLevel
|
4045
|
+
if (isDynamicZone(attribute)) {
|
4046
|
+
const components2 = attribute.components;
|
4047
|
+
const componentsResult = (components2 || []).reduce(
|
4048
|
+
(acc, componentUID) => {
|
4049
|
+
const componentResult = getPopulateForValidation(componentUID);
|
4050
|
+
if (Object.keys(componentResult).length > 0) {
|
4051
|
+
acc[componentUID] = componentResult;
|
4052
|
+
}
|
4053
|
+
return acc;
|
3798
4054
|
},
|
3799
|
-
|
3800
|
-
)
|
3801
|
-
|
4055
|
+
{}
|
4056
|
+
);
|
4057
|
+
if (Object.keys(componentsResult).length > 0) {
|
4058
|
+
populateAcc.populate = populateAcc.populate || {};
|
4059
|
+
populateAcc.populate[attributeName] = { on: componentsResult };
|
4060
|
+
}
|
4061
|
+
}
|
4062
|
+
return populateAcc;
|
3802
4063
|
}, {});
|
3803
4064
|
};
|
3804
4065
|
const getDeepPopulateDraftCount = (uid2) => {
|
@@ -3878,7 +4139,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3878
4139
|
return populateQuery;
|
3879
4140
|
};
|
3880
4141
|
const buildDeepPopulate = (uid2) => {
|
3881
|
-
return getService$
|
4142
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3882
4143
|
};
|
3883
4144
|
const populateBuilder = (uid2) => {
|
3884
4145
|
let getInitialPopulate = async () => {
|
@@ -4040,7 +4301,6 @@ const AVAILABLE_LOCALES_FIELDS = [
|
|
4040
4301
|
"locale",
|
4041
4302
|
"updatedAt",
|
4042
4303
|
"createdAt",
|
4043
|
-
"status",
|
4044
4304
|
"publishedAt",
|
4045
4305
|
"documentId"
|
4046
4306
|
];
|
@@ -4061,34 +4321,20 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4061
4321
|
/**
|
4062
4322
|
* Returns available locales of a document for the current status
|
4063
4323
|
*/
|
4064
|
-
async getAvailableLocales(uid2, version, allVersions
|
4324
|
+
async getAvailableLocales(uid2, version, allVersions) {
|
4065
4325
|
const versionsByLocale = fp.groupBy("locale", allVersions);
|
4066
|
-
|
4326
|
+
if (version.locale) {
|
4327
|
+
delete versionsByLocale[version.locale];
|
4328
|
+
}
|
4067
4329
|
const model = strapi2.getModel(uid2);
|
4068
|
-
const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
|
4069
|
-
const traversalFunction = async (localeVersion) => strapiUtils.traverseEntity(
|
4070
|
-
({ key }, { remove }) => {
|
4071
|
-
if (keysToKeep.includes(key)) {
|
4072
|
-
return;
|
4073
|
-
}
|
4074
|
-
remove(key);
|
4075
|
-
},
|
4076
|
-
{ schema: model, getModel: strapi2.getModel.bind(strapi2) },
|
4077
|
-
// @ts-expect-error fix types DocumentVersion incompatible with Data
|
4078
|
-
localeVersion
|
4079
|
-
);
|
4080
4330
|
const mappingResult = await strapiUtils.async.map(
|
4081
4331
|
Object.values(versionsByLocale),
|
4082
4332
|
async (localeVersions) => {
|
4083
|
-
const mappedLocaleVersions = await strapiUtils.async.map(
|
4084
|
-
localeVersions,
|
4085
|
-
traversalFunction
|
4086
|
-
);
|
4087
4333
|
if (!strapiUtils.contentTypes.hasDraftAndPublish(model)) {
|
4088
|
-
return
|
4334
|
+
return localeVersions[0];
|
4089
4335
|
}
|
4090
|
-
const draftVersion =
|
4091
|
-
const otherVersions =
|
4336
|
+
const draftVersion = localeVersions.find((v) => v.publishedAt === null);
|
4337
|
+
const otherVersions = localeVersions.filter((v) => v.id !== draftVersion?.id);
|
4092
4338
|
if (!draftVersion) {
|
4093
4339
|
return;
|
4094
4340
|
}
|
@@ -4110,8 +4356,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4110
4356
|
const matchStatus = status === "published" ? v.publishedAt !== null : v.publishedAt === null;
|
4111
4357
|
return matchLocale && matchStatus;
|
4112
4358
|
});
|
4113
|
-
if (!availableStatus)
|
4114
|
-
return availableStatus;
|
4359
|
+
if (!availableStatus) return availableStatus;
|
4115
4360
|
return fp.pick(AVAILABLE_STATUS_FIELDS, availableStatus);
|
4116
4361
|
},
|
4117
4362
|
/**
|
@@ -4121,18 +4366,19 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4121
4366
|
* @returns
|
4122
4367
|
*/
|
4123
4368
|
async getManyAvailableStatus(uid2, documents) {
|
4124
|
-
if (!documents.length)
|
4125
|
-
return [];
|
4369
|
+
if (!documents.length) return [];
|
4126
4370
|
const status = documents[0].publishedAt !== null ? "published" : "draft";
|
4127
|
-
const
|
4128
|
-
const
|
4129
|
-
|
4130
|
-
|
4131
|
-
|
4132
|
-
|
4133
|
-
|
4134
|
-
|
4135
|
-
|
4371
|
+
const locales = documents.map((d) => d.locale).filter(Boolean);
|
4372
|
+
const where = {
|
4373
|
+
documentId: { $in: documents.map((d) => d.documentId).filter(Boolean) },
|
4374
|
+
publishedAt: { $null: status === "published" }
|
4375
|
+
};
|
4376
|
+
if (locales.length) {
|
4377
|
+
where.locale = { $in: locales };
|
4378
|
+
}
|
4379
|
+
return strapi2.query(uid2).findMany({
|
4380
|
+
where,
|
4381
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"]
|
4136
4382
|
});
|
4137
4383
|
},
|
4138
4384
|
getStatus(version, otherDocumentStatuses) {
|
@@ -4149,10 +4395,8 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4149
4395
|
} else if (otherVersion) {
|
4150
4396
|
draftVersion = otherVersion;
|
4151
4397
|
}
|
4152
|
-
if (!draftVersion)
|
4153
|
-
|
4154
|
-
if (!publishedVersion)
|
4155
|
-
return CONTENT_MANAGER_STATUS.DRAFT;
|
4398
|
+
if (!draftVersion) return CONTENT_MANAGER_STATUS.PUBLISHED;
|
4399
|
+
if (!publishedVersion) return CONTENT_MANAGER_STATUS.DRAFT;
|
4156
4400
|
const isDraftModified = getIsVersionLatestModification(draftVersion, publishedVersion);
|
4157
4401
|
return isDraftModified ? CONTENT_MANAGER_STATUS.MODIFIED : CONTENT_MANAGER_STATUS.PUBLISHED;
|
4158
4402
|
},
|
@@ -4160,11 +4404,9 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4160
4404
|
// We could refactor this so the locales are only loaded when they're
|
4161
4405
|
// needed. e.g. in the bulk locale action modal.
|
4162
4406
|
async getMetadata(uid2, version, { availableLocales = true, availableStatus = true } = {}) {
|
4163
|
-
const populate =
|
4164
|
-
const
|
4165
|
-
where: { documentId: version.documentId },
|
4407
|
+
const { populate = {}, fields = [] } = getPopulateForValidation(uid2);
|
4408
|
+
const params = {
|
4166
4409
|
populate: {
|
4167
|
-
// Populate only fields that require validation for bulk locale actions
|
4168
4410
|
...populate,
|
4169
4411
|
// NOTE: creator fields are selected in this way to avoid exposing sensitive data
|
4170
4412
|
createdBy: {
|
@@ -4173,9 +4415,15 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4173
4415
|
updatedBy: {
|
4174
4416
|
select: ["id", "firstname", "lastname", "email"]
|
4175
4417
|
}
|
4418
|
+
},
|
4419
|
+
fields: fp.uniq([...AVAILABLE_LOCALES_FIELDS, ...fields]),
|
4420
|
+
filters: {
|
4421
|
+
documentId: version.documentId
|
4176
4422
|
}
|
4177
|
-
}
|
4178
|
-
const
|
4423
|
+
};
|
4424
|
+
const dbParams = strapi2.get("query-params").transform(uid2, params);
|
4425
|
+
const versions = await strapi2.db.query(uid2).findMany(dbParams);
|
4426
|
+
const availableLocalesResult = availableLocales ? await this.getAvailableLocales(uid2, version, versions) : [];
|
4179
4427
|
const availableStatusResult = availableStatus ? this.getAvailableStatus(version, versions) : null;
|
4180
4428
|
return {
|
4181
4429
|
availableLocales: availableLocalesResult,
|
@@ -4202,6 +4450,16 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4202
4450
|
opts.availableStatus = false;
|
4203
4451
|
}
|
4204
4452
|
const meta = await this.getMetadata(uid2, document, opts);
|
4453
|
+
if (document.localizations) {
|
4454
|
+
const otherStatus = await this.getManyAvailableStatus(uid2, document.localizations);
|
4455
|
+
document.localizations = document.localizations.map((d) => {
|
4456
|
+
const status = otherStatus.find((s) => s.documentId === d.documentId);
|
4457
|
+
return {
|
4458
|
+
...d,
|
4459
|
+
status: this.getStatus(d, status ? [status] : [])
|
4460
|
+
};
|
4461
|
+
});
|
4462
|
+
}
|
4205
4463
|
return {
|
4206
4464
|
data: {
|
4207
4465
|
...document,
|
@@ -4419,7 +4677,8 @@ const services = {
|
|
4419
4677
|
permission,
|
4420
4678
|
"populate-builder": populateBuilder$1,
|
4421
4679
|
uid,
|
4422
|
-
...history.services ? history.services : {}
|
4680
|
+
...history.services ? history.services : {},
|
4681
|
+
...preview.services ? preview.services : {}
|
4423
4682
|
};
|
4424
4683
|
const index = () => {
|
4425
4684
|
return {
|