@strapi/content-manager 0.0.0-experimental.5788c38836be65c0321a2dcadbdf44f04b798e8a → 0.0.0-experimental.599b53360e581fdbd0afac055f1bf2d29816feec
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-D1YuKq8j.mjs → ComponentConfigurationPage-D4H-v0et.mjs} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-D1YuKq8j.mjs.map → ComponentConfigurationPage-D4H-v0et.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-B42mQr1K.js → ComponentConfigurationPage-DdkVGfXC.js} +5 -6
- package/dist/_chunks/{ComponentConfigurationPage-B42mQr1K.js.map → ComponentConfigurationPage-DdkVGfXC.js.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-C9yiwgI_.mjs → EditConfigurationPage-D1nvB7Br.mjs} +4 -4
- package/dist/_chunks/{EditConfigurationPage-C9yiwgI_.mjs.map → EditConfigurationPage-D1nvB7Br.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-NC89F29V.js → EditConfigurationPage-LYEvR4fW.js} +5 -6
- package/dist/_chunks/{EditConfigurationPage-NC89F29V.js.map → EditConfigurationPage-LYEvR4fW.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-k8UcfVwt.mjs → EditViewPage-Bcnff6Vd.mjs} +21 -54
- package/dist/_chunks/EditViewPage-Bcnff6Vd.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-DYDpe5Wi.js → EditViewPage-DqelJ9UK.js} +23 -57
- package/dist/_chunks/EditViewPage-DqelJ9UK.js.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-DUU19g6M.js → Form-CnHfBeiB.js} +6 -7
- package/dist/_chunks/Form-CnHfBeiB.js.map +1 -0
- package/dist/_chunks/{Form-UHu2eOuG.mjs → Form-CzPCJi3B.mjs} +4 -4
- package/dist/_chunks/Form-CzPCJi3B.mjs.map +1 -0
- package/dist/_chunks/{History-CpxkZXS3.mjs → History-CcmSn3Mj.mjs} +71 -104
- package/dist/_chunks/History-CcmSn3Mj.mjs.map +1 -0
- package/dist/_chunks/{History-CyA8tvJZ.js → History-zArjENzj.js} +81 -115
- package/dist/_chunks/History-zArjENzj.js.map +1 -0
- package/dist/_chunks/{Field-Crhugun2.js → Input-CDHKQd7o.js} +1266 -1239
- package/dist/_chunks/Input-CDHKQd7o.js.map +1 -0
- package/dist/_chunks/{Field-BLL5lknV.mjs → Input-aV8SSoTa.mjs} +1271 -1244
- package/dist/_chunks/Input-aV8SSoTa.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-OUwV8QF1.mjs → ListConfigurationPage-BPvzENJJ.mjs} +7 -6
- package/dist/_chunks/ListConfigurationPage-BPvzENJJ.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-pJV7aG2V.js → ListConfigurationPage-ByZAO_9H.js} +7 -7
- package/dist/_chunks/ListConfigurationPage-ByZAO_9H.js.map +1 -0
- package/dist/_chunks/{ListViewPage-BIT0M8VG.js → ListViewPage-BVKBeQAA.js} +73 -48
- package/dist/_chunks/ListViewPage-BVKBeQAA.js.map +1 -0
- package/dist/_chunks/{ListViewPage-BOnhCGkE.mjs → ListViewPage-HljQVnFH.mjs} +67 -41
- package/dist/_chunks/ListViewPage-HljQVnFH.mjs.map +1 -0
- package/dist/_chunks/{NoContentTypePage-uIBsBUmH.js → NoContentTypePage-BV5zfDxr.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-uIBsBUmH.js.map → NoContentTypePage-BV5zfDxr.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-CwjlHGTn.mjs → NoContentTypePage-BfHaSM-K.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-CwjlHGTn.mjs.map → NoContentTypePage-BfHaSM-K.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-CcWbyT_z.mjs → NoPermissionsPage-D6ze2nQL.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-CcWbyT_z.mjs.map → NoPermissionsPage-D6ze2nQL.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-C8wkEaOF.js → NoPermissionsPage-vdNpc6jb.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-C8wkEaOF.js.map → NoPermissionsPage-vdNpc6jb.js.map} +1 -1
- package/dist/_chunks/Preview-DEHdENT1.js +305 -0
- package/dist/_chunks/Preview-DEHdENT1.js.map +1 -0
- package/dist/_chunks/Preview-vfWOtPG5.mjs +287 -0
- package/dist/_chunks/Preview-vfWOtPG5.mjs.map +1 -0
- package/dist/_chunks/{Relations-wIdWJnA9.mjs → Relations-B7_hbF0w.mjs} +50 -24
- package/dist/_chunks/Relations-B7_hbF0w.mjs.map +1 -0
- package/dist/_chunks/{Relations-CwRu_eZv.js → Relations-DcoOBejP.js} +50 -25
- package/dist/_chunks/Relations-DcoOBejP.js.map +1 -0
- package/dist/_chunks/{en-Bm0D0IWz.js → en-BR48D_RH.js} +23 -4
- package/dist/_chunks/{en-Bm0D0IWz.js.map → en-BR48D_RH.js.map} +1 -1
- package/dist/_chunks/{en-DKV44jRb.mjs → en-D65uIF6Y.mjs} +23 -4
- package/dist/_chunks/{en-DKV44jRb.mjs.map → en-D65uIF6Y.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-B7kGGg3E.js → fr-C43IbhA_.js} +16 -3
- package/dist/_chunks/{fr-B7kGGg3E.js.map → fr-C43IbhA_.js.map} +1 -1
- package/dist/_chunks/{fr-CD9VFbPM.mjs → fr-DBseuRuB.mjs} +16 -3
- package/dist/_chunks/{fr-CD9VFbPM.mjs.map → fr-DBseuRuB.mjs.map} +1 -1
- package/dist/_chunks/hooks-BAaaKPS_.js.map +1 -1
- package/dist/_chunks/{index-BO-T2BdP.js → index-CxLSGwnk.js} +653 -249
- package/dist/_chunks/index-CxLSGwnk.js.map +1 -0
- package/dist/_chunks/{index-BQ8DxaCa.mjs → index-EH8ZtHd5.mjs} +670 -266
- package/dist/_chunks/index-EH8ZtHd5.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-N63eyE5E.mjs → layout-CxDMdJ13.mjs} +4 -4
- package/dist/_chunks/{layout-N63eyE5E.mjs.map → layout-CxDMdJ13.mjs.map} +1 -1
- package/dist/_chunks/{layout-BTB1_M8g.js → layout-DSeUTfMv.js} +5 -6
- package/dist/_chunks/{layout-BTB1_M8g.js.map → layout-DSeUTfMv.js.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-Bh9r0CVE.mjs → relations-B8_Uu38Q.mjs} +21 -8
- package/dist/_chunks/relations-B8_Uu38Q.mjs.map +1 -0
- package/dist/_chunks/{relations-C9AQuM2z.js → relations-S5nNKdN3.js} +20 -7
- package/dist/_chunks/relations-S5nNKdN3.js.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/_chunks/{useDebounce-CtcjDB3L.js → usePrev-B9w_-eYc.js} +1 -14
- package/dist/_chunks/usePrev-B9w_-eYc.js.map +1 -0
- package/dist/_chunks/usePrev-DH6iah0A.mjs +16 -0
- package/dist/_chunks/usePrev-DH6iah0A.mjs.map +1 -0
- package/dist/admin/index.js +2 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +6 -5
- package/dist/admin/src/content-manager.d.ts +3 -2
- package/dist/admin/src/exports.d.ts +1 -0
- package/dist/admin/src/history/services/historyVersion.d.ts +1 -1
- package/dist/admin/src/hooks/useDocument.d.ts +19 -2
- 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/FormLayout.d.ts +27 -0
- package/dist/admin/src/pages/EditView/utils/data.d.ts +1 -0
- package/dist/admin/src/preview/components/PreviewContent.d.ts +2 -0
- package/dist/admin/src/preview/components/PreviewHeader.d.ts +2 -0
- package/dist/admin/src/preview/components/PreviewSidePanel.d.ts +3 -0
- package/dist/admin/src/preview/index.d.ts +4 -0
- package/dist/admin/src/preview/pages/Preview.d.ts +11 -0
- package/dist/admin/src/preview/routes.d.ts +3 -0
- package/dist/admin/src/preview/services/preview.d.ts +3 -0
- package/dist/admin/src/router.d.ts +1 -1
- package/dist/admin/src/services/api.d.ts +1 -1
- package/dist/admin/src/services/components.d.ts +2 -2
- package/dist/admin/src/services/contentTypes.d.ts +3 -3
- package/dist/admin/src/services/documents.d.ts +16 -19
- package/dist/admin/src/services/init.d.ts +1 -1
- package/dist/admin/src/services/relations.d.ts +2 -2
- package/dist/admin/src/services/uid.d.ts +3 -3
- package/dist/server/index.js +566 -318
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +567 -318
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/bootstrap.d.ts.map +1 -1
- package/dist/server/src/controllers/index.d.ts.map +1 -1
- package/dist/server/src/controllers/relations.d.ts.map +1 -1
- package/dist/server/src/controllers/utils/metadata.d.ts +16 -1
- package/dist/server/src/controllers/utils/metadata.d.ts.map +1 -1
- package/dist/server/src/history/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/index.d.ts +1 -0
- package/dist/shared/contracts/index.d.ts.map +1 -1
- package/dist/shared/contracts/preview.d.ts +27 -0
- package/dist/shared/contracts/preview.d.ts.map +1 -0
- package/dist/shared/index.js +4 -0
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/index.mjs +4 -0
- package/dist/shared/index.mjs.map +1 -1
- package/package.json +14 -13
- package/dist/_chunks/EditViewPage-DYDpe5Wi.js.map +0 -1
- package/dist/_chunks/EditViewPage-k8UcfVwt.mjs.map +0 -1
- package/dist/_chunks/Field-BLL5lknV.mjs.map +0 -1
- package/dist/_chunks/Field-Crhugun2.js.map +0 -1
- package/dist/_chunks/Form-DUU19g6M.js.map +0 -1
- package/dist/_chunks/Form-UHu2eOuG.mjs.map +0 -1
- package/dist/_chunks/History-CpxkZXS3.mjs.map +0 -1
- package/dist/_chunks/History-CyA8tvJZ.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-OUwV8QF1.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-pJV7aG2V.js.map +0 -1
- package/dist/_chunks/ListViewPage-BIT0M8VG.js.map +0 -1
- package/dist/_chunks/ListViewPage-BOnhCGkE.mjs.map +0 -1
- package/dist/_chunks/Relations-CwRu_eZv.js.map +0 -1
- package/dist/_chunks/Relations-wIdWJnA9.mjs.map +0 -1
- package/dist/_chunks/index-BO-T2BdP.js.map +0 -1
- package/dist/_chunks/index-BQ8DxaCa.mjs.map +0 -1
- package/dist/_chunks/relations-Bh9r0CVE.mjs.map +0 -1
- package/dist/_chunks/relations-C9AQuM2z.js.map +0 -1
- package/dist/_chunks/useDebounce-CtcjDB3L.js.map +0 -1
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs +0 -29
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs.map +0 -1
package/dist/server/index.mjs
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1,
|
2
|
-
import { pick, omit, difference, castArray, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
|
1
|
+
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, traverseEntity, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1, pagination } from "@strapi/utils";
|
2
|
+
import { pick, omit, difference, castArray, mergeWith, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
|
3
3
|
import "@strapi/types";
|
4
4
|
import * as yup from "yup";
|
5
5
|
import { scheduleJob } from "node-schedule";
|
@@ -7,10 +7,10 @@ import isNil from "lodash/isNil";
|
|
7
7
|
import _, { intersection as intersection$1, difference as difference$1 } from "lodash";
|
8
8
|
import qs from "qs";
|
9
9
|
import slugify from "@sindresorhus/slugify";
|
10
|
-
const getService$
|
10
|
+
const getService$2 = (name) => {
|
11
11
|
return strapi.plugin("content-manager").service(name);
|
12
12
|
};
|
13
|
-
function getService(strapi2, name) {
|
13
|
+
function getService$1(strapi2, name) {
|
14
14
|
return strapi2.service(`plugin::content-manager.${name}`);
|
15
15
|
}
|
16
16
|
const historyRestoreVersionSchema = yup.object().shape({
|
@@ -46,7 +46,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
46
46
|
if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {
|
47
47
|
throw new errors.ForbiddenError("contentType and documentId are required");
|
48
48
|
}
|
49
|
-
const permissionChecker2 = getService$
|
49
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
50
50
|
userAbility: ctx.state.userAbility,
|
51
51
|
model: ctx.query.contentType
|
52
52
|
});
|
@@ -54,7 +54,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
54
54
|
return ctx.forbidden();
|
55
55
|
}
|
56
56
|
const query = await permissionChecker2.sanitizeQuery(ctx.query);
|
57
|
-
const { results, pagination: pagination2 } = await getService(strapi2, "history").findVersionsPage({
|
57
|
+
const { results, pagination: pagination2 } = await getService$1(strapi2, "history").findVersionsPage({
|
58
58
|
query: {
|
59
59
|
...query,
|
60
60
|
...getValidPagination({ page: query.page, pageSize: query.pageSize })
|
@@ -79,14 +79,14 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
79
79
|
async restoreVersion(ctx) {
|
80
80
|
const request = ctx.request;
|
81
81
|
await validateRestoreVersion(request.body, "contentType is required");
|
82
|
-
const permissionChecker2 = getService$
|
82
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
83
83
|
userAbility: ctx.state.userAbility,
|
84
84
|
model: request.body.contentType
|
85
85
|
});
|
86
86
|
if (permissionChecker2.cannot.update()) {
|
87
87
|
throw new errors.ForbiddenError();
|
88
88
|
}
|
89
|
-
const restoredDocument = await getService(strapi2, "history").restoreVersion(
|
89
|
+
const restoredDocument = await getService$1(strapi2, "history").restoreVersion(
|
90
90
|
request.params.versionId
|
91
91
|
);
|
92
92
|
return {
|
@@ -95,7 +95,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
95
95
|
}
|
96
96
|
};
|
97
97
|
};
|
98
|
-
const controllers$
|
98
|
+
const controllers$2 = {
|
99
99
|
"history-version": createHistoryVersionController
|
100
100
|
/**
|
101
101
|
* Casting is needed because the types aren't aware that Strapi supports
|
@@ -141,8 +141,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
141
141
|
};
|
142
142
|
const getRelationRestoreValue = async (versionRelationData, attribute) => {
|
143
143
|
if (Array.isArray(versionRelationData)) {
|
144
|
-
if (versionRelationData.length === 0)
|
145
|
-
return versionRelationData;
|
144
|
+
if (versionRelationData.length === 0) return versionRelationData;
|
146
145
|
const existingAndMissingRelations = await Promise.all(
|
147
146
|
versionRelationData.map((relation) => {
|
148
147
|
return strapi2.documents(attribute.target).findOne({
|
@@ -151,19 +150,16 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
151
150
|
});
|
152
151
|
})
|
153
152
|
);
|
154
|
-
return existingAndMissingRelations.filter(
|
155
|
-
(relation) => relation !== null
|
156
|
-
);
|
153
|
+
return existingAndMissingRelations.filter((relation) => relation !== null);
|
157
154
|
}
|
158
155
|
return strapi2.documents(attribute.target).findOne({
|
159
156
|
documentId: versionRelationData.documentId,
|
160
157
|
locale: versionRelationData.locale || void 0
|
161
158
|
});
|
162
159
|
};
|
163
|
-
const getMediaRestoreValue = async (versionRelationData
|
164
|
-
if (
|
160
|
+
const getMediaRestoreValue = async (versionRelationData) => {
|
161
|
+
if (Array.isArray(versionRelationData)) {
|
165
162
|
const existingAndMissingMedias = await Promise.all(
|
166
|
-
// @ts-expect-error Fix the type definitions so this isn't any
|
167
163
|
versionRelationData.map((media) => {
|
168
164
|
return strapi2.db.query("plugin::upload.file").findOne({ where: { id: media.id } });
|
169
165
|
})
|
@@ -177,8 +173,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
177
173
|
const getDefaultLocale = async () => localesService ? localesService.getDefaultLocale() : null;
|
178
174
|
const isLocalizedContentType = (model) => i18nContentTypeService ? i18nContentTypeService.isLocalizedContentType(model) : false;
|
179
175
|
const getLocaleDictionary = async () => {
|
180
|
-
if (!localesService)
|
181
|
-
return {};
|
176
|
+
if (!localesService) return {};
|
182
177
|
const locales = await localesService.find() || [];
|
183
178
|
return locales.reduce(
|
184
179
|
(acc, locale) => {
|
@@ -202,6 +197,17 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
202
197
|
const meta = await documentMetadataService.getMetadata(contentTypeUid, document);
|
203
198
|
return documentMetadataService.getStatus(document, meta.availableStatus);
|
204
199
|
};
|
200
|
+
const getComponentFields = (componentUID) => {
|
201
|
+
return Object.entries(strapi2.getModel(componentUID).attributes).reduce(
|
202
|
+
(fieldsAcc, [key, attribute]) => {
|
203
|
+
if (!["relation", "media", "component", "dynamiczone"].includes(attribute.type)) {
|
204
|
+
fieldsAcc.push(key);
|
205
|
+
}
|
206
|
+
return fieldsAcc;
|
207
|
+
},
|
208
|
+
[]
|
209
|
+
);
|
210
|
+
};
|
205
211
|
const getDeepPopulate2 = (uid2, useDatabaseSyntax = false) => {
|
206
212
|
const model = strapi2.getModel(uid2);
|
207
213
|
const attributes = Object.entries(model.attributes);
|
@@ -225,13 +231,19 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
225
231
|
}
|
226
232
|
case "component": {
|
227
233
|
const populate = getDeepPopulate2(attribute.component);
|
228
|
-
acc[attributeName] = {
|
234
|
+
acc[attributeName] = {
|
235
|
+
populate,
|
236
|
+
[fieldSelector]: getComponentFields(attribute.component)
|
237
|
+
};
|
229
238
|
break;
|
230
239
|
}
|
231
240
|
case "dynamiczone": {
|
232
241
|
const populatedComponents = (attribute.components || []).reduce(
|
233
242
|
(acc2, componentUID) => {
|
234
|
-
acc2[componentUID] = {
|
243
|
+
acc2[componentUID] = {
|
244
|
+
populate: getDeepPopulate2(componentUID),
|
245
|
+
[fieldSelector]: getComponentFields(componentUID)
|
246
|
+
};
|
235
247
|
return acc2;
|
236
248
|
},
|
237
249
|
{}
|
@@ -316,8 +328,8 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
316
328
|
});
|
317
329
|
},
|
318
330
|
async findVersionsPage(params) {
|
319
|
-
const
|
320
|
-
const isLocalizedContentType = serviceUtils.isLocalizedContentType(
|
331
|
+
const schema = strapi2.getModel(params.query.contentType);
|
332
|
+
const isLocalizedContentType = serviceUtils.isLocalizedContentType(schema);
|
321
333
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
322
334
|
let locale = null;
|
323
335
|
if (isLocalizedContentType) {
|
@@ -338,78 +350,76 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
338
350
|
}),
|
339
351
|
serviceUtils.getLocaleDictionary()
|
340
352
|
]);
|
341
|
-
const
|
342
|
-
|
343
|
-
async (
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
|
348
|
-
|
349
|
-
model: "plugin::upload.file"
|
350
|
-
});
|
351
|
-
const response = await serviceUtils.buildMediaResponse(attributeValues);
|
352
|
-
const sanitizedResults = await Promise.all(
|
353
|
-
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
354
|
-
);
|
355
|
-
return {
|
356
|
-
...await currentDataWithRelations,
|
357
|
-
[attributeKey]: {
|
358
|
-
results: sanitizedResults,
|
359
|
-
meta: response.meta
|
360
|
-
}
|
361
|
-
};
|
353
|
+
const populateEntry = async (entry) => {
|
354
|
+
return traverseEntity(
|
355
|
+
async (options, utils) => {
|
356
|
+
if (!options.attribute) return;
|
357
|
+
if (!options.value) return;
|
358
|
+
const currentValue = Array.isArray(options.value) ? options.value : [options.value];
|
359
|
+
if (options.attribute.type === "component") {
|
360
|
+
utils.remove("id");
|
362
361
|
}
|
363
|
-
if (
|
364
|
-
|
362
|
+
if (options.attribute.type === "relation" && // TODO: handle polymorphic relations
|
363
|
+
options.attribute.relation !== "morphToOne" && options.attribute.relation !== "morphToMany") {
|
364
|
+
if (options.attribute.target === "admin::user") {
|
365
365
|
const adminUsers = await Promise.all(
|
366
|
-
|
366
|
+
currentValue.map((userToPopulate) => {
|
367
367
|
if (userToPopulate == null) {
|
368
368
|
return null;
|
369
369
|
}
|
370
|
-
return strapi2.query("admin::user").findOne({
|
370
|
+
return strapi2.query("admin::user").findOne({
|
371
|
+
where: {
|
372
|
+
...userToPopulate.id ? { id: userToPopulate.id } : {},
|
373
|
+
...userToPopulate.documentId ? { documentId: userToPopulate.documentId } : {}
|
374
|
+
}
|
375
|
+
});
|
371
376
|
})
|
372
377
|
);
|
373
|
-
|
374
|
-
...await currentDataWithRelations,
|
375
|
-
/**
|
376
|
-
* Ideally we would return the same "{results: [], meta: {}}" shape, however,
|
377
|
-
* when sanitizing the data as a whole in the controller before sending to the client,
|
378
|
-
* the data for admin relation user is completely sanitized if we return an object here as opposed to an array.
|
379
|
-
*/
|
380
|
-
[attributeKey]: adminUsers
|
381
|
-
};
|
378
|
+
utils.set(options.key, adminUsers);
|
382
379
|
}
|
383
|
-
const permissionChecker2 = getService$
|
380
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
384
381
|
userAbility: params.state.userAbility,
|
385
|
-
model:
|
382
|
+
model: options.attribute.target
|
386
383
|
});
|
387
384
|
const response = await serviceUtils.buildRelationReponse(
|
388
|
-
|
389
|
-
|
385
|
+
currentValue,
|
386
|
+
options.attribute
|
390
387
|
);
|
391
388
|
const sanitizedResults = await Promise.all(
|
392
389
|
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
393
390
|
);
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
meta: response.meta
|
399
|
-
}
|
400
|
-
};
|
391
|
+
utils.set(options.key, {
|
392
|
+
results: sanitizedResults,
|
393
|
+
meta: response.meta
|
394
|
+
});
|
401
395
|
}
|
402
|
-
|
396
|
+
if (options.attribute.type === "media") {
|
397
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
398
|
+
userAbility: params.state.userAbility,
|
399
|
+
model: "plugin::upload.file"
|
400
|
+
});
|
401
|
+
const response = await serviceUtils.buildMediaResponse(currentValue);
|
402
|
+
const sanitizedResults = await Promise.all(
|
403
|
+
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
404
|
+
);
|
405
|
+
utils.set(options.key, {
|
406
|
+
results: sanitizedResults,
|
407
|
+
meta: response.meta
|
408
|
+
});
|
409
|
+
}
|
410
|
+
},
|
411
|
+
{
|
412
|
+
schema,
|
413
|
+
getModel: strapi2.getModel.bind(strapi2)
|
403
414
|
},
|
404
|
-
|
415
|
+
entry.data
|
405
416
|
);
|
406
|
-
return entryWithRelations;
|
407
417
|
};
|
408
418
|
const formattedResults = await Promise.all(
|
409
419
|
results.map(async (result) => {
|
410
420
|
return {
|
411
421
|
...result,
|
412
|
-
data: await
|
422
|
+
data: await populateEntry(result),
|
413
423
|
meta: {
|
414
424
|
unknownAttributes: serviceUtils.getSchemaAttributesDiff(
|
415
425
|
result.schema,
|
@@ -440,30 +450,44 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
440
450
|
// Clone to avoid mutating the original version data
|
441
451
|
structuredClone(version.data)
|
442
452
|
);
|
443
|
-
const
|
444
|
-
|
445
|
-
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
+
const schema = structuredClone(version.schema);
|
454
|
+
schema.attributes = omit(FIELDS_TO_IGNORE, contentTypeSchemaAttributes);
|
455
|
+
const dataWithoutMissingRelations = await traverseEntity(
|
456
|
+
async (options, utils) => {
|
457
|
+
if (!options.attribute) return;
|
458
|
+
if (options.attribute.type === "component") {
|
459
|
+
utils.remove("id");
|
460
|
+
if (options.attribute.repeatable && options.value === null) {
|
461
|
+
utils.set(options.key, []);
|
462
|
+
}
|
453
463
|
}
|
454
|
-
if (attribute.type === "
|
455
|
-
|
456
|
-
|
457
|
-
|
464
|
+
if (options.attribute.type === "dynamiczone") {
|
465
|
+
if (options.value === null) {
|
466
|
+
utils.set(options.key, []);
|
467
|
+
}
|
458
468
|
}
|
459
|
-
if (attribute.type === "
|
460
|
-
|
461
|
-
|
469
|
+
if (options.attribute.type === "relation" && // TODO: handle polymorphic relations
|
470
|
+
options.attribute.relation !== "morphToOne" && options.attribute.relation !== "morphToMany") {
|
471
|
+
if (!options.value) return;
|
472
|
+
const data2 = await serviceUtils.getRelationRestoreValue(
|
473
|
+
options.value,
|
474
|
+
options.attribute
|
475
|
+
);
|
476
|
+
utils.set(options.key, data2);
|
477
|
+
}
|
478
|
+
if (options.attribute.type === "media") {
|
479
|
+
if (!options.value) return;
|
480
|
+
const data2 = await serviceUtils.getMediaRestoreValue(
|
481
|
+
options.value
|
482
|
+
);
|
483
|
+
utils.set(options.key, data2);
|
462
484
|
}
|
463
|
-
return previousRelationAttributes;
|
464
485
|
},
|
465
|
-
|
466
|
-
|
486
|
+
{
|
487
|
+
schema,
|
488
|
+
getModel: strapi2.getModel.bind(strapi2)
|
489
|
+
},
|
490
|
+
dataWithoutAddedAttributes
|
467
491
|
);
|
468
492
|
const data = omit(["id", ...Object.keys(schemaDiff.removed)], dataWithoutMissingRelations);
|
469
493
|
const restoredDocument = await strapi2.documents(version.contentType).update({
|
@@ -556,7 +580,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
556
580
|
onCommit(async () => {
|
557
581
|
for (const entry of localeEntries) {
|
558
582
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
559
|
-
await getService(strapi2, "history").createVersion({
|
583
|
+
await getService$1(strapi2, "history").createVersion({
|
560
584
|
contentType: uid2,
|
561
585
|
data: omit(FIELDS_TO_IGNORE, entry),
|
562
586
|
relatedDocumentId: documentId,
|
@@ -569,15 +593,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
569
593
|
});
|
570
594
|
return result;
|
571
595
|
});
|
572
|
-
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
596
|
+
state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
|
573
597
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
574
598
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
575
599
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
576
600
|
where: {
|
577
601
|
created_at: {
|
578
|
-
$lt: expirationDate
|
602
|
+
$lt: expirationDate
|
579
603
|
}
|
580
604
|
}
|
605
|
+
}).catch((error) => {
|
606
|
+
if (error instanceof Error) {
|
607
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
608
|
+
}
|
581
609
|
});
|
582
610
|
});
|
583
611
|
state.isInitialized = true;
|
@@ -589,17 +617,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
589
617
|
}
|
590
618
|
};
|
591
619
|
};
|
592
|
-
const services$
|
620
|
+
const services$2 = {
|
593
621
|
history: createHistoryService,
|
594
622
|
lifecycles: createLifecyclesService
|
595
623
|
};
|
596
|
-
const info = { pluginName: "content-manager", type: "admin" };
|
624
|
+
const info$1 = { pluginName: "content-manager", type: "admin" };
|
597
625
|
const historyVersionRouter = {
|
598
626
|
type: "admin",
|
599
627
|
routes: [
|
600
628
|
{
|
601
629
|
method: "GET",
|
602
|
-
info,
|
630
|
+
info: info$1,
|
603
631
|
path: "/history-versions",
|
604
632
|
handler: "history-version.findMany",
|
605
633
|
config: {
|
@@ -608,7 +636,7 @@ const historyVersionRouter = {
|
|
608
636
|
},
|
609
637
|
{
|
610
638
|
method: "PUT",
|
611
|
-
info,
|
639
|
+
info: info$1,
|
612
640
|
path: "/history-versions/:versionId/restore",
|
613
641
|
handler: "history-version.restoreVersion",
|
614
642
|
config: {
|
@@ -617,7 +645,7 @@ const historyVersionRouter = {
|
|
617
645
|
}
|
618
646
|
]
|
619
647
|
};
|
620
|
-
const routes$
|
648
|
+
const routes$2 = {
|
621
649
|
"history-version": historyVersionRouter
|
622
650
|
};
|
623
651
|
const historyVersion = {
|
@@ -664,21 +692,21 @@ const historyVersion = {
|
|
664
692
|
}
|
665
693
|
}
|
666
694
|
};
|
667
|
-
const getFeature = () => {
|
695
|
+
const getFeature$1 = () => {
|
668
696
|
if (strapi.ee.features.isEnabled("cms-content-history")) {
|
669
697
|
return {
|
670
698
|
register({ strapi: strapi2 }) {
|
671
699
|
strapi2.get("models").add(historyVersion);
|
672
700
|
},
|
673
701
|
bootstrap({ strapi: strapi2 }) {
|
674
|
-
getService(strapi2, "lifecycles").bootstrap();
|
702
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
675
703
|
},
|
676
704
|
destroy({ strapi: strapi2 }) {
|
677
|
-
getService(strapi2, "lifecycles").destroy();
|
705
|
+
getService$1(strapi2, "lifecycles").destroy();
|
678
706
|
},
|
679
|
-
controllers: controllers$
|
680
|
-
services: services$
|
681
|
-
routes: routes$
|
707
|
+
controllers: controllers$2,
|
708
|
+
services: services$2,
|
709
|
+
routes: routes$2
|
682
710
|
};
|
683
711
|
}
|
684
712
|
return {
|
@@ -687,9 +715,201 @@ const getFeature = () => {
|
|
687
715
|
}
|
688
716
|
};
|
689
717
|
};
|
690
|
-
const history = getFeature();
|
718
|
+
const history = getFeature$1();
|
719
|
+
const info = { pluginName: "content-manager", type: "admin" };
|
720
|
+
const previewRouter = {
|
721
|
+
type: "admin",
|
722
|
+
routes: [
|
723
|
+
{
|
724
|
+
method: "GET",
|
725
|
+
info,
|
726
|
+
path: "/preview/url/:contentType",
|
727
|
+
handler: "preview.getPreviewUrl",
|
728
|
+
config: {
|
729
|
+
policies: ["admin::isAuthenticatedAdmin"]
|
730
|
+
}
|
731
|
+
}
|
732
|
+
]
|
733
|
+
};
|
734
|
+
const routes$1 = {
|
735
|
+
preview: previewRouter
|
736
|
+
};
|
737
|
+
function getService(strapi2, name) {
|
738
|
+
return strapi2.service(`plugin::content-manager.${name}`);
|
739
|
+
}
|
740
|
+
const getPreviewUrlSchema = yup.object().shape({
|
741
|
+
// Will be undefined for single types
|
742
|
+
documentId: yup.string(),
|
743
|
+
locale: yup.string().nullable(),
|
744
|
+
status: yup.string()
|
745
|
+
}).required();
|
746
|
+
const validatePreviewUrl = async (strapi2, uid2, params) => {
|
747
|
+
await validateYupSchema(getPreviewUrlSchema)(params);
|
748
|
+
const newParams = pick(["documentId", "locale", "status"], params);
|
749
|
+
const model = strapi2.getModel(uid2);
|
750
|
+
if (!model || model.modelType !== "contentType") {
|
751
|
+
throw new errors.ValidationError("Invalid content type");
|
752
|
+
}
|
753
|
+
const isSingleType = model?.kind === "singleType";
|
754
|
+
if (!isSingleType && !params.documentId) {
|
755
|
+
throw new errors.ValidationError("documentId is required for Collection Types");
|
756
|
+
}
|
757
|
+
if (isSingleType) {
|
758
|
+
const doc = await strapi2.documents(uid2).findFirst();
|
759
|
+
if (!doc) {
|
760
|
+
throw new errors.NotFoundError("Document not found");
|
761
|
+
}
|
762
|
+
newParams.documentId = doc?.documentId;
|
763
|
+
}
|
764
|
+
if (!newParams.status) {
|
765
|
+
const isDPEnabled = model?.options?.draftAndPublish;
|
766
|
+
newParams.status = isDPEnabled ? "draft" : "published";
|
767
|
+
}
|
768
|
+
return newParams;
|
769
|
+
};
|
770
|
+
const createPreviewController = () => {
|
771
|
+
return {
|
772
|
+
/**
|
773
|
+
* Transforms an entry into a preview URL, so that it can be previewed
|
774
|
+
* in the Content Manager.
|
775
|
+
*/
|
776
|
+
async getPreviewUrl(ctx) {
|
777
|
+
const uid2 = ctx.params.contentType;
|
778
|
+
const query = ctx.request.query;
|
779
|
+
const params = await validatePreviewUrl(strapi, uid2, query);
|
780
|
+
const previewService = getService(strapi, "preview");
|
781
|
+
const url = await previewService.getPreviewUrl(uid2, params);
|
782
|
+
if (!url) {
|
783
|
+
ctx.status = 204;
|
784
|
+
}
|
785
|
+
return {
|
786
|
+
data: { url }
|
787
|
+
};
|
788
|
+
}
|
789
|
+
};
|
790
|
+
};
|
791
|
+
const controllers$1 = {
|
792
|
+
preview: createPreviewController
|
793
|
+
/**
|
794
|
+
* Casting is needed because the types aren't aware that Strapi supports
|
795
|
+
* passing a controller factory as the value, instead of a controller object directly
|
796
|
+
*/
|
797
|
+
};
|
798
|
+
const createPreviewService = ({ strapi: strapi2 }) => {
|
799
|
+
const config = getService(strapi2, "preview-config");
|
800
|
+
return {
|
801
|
+
async getPreviewUrl(uid2, params) {
|
802
|
+
const handler = config.getPreviewHandler();
|
803
|
+
try {
|
804
|
+
return handler(uid2, params);
|
805
|
+
} catch (error) {
|
806
|
+
strapi2.log.error(`Failed to get preview URL: ${error}`);
|
807
|
+
throw new errors.ApplicationError("Failed to get preview URL");
|
808
|
+
}
|
809
|
+
return;
|
810
|
+
}
|
811
|
+
};
|
812
|
+
};
|
813
|
+
const extendMiddlewareConfiguration = (middleware = { name: "", config: {} }) => {
|
814
|
+
const middlewares = strapi.config.get("middlewares");
|
815
|
+
const configuredMiddlewares = middlewares.map((currentMiddleware) => {
|
816
|
+
if (currentMiddleware === middleware.name) {
|
817
|
+
return middleware;
|
818
|
+
}
|
819
|
+
if (currentMiddleware.name === middleware.name) {
|
820
|
+
return mergeWith(
|
821
|
+
(objValue, srcValue) => {
|
822
|
+
if (Array.isArray(objValue)) {
|
823
|
+
return objValue.concat(srcValue);
|
824
|
+
}
|
825
|
+
return void 0;
|
826
|
+
},
|
827
|
+
currentMiddleware,
|
828
|
+
middleware
|
829
|
+
);
|
830
|
+
}
|
831
|
+
return currentMiddleware;
|
832
|
+
});
|
833
|
+
strapi.config.set("middlewares", configuredMiddlewares);
|
834
|
+
};
|
835
|
+
const createPreviewConfigService = ({ strapi: strapi2 }) => {
|
836
|
+
return {
|
837
|
+
register() {
|
838
|
+
if (!this.isEnabled()) {
|
839
|
+
return;
|
840
|
+
}
|
841
|
+
const config = strapi2.config.get("admin.preview");
|
842
|
+
if (config.config?.allowedOrigins) {
|
843
|
+
extendMiddlewareConfiguration({
|
844
|
+
name: "strapi::security",
|
845
|
+
config: {
|
846
|
+
contentSecurityPolicy: {
|
847
|
+
directives: {
|
848
|
+
"frame-src": config.config.allowedOrigins
|
849
|
+
}
|
850
|
+
}
|
851
|
+
}
|
852
|
+
});
|
853
|
+
}
|
854
|
+
},
|
855
|
+
isEnabled() {
|
856
|
+
const config = strapi2.config.get("admin.preview");
|
857
|
+
if (!config) {
|
858
|
+
return false;
|
859
|
+
}
|
860
|
+
return config?.enabled ?? true;
|
861
|
+
},
|
862
|
+
/**
|
863
|
+
* Validate if the configuration is valid
|
864
|
+
*/
|
865
|
+
validate() {
|
866
|
+
if (!this.isEnabled()) {
|
867
|
+
return;
|
868
|
+
}
|
869
|
+
const handler = this.getPreviewHandler();
|
870
|
+
if (typeof handler !== "function") {
|
871
|
+
throw new errors.ValidationError(
|
872
|
+
"Preview configuration is invalid. Handler must be a function"
|
873
|
+
);
|
874
|
+
}
|
875
|
+
},
|
876
|
+
/**
|
877
|
+
* Utility to get the preview handler from the configuration
|
878
|
+
*/
|
879
|
+
getPreviewHandler() {
|
880
|
+
const config = strapi2.config.get("admin.preview");
|
881
|
+
const emptyHandler = () => {
|
882
|
+
return void 0;
|
883
|
+
};
|
884
|
+
if (!this.isEnabled()) {
|
885
|
+
return emptyHandler;
|
886
|
+
}
|
887
|
+
return config?.config?.handler || emptyHandler;
|
888
|
+
}
|
889
|
+
};
|
890
|
+
};
|
891
|
+
const services$1 = {
|
892
|
+
preview: createPreviewService,
|
893
|
+
"preview-config": createPreviewConfigService
|
894
|
+
};
|
895
|
+
const getFeature = () => {
|
896
|
+
return {
|
897
|
+
register() {
|
898
|
+
const config = getService(strapi, "preview-config");
|
899
|
+
config.validate();
|
900
|
+
config.register();
|
901
|
+
},
|
902
|
+
bootstrap() {
|
903
|
+
},
|
904
|
+
routes: routes$1,
|
905
|
+
controllers: controllers$1,
|
906
|
+
services: services$1
|
907
|
+
};
|
908
|
+
};
|
909
|
+
const preview = getFeature();
|
691
910
|
const register = async ({ strapi: strapi2 }) => {
|
692
911
|
await history.register?.({ strapi: strapi2 });
|
912
|
+
await preview.register?.({ strapi: strapi2 });
|
693
913
|
};
|
694
914
|
const ALLOWED_WEBHOOK_EVENTS = {
|
695
915
|
ENTRY_PUBLISH: "entry.publish",
|
@@ -699,11 +919,12 @@ const bootstrap = async () => {
|
|
699
919
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
700
920
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
701
921
|
});
|
702
|
-
getService$
|
703
|
-
await getService$
|
704
|
-
await getService$
|
705
|
-
await getService$
|
922
|
+
getService$2("field-sizes").setCustomFieldInputSizes();
|
923
|
+
await getService$2("components").syncConfigurations();
|
924
|
+
await getService$2("content-types").syncConfigurations();
|
925
|
+
await getService$2("permission").registerPermissions();
|
706
926
|
await history.bootstrap?.({ strapi });
|
927
|
+
await preview.bootstrap?.({ strapi });
|
707
928
|
};
|
708
929
|
const destroy = async ({ strapi: strapi2 }) => {
|
709
930
|
await history.destroy?.({ strapi: strapi2 });
|
@@ -1193,7 +1414,8 @@ const admin = {
|
|
1193
1414
|
};
|
1194
1415
|
const routes = {
|
1195
1416
|
admin,
|
1196
|
-
...history.routes ? history.routes : {}
|
1417
|
+
...history.routes ? history.routes : {},
|
1418
|
+
...preview.routes ? preview.routes : {}
|
1197
1419
|
};
|
1198
1420
|
const hasPermissionsSchema = yup$1.object({
|
1199
1421
|
actions: yup$1.array().of(yup$1.string()),
|
@@ -1256,8 +1478,7 @@ const isSortable = (schema, name) => {
|
|
1256
1478
|
if (!_.has(schema.attributes, name)) {
|
1257
1479
|
return false;
|
1258
1480
|
}
|
1259
|
-
if (schema.modelType === "component" && name === "id")
|
1260
|
-
return false;
|
1481
|
+
if (schema.modelType === "component" && name === "id") return false;
|
1261
1482
|
const attribute = schema.attributes[name];
|
1262
1483
|
if (NON_SORTABLES.includes(attribute.type)) {
|
1263
1484
|
return false;
|
@@ -1402,8 +1623,7 @@ const createDefaultSettings = async (schema) => {
|
|
1402
1623
|
};
|
1403
1624
|
};
|
1404
1625
|
const syncSettings = async (configuration, schema) => {
|
1405
|
-
if (isEmpty(configuration.settings))
|
1406
|
-
return createDefaultSettings(schema);
|
1626
|
+
if (isEmpty(configuration.settings)) return createDefaultSettings(schema);
|
1407
1627
|
const defaultField = getDefaultMainField(schema);
|
1408
1628
|
const { mainField = defaultField, defaultSortBy = defaultField } = configuration.settings || {};
|
1409
1629
|
return {
|
@@ -1450,7 +1670,7 @@ const createMetadasSchema = (schema) => {
|
|
1450
1670
|
if (!value) {
|
1451
1671
|
return yup$1.string();
|
1452
1672
|
}
|
1453
|
-
const targetSchema = getService$
|
1673
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1454
1674
|
schema.attributes[key].targetModel
|
1455
1675
|
);
|
1456
1676
|
if (!targetSchema) {
|
@@ -1579,8 +1799,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1579
1799
|
}
|
1580
1800
|
switch (attribute.type) {
|
1581
1801
|
case "relation": {
|
1582
|
-
if (canCreate(attributePath))
|
1583
|
-
return body2;
|
1802
|
+
if (canCreate(attributePath)) return body2;
|
1584
1803
|
return set(attributePath, { set: [] }, body2);
|
1585
1804
|
}
|
1586
1805
|
case "component": {
|
@@ -1590,8 +1809,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1590
1809
|
]);
|
1591
1810
|
}
|
1592
1811
|
default: {
|
1593
|
-
if (canCreate(attributePath))
|
1594
|
-
return body2;
|
1812
|
+
if (canCreate(attributePath)) return body2;
|
1595
1813
|
return set(attributePath, null, body2);
|
1596
1814
|
}
|
1597
1815
|
}
|
@@ -1619,7 +1837,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1619
1837
|
}
|
1620
1838
|
};
|
1621
1839
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1622
|
-
const documentMetadata2 = getService$
|
1840
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1623
1841
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1624
1842
|
let {
|
1625
1843
|
meta: { availableLocales, availableStatus }
|
@@ -1645,8 +1863,8 @@ const createDocument = async (ctx, opts) => {
|
|
1645
1863
|
const { userAbility, user } = ctx.state;
|
1646
1864
|
const { model } = ctx.params;
|
1647
1865
|
const { body } = ctx.request;
|
1648
|
-
const documentManager2 = getService$
|
1649
|
-
const permissionChecker2 = getService$
|
1866
|
+
const documentManager2 = getService$2("document-manager");
|
1867
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1650
1868
|
if (permissionChecker2.cannot.create()) {
|
1651
1869
|
throw new errors.ForbiddenError();
|
1652
1870
|
}
|
@@ -1666,13 +1884,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1666
1884
|
const { userAbility, user } = ctx.state;
|
1667
1885
|
const { id, model } = ctx.params;
|
1668
1886
|
const { body } = ctx.request;
|
1669
|
-
const documentManager2 = getService$
|
1670
|
-
const permissionChecker2 = getService$
|
1887
|
+
const documentManager2 = getService$2("document-manager");
|
1888
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1671
1889
|
if (permissionChecker2.cannot.update()) {
|
1672
1890
|
throw new errors.ForbiddenError();
|
1673
1891
|
}
|
1674
1892
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1675
|
-
const populate = await getService$
|
1893
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1676
1894
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1677
1895
|
const [documentVersion, documentExists] = await Promise.all([
|
1678
1896
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1703,14 +1921,14 @@ const collectionTypes = {
|
|
1703
1921
|
const { userAbility } = ctx.state;
|
1704
1922
|
const { model } = ctx.params;
|
1705
1923
|
const { query } = ctx.request;
|
1706
|
-
const documentMetadata2 = getService$
|
1707
|
-
const documentManager2 = getService$
|
1708
|
-
const permissionChecker2 = getService$
|
1924
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1925
|
+
const documentManager2 = getService$2("document-manager");
|
1926
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1709
1927
|
if (permissionChecker2.cannot.read()) {
|
1710
1928
|
return ctx.forbidden();
|
1711
1929
|
}
|
1712
1930
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1713
|
-
const populate = await getService$
|
1931
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1714
1932
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1715
1933
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1716
1934
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1739,13 +1957,13 @@ const collectionTypes = {
|
|
1739
1957
|
async findOne(ctx) {
|
1740
1958
|
const { userAbility } = ctx.state;
|
1741
1959
|
const { model, id } = ctx.params;
|
1742
|
-
const documentManager2 = getService$
|
1743
|
-
const permissionChecker2 = getService$
|
1960
|
+
const documentManager2 = getService$2("document-manager");
|
1961
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1744
1962
|
if (permissionChecker2.cannot.read()) {
|
1745
1963
|
return ctx.forbidden();
|
1746
1964
|
}
|
1747
1965
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1748
|
-
const populate = await getService$
|
1966
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1749
1967
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1750
1968
|
const version = await documentManager2.findOne(id, model, {
|
1751
1969
|
populate,
|
@@ -1776,7 +1994,7 @@ const collectionTypes = {
|
|
1776
1994
|
async create(ctx) {
|
1777
1995
|
const { userAbility } = ctx.state;
|
1778
1996
|
const { model } = ctx.params;
|
1779
|
-
const permissionChecker2 = getService$
|
1997
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1780
1998
|
const [totalEntries, document] = await Promise.all([
|
1781
1999
|
strapi.db.query(model).count(),
|
1782
2000
|
createDocument(ctx)
|
@@ -1797,7 +2015,7 @@ const collectionTypes = {
|
|
1797
2015
|
async update(ctx) {
|
1798
2016
|
const { userAbility } = ctx.state;
|
1799
2017
|
const { model } = ctx.params;
|
1800
|
-
const permissionChecker2 = getService$
|
2018
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1801
2019
|
const updatedVersion = await updateDocument(ctx);
|
1802
2020
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1803
2021
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1806,13 +2024,13 @@ const collectionTypes = {
|
|
1806
2024
|
const { userAbility, user } = ctx.state;
|
1807
2025
|
const { model, sourceId: id } = ctx.params;
|
1808
2026
|
const { body } = ctx.request;
|
1809
|
-
const documentManager2 = getService$
|
1810
|
-
const permissionChecker2 = getService$
|
2027
|
+
const documentManager2 = getService$2("document-manager");
|
2028
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1811
2029
|
if (permissionChecker2.cannot.create()) {
|
1812
2030
|
return ctx.forbidden();
|
1813
2031
|
}
|
1814
2032
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1815
|
-
const populate = await getService$
|
2033
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1816
2034
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1817
2035
|
const document = await documentManager2.findOne(id, model, {
|
1818
2036
|
populate,
|
@@ -1851,13 +2069,13 @@ const collectionTypes = {
|
|
1851
2069
|
async delete(ctx) {
|
1852
2070
|
const { userAbility } = ctx.state;
|
1853
2071
|
const { id, model } = ctx.params;
|
1854
|
-
const documentManager2 = getService$
|
1855
|
-
const permissionChecker2 = getService$
|
2072
|
+
const documentManager2 = getService$2("document-manager");
|
2073
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1856
2074
|
if (permissionChecker2.cannot.delete()) {
|
1857
2075
|
return ctx.forbidden();
|
1858
2076
|
}
|
1859
2077
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1860
|
-
const populate = await getService$
|
2078
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1861
2079
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1862
2080
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1863
2081
|
if (documentLocales.length === 0) {
|
@@ -1879,14 +2097,14 @@ const collectionTypes = {
|
|
1879
2097
|
const { userAbility } = ctx.state;
|
1880
2098
|
const { id, model } = ctx.params;
|
1881
2099
|
const { body } = ctx.request;
|
1882
|
-
const documentManager2 = getService$
|
1883
|
-
const permissionChecker2 = getService$
|
2100
|
+
const documentManager2 = getService$2("document-manager");
|
2101
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1884
2102
|
if (permissionChecker2.cannot.publish()) {
|
1885
2103
|
return ctx.forbidden();
|
1886
2104
|
}
|
1887
2105
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1888
2106
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1889
|
-
const populate = await getService$
|
2107
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1890
2108
|
let document;
|
1891
2109
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1892
2110
|
const isCreate = isNil$1(id);
|
@@ -1934,13 +2152,13 @@ const collectionTypes = {
|
|
1934
2152
|
const { body } = ctx.request;
|
1935
2153
|
const { documentIds } = body;
|
1936
2154
|
await validateBulkActionInput(body);
|
1937
|
-
const documentManager2 = getService$
|
1938
|
-
const permissionChecker2 = getService$
|
2155
|
+
const documentManager2 = getService$2("document-manager");
|
2156
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1939
2157
|
if (permissionChecker2.cannot.publish()) {
|
1940
2158
|
return ctx.forbidden();
|
1941
2159
|
}
|
1942
2160
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1943
|
-
const populate = await getService$
|
2161
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1944
2162
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1945
2163
|
allowMultipleLocales: true
|
1946
2164
|
});
|
@@ -1965,8 +2183,8 @@ const collectionTypes = {
|
|
1965
2183
|
const { body } = ctx.request;
|
1966
2184
|
const { documentIds } = body;
|
1967
2185
|
await validateBulkActionInput(body);
|
1968
|
-
const documentManager2 = getService$
|
1969
|
-
const permissionChecker2 = getService$
|
2186
|
+
const documentManager2 = getService$2("document-manager");
|
2187
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1970
2188
|
if (permissionChecker2.cannot.unpublish()) {
|
1971
2189
|
return ctx.forbidden();
|
1972
2190
|
}
|
@@ -1995,8 +2213,8 @@ const collectionTypes = {
|
|
1995
2213
|
const {
|
1996
2214
|
body: { discardDraft, ...body }
|
1997
2215
|
} = ctx.request;
|
1998
|
-
const documentManager2 = getService$
|
1999
|
-
const permissionChecker2 = getService$
|
2216
|
+
const documentManager2 = getService$2("document-manager");
|
2217
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2000
2218
|
if (permissionChecker2.cannot.unpublish()) {
|
2001
2219
|
return ctx.forbidden();
|
2002
2220
|
}
|
@@ -2004,7 +2222,7 @@ const collectionTypes = {
|
|
2004
2222
|
return ctx.forbidden();
|
2005
2223
|
}
|
2006
2224
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2007
|
-
const populate = await getService$
|
2225
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2008
2226
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2009
2227
|
const document = await documentManager2.findOne(id, model, {
|
2010
2228
|
populate,
|
@@ -2035,13 +2253,13 @@ const collectionTypes = {
|
|
2035
2253
|
const { userAbility } = ctx.state;
|
2036
2254
|
const { id, model } = ctx.params;
|
2037
2255
|
const { body } = ctx.request;
|
2038
|
-
const documentManager2 = getService$
|
2039
|
-
const permissionChecker2 = getService$
|
2256
|
+
const documentManager2 = getService$2("document-manager");
|
2257
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2040
2258
|
if (permissionChecker2.cannot.discard()) {
|
2041
2259
|
return ctx.forbidden();
|
2042
2260
|
}
|
2043
2261
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2044
|
-
const populate = await getService$
|
2262
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2045
2263
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2046
2264
|
const document = await documentManager2.findOne(id, model, {
|
2047
2265
|
populate,
|
@@ -2066,13 +2284,13 @@ const collectionTypes = {
|
|
2066
2284
|
const { query, body } = ctx.request;
|
2067
2285
|
const { documentIds } = body;
|
2068
2286
|
await validateBulkActionInput(body);
|
2069
|
-
const documentManager2 = getService$
|
2070
|
-
const permissionChecker2 = getService$
|
2287
|
+
const documentManager2 = getService$2("document-manager");
|
2288
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2071
2289
|
if (permissionChecker2.cannot.delete()) {
|
2072
2290
|
return ctx.forbidden();
|
2073
2291
|
}
|
2074
2292
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2075
|
-
const populate = await getService$
|
2293
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2076
2294
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2077
2295
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2078
2296
|
populate,
|
@@ -2093,13 +2311,13 @@ const collectionTypes = {
|
|
2093
2311
|
async countDraftRelations(ctx) {
|
2094
2312
|
const { userAbility } = ctx.state;
|
2095
2313
|
const { model, id } = ctx.params;
|
2096
|
-
const documentManager2 = getService$
|
2097
|
-
const permissionChecker2 = getService$
|
2314
|
+
const documentManager2 = getService$2("document-manager");
|
2315
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2098
2316
|
if (permissionChecker2.cannot.read()) {
|
2099
2317
|
return ctx.forbidden();
|
2100
2318
|
}
|
2101
2319
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2102
|
-
const populate = await getService$
|
2320
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2103
2321
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2104
2322
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2105
2323
|
if (!entity) {
|
@@ -2118,8 +2336,8 @@ const collectionTypes = {
|
|
2118
2336
|
const ids = ctx.request.query.documentIds;
|
2119
2337
|
const locale = ctx.request.query.locale;
|
2120
2338
|
const { model } = ctx.params;
|
2121
|
-
const documentManager2 = getService$
|
2122
|
-
const permissionChecker2 = getService$
|
2339
|
+
const documentManager2 = getService$2("document-manager");
|
2340
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2123
2341
|
if (permissionChecker2.cannot.read()) {
|
2124
2342
|
return ctx.forbidden();
|
2125
2343
|
}
|
@@ -2143,13 +2361,13 @@ const collectionTypes = {
|
|
2143
2361
|
};
|
2144
2362
|
const components$1 = {
|
2145
2363
|
findComponents(ctx) {
|
2146
|
-
const components2 = getService$
|
2147
|
-
const { toDto } = getService$
|
2364
|
+
const components2 = getService$2("components").findAllComponents();
|
2365
|
+
const { toDto } = getService$2("data-mapper");
|
2148
2366
|
ctx.body = { data: components2.map(toDto) };
|
2149
2367
|
},
|
2150
2368
|
async findComponentConfiguration(ctx) {
|
2151
2369
|
const { uid: uid2 } = ctx.params;
|
2152
|
-
const componentService = getService$
|
2370
|
+
const componentService = getService$2("components");
|
2153
2371
|
const component = componentService.findComponent(uid2);
|
2154
2372
|
if (!component) {
|
2155
2373
|
return ctx.notFound("component.notFound");
|
@@ -2166,7 +2384,7 @@ const components$1 = {
|
|
2166
2384
|
async updateComponentConfiguration(ctx) {
|
2167
2385
|
const { uid: uid2 } = ctx.params;
|
2168
2386
|
const { body } = ctx.request;
|
2169
|
-
const componentService = getService$
|
2387
|
+
const componentService = getService$2("components");
|
2170
2388
|
const component = componentService.findComponent(uid2);
|
2171
2389
|
if (!component) {
|
2172
2390
|
return ctx.notFound("component.notFound");
|
@@ -2200,12 +2418,12 @@ const contentTypes = {
|
|
2200
2418
|
} catch (error) {
|
2201
2419
|
return ctx.send({ error }, 400);
|
2202
2420
|
}
|
2203
|
-
const contentTypes2 = getService$
|
2204
|
-
const { toDto } = getService$
|
2421
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2422
|
+
const { toDto } = getService$2("data-mapper");
|
2205
2423
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2206
2424
|
},
|
2207
2425
|
async findContentTypesSettings(ctx) {
|
2208
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2426
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2209
2427
|
const contentTypes2 = await findAllContentTypes();
|
2210
2428
|
const configurations = await Promise.all(
|
2211
2429
|
contentTypes2.map(async (contentType) => {
|
@@ -2219,7 +2437,7 @@ const contentTypes = {
|
|
2219
2437
|
},
|
2220
2438
|
async findContentTypeConfiguration(ctx) {
|
2221
2439
|
const { uid: uid2 } = ctx.params;
|
2222
|
-
const contentTypeService = getService$
|
2440
|
+
const contentTypeService = getService$2("content-types");
|
2223
2441
|
const contentType = await contentTypeService.findContentType(uid2);
|
2224
2442
|
if (!contentType) {
|
2225
2443
|
return ctx.notFound("contentType.notFound");
|
@@ -2241,13 +2459,13 @@ const contentTypes = {
|
|
2241
2459
|
const { userAbility } = ctx.state;
|
2242
2460
|
const { uid: uid2 } = ctx.params;
|
2243
2461
|
const { body } = ctx.request;
|
2244
|
-
const contentTypeService = getService$
|
2245
|
-
const metricsService = getService$
|
2462
|
+
const contentTypeService = getService$2("content-types");
|
2463
|
+
const metricsService = getService$2("metrics");
|
2246
2464
|
const contentType = await contentTypeService.findContentType(uid2);
|
2247
2465
|
if (!contentType) {
|
2248
2466
|
return ctx.notFound("contentType.notFound");
|
2249
2467
|
}
|
2250
|
-
if (!getService$
|
2468
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2251
2469
|
return ctx.forbidden();
|
2252
2470
|
}
|
2253
2471
|
let input;
|
@@ -2280,10 +2498,10 @@ const contentTypes = {
|
|
2280
2498
|
};
|
2281
2499
|
const init = {
|
2282
2500
|
getInitData(ctx) {
|
2283
|
-
const { toDto } = getService$
|
2284
|
-
const { findAllComponents } = getService$
|
2285
|
-
const { getAllFieldSizes } = getService$
|
2286
|
-
const { findAllContentTypes } = getService$
|
2501
|
+
const { toDto } = getService$2("data-mapper");
|
2502
|
+
const { findAllComponents } = getService$2("components");
|
2503
|
+
const { getAllFieldSizes } = getService$2("field-sizes");
|
2504
|
+
const { findAllContentTypes } = getService$2("content-types");
|
2287
2505
|
ctx.body = {
|
2288
2506
|
data: {
|
2289
2507
|
fieldSizes: getAllFieldSizes(),
|
@@ -2319,7 +2537,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2319
2537
|
params.filters.$and.push(filtersClause);
|
2320
2538
|
};
|
2321
2539
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2322
|
-
const permissionChecker2 = getService$
|
2540
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2323
2541
|
userAbility,
|
2324
2542
|
model: model.uid
|
2325
2543
|
});
|
@@ -2333,15 +2551,27 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2333
2551
|
}
|
2334
2552
|
return mainField;
|
2335
2553
|
};
|
2336
|
-
const addStatusToRelations = async (
|
2337
|
-
if (!contentTypes$1.hasDraftAndPublish(strapi.
|
2554
|
+
const addStatusToRelations = async (targetUid, relations2) => {
|
2555
|
+
if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2556
|
+
return relations2;
|
2557
|
+
}
|
2558
|
+
const documentMetadata2 = getService$2("document-metadata");
|
2559
|
+
if (!relations2.length) {
|
2338
2560
|
return relations2;
|
2339
2561
|
}
|
2340
|
-
const
|
2341
|
-
const
|
2562
|
+
const firstRelation = relations2[0];
|
2563
|
+
const filters = {
|
2564
|
+
documentId: { $in: relations2.map((r) => r.documentId) },
|
2565
|
+
// NOTE: find the "opposite" status
|
2566
|
+
publishedAt: firstRelation.publishedAt !== null ? { $null: true } : { $notNull: true }
|
2567
|
+
};
|
2568
|
+
const availableStatus = await strapi.query(targetUid).findMany({
|
2569
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"],
|
2570
|
+
filters
|
2571
|
+
});
|
2342
2572
|
return relations2.map((relation) => {
|
2343
|
-
const availableStatuses =
|
2344
|
-
(availableDocument) => availableDocument.documentId === relation.documentId
|
2573
|
+
const availableStatuses = availableStatus.filter(
|
2574
|
+
(availableDocument) => availableDocument.documentId === relation.documentId && (relation.locale ? availableDocument.locale === relation.locale : true)
|
2345
2575
|
);
|
2346
2576
|
return {
|
2347
2577
|
...relation,
|
@@ -2372,8 +2602,7 @@ const validateStatus = (sourceUid, status) => {
|
|
2372
2602
|
const sourceModel = strapi.getModel(sourceUid);
|
2373
2603
|
const isDP = contentTypes$1.hasDraftAndPublish;
|
2374
2604
|
const isSourceDP = isDP(sourceModel);
|
2375
|
-
if (!isSourceDP)
|
2376
|
-
return { status: void 0 };
|
2605
|
+
if (!isSourceDP) return { status: void 0 };
|
2377
2606
|
switch (status) {
|
2378
2607
|
case "published":
|
2379
2608
|
return { status: "published" };
|
@@ -2403,7 +2632,7 @@ const relations = {
|
|
2403
2632
|
ctx.request?.query?.locale
|
2404
2633
|
);
|
2405
2634
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2406
|
-
const permissionChecker2 = getService$
|
2635
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2407
2636
|
userAbility,
|
2408
2637
|
model
|
2409
2638
|
});
|
@@ -2428,7 +2657,7 @@ const relations = {
|
|
2428
2657
|
where.id = id;
|
2429
2658
|
}
|
2430
2659
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2431
|
-
const populate = await getService$
|
2660
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2432
2661
|
const currentEntity = await strapi.db.query(model).findOne({
|
2433
2662
|
where,
|
2434
2663
|
populate
|
@@ -2443,7 +2672,7 @@ const relations = {
|
|
2443
2672
|
}
|
2444
2673
|
entryId = currentEntity.id;
|
2445
2674
|
}
|
2446
|
-
const modelConfig = isComponent2 ? await getService$
|
2675
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2447
2676
|
const targetSchema = strapi.getModel(targetUid);
|
2448
2677
|
const mainField = flow(
|
2449
2678
|
prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2497,7 +2726,7 @@ const relations = {
|
|
2497
2726
|
}
|
2498
2727
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2499
2728
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2500
|
-
const permissionChecker2 = getService$
|
2729
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2501
2730
|
userAbility: ctx.state.userAbility,
|
2502
2731
|
model: targetUid
|
2503
2732
|
});
|
@@ -2570,21 +2799,33 @@ const relations = {
|
|
2570
2799
|
attribute,
|
2571
2800
|
targetField,
|
2572
2801
|
fieldsToSelect,
|
2573
|
-
|
2574
|
-
|
2575
|
-
}
|
2576
|
-
target: {
|
2577
|
-
schema: { uid: targetUid }
|
2578
|
-
}
|
2802
|
+
status,
|
2803
|
+
source: { schema: sourceSchema },
|
2804
|
+
target: { schema: targetSchema }
|
2579
2805
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2580
|
-
const
|
2806
|
+
const { uid: sourceUid } = sourceSchema;
|
2807
|
+
const { uid: targetUid } = targetSchema;
|
2808
|
+
const permissionQuery = await getService$2("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
|
2581
2809
|
const dbQuery = strapi.db.query(sourceUid);
|
2582
2810
|
const loadRelations = relations$1.isAnyToMany(attribute) ? (...args) => dbQuery.loadPages(...args) : (...args) => dbQuery.load(...args).then((res2) => ({ results: res2 ? [res2] : [] }));
|
2811
|
+
const filters = {};
|
2812
|
+
if (sourceSchema?.options?.draftAndPublish) {
|
2813
|
+
if (targetSchema?.options?.draftAndPublish) {
|
2814
|
+
if (status === "published") {
|
2815
|
+
filters.publishedAt = { $notNull: true };
|
2816
|
+
} else {
|
2817
|
+
filters.publishedAt = { $null: true };
|
2818
|
+
}
|
2819
|
+
}
|
2820
|
+
} else if (targetSchema?.options?.draftAndPublish) {
|
2821
|
+
filters.publishedAt = { $null: true };
|
2822
|
+
}
|
2583
2823
|
const res = await loadRelations({ id: entryId }, targetField, {
|
2584
|
-
select: ["id", "documentId", "locale", "publishedAt"],
|
2824
|
+
select: ["id", "documentId", "locale", "publishedAt", "updatedAt"],
|
2585
2825
|
ordering: "desc",
|
2586
2826
|
page: ctx.request.query.page,
|
2587
|
-
pageSize: ctx.request.query.pageSize
|
2827
|
+
pageSize: ctx.request.query.pageSize,
|
2828
|
+
filters
|
2588
2829
|
});
|
2589
2830
|
const loadedIds = res.results.map((item) => item.id);
|
2590
2831
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
@@ -2605,10 +2846,10 @@ const relations = {
|
|
2605
2846
|
}
|
2606
2847
|
};
|
2607
2848
|
const buildPopulateFromQuery = async (query, model) => {
|
2608
|
-
return getService$
|
2849
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2609
2850
|
};
|
2610
2851
|
const findDocument = async (query, uid2, opts = {}) => {
|
2611
|
-
const documentManager2 = getService$
|
2852
|
+
const documentManager2 = getService$2("document-manager");
|
2612
2853
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2613
2854
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2614
2855
|
};
|
@@ -2616,8 +2857,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2616
2857
|
const { user, userAbility } = ctx.state;
|
2617
2858
|
const { model } = ctx.params;
|
2618
2859
|
const { body, query } = ctx.request;
|
2619
|
-
const documentManager2 = getService$
|
2620
|
-
const permissionChecker2 = getService$
|
2860
|
+
const documentManager2 = getService$2("document-manager");
|
2861
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2621
2862
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2622
2863
|
throw new errors.ForbiddenError();
|
2623
2864
|
}
|
@@ -2658,7 +2899,7 @@ const singleTypes = {
|
|
2658
2899
|
const { userAbility } = ctx.state;
|
2659
2900
|
const { model } = ctx.params;
|
2660
2901
|
const { query = {} } = ctx.request;
|
2661
|
-
const permissionChecker2 = getService$
|
2902
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2662
2903
|
if (permissionChecker2.cannot.read()) {
|
2663
2904
|
return ctx.forbidden();
|
2664
2905
|
}
|
@@ -2692,7 +2933,7 @@ const singleTypes = {
|
|
2692
2933
|
async createOrUpdate(ctx) {
|
2693
2934
|
const { userAbility } = ctx.state;
|
2694
2935
|
const { model } = ctx.params;
|
2695
|
-
const permissionChecker2 = getService$
|
2936
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2696
2937
|
const document = await createOrUpdateDocument(ctx);
|
2697
2938
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2698
2939
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2701,8 +2942,8 @@ const singleTypes = {
|
|
2701
2942
|
const { userAbility } = ctx.state;
|
2702
2943
|
const { model } = ctx.params;
|
2703
2944
|
const { query = {} } = ctx.request;
|
2704
|
-
const documentManager2 = getService$
|
2705
|
-
const permissionChecker2 = getService$
|
2945
|
+
const documentManager2 = getService$2("document-manager");
|
2946
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2706
2947
|
if (permissionChecker2.cannot.delete()) {
|
2707
2948
|
return ctx.forbidden();
|
2708
2949
|
}
|
@@ -2730,8 +2971,8 @@ const singleTypes = {
|
|
2730
2971
|
const { userAbility } = ctx.state;
|
2731
2972
|
const { model } = ctx.params;
|
2732
2973
|
const { query = {} } = ctx.request;
|
2733
|
-
const documentManager2 = getService$
|
2734
|
-
const permissionChecker2 = getService$
|
2974
|
+
const documentManager2 = getService$2("document-manager");
|
2975
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2735
2976
|
if (permissionChecker2.cannot.publish()) {
|
2736
2977
|
return ctx.forbidden();
|
2737
2978
|
}
|
@@ -2759,8 +3000,8 @@ const singleTypes = {
|
|
2759
3000
|
body: { discardDraft, ...body },
|
2760
3001
|
query = {}
|
2761
3002
|
} = ctx.request;
|
2762
|
-
const documentManager2 = getService$
|
2763
|
-
const permissionChecker2 = getService$
|
3003
|
+
const documentManager2 = getService$2("document-manager");
|
3004
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2764
3005
|
if (permissionChecker2.cannot.unpublish()) {
|
2765
3006
|
return ctx.forbidden();
|
2766
3007
|
}
|
@@ -2794,8 +3035,8 @@ const singleTypes = {
|
|
2794
3035
|
const { userAbility } = ctx.state;
|
2795
3036
|
const { model } = ctx.params;
|
2796
3037
|
const { body, query = {} } = ctx.request;
|
2797
|
-
const documentManager2 = getService$
|
2798
|
-
const permissionChecker2 = getService$
|
3038
|
+
const documentManager2 = getService$2("document-manager");
|
3039
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2799
3040
|
if (permissionChecker2.cannot.discard()) {
|
2800
3041
|
return ctx.forbidden();
|
2801
3042
|
}
|
@@ -2818,8 +3059,8 @@ const singleTypes = {
|
|
2818
3059
|
const { userAbility } = ctx.state;
|
2819
3060
|
const { model } = ctx.params;
|
2820
3061
|
const { query } = ctx.request;
|
2821
|
-
const documentManager2 = getService$
|
2822
|
-
const permissionChecker2 = getService$
|
3062
|
+
const documentManager2 = getService$2("document-manager");
|
3063
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2823
3064
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2824
3065
|
if (permissionChecker2.cannot.read()) {
|
2825
3066
|
return ctx.forbidden();
|
@@ -2843,7 +3084,7 @@ const uid$1 = {
|
|
2843
3084
|
const { query = {} } = ctx.request;
|
2844
3085
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2845
3086
|
await validateUIDField(contentTypeUID, field);
|
2846
|
-
const uidService = getService$
|
3087
|
+
const uidService = getService$2("uid");
|
2847
3088
|
ctx.body = {
|
2848
3089
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2849
3090
|
};
|
@@ -2855,7 +3096,7 @@ const uid$1 = {
|
|
2855
3096
|
const { query = {} } = ctx.request;
|
2856
3097
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2857
3098
|
await validateUIDField(contentTypeUID, field);
|
2858
|
-
const uidService = getService$
|
3099
|
+
const uidService = getService$2("uid");
|
2859
3100
|
const isAvailable = await uidService.checkUIDAvailability({
|
2860
3101
|
contentTypeUID,
|
2861
3102
|
field,
|
@@ -2876,7 +3117,8 @@ const controllers = {
|
|
2876
3117
|
relations,
|
2877
3118
|
"single-types": singleTypes,
|
2878
3119
|
uid: uid$1,
|
2879
|
-
...history.controllers ? history.controllers : {}
|
3120
|
+
...history.controllers ? history.controllers : {},
|
3121
|
+
...preview.controllers ? preview.controllers : {}
|
2880
3122
|
};
|
2881
3123
|
const keys = {
|
2882
3124
|
CONFIGURATION: "configuration"
|
@@ -3005,18 +3247,15 @@ async function syncMetadatas(configuration, schema) {
|
|
3005
3247
|
_.set(updatedMeta, ["list", "searchable"], false);
|
3006
3248
|
_.set(acc, [key], updatedMeta);
|
3007
3249
|
}
|
3008
|
-
if (!_.has(edit, "mainField"))
|
3009
|
-
return acc;
|
3250
|
+
if (!_.has(edit, "mainField")) return acc;
|
3010
3251
|
if (!isRelation$1(attr)) {
|
3011
3252
|
_.set(updatedMeta, "edit", _.omit(edit, ["mainField"]));
|
3012
3253
|
_.set(acc, [key], updatedMeta);
|
3013
3254
|
return acc;
|
3014
3255
|
}
|
3015
|
-
if (edit.mainField === "id")
|
3016
|
-
return acc;
|
3256
|
+
if (edit.mainField === "id") return acc;
|
3017
3257
|
const targetSchema = getTargetSchema(attr.targetModel);
|
3018
|
-
if (!targetSchema)
|
3019
|
-
return acc;
|
3258
|
+
if (!targetSchema) return acc;
|
3020
3259
|
if (!isSortable(targetSchema, edit.mainField) && !isListable(targetSchema, edit.mainField)) {
|
3021
3260
|
_.set(updatedMeta, ["edit", "mainField"], getDefaultMainField(targetSchema));
|
3022
3261
|
_.set(acc, [key], updatedMeta);
|
@@ -3027,12 +3266,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3027
3266
|
return _.assign(metasWithDefaults, updatedMetas);
|
3028
3267
|
}
|
3029
3268
|
const getTargetSchema = (targetModel) => {
|
3030
|
-
return getService$
|
3269
|
+
return getService$2("content-types").findContentType(targetModel);
|
3031
3270
|
};
|
3032
3271
|
const DEFAULT_LIST_LENGTH = 4;
|
3033
3272
|
const MAX_ROW_SIZE = 12;
|
3034
3273
|
const isAllowedFieldSize = (type, size) => {
|
3035
|
-
const { getFieldSize } = getService$
|
3274
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3036
3275
|
const fieldSize = getFieldSize(type);
|
3037
3276
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3038
3277
|
return false;
|
@@ -3040,7 +3279,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3040
3279
|
return size <= MAX_ROW_SIZE;
|
3041
3280
|
};
|
3042
3281
|
const getDefaultFieldSize = (attribute) => {
|
3043
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3282
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3044
3283
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3045
3284
|
};
|
3046
3285
|
async function createDefaultLayouts(schema) {
|
@@ -3061,8 +3300,7 @@ function createDefaultEditLayout(schema) {
|
|
3061
3300
|
return appendToEditLayout([], keys2, schema);
|
3062
3301
|
}
|
3063
3302
|
function syncLayouts(configuration, schema) {
|
3064
|
-
if (_.isEmpty(configuration.layouts))
|
3065
|
-
return createDefaultLayouts(schema);
|
3303
|
+
if (_.isEmpty(configuration.layouts)) return createDefaultLayouts(schema);
|
3066
3304
|
const { list = [], editRelations = [], edit = [] } = configuration.layouts || {};
|
3067
3305
|
let cleanList = list.filter((attr) => isListable(schema, attr));
|
3068
3306
|
const cleanEditRelations = editRelations.filter(
|
@@ -3073,9 +3311,8 @@ function syncLayouts(configuration, schema) {
|
|
3073
3311
|
for (const row of edit) {
|
3074
3312
|
const newRow = [];
|
3075
3313
|
for (const el of row) {
|
3076
|
-
if (!hasEditableAttribute(schema, el.name))
|
3077
|
-
|
3078
|
-
const { hasFieldSize } = getService$1("field-sizes");
|
3314
|
+
if (!hasEditableAttribute(schema, el.name)) continue;
|
3315
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3079
3316
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3080
3317
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3081
3318
|
elementsToReAppend.push(el.name);
|
@@ -3105,8 +3342,7 @@ function syncLayouts(configuration, schema) {
|
|
3105
3342
|
};
|
3106
3343
|
}
|
3107
3344
|
const appendToEditLayout = (layout = [], keysToAppend, schema) => {
|
3108
|
-
if (keysToAppend.length === 0)
|
3109
|
-
return layout;
|
3345
|
+
if (keysToAppend.length === 0) return layout;
|
3110
3346
|
let currentRowIndex = Math.max(layout.length - 1, 0);
|
3111
3347
|
if (!layout[currentRowIndex]) {
|
3112
3348
|
layout[currentRowIndex] = [];
|
@@ -3215,17 +3451,17 @@ const configurationService$1 = createConfigurationService({
|
|
3215
3451
|
isComponent: true,
|
3216
3452
|
prefix: STORE_KEY_PREFIX,
|
3217
3453
|
getModels() {
|
3218
|
-
const { toContentManagerModel } = getService$
|
3454
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3219
3455
|
return mapValues(toContentManagerModel, strapi.components);
|
3220
3456
|
}
|
3221
3457
|
});
|
3222
3458
|
const components = ({ strapi: strapi2 }) => ({
|
3223
3459
|
findAllComponents() {
|
3224
|
-
const { toContentManagerModel } = getService$
|
3460
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3225
3461
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3226
3462
|
},
|
3227
3463
|
findComponent(uid2) {
|
3228
|
-
const { toContentManagerModel } = getService$
|
3464
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3229
3465
|
const component = strapi2.components[uid2];
|
3230
3466
|
return isNil$1(component) ? component : toContentManagerModel(component);
|
3231
3467
|
},
|
@@ -3276,17 +3512,17 @@ const configurationService = createConfigurationService({
|
|
3276
3512
|
storeUtils,
|
3277
3513
|
prefix: "content_types",
|
3278
3514
|
getModels() {
|
3279
|
-
const { toContentManagerModel } = getService$
|
3515
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3280
3516
|
return mapValues(toContentManagerModel, strapi.contentTypes);
|
3281
3517
|
}
|
3282
3518
|
});
|
3283
3519
|
const service = ({ strapi: strapi2 }) => ({
|
3284
3520
|
findAllContentTypes() {
|
3285
|
-
const { toContentManagerModel } = getService$
|
3521
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3286
3522
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3287
3523
|
},
|
3288
3524
|
findContentType(uid2) {
|
3289
|
-
const { toContentManagerModel } = getService$
|
3525
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3290
3526
|
const contentType = strapi2.contentTypes[uid2];
|
3291
3527
|
return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
|
3292
3528
|
},
|
@@ -3315,7 +3551,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3315
3551
|
return this.findConfiguration(contentType);
|
3316
3552
|
},
|
3317
3553
|
findComponentsConfigurations(contentType) {
|
3318
|
-
return getService$
|
3554
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3319
3555
|
},
|
3320
3556
|
syncConfigurations() {
|
3321
3557
|
return configurationService.syncConfigurations();
|
@@ -3587,7 +3823,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3587
3823
|
return userAbility.can(action);
|
3588
3824
|
},
|
3589
3825
|
async registerPermissions() {
|
3590
|
-
const displayedContentTypes = getService$
|
3826
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3591
3827
|
const contentTypesUids = displayedContentTypes.map(prop("uid"));
|
3592
3828
|
const actions = [
|
3593
3829
|
{
|
@@ -3672,6 +3908,12 @@ function getPopulateForRelation(attribute, model, attributeName, { countMany, co
|
|
3672
3908
|
if (initialPopulate) {
|
3673
3909
|
return initialPopulate;
|
3674
3910
|
}
|
3911
|
+
if (attributeName === "localizations") {
|
3912
|
+
const validationPopulate = getPopulateForValidation(model.uid);
|
3913
|
+
return {
|
3914
|
+
populate: validationPopulate.populate
|
3915
|
+
};
|
3916
|
+
}
|
3675
3917
|
if (!isVisibleAttribute$1(model, attributeName)) {
|
3676
3918
|
return true;
|
3677
3919
|
}
|
@@ -3731,6 +3973,9 @@ const getDeepPopulate = (uid2, {
|
|
3731
3973
|
return {};
|
3732
3974
|
}
|
3733
3975
|
const model = strapi.getModel(uid2);
|
3976
|
+
if (!model) {
|
3977
|
+
return {};
|
3978
|
+
}
|
3734
3979
|
return Object.keys(model.attributes).reduce(
|
3735
3980
|
(populateAcc, attributeName) => merge(
|
3736
3981
|
populateAcc,
|
@@ -3750,40 +3995,46 @@ const getDeepPopulate = (uid2, {
|
|
3750
3995
|
{}
|
3751
3996
|
);
|
3752
3997
|
};
|
3753
|
-
const
|
3754
|
-
|
3755
|
-
|
3756
|
-
countOne = false,
|
3757
|
-
maxLevel = Infinity
|
3758
|
-
} = {}, level = 1) => {
|
3759
|
-
if (level > maxLevel) {
|
3998
|
+
const getPopulateForValidation = (uid2) => {
|
3999
|
+
const model = strapi.getModel(uid2);
|
4000
|
+
if (!model) {
|
3760
4001
|
return {};
|
3761
4002
|
}
|
3762
|
-
const model = strapi.getModel(uid2);
|
3763
4003
|
return Object.entries(model.attributes).reduce((populateAcc, [attributeName, attribute]) => {
|
3764
|
-
if (
|
4004
|
+
if (isScalarAttribute(attribute)) {
|
4005
|
+
if (getDoesAttributeRequireValidation(attribute)) {
|
4006
|
+
populateAcc.fields = populateAcc.fields || [];
|
4007
|
+
populateAcc.fields.push(attributeName);
|
4008
|
+
}
|
3765
4009
|
return populateAcc;
|
3766
4010
|
}
|
3767
|
-
if (
|
3768
|
-
|
3769
|
-
|
3770
|
-
|
4011
|
+
if (isComponent(attribute)) {
|
4012
|
+
const component = attribute.component;
|
4013
|
+
const componentResult = getPopulateForValidation(component);
|
4014
|
+
if (Object.keys(componentResult).length > 0) {
|
4015
|
+
populateAcc.populate = populateAcc.populate || {};
|
4016
|
+
populateAcc.populate[attributeName] = componentResult;
|
4017
|
+
}
|
4018
|
+
return populateAcc;
|
3771
4019
|
}
|
3772
|
-
|
3773
|
-
|
3774
|
-
|
3775
|
-
|
3776
|
-
|
3777
|
-
|
3778
|
-
|
3779
|
-
|
3780
|
-
|
3781
|
-
countOne,
|
3782
|
-
maxLevel
|
4020
|
+
if (isDynamicZone(attribute)) {
|
4021
|
+
const components2 = attribute.components;
|
4022
|
+
const componentsResult = (components2 || []).reduce(
|
4023
|
+
(acc, componentUID) => {
|
4024
|
+
const componentResult = getPopulateForValidation(componentUID);
|
4025
|
+
if (Object.keys(componentResult).length > 0) {
|
4026
|
+
acc[componentUID] = componentResult;
|
4027
|
+
}
|
4028
|
+
return acc;
|
3783
4029
|
},
|
3784
|
-
|
3785
|
-
)
|
3786
|
-
|
4030
|
+
{}
|
4031
|
+
);
|
4032
|
+
if (Object.keys(componentsResult).length > 0) {
|
4033
|
+
populateAcc.populate = populateAcc.populate || {};
|
4034
|
+
populateAcc.populate[attributeName] = { on: componentsResult };
|
4035
|
+
}
|
4036
|
+
}
|
4037
|
+
return populateAcc;
|
3787
4038
|
}, {});
|
3788
4039
|
};
|
3789
4040
|
const getDeepPopulateDraftCount = (uid2) => {
|
@@ -3863,7 +4114,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3863
4114
|
return populateQuery;
|
3864
4115
|
};
|
3865
4116
|
const buildDeepPopulate = (uid2) => {
|
3866
|
-
return getService$
|
4117
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3867
4118
|
};
|
3868
4119
|
const populateBuilder = (uid2) => {
|
3869
4120
|
let getInitialPopulate = async () => {
|
@@ -4025,7 +4276,6 @@ const AVAILABLE_LOCALES_FIELDS = [
|
|
4025
4276
|
"locale",
|
4026
4277
|
"updatedAt",
|
4027
4278
|
"createdAt",
|
4028
|
-
"status",
|
4029
4279
|
"publishedAt",
|
4030
4280
|
"documentId"
|
4031
4281
|
];
|
@@ -4046,34 +4296,20 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4046
4296
|
/**
|
4047
4297
|
* Returns available locales of a document for the current status
|
4048
4298
|
*/
|
4049
|
-
async getAvailableLocales(uid2, version, allVersions
|
4299
|
+
async getAvailableLocales(uid2, version, allVersions) {
|
4050
4300
|
const versionsByLocale = groupBy("locale", allVersions);
|
4051
|
-
|
4301
|
+
if (version.locale) {
|
4302
|
+
delete versionsByLocale[version.locale];
|
4303
|
+
}
|
4052
4304
|
const model = strapi2.getModel(uid2);
|
4053
|
-
const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
|
4054
|
-
const traversalFunction = async (localeVersion) => traverseEntity(
|
4055
|
-
({ key }, { remove }) => {
|
4056
|
-
if (keysToKeep.includes(key)) {
|
4057
|
-
return;
|
4058
|
-
}
|
4059
|
-
remove(key);
|
4060
|
-
},
|
4061
|
-
{ schema: model, getModel: strapi2.getModel.bind(strapi2) },
|
4062
|
-
// @ts-expect-error fix types DocumentVersion incompatible with Data
|
4063
|
-
localeVersion
|
4064
|
-
);
|
4065
4305
|
const mappingResult = await async.map(
|
4066
4306
|
Object.values(versionsByLocale),
|
4067
4307
|
async (localeVersions) => {
|
4068
|
-
const mappedLocaleVersions = await async.map(
|
4069
|
-
localeVersions,
|
4070
|
-
traversalFunction
|
4071
|
-
);
|
4072
4308
|
if (!contentTypes$1.hasDraftAndPublish(model)) {
|
4073
|
-
return
|
4309
|
+
return localeVersions[0];
|
4074
4310
|
}
|
4075
|
-
const draftVersion =
|
4076
|
-
const otherVersions =
|
4311
|
+
const draftVersion = localeVersions.find((v) => v.publishedAt === null);
|
4312
|
+
const otherVersions = localeVersions.filter((v) => v.id !== draftVersion?.id);
|
4077
4313
|
if (!draftVersion) {
|
4078
4314
|
return;
|
4079
4315
|
}
|
@@ -4095,8 +4331,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4095
4331
|
const matchStatus = status === "published" ? v.publishedAt !== null : v.publishedAt === null;
|
4096
4332
|
return matchLocale && matchStatus;
|
4097
4333
|
});
|
4098
|
-
if (!availableStatus)
|
4099
|
-
return availableStatus;
|
4334
|
+
if (!availableStatus) return availableStatus;
|
4100
4335
|
return pick(AVAILABLE_STATUS_FIELDS, availableStatus);
|
4101
4336
|
},
|
4102
4337
|
/**
|
@@ -4106,18 +4341,19 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4106
4341
|
* @returns
|
4107
4342
|
*/
|
4108
4343
|
async getManyAvailableStatus(uid2, documents) {
|
4109
|
-
if (!documents.length)
|
4110
|
-
return [];
|
4344
|
+
if (!documents.length) return [];
|
4111
4345
|
const status = documents[0].publishedAt !== null ? "published" : "draft";
|
4112
|
-
const
|
4113
|
-
const
|
4114
|
-
|
4115
|
-
|
4116
|
-
|
4117
|
-
|
4118
|
-
|
4119
|
-
|
4120
|
-
|
4346
|
+
const locales = documents.map((d) => d.locale).filter(Boolean);
|
4347
|
+
const where = {
|
4348
|
+
documentId: { $in: documents.map((d) => d.documentId).filter(Boolean) },
|
4349
|
+
publishedAt: { $null: status === "published" }
|
4350
|
+
};
|
4351
|
+
if (locales.length) {
|
4352
|
+
where.locale = { $in: locales };
|
4353
|
+
}
|
4354
|
+
return strapi2.query(uid2).findMany({
|
4355
|
+
where,
|
4356
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"]
|
4121
4357
|
});
|
4122
4358
|
},
|
4123
4359
|
getStatus(version, otherDocumentStatuses) {
|
@@ -4134,10 +4370,8 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4134
4370
|
} else if (otherVersion) {
|
4135
4371
|
draftVersion = otherVersion;
|
4136
4372
|
}
|
4137
|
-
if (!draftVersion)
|
4138
|
-
|
4139
|
-
if (!publishedVersion)
|
4140
|
-
return CONTENT_MANAGER_STATUS.DRAFT;
|
4373
|
+
if (!draftVersion) return CONTENT_MANAGER_STATUS.PUBLISHED;
|
4374
|
+
if (!publishedVersion) return CONTENT_MANAGER_STATUS.DRAFT;
|
4141
4375
|
const isDraftModified = getIsVersionLatestModification(draftVersion, publishedVersion);
|
4142
4376
|
return isDraftModified ? CONTENT_MANAGER_STATUS.MODIFIED : CONTENT_MANAGER_STATUS.PUBLISHED;
|
4143
4377
|
},
|
@@ -4145,11 +4379,9 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4145
4379
|
// We could refactor this so the locales are only loaded when they're
|
4146
4380
|
// needed. e.g. in the bulk locale action modal.
|
4147
4381
|
async getMetadata(uid2, version, { availableLocales = true, availableStatus = true } = {}) {
|
4148
|
-
const populate =
|
4149
|
-
const
|
4150
|
-
where: { documentId: version.documentId },
|
4382
|
+
const { populate = {}, fields = [] } = getPopulateForValidation(uid2);
|
4383
|
+
const params = {
|
4151
4384
|
populate: {
|
4152
|
-
// Populate only fields that require validation for bulk locale actions
|
4153
4385
|
...populate,
|
4154
4386
|
// NOTE: creator fields are selected in this way to avoid exposing sensitive data
|
4155
4387
|
createdBy: {
|
@@ -4158,9 +4390,15 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4158
4390
|
updatedBy: {
|
4159
4391
|
select: ["id", "firstname", "lastname", "email"]
|
4160
4392
|
}
|
4393
|
+
},
|
4394
|
+
fields: uniq([...AVAILABLE_LOCALES_FIELDS, ...fields]),
|
4395
|
+
filters: {
|
4396
|
+
documentId: version.documentId
|
4161
4397
|
}
|
4162
|
-
}
|
4163
|
-
const
|
4398
|
+
};
|
4399
|
+
const dbParams = strapi2.get("query-params").transform(uid2, params);
|
4400
|
+
const versions = await strapi2.db.query(uid2).findMany(dbParams);
|
4401
|
+
const availableLocalesResult = availableLocales ? await this.getAvailableLocales(uid2, version, versions) : [];
|
4164
4402
|
const availableStatusResult = availableStatus ? this.getAvailableStatus(version, versions) : null;
|
4165
4403
|
return {
|
4166
4404
|
availableLocales: availableLocalesResult,
|
@@ -4187,6 +4425,16 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4187
4425
|
opts.availableStatus = false;
|
4188
4426
|
}
|
4189
4427
|
const meta = await this.getMetadata(uid2, document, opts);
|
4428
|
+
if (document.localizations) {
|
4429
|
+
const otherStatus = await this.getManyAvailableStatus(uid2, document.localizations);
|
4430
|
+
document.localizations = document.localizations.map((d) => {
|
4431
|
+
const status = otherStatus.find((s) => s.documentId === d.documentId);
|
4432
|
+
return {
|
4433
|
+
...d,
|
4434
|
+
status: this.getStatus(d, status ? [status] : [])
|
4435
|
+
};
|
4436
|
+
});
|
4437
|
+
}
|
4190
4438
|
return {
|
4191
4439
|
data: {
|
4192
4440
|
...document,
|
@@ -4404,7 +4652,8 @@ const services = {
|
|
4404
4652
|
permission,
|
4405
4653
|
"populate-builder": populateBuilder$1,
|
4406
4654
|
uid,
|
4407
|
-
...history.services ? history.services : {}
|
4655
|
+
...history.services ? history.services : {},
|
4656
|
+
...preview.services ? preview.services : {}
|
4408
4657
|
};
|
4409
4658
|
const index = () => {
|
4410
4659
|
return {
|