@strapi/content-manager 0.0.0-experimental.86fea32ae4240d73f76516d7238e302b6b927e88 → 0.0.0-experimental.8e4302929d7fe147203ed0266450d0a565c69660
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-B2g3icXu.mjs → ComponentConfigurationPage-D4H-v0et.mjs} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-B2g3icXu.mjs.map → ComponentConfigurationPage-D4H-v0et.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-CzDn8Uxh.js → ComponentConfigurationPage-DdkVGfXC.js} +5 -6
- package/dist/_chunks/{ComponentConfigurationPage-CzDn8Uxh.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-DSA1zONV.mjs → EditConfigurationPage-D1nvB7Br.mjs} +4 -4
- package/dist/_chunks/{EditConfigurationPage-DSA1zONV.mjs.map → EditConfigurationPage-D1nvB7Br.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-Bcbi6r5y.js → EditConfigurationPage-LYEvR4fW.js} +5 -6
- package/dist/_chunks/{EditConfigurationPage-Bcbi6r5y.js.map → EditConfigurationPage-LYEvR4fW.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-Ca2EmJpb.mjs → EditViewPage-Bcnff6Vd.mjs} +21 -54
- package/dist/_chunks/EditViewPage-Bcnff6Vd.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-BvcMXaP2.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-DAUpPBVM.js → Form-CnHfBeiB.js} +5 -6
- package/dist/_chunks/{Form-DAUpPBVM.js.map → Form-CnHfBeiB.js.map} +1 -1
- package/dist/_chunks/{Form-BJVbU6w4.mjs → Form-CzPCJi3B.mjs} +3 -3
- package/dist/_chunks/{Form-BJVbU6w4.mjs.map → Form-CzPCJi3B.mjs.map} +1 -1
- package/dist/_chunks/{History-M6Pk9CoY.mjs → History-CcmSn3Mj.mjs} +51 -97
- package/dist/_chunks/History-CcmSn3Mj.mjs.map +1 -0
- package/dist/_chunks/{History-Bw9vfT1k.js → History-zArjENzj.js} +62 -109
- package/dist/_chunks/History-zArjENzj.js.map +1 -0
- package/dist/_chunks/{Field-CmaWxdpf.js → Input-CDHKQd7o.js} +1259 -1236
- package/dist/_chunks/Input-CDHKQd7o.js.map +1 -0
- package/dist/_chunks/{Field-BEYkgCZ0.mjs → Input-aV8SSoTa.mjs} +1334 -1311
- package/dist/_chunks/Input-aV8SSoTa.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-D7ior2zq.mjs → ListConfigurationPage-BPvzENJJ.mjs} +7 -6
- package/dist/_chunks/ListConfigurationPage-BPvzENJJ.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DBVqF5fc.js → ListConfigurationPage-ByZAO_9H.js} +7 -7
- package/dist/_chunks/ListConfigurationPage-ByZAO_9H.js.map +1 -0
- package/dist/_chunks/{ListViewPage-MZu-8OKX.js → ListViewPage-BVKBeQAA.js} +73 -48
- package/dist/_chunks/ListViewPage-BVKBeQAA.js.map +1 -0
- package/dist/_chunks/{ListViewPage-BH37wONY.mjs → ListViewPage-HljQVnFH.mjs} +67 -41
- package/dist/_chunks/ListViewPage-HljQVnFH.mjs.map +1 -0
- package/dist/_chunks/{NoContentTypePage-C9lRMTCa.js → NoContentTypePage-BV5zfDxr.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-C9lRMTCa.js.map → NoContentTypePage-BV5zfDxr.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-DRp7Aem_.mjs → NoContentTypePage-BfHaSM-K.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-DRp7Aem_.mjs.map → NoContentTypePage-BfHaSM-K.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-CzhRt5CA.mjs → NoPermissionsPage-D6ze2nQL.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-CzhRt5CA.mjs.map → NoPermissionsPage-D6ze2nQL.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-COs61PpB.js → NoPermissionsPage-vdNpc6jb.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-COs61PpB.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-68XxIzPI.mjs → Relations-B7_hbF0w.mjs} +33 -19
- package/dist/_chunks/Relations-B7_hbF0w.mjs.map +1 -0
- package/dist/_chunks/{Relations-CsGlulU_.js → Relations-DcoOBejP.js} +33 -20
- 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-oDq3VO9j.js → index-CxLSGwnk.js} +614 -237
- package/dist/_chunks/index-CxLSGwnk.js.map +1 -0
- package/dist/_chunks/{index-CsfwpRfc.mjs → index-EH8ZtHd5.mjs} +631 -253
- 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-C5uSVTqi.mjs → layout-CxDMdJ13.mjs} +4 -4
- package/dist/_chunks/{layout-C5uSVTqi.mjs.map → layout-CxDMdJ13.mjs.map} +1 -1
- package/dist/_chunks/{layout-Euka-kfv.js → layout-DSeUTfMv.js} +5 -6
- package/dist/_chunks/{layout-Euka-kfv.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-BpHVgFuV.mjs → relations-B8_Uu38Q.mjs} +21 -8
- package/dist/_chunks/relations-B8_Uu38Q.mjs.map +1 -0
- package/dist/_chunks/{relations-DG7kmxa0.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 +561 -323
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +562 -323
- 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 +13 -12
- package/dist/_chunks/EditViewPage-BvcMXaP2.js.map +0 -1
- package/dist/_chunks/EditViewPage-Ca2EmJpb.mjs.map +0 -1
- package/dist/_chunks/Field-BEYkgCZ0.mjs.map +0 -1
- package/dist/_chunks/Field-CmaWxdpf.js.map +0 -1
- package/dist/_chunks/History-Bw9vfT1k.js.map +0 -1
- package/dist/_chunks/History-M6Pk9CoY.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-D7ior2zq.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-DBVqF5fc.js.map +0 -1
- package/dist/_chunks/ListViewPage-BH37wONY.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-MZu-8OKX.js.map +0 -1
- package/dist/_chunks/Relations-68XxIzPI.mjs.map +0 -1
- package/dist/_chunks/Relations-CsGlulU_.js.map +0 -1
- package/dist/_chunks/index-CsfwpRfc.mjs.map +0 -1
- package/dist/_chunks/index-oDq3VO9j.js.map +0 -1
- package/dist/_chunks/relations-BpHVgFuV.mjs.map +0 -1
- package/dist/_chunks/relations-DG7kmxa0.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,32 +350,20 @@ 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
|
}
|
@@ -375,46 +375,51 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
375
375
|
});
|
376
376
|
})
|
377
377
|
);
|
378
|
-
|
379
|
-
...await currentDataWithRelations,
|
380
|
-
/**
|
381
|
-
* Ideally we would return the same "{results: [], meta: {}}" shape, however,
|
382
|
-
* when sanitizing the data as a whole in the controller before sending to the client,
|
383
|
-
* the data for admin relation user is completely sanitized if we return an object here as opposed to an array.
|
384
|
-
*/
|
385
|
-
[attributeKey]: adminUsers
|
386
|
-
};
|
378
|
+
utils.set(options.key, adminUsers);
|
387
379
|
}
|
388
|
-
const permissionChecker2 = getService$
|
380
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
389
381
|
userAbility: params.state.userAbility,
|
390
|
-
model:
|
382
|
+
model: options.attribute.target
|
391
383
|
});
|
392
384
|
const response = await serviceUtils.buildRelationReponse(
|
393
|
-
|
394
|
-
|
385
|
+
currentValue,
|
386
|
+
options.attribute
|
395
387
|
);
|
396
388
|
const sanitizedResults = await Promise.all(
|
397
389
|
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
398
390
|
);
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
meta: response.meta
|
404
|
-
}
|
405
|
-
};
|
391
|
+
utils.set(options.key, {
|
392
|
+
results: sanitizedResults,
|
393
|
+
meta: response.meta
|
394
|
+
});
|
406
395
|
}
|
407
|
-
|
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)
|
408
414
|
},
|
409
|
-
|
415
|
+
entry.data
|
410
416
|
);
|
411
|
-
return entryWithRelations;
|
412
417
|
};
|
413
418
|
const formattedResults = await Promise.all(
|
414
419
|
results.map(async (result) => {
|
415
420
|
return {
|
416
421
|
...result,
|
417
|
-
data: await
|
422
|
+
data: await populateEntry(result),
|
418
423
|
meta: {
|
419
424
|
unknownAttributes: serviceUtils.getSchemaAttributesDiff(
|
420
425
|
result.schema,
|
@@ -445,30 +450,44 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
445
450
|
// Clone to avoid mutating the original version data
|
446
451
|
structuredClone(version.data)
|
447
452
|
);
|
448
|
-
const
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
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
|
+
}
|
458
463
|
}
|
459
|
-
if (attribute.type === "
|
460
|
-
|
461
|
-
|
462
|
-
|
464
|
+
if (options.attribute.type === "dynamiczone") {
|
465
|
+
if (options.value === null) {
|
466
|
+
utils.set(options.key, []);
|
467
|
+
}
|
463
468
|
}
|
464
|
-
if (attribute.type === "
|
465
|
-
|
466
|
-
|
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);
|
467
484
|
}
|
468
|
-
return previousRelationAttributes;
|
469
485
|
},
|
470
|
-
|
471
|
-
|
486
|
+
{
|
487
|
+
schema,
|
488
|
+
getModel: strapi2.getModel.bind(strapi2)
|
489
|
+
},
|
490
|
+
dataWithoutAddedAttributes
|
472
491
|
);
|
473
492
|
const data = omit(["id", ...Object.keys(schemaDiff.removed)], dataWithoutMissingRelations);
|
474
493
|
const restoredDocument = await strapi2.documents(version.contentType).update({
|
@@ -561,7 +580,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
561
580
|
onCommit(async () => {
|
562
581
|
for (const entry of localeEntries) {
|
563
582
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
564
|
-
await getService(strapi2, "history").createVersion({
|
583
|
+
await getService$1(strapi2, "history").createVersion({
|
565
584
|
contentType: uid2,
|
566
585
|
data: omit(FIELDS_TO_IGNORE, entry),
|
567
586
|
relatedDocumentId: documentId,
|
@@ -574,15 +593,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
574
593
|
});
|
575
594
|
return result;
|
576
595
|
});
|
577
|
-
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
596
|
+
state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
|
578
597
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
579
598
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
580
599
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
581
600
|
where: {
|
582
601
|
created_at: {
|
583
|
-
$lt: expirationDate
|
602
|
+
$lt: expirationDate
|
584
603
|
}
|
585
604
|
}
|
605
|
+
}).catch((error) => {
|
606
|
+
if (error instanceof Error) {
|
607
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
608
|
+
}
|
586
609
|
});
|
587
610
|
});
|
588
611
|
state.isInitialized = true;
|
@@ -594,17 +617,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
594
617
|
}
|
595
618
|
};
|
596
619
|
};
|
597
|
-
const services$
|
620
|
+
const services$2 = {
|
598
621
|
history: createHistoryService,
|
599
622
|
lifecycles: createLifecyclesService
|
600
623
|
};
|
601
|
-
const info = { pluginName: "content-manager", type: "admin" };
|
624
|
+
const info$1 = { pluginName: "content-manager", type: "admin" };
|
602
625
|
const historyVersionRouter = {
|
603
626
|
type: "admin",
|
604
627
|
routes: [
|
605
628
|
{
|
606
629
|
method: "GET",
|
607
|
-
info,
|
630
|
+
info: info$1,
|
608
631
|
path: "/history-versions",
|
609
632
|
handler: "history-version.findMany",
|
610
633
|
config: {
|
@@ -613,7 +636,7 @@ const historyVersionRouter = {
|
|
613
636
|
},
|
614
637
|
{
|
615
638
|
method: "PUT",
|
616
|
-
info,
|
639
|
+
info: info$1,
|
617
640
|
path: "/history-versions/:versionId/restore",
|
618
641
|
handler: "history-version.restoreVersion",
|
619
642
|
config: {
|
@@ -622,7 +645,7 @@ const historyVersionRouter = {
|
|
622
645
|
}
|
623
646
|
]
|
624
647
|
};
|
625
|
-
const routes$
|
648
|
+
const routes$2 = {
|
626
649
|
"history-version": historyVersionRouter
|
627
650
|
};
|
628
651
|
const historyVersion = {
|
@@ -669,21 +692,21 @@ const historyVersion = {
|
|
669
692
|
}
|
670
693
|
}
|
671
694
|
};
|
672
|
-
const getFeature = () => {
|
695
|
+
const getFeature$1 = () => {
|
673
696
|
if (strapi.ee.features.isEnabled("cms-content-history")) {
|
674
697
|
return {
|
675
698
|
register({ strapi: strapi2 }) {
|
676
699
|
strapi2.get("models").add(historyVersion);
|
677
700
|
},
|
678
701
|
bootstrap({ strapi: strapi2 }) {
|
679
|
-
getService(strapi2, "lifecycles").bootstrap();
|
702
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
680
703
|
},
|
681
704
|
destroy({ strapi: strapi2 }) {
|
682
|
-
getService(strapi2, "lifecycles").destroy();
|
705
|
+
getService$1(strapi2, "lifecycles").destroy();
|
683
706
|
},
|
684
|
-
controllers: controllers$
|
685
|
-
services: services$
|
686
|
-
routes: routes$
|
707
|
+
controllers: controllers$2,
|
708
|
+
services: services$2,
|
709
|
+
routes: routes$2
|
687
710
|
};
|
688
711
|
}
|
689
712
|
return {
|
@@ -692,9 +715,201 @@ const getFeature = () => {
|
|
692
715
|
}
|
693
716
|
};
|
694
717
|
};
|
695
|
-
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();
|
696
910
|
const register = async ({ strapi: strapi2 }) => {
|
697
911
|
await history.register?.({ strapi: strapi2 });
|
912
|
+
await preview.register?.({ strapi: strapi2 });
|
698
913
|
};
|
699
914
|
const ALLOWED_WEBHOOK_EVENTS = {
|
700
915
|
ENTRY_PUBLISH: "entry.publish",
|
@@ -704,11 +919,12 @@ const bootstrap = async () => {
|
|
704
919
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
705
920
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
706
921
|
});
|
707
|
-
getService$
|
708
|
-
await getService$
|
709
|
-
await getService$
|
710
|
-
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();
|
711
926
|
await history.bootstrap?.({ strapi });
|
927
|
+
await preview.bootstrap?.({ strapi });
|
712
928
|
};
|
713
929
|
const destroy = async ({ strapi: strapi2 }) => {
|
714
930
|
await history.destroy?.({ strapi: strapi2 });
|
@@ -1198,7 +1414,8 @@ const admin = {
|
|
1198
1414
|
};
|
1199
1415
|
const routes = {
|
1200
1416
|
admin,
|
1201
|
-
...history.routes ? history.routes : {}
|
1417
|
+
...history.routes ? history.routes : {},
|
1418
|
+
...preview.routes ? preview.routes : {}
|
1202
1419
|
};
|
1203
1420
|
const hasPermissionsSchema = yup$1.object({
|
1204
1421
|
actions: yup$1.array().of(yup$1.string()),
|
@@ -1261,8 +1478,7 @@ const isSortable = (schema, name) => {
|
|
1261
1478
|
if (!_.has(schema.attributes, name)) {
|
1262
1479
|
return false;
|
1263
1480
|
}
|
1264
|
-
if (schema.modelType === "component" && name === "id")
|
1265
|
-
return false;
|
1481
|
+
if (schema.modelType === "component" && name === "id") return false;
|
1266
1482
|
const attribute = schema.attributes[name];
|
1267
1483
|
if (NON_SORTABLES.includes(attribute.type)) {
|
1268
1484
|
return false;
|
@@ -1407,8 +1623,7 @@ const createDefaultSettings = async (schema) => {
|
|
1407
1623
|
};
|
1408
1624
|
};
|
1409
1625
|
const syncSettings = async (configuration, schema) => {
|
1410
|
-
if (isEmpty(configuration.settings))
|
1411
|
-
return createDefaultSettings(schema);
|
1626
|
+
if (isEmpty(configuration.settings)) return createDefaultSettings(schema);
|
1412
1627
|
const defaultField = getDefaultMainField(schema);
|
1413
1628
|
const { mainField = defaultField, defaultSortBy = defaultField } = configuration.settings || {};
|
1414
1629
|
return {
|
@@ -1455,7 +1670,7 @@ const createMetadasSchema = (schema) => {
|
|
1455
1670
|
if (!value) {
|
1456
1671
|
return yup$1.string();
|
1457
1672
|
}
|
1458
|
-
const targetSchema = getService$
|
1673
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1459
1674
|
schema.attributes[key].targetModel
|
1460
1675
|
);
|
1461
1676
|
if (!targetSchema) {
|
@@ -1584,8 +1799,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1584
1799
|
}
|
1585
1800
|
switch (attribute.type) {
|
1586
1801
|
case "relation": {
|
1587
|
-
if (canCreate(attributePath))
|
1588
|
-
return body2;
|
1802
|
+
if (canCreate(attributePath)) return body2;
|
1589
1803
|
return set(attributePath, { set: [] }, body2);
|
1590
1804
|
}
|
1591
1805
|
case "component": {
|
@@ -1595,8 +1809,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1595
1809
|
]);
|
1596
1810
|
}
|
1597
1811
|
default: {
|
1598
|
-
if (canCreate(attributePath))
|
1599
|
-
return body2;
|
1812
|
+
if (canCreate(attributePath)) return body2;
|
1600
1813
|
return set(attributePath, null, body2);
|
1601
1814
|
}
|
1602
1815
|
}
|
@@ -1624,7 +1837,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1624
1837
|
}
|
1625
1838
|
};
|
1626
1839
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1627
|
-
const documentMetadata2 = getService$
|
1840
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1628
1841
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1629
1842
|
let {
|
1630
1843
|
meta: { availableLocales, availableStatus }
|
@@ -1650,8 +1863,8 @@ const createDocument = async (ctx, opts) => {
|
|
1650
1863
|
const { userAbility, user } = ctx.state;
|
1651
1864
|
const { model } = ctx.params;
|
1652
1865
|
const { body } = ctx.request;
|
1653
|
-
const documentManager2 = getService$
|
1654
|
-
const permissionChecker2 = getService$
|
1866
|
+
const documentManager2 = getService$2("document-manager");
|
1867
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1655
1868
|
if (permissionChecker2.cannot.create()) {
|
1656
1869
|
throw new errors.ForbiddenError();
|
1657
1870
|
}
|
@@ -1671,13 +1884,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1671
1884
|
const { userAbility, user } = ctx.state;
|
1672
1885
|
const { id, model } = ctx.params;
|
1673
1886
|
const { body } = ctx.request;
|
1674
|
-
const documentManager2 = getService$
|
1675
|
-
const permissionChecker2 = getService$
|
1887
|
+
const documentManager2 = getService$2("document-manager");
|
1888
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1676
1889
|
if (permissionChecker2.cannot.update()) {
|
1677
1890
|
throw new errors.ForbiddenError();
|
1678
1891
|
}
|
1679
1892
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1680
|
-
const populate = await getService$
|
1893
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1681
1894
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1682
1895
|
const [documentVersion, documentExists] = await Promise.all([
|
1683
1896
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1708,14 +1921,14 @@ const collectionTypes = {
|
|
1708
1921
|
const { userAbility } = ctx.state;
|
1709
1922
|
const { model } = ctx.params;
|
1710
1923
|
const { query } = ctx.request;
|
1711
|
-
const documentMetadata2 = getService$
|
1712
|
-
const documentManager2 = getService$
|
1713
|
-
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 });
|
1714
1927
|
if (permissionChecker2.cannot.read()) {
|
1715
1928
|
return ctx.forbidden();
|
1716
1929
|
}
|
1717
1930
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1718
|
-
const populate = await getService$
|
1931
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1719
1932
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1720
1933
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1721
1934
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1744,13 +1957,13 @@ const collectionTypes = {
|
|
1744
1957
|
async findOne(ctx) {
|
1745
1958
|
const { userAbility } = ctx.state;
|
1746
1959
|
const { model, id } = ctx.params;
|
1747
|
-
const documentManager2 = getService$
|
1748
|
-
const permissionChecker2 = getService$
|
1960
|
+
const documentManager2 = getService$2("document-manager");
|
1961
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1749
1962
|
if (permissionChecker2.cannot.read()) {
|
1750
1963
|
return ctx.forbidden();
|
1751
1964
|
}
|
1752
1965
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1753
|
-
const populate = await getService$
|
1966
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1754
1967
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1755
1968
|
const version = await documentManager2.findOne(id, model, {
|
1756
1969
|
populate,
|
@@ -1781,7 +1994,7 @@ const collectionTypes = {
|
|
1781
1994
|
async create(ctx) {
|
1782
1995
|
const { userAbility } = ctx.state;
|
1783
1996
|
const { model } = ctx.params;
|
1784
|
-
const permissionChecker2 = getService$
|
1997
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1785
1998
|
const [totalEntries, document] = await Promise.all([
|
1786
1999
|
strapi.db.query(model).count(),
|
1787
2000
|
createDocument(ctx)
|
@@ -1802,7 +2015,7 @@ const collectionTypes = {
|
|
1802
2015
|
async update(ctx) {
|
1803
2016
|
const { userAbility } = ctx.state;
|
1804
2017
|
const { model } = ctx.params;
|
1805
|
-
const permissionChecker2 = getService$
|
2018
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1806
2019
|
const updatedVersion = await updateDocument(ctx);
|
1807
2020
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1808
2021
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1811,13 +2024,13 @@ const collectionTypes = {
|
|
1811
2024
|
const { userAbility, user } = ctx.state;
|
1812
2025
|
const { model, sourceId: id } = ctx.params;
|
1813
2026
|
const { body } = ctx.request;
|
1814
|
-
const documentManager2 = getService$
|
1815
|
-
const permissionChecker2 = getService$
|
2027
|
+
const documentManager2 = getService$2("document-manager");
|
2028
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1816
2029
|
if (permissionChecker2.cannot.create()) {
|
1817
2030
|
return ctx.forbidden();
|
1818
2031
|
}
|
1819
2032
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1820
|
-
const populate = await getService$
|
2033
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1821
2034
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1822
2035
|
const document = await documentManager2.findOne(id, model, {
|
1823
2036
|
populate,
|
@@ -1856,13 +2069,13 @@ const collectionTypes = {
|
|
1856
2069
|
async delete(ctx) {
|
1857
2070
|
const { userAbility } = ctx.state;
|
1858
2071
|
const { id, model } = ctx.params;
|
1859
|
-
const documentManager2 = getService$
|
1860
|
-
const permissionChecker2 = getService$
|
2072
|
+
const documentManager2 = getService$2("document-manager");
|
2073
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1861
2074
|
if (permissionChecker2.cannot.delete()) {
|
1862
2075
|
return ctx.forbidden();
|
1863
2076
|
}
|
1864
2077
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1865
|
-
const populate = await getService$
|
2078
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1866
2079
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1867
2080
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1868
2081
|
if (documentLocales.length === 0) {
|
@@ -1884,14 +2097,14 @@ const collectionTypes = {
|
|
1884
2097
|
const { userAbility } = ctx.state;
|
1885
2098
|
const { id, model } = ctx.params;
|
1886
2099
|
const { body } = ctx.request;
|
1887
|
-
const documentManager2 = getService$
|
1888
|
-
const permissionChecker2 = getService$
|
2100
|
+
const documentManager2 = getService$2("document-manager");
|
2101
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1889
2102
|
if (permissionChecker2.cannot.publish()) {
|
1890
2103
|
return ctx.forbidden();
|
1891
2104
|
}
|
1892
2105
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1893
2106
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1894
|
-
const populate = await getService$
|
2107
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1895
2108
|
let document;
|
1896
2109
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1897
2110
|
const isCreate = isNil$1(id);
|
@@ -1939,13 +2152,13 @@ const collectionTypes = {
|
|
1939
2152
|
const { body } = ctx.request;
|
1940
2153
|
const { documentIds } = body;
|
1941
2154
|
await validateBulkActionInput(body);
|
1942
|
-
const documentManager2 = getService$
|
1943
|
-
const permissionChecker2 = getService$
|
2155
|
+
const documentManager2 = getService$2("document-manager");
|
2156
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1944
2157
|
if (permissionChecker2.cannot.publish()) {
|
1945
2158
|
return ctx.forbidden();
|
1946
2159
|
}
|
1947
2160
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1948
|
-
const populate = await getService$
|
2161
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1949
2162
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1950
2163
|
allowMultipleLocales: true
|
1951
2164
|
});
|
@@ -1970,8 +2183,8 @@ const collectionTypes = {
|
|
1970
2183
|
const { body } = ctx.request;
|
1971
2184
|
const { documentIds } = body;
|
1972
2185
|
await validateBulkActionInput(body);
|
1973
|
-
const documentManager2 = getService$
|
1974
|
-
const permissionChecker2 = getService$
|
2186
|
+
const documentManager2 = getService$2("document-manager");
|
2187
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1975
2188
|
if (permissionChecker2.cannot.unpublish()) {
|
1976
2189
|
return ctx.forbidden();
|
1977
2190
|
}
|
@@ -2000,8 +2213,8 @@ const collectionTypes = {
|
|
2000
2213
|
const {
|
2001
2214
|
body: { discardDraft, ...body }
|
2002
2215
|
} = ctx.request;
|
2003
|
-
const documentManager2 = getService$
|
2004
|
-
const permissionChecker2 = getService$
|
2216
|
+
const documentManager2 = getService$2("document-manager");
|
2217
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2005
2218
|
if (permissionChecker2.cannot.unpublish()) {
|
2006
2219
|
return ctx.forbidden();
|
2007
2220
|
}
|
@@ -2009,7 +2222,7 @@ const collectionTypes = {
|
|
2009
2222
|
return ctx.forbidden();
|
2010
2223
|
}
|
2011
2224
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2012
|
-
const populate = await getService$
|
2225
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2013
2226
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2014
2227
|
const document = await documentManager2.findOne(id, model, {
|
2015
2228
|
populate,
|
@@ -2040,13 +2253,13 @@ const collectionTypes = {
|
|
2040
2253
|
const { userAbility } = ctx.state;
|
2041
2254
|
const { id, model } = ctx.params;
|
2042
2255
|
const { body } = ctx.request;
|
2043
|
-
const documentManager2 = getService$
|
2044
|
-
const permissionChecker2 = getService$
|
2256
|
+
const documentManager2 = getService$2("document-manager");
|
2257
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2045
2258
|
if (permissionChecker2.cannot.discard()) {
|
2046
2259
|
return ctx.forbidden();
|
2047
2260
|
}
|
2048
2261
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2049
|
-
const populate = await getService$
|
2262
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2050
2263
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2051
2264
|
const document = await documentManager2.findOne(id, model, {
|
2052
2265
|
populate,
|
@@ -2071,13 +2284,13 @@ const collectionTypes = {
|
|
2071
2284
|
const { query, body } = ctx.request;
|
2072
2285
|
const { documentIds } = body;
|
2073
2286
|
await validateBulkActionInput(body);
|
2074
|
-
const documentManager2 = getService$
|
2075
|
-
const permissionChecker2 = getService$
|
2287
|
+
const documentManager2 = getService$2("document-manager");
|
2288
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2076
2289
|
if (permissionChecker2.cannot.delete()) {
|
2077
2290
|
return ctx.forbidden();
|
2078
2291
|
}
|
2079
2292
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2080
|
-
const populate = await getService$
|
2293
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2081
2294
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2082
2295
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2083
2296
|
populate,
|
@@ -2098,13 +2311,13 @@ const collectionTypes = {
|
|
2098
2311
|
async countDraftRelations(ctx) {
|
2099
2312
|
const { userAbility } = ctx.state;
|
2100
2313
|
const { model, id } = ctx.params;
|
2101
|
-
const documentManager2 = getService$
|
2102
|
-
const permissionChecker2 = getService$
|
2314
|
+
const documentManager2 = getService$2("document-manager");
|
2315
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2103
2316
|
if (permissionChecker2.cannot.read()) {
|
2104
2317
|
return ctx.forbidden();
|
2105
2318
|
}
|
2106
2319
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2107
|
-
const populate = await getService$
|
2320
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2108
2321
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2109
2322
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2110
2323
|
if (!entity) {
|
@@ -2123,8 +2336,8 @@ const collectionTypes = {
|
|
2123
2336
|
const ids = ctx.request.query.documentIds;
|
2124
2337
|
const locale = ctx.request.query.locale;
|
2125
2338
|
const { model } = ctx.params;
|
2126
|
-
const documentManager2 = getService$
|
2127
|
-
const permissionChecker2 = getService$
|
2339
|
+
const documentManager2 = getService$2("document-manager");
|
2340
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2128
2341
|
if (permissionChecker2.cannot.read()) {
|
2129
2342
|
return ctx.forbidden();
|
2130
2343
|
}
|
@@ -2148,13 +2361,13 @@ const collectionTypes = {
|
|
2148
2361
|
};
|
2149
2362
|
const components$1 = {
|
2150
2363
|
findComponents(ctx) {
|
2151
|
-
const components2 = getService$
|
2152
|
-
const { toDto } = getService$
|
2364
|
+
const components2 = getService$2("components").findAllComponents();
|
2365
|
+
const { toDto } = getService$2("data-mapper");
|
2153
2366
|
ctx.body = { data: components2.map(toDto) };
|
2154
2367
|
},
|
2155
2368
|
async findComponentConfiguration(ctx) {
|
2156
2369
|
const { uid: uid2 } = ctx.params;
|
2157
|
-
const componentService = getService$
|
2370
|
+
const componentService = getService$2("components");
|
2158
2371
|
const component = componentService.findComponent(uid2);
|
2159
2372
|
if (!component) {
|
2160
2373
|
return ctx.notFound("component.notFound");
|
@@ -2171,7 +2384,7 @@ const components$1 = {
|
|
2171
2384
|
async updateComponentConfiguration(ctx) {
|
2172
2385
|
const { uid: uid2 } = ctx.params;
|
2173
2386
|
const { body } = ctx.request;
|
2174
|
-
const componentService = getService$
|
2387
|
+
const componentService = getService$2("components");
|
2175
2388
|
const component = componentService.findComponent(uid2);
|
2176
2389
|
if (!component) {
|
2177
2390
|
return ctx.notFound("component.notFound");
|
@@ -2205,12 +2418,12 @@ const contentTypes = {
|
|
2205
2418
|
} catch (error) {
|
2206
2419
|
return ctx.send({ error }, 400);
|
2207
2420
|
}
|
2208
|
-
const contentTypes2 = getService$
|
2209
|
-
const { toDto } = getService$
|
2421
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2422
|
+
const { toDto } = getService$2("data-mapper");
|
2210
2423
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2211
2424
|
},
|
2212
2425
|
async findContentTypesSettings(ctx) {
|
2213
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2426
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2214
2427
|
const contentTypes2 = await findAllContentTypes();
|
2215
2428
|
const configurations = await Promise.all(
|
2216
2429
|
contentTypes2.map(async (contentType) => {
|
@@ -2224,7 +2437,7 @@ const contentTypes = {
|
|
2224
2437
|
},
|
2225
2438
|
async findContentTypeConfiguration(ctx) {
|
2226
2439
|
const { uid: uid2 } = ctx.params;
|
2227
|
-
const contentTypeService = getService$
|
2440
|
+
const contentTypeService = getService$2("content-types");
|
2228
2441
|
const contentType = await contentTypeService.findContentType(uid2);
|
2229
2442
|
if (!contentType) {
|
2230
2443
|
return ctx.notFound("contentType.notFound");
|
@@ -2246,13 +2459,13 @@ const contentTypes = {
|
|
2246
2459
|
const { userAbility } = ctx.state;
|
2247
2460
|
const { uid: uid2 } = ctx.params;
|
2248
2461
|
const { body } = ctx.request;
|
2249
|
-
const contentTypeService = getService$
|
2250
|
-
const metricsService = getService$
|
2462
|
+
const contentTypeService = getService$2("content-types");
|
2463
|
+
const metricsService = getService$2("metrics");
|
2251
2464
|
const contentType = await contentTypeService.findContentType(uid2);
|
2252
2465
|
if (!contentType) {
|
2253
2466
|
return ctx.notFound("contentType.notFound");
|
2254
2467
|
}
|
2255
|
-
if (!getService$
|
2468
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2256
2469
|
return ctx.forbidden();
|
2257
2470
|
}
|
2258
2471
|
let input;
|
@@ -2285,10 +2498,10 @@ const contentTypes = {
|
|
2285
2498
|
};
|
2286
2499
|
const init = {
|
2287
2500
|
getInitData(ctx) {
|
2288
|
-
const { toDto } = getService$
|
2289
|
-
const { findAllComponents } = getService$
|
2290
|
-
const { getAllFieldSizes } = getService$
|
2291
|
-
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");
|
2292
2505
|
ctx.body = {
|
2293
2506
|
data: {
|
2294
2507
|
fieldSizes: getAllFieldSizes(),
|
@@ -2324,7 +2537,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2324
2537
|
params.filters.$and.push(filtersClause);
|
2325
2538
|
};
|
2326
2539
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2327
|
-
const permissionChecker2 = getService$
|
2540
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2328
2541
|
userAbility,
|
2329
2542
|
model: model.uid
|
2330
2543
|
});
|
@@ -2338,15 +2551,27 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2338
2551
|
}
|
2339
2552
|
return mainField;
|
2340
2553
|
};
|
2341
|
-
const addStatusToRelations = async (
|
2342
|
-
if (!contentTypes$1.hasDraftAndPublish(strapi.
|
2554
|
+
const addStatusToRelations = async (targetUid, relations2) => {
|
2555
|
+
if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2343
2556
|
return relations2;
|
2344
2557
|
}
|
2345
|
-
const documentMetadata2 = getService$
|
2346
|
-
|
2558
|
+
const documentMetadata2 = getService$2("document-metadata");
|
2559
|
+
if (!relations2.length) {
|
2560
|
+
return relations2;
|
2561
|
+
}
|
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
|
+
});
|
2347
2572
|
return relations2.map((relation) => {
|
2348
|
-
const availableStatuses =
|
2349
|
-
(availableDocument) => availableDocument.documentId === relation.documentId
|
2573
|
+
const availableStatuses = availableStatus.filter(
|
2574
|
+
(availableDocument) => availableDocument.documentId === relation.documentId && (relation.locale ? availableDocument.locale === relation.locale : true)
|
2350
2575
|
);
|
2351
2576
|
return {
|
2352
2577
|
...relation,
|
@@ -2377,8 +2602,7 @@ const validateStatus = (sourceUid, status) => {
|
|
2377
2602
|
const sourceModel = strapi.getModel(sourceUid);
|
2378
2603
|
const isDP = contentTypes$1.hasDraftAndPublish;
|
2379
2604
|
const isSourceDP = isDP(sourceModel);
|
2380
|
-
if (!isSourceDP)
|
2381
|
-
return { status: void 0 };
|
2605
|
+
if (!isSourceDP) return { status: void 0 };
|
2382
2606
|
switch (status) {
|
2383
2607
|
case "published":
|
2384
2608
|
return { status: "published" };
|
@@ -2408,7 +2632,7 @@ const relations = {
|
|
2408
2632
|
ctx.request?.query?.locale
|
2409
2633
|
);
|
2410
2634
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2411
|
-
const permissionChecker2 = getService$
|
2635
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2412
2636
|
userAbility,
|
2413
2637
|
model
|
2414
2638
|
});
|
@@ -2433,7 +2657,7 @@ const relations = {
|
|
2433
2657
|
where.id = id;
|
2434
2658
|
}
|
2435
2659
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2436
|
-
const populate = await getService$
|
2660
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2437
2661
|
const currentEntity = await strapi.db.query(model).findOne({
|
2438
2662
|
where,
|
2439
2663
|
populate
|
@@ -2448,7 +2672,7 @@ const relations = {
|
|
2448
2672
|
}
|
2449
2673
|
entryId = currentEntity.id;
|
2450
2674
|
}
|
2451
|
-
const modelConfig = isComponent2 ? await getService$
|
2675
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2452
2676
|
const targetSchema = strapi.getModel(targetUid);
|
2453
2677
|
const mainField = flow(
|
2454
2678
|
prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2502,7 +2726,7 @@ const relations = {
|
|
2502
2726
|
}
|
2503
2727
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2504
2728
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2505
|
-
const permissionChecker2 = getService$
|
2729
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2506
2730
|
userAbility: ctx.state.userAbility,
|
2507
2731
|
model: targetUid
|
2508
2732
|
});
|
@@ -2575,21 +2799,33 @@ const relations = {
|
|
2575
2799
|
attribute,
|
2576
2800
|
targetField,
|
2577
2801
|
fieldsToSelect,
|
2578
|
-
|
2579
|
-
|
2580
|
-
}
|
2581
|
-
target: {
|
2582
|
-
schema: { uid: targetUid }
|
2583
|
-
}
|
2802
|
+
status,
|
2803
|
+
source: { schema: sourceSchema },
|
2804
|
+
target: { schema: targetSchema }
|
2584
2805
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2585
|
-
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 });
|
2586
2809
|
const dbQuery = strapi.db.query(sourceUid);
|
2587
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
|
+
}
|
2588
2823
|
const res = await loadRelations({ id: entryId }, targetField, {
|
2589
|
-
select: ["id", "documentId", "locale", "publishedAt"],
|
2824
|
+
select: ["id", "documentId", "locale", "publishedAt", "updatedAt"],
|
2590
2825
|
ordering: "desc",
|
2591
2826
|
page: ctx.request.query.page,
|
2592
|
-
pageSize: ctx.request.query.pageSize
|
2827
|
+
pageSize: ctx.request.query.pageSize,
|
2828
|
+
filters
|
2593
2829
|
});
|
2594
2830
|
const loadedIds = res.results.map((item) => item.id);
|
2595
2831
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
@@ -2597,12 +2833,7 @@ const relations = {
|
|
2597
2833
|
...strapi.get("query-params").transform(targetUid, permissionQuery),
|
2598
2834
|
ordering: "desc"
|
2599
2835
|
});
|
2600
|
-
const relationsUnion = uniqBy(
|
2601
|
-
(res2) => {
|
2602
|
-
return res2.locale ? `${res2.documentId}-${res2.locale}` : `${res2.documentId}-`;
|
2603
|
-
},
|
2604
|
-
concat(sanitizedRes.results, res.results)
|
2605
|
-
);
|
2836
|
+
const relationsUnion = uniqBy("id", concat(sanitizedRes.results, res.results));
|
2606
2837
|
ctx.body = {
|
2607
2838
|
pagination: res.pagination || {
|
2608
2839
|
page: 1,
|
@@ -2615,10 +2846,10 @@ const relations = {
|
|
2615
2846
|
}
|
2616
2847
|
};
|
2617
2848
|
const buildPopulateFromQuery = async (query, model) => {
|
2618
|
-
return getService$
|
2849
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2619
2850
|
};
|
2620
2851
|
const findDocument = async (query, uid2, opts = {}) => {
|
2621
|
-
const documentManager2 = getService$
|
2852
|
+
const documentManager2 = getService$2("document-manager");
|
2622
2853
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2623
2854
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2624
2855
|
};
|
@@ -2626,8 +2857,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2626
2857
|
const { user, userAbility } = ctx.state;
|
2627
2858
|
const { model } = ctx.params;
|
2628
2859
|
const { body, query } = ctx.request;
|
2629
|
-
const documentManager2 = getService$
|
2630
|
-
const permissionChecker2 = getService$
|
2860
|
+
const documentManager2 = getService$2("document-manager");
|
2861
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2631
2862
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2632
2863
|
throw new errors.ForbiddenError();
|
2633
2864
|
}
|
@@ -2668,7 +2899,7 @@ const singleTypes = {
|
|
2668
2899
|
const { userAbility } = ctx.state;
|
2669
2900
|
const { model } = ctx.params;
|
2670
2901
|
const { query = {} } = ctx.request;
|
2671
|
-
const permissionChecker2 = getService$
|
2902
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2672
2903
|
if (permissionChecker2.cannot.read()) {
|
2673
2904
|
return ctx.forbidden();
|
2674
2905
|
}
|
@@ -2702,7 +2933,7 @@ const singleTypes = {
|
|
2702
2933
|
async createOrUpdate(ctx) {
|
2703
2934
|
const { userAbility } = ctx.state;
|
2704
2935
|
const { model } = ctx.params;
|
2705
|
-
const permissionChecker2 = getService$
|
2936
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2706
2937
|
const document = await createOrUpdateDocument(ctx);
|
2707
2938
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2708
2939
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2711,8 +2942,8 @@ const singleTypes = {
|
|
2711
2942
|
const { userAbility } = ctx.state;
|
2712
2943
|
const { model } = ctx.params;
|
2713
2944
|
const { query = {} } = ctx.request;
|
2714
|
-
const documentManager2 = getService$
|
2715
|
-
const permissionChecker2 = getService$
|
2945
|
+
const documentManager2 = getService$2("document-manager");
|
2946
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2716
2947
|
if (permissionChecker2.cannot.delete()) {
|
2717
2948
|
return ctx.forbidden();
|
2718
2949
|
}
|
@@ -2740,8 +2971,8 @@ const singleTypes = {
|
|
2740
2971
|
const { userAbility } = ctx.state;
|
2741
2972
|
const { model } = ctx.params;
|
2742
2973
|
const { query = {} } = ctx.request;
|
2743
|
-
const documentManager2 = getService$
|
2744
|
-
const permissionChecker2 = getService$
|
2974
|
+
const documentManager2 = getService$2("document-manager");
|
2975
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2745
2976
|
if (permissionChecker2.cannot.publish()) {
|
2746
2977
|
return ctx.forbidden();
|
2747
2978
|
}
|
@@ -2769,8 +3000,8 @@ const singleTypes = {
|
|
2769
3000
|
body: { discardDraft, ...body },
|
2770
3001
|
query = {}
|
2771
3002
|
} = ctx.request;
|
2772
|
-
const documentManager2 = getService$
|
2773
|
-
const permissionChecker2 = getService$
|
3003
|
+
const documentManager2 = getService$2("document-manager");
|
3004
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2774
3005
|
if (permissionChecker2.cannot.unpublish()) {
|
2775
3006
|
return ctx.forbidden();
|
2776
3007
|
}
|
@@ -2804,8 +3035,8 @@ const singleTypes = {
|
|
2804
3035
|
const { userAbility } = ctx.state;
|
2805
3036
|
const { model } = ctx.params;
|
2806
3037
|
const { body, query = {} } = ctx.request;
|
2807
|
-
const documentManager2 = getService$
|
2808
|
-
const permissionChecker2 = getService$
|
3038
|
+
const documentManager2 = getService$2("document-manager");
|
3039
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2809
3040
|
if (permissionChecker2.cannot.discard()) {
|
2810
3041
|
return ctx.forbidden();
|
2811
3042
|
}
|
@@ -2828,8 +3059,8 @@ const singleTypes = {
|
|
2828
3059
|
const { userAbility } = ctx.state;
|
2829
3060
|
const { model } = ctx.params;
|
2830
3061
|
const { query } = ctx.request;
|
2831
|
-
const documentManager2 = getService$
|
2832
|
-
const permissionChecker2 = getService$
|
3062
|
+
const documentManager2 = getService$2("document-manager");
|
3063
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2833
3064
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2834
3065
|
if (permissionChecker2.cannot.read()) {
|
2835
3066
|
return ctx.forbidden();
|
@@ -2853,7 +3084,7 @@ const uid$1 = {
|
|
2853
3084
|
const { query = {} } = ctx.request;
|
2854
3085
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2855
3086
|
await validateUIDField(contentTypeUID, field);
|
2856
|
-
const uidService = getService$
|
3087
|
+
const uidService = getService$2("uid");
|
2857
3088
|
ctx.body = {
|
2858
3089
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2859
3090
|
};
|
@@ -2865,7 +3096,7 @@ const uid$1 = {
|
|
2865
3096
|
const { query = {} } = ctx.request;
|
2866
3097
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2867
3098
|
await validateUIDField(contentTypeUID, field);
|
2868
|
-
const uidService = getService$
|
3099
|
+
const uidService = getService$2("uid");
|
2869
3100
|
const isAvailable = await uidService.checkUIDAvailability({
|
2870
3101
|
contentTypeUID,
|
2871
3102
|
field,
|
@@ -2886,7 +3117,8 @@ const controllers = {
|
|
2886
3117
|
relations,
|
2887
3118
|
"single-types": singleTypes,
|
2888
3119
|
uid: uid$1,
|
2889
|
-
...history.controllers ? history.controllers : {}
|
3120
|
+
...history.controllers ? history.controllers : {},
|
3121
|
+
...preview.controllers ? preview.controllers : {}
|
2890
3122
|
};
|
2891
3123
|
const keys = {
|
2892
3124
|
CONFIGURATION: "configuration"
|
@@ -3015,18 +3247,15 @@ async function syncMetadatas(configuration, schema) {
|
|
3015
3247
|
_.set(updatedMeta, ["list", "searchable"], false);
|
3016
3248
|
_.set(acc, [key], updatedMeta);
|
3017
3249
|
}
|
3018
|
-
if (!_.has(edit, "mainField"))
|
3019
|
-
return acc;
|
3250
|
+
if (!_.has(edit, "mainField")) return acc;
|
3020
3251
|
if (!isRelation$1(attr)) {
|
3021
3252
|
_.set(updatedMeta, "edit", _.omit(edit, ["mainField"]));
|
3022
3253
|
_.set(acc, [key], updatedMeta);
|
3023
3254
|
return acc;
|
3024
3255
|
}
|
3025
|
-
if (edit.mainField === "id")
|
3026
|
-
return acc;
|
3256
|
+
if (edit.mainField === "id") return acc;
|
3027
3257
|
const targetSchema = getTargetSchema(attr.targetModel);
|
3028
|
-
if (!targetSchema)
|
3029
|
-
return acc;
|
3258
|
+
if (!targetSchema) return acc;
|
3030
3259
|
if (!isSortable(targetSchema, edit.mainField) && !isListable(targetSchema, edit.mainField)) {
|
3031
3260
|
_.set(updatedMeta, ["edit", "mainField"], getDefaultMainField(targetSchema));
|
3032
3261
|
_.set(acc, [key], updatedMeta);
|
@@ -3037,12 +3266,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3037
3266
|
return _.assign(metasWithDefaults, updatedMetas);
|
3038
3267
|
}
|
3039
3268
|
const getTargetSchema = (targetModel) => {
|
3040
|
-
return getService$
|
3269
|
+
return getService$2("content-types").findContentType(targetModel);
|
3041
3270
|
};
|
3042
3271
|
const DEFAULT_LIST_LENGTH = 4;
|
3043
3272
|
const MAX_ROW_SIZE = 12;
|
3044
3273
|
const isAllowedFieldSize = (type, size) => {
|
3045
|
-
const { getFieldSize } = getService$
|
3274
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3046
3275
|
const fieldSize = getFieldSize(type);
|
3047
3276
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3048
3277
|
return false;
|
@@ -3050,7 +3279,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3050
3279
|
return size <= MAX_ROW_SIZE;
|
3051
3280
|
};
|
3052
3281
|
const getDefaultFieldSize = (attribute) => {
|
3053
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3282
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3054
3283
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3055
3284
|
};
|
3056
3285
|
async function createDefaultLayouts(schema) {
|
@@ -3071,8 +3300,7 @@ function createDefaultEditLayout(schema) {
|
|
3071
3300
|
return appendToEditLayout([], keys2, schema);
|
3072
3301
|
}
|
3073
3302
|
function syncLayouts(configuration, schema) {
|
3074
|
-
if (_.isEmpty(configuration.layouts))
|
3075
|
-
return createDefaultLayouts(schema);
|
3303
|
+
if (_.isEmpty(configuration.layouts)) return createDefaultLayouts(schema);
|
3076
3304
|
const { list = [], editRelations = [], edit = [] } = configuration.layouts || {};
|
3077
3305
|
let cleanList = list.filter((attr) => isListable(schema, attr));
|
3078
3306
|
const cleanEditRelations = editRelations.filter(
|
@@ -3083,9 +3311,8 @@ function syncLayouts(configuration, schema) {
|
|
3083
3311
|
for (const row of edit) {
|
3084
3312
|
const newRow = [];
|
3085
3313
|
for (const el of row) {
|
3086
|
-
if (!hasEditableAttribute(schema, el.name))
|
3087
|
-
|
3088
|
-
const { hasFieldSize } = getService$1("field-sizes");
|
3314
|
+
if (!hasEditableAttribute(schema, el.name)) continue;
|
3315
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3089
3316
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3090
3317
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3091
3318
|
elementsToReAppend.push(el.name);
|
@@ -3115,8 +3342,7 @@ function syncLayouts(configuration, schema) {
|
|
3115
3342
|
};
|
3116
3343
|
}
|
3117
3344
|
const appendToEditLayout = (layout = [], keysToAppend, schema) => {
|
3118
|
-
if (keysToAppend.length === 0)
|
3119
|
-
return layout;
|
3345
|
+
if (keysToAppend.length === 0) return layout;
|
3120
3346
|
let currentRowIndex = Math.max(layout.length - 1, 0);
|
3121
3347
|
if (!layout[currentRowIndex]) {
|
3122
3348
|
layout[currentRowIndex] = [];
|
@@ -3225,17 +3451,17 @@ const configurationService$1 = createConfigurationService({
|
|
3225
3451
|
isComponent: true,
|
3226
3452
|
prefix: STORE_KEY_PREFIX,
|
3227
3453
|
getModels() {
|
3228
|
-
const { toContentManagerModel } = getService$
|
3454
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3229
3455
|
return mapValues(toContentManagerModel, strapi.components);
|
3230
3456
|
}
|
3231
3457
|
});
|
3232
3458
|
const components = ({ strapi: strapi2 }) => ({
|
3233
3459
|
findAllComponents() {
|
3234
|
-
const { toContentManagerModel } = getService$
|
3460
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3235
3461
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3236
3462
|
},
|
3237
3463
|
findComponent(uid2) {
|
3238
|
-
const { toContentManagerModel } = getService$
|
3464
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3239
3465
|
const component = strapi2.components[uid2];
|
3240
3466
|
return isNil$1(component) ? component : toContentManagerModel(component);
|
3241
3467
|
},
|
@@ -3286,17 +3512,17 @@ const configurationService = createConfigurationService({
|
|
3286
3512
|
storeUtils,
|
3287
3513
|
prefix: "content_types",
|
3288
3514
|
getModels() {
|
3289
|
-
const { toContentManagerModel } = getService$
|
3515
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3290
3516
|
return mapValues(toContentManagerModel, strapi.contentTypes);
|
3291
3517
|
}
|
3292
3518
|
});
|
3293
3519
|
const service = ({ strapi: strapi2 }) => ({
|
3294
3520
|
findAllContentTypes() {
|
3295
|
-
const { toContentManagerModel } = getService$
|
3521
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3296
3522
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3297
3523
|
},
|
3298
3524
|
findContentType(uid2) {
|
3299
|
-
const { toContentManagerModel } = getService$
|
3525
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3300
3526
|
const contentType = strapi2.contentTypes[uid2];
|
3301
3527
|
return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
|
3302
3528
|
},
|
@@ -3325,7 +3551,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3325
3551
|
return this.findConfiguration(contentType);
|
3326
3552
|
},
|
3327
3553
|
findComponentsConfigurations(contentType) {
|
3328
|
-
return getService$
|
3554
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3329
3555
|
},
|
3330
3556
|
syncConfigurations() {
|
3331
3557
|
return configurationService.syncConfigurations();
|
@@ -3597,7 +3823,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3597
3823
|
return userAbility.can(action);
|
3598
3824
|
},
|
3599
3825
|
async registerPermissions() {
|
3600
|
-
const displayedContentTypes = getService$
|
3826
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3601
3827
|
const contentTypesUids = displayedContentTypes.map(prop("uid"));
|
3602
3828
|
const actions = [
|
3603
3829
|
{
|
@@ -3682,6 +3908,12 @@ function getPopulateForRelation(attribute, model, attributeName, { countMany, co
|
|
3682
3908
|
if (initialPopulate) {
|
3683
3909
|
return initialPopulate;
|
3684
3910
|
}
|
3911
|
+
if (attributeName === "localizations") {
|
3912
|
+
const validationPopulate = getPopulateForValidation(model.uid);
|
3913
|
+
return {
|
3914
|
+
populate: validationPopulate.populate
|
3915
|
+
};
|
3916
|
+
}
|
3685
3917
|
if (!isVisibleAttribute$1(model, attributeName)) {
|
3686
3918
|
return true;
|
3687
3919
|
}
|
@@ -3741,6 +3973,9 @@ const getDeepPopulate = (uid2, {
|
|
3741
3973
|
return {};
|
3742
3974
|
}
|
3743
3975
|
const model = strapi.getModel(uid2);
|
3976
|
+
if (!model) {
|
3977
|
+
return {};
|
3978
|
+
}
|
3744
3979
|
return Object.keys(model.attributes).reduce(
|
3745
3980
|
(populateAcc, attributeName) => merge(
|
3746
3981
|
populateAcc,
|
@@ -3760,40 +3995,46 @@ const getDeepPopulate = (uid2, {
|
|
3760
3995
|
{}
|
3761
3996
|
);
|
3762
3997
|
};
|
3763
|
-
const
|
3764
|
-
|
3765
|
-
|
3766
|
-
countOne = false,
|
3767
|
-
maxLevel = Infinity
|
3768
|
-
} = {}, level = 1) => {
|
3769
|
-
if (level > maxLevel) {
|
3998
|
+
const getPopulateForValidation = (uid2) => {
|
3999
|
+
const model = strapi.getModel(uid2);
|
4000
|
+
if (!model) {
|
3770
4001
|
return {};
|
3771
4002
|
}
|
3772
|
-
const model = strapi.getModel(uid2);
|
3773
4003
|
return Object.entries(model.attributes).reduce((populateAcc, [attributeName, attribute]) => {
|
3774
|
-
if (
|
4004
|
+
if (isScalarAttribute(attribute)) {
|
4005
|
+
if (getDoesAttributeRequireValidation(attribute)) {
|
4006
|
+
populateAcc.fields = populateAcc.fields || [];
|
4007
|
+
populateAcc.fields.push(attributeName);
|
4008
|
+
}
|
3775
4009
|
return populateAcc;
|
3776
4010
|
}
|
3777
|
-
if (
|
3778
|
-
|
3779
|
-
|
3780
|
-
|
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;
|
3781
4019
|
}
|
3782
|
-
|
3783
|
-
|
3784
|
-
|
3785
|
-
|
3786
|
-
|
3787
|
-
|
3788
|
-
|
3789
|
-
|
3790
|
-
|
3791
|
-
countOne,
|
3792
|
-
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;
|
3793
4029
|
},
|
3794
|
-
|
3795
|
-
)
|
3796
|
-
|
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;
|
3797
4038
|
}, {});
|
3798
4039
|
};
|
3799
4040
|
const getDeepPopulateDraftCount = (uid2) => {
|
@@ -3873,7 +4114,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3873
4114
|
return populateQuery;
|
3874
4115
|
};
|
3875
4116
|
const buildDeepPopulate = (uid2) => {
|
3876
|
-
return getService$
|
4117
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3877
4118
|
};
|
3878
4119
|
const populateBuilder = (uid2) => {
|
3879
4120
|
let getInitialPopulate = async () => {
|
@@ -4035,7 +4276,6 @@ const AVAILABLE_LOCALES_FIELDS = [
|
|
4035
4276
|
"locale",
|
4036
4277
|
"updatedAt",
|
4037
4278
|
"createdAt",
|
4038
|
-
"status",
|
4039
4279
|
"publishedAt",
|
4040
4280
|
"documentId"
|
4041
4281
|
];
|
@@ -4056,34 +4296,20 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4056
4296
|
/**
|
4057
4297
|
* Returns available locales of a document for the current status
|
4058
4298
|
*/
|
4059
|
-
async getAvailableLocales(uid2, version, allVersions
|
4299
|
+
async getAvailableLocales(uid2, version, allVersions) {
|
4060
4300
|
const versionsByLocale = groupBy("locale", allVersions);
|
4061
|
-
|
4301
|
+
if (version.locale) {
|
4302
|
+
delete versionsByLocale[version.locale];
|
4303
|
+
}
|
4062
4304
|
const model = strapi2.getModel(uid2);
|
4063
|
-
const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
|
4064
|
-
const traversalFunction = async (localeVersion) => traverseEntity(
|
4065
|
-
({ key }, { remove }) => {
|
4066
|
-
if (keysToKeep.includes(key)) {
|
4067
|
-
return;
|
4068
|
-
}
|
4069
|
-
remove(key);
|
4070
|
-
},
|
4071
|
-
{ schema: model, getModel: strapi2.getModel.bind(strapi2) },
|
4072
|
-
// @ts-expect-error fix types DocumentVersion incompatible with Data
|
4073
|
-
localeVersion
|
4074
|
-
);
|
4075
4305
|
const mappingResult = await async.map(
|
4076
4306
|
Object.values(versionsByLocale),
|
4077
4307
|
async (localeVersions) => {
|
4078
|
-
const mappedLocaleVersions = await async.map(
|
4079
|
-
localeVersions,
|
4080
|
-
traversalFunction
|
4081
|
-
);
|
4082
4308
|
if (!contentTypes$1.hasDraftAndPublish(model)) {
|
4083
|
-
return
|
4309
|
+
return localeVersions[0];
|
4084
4310
|
}
|
4085
|
-
const draftVersion =
|
4086
|
-
const otherVersions =
|
4311
|
+
const draftVersion = localeVersions.find((v) => v.publishedAt === null);
|
4312
|
+
const otherVersions = localeVersions.filter((v) => v.id !== draftVersion?.id);
|
4087
4313
|
if (!draftVersion) {
|
4088
4314
|
return;
|
4089
4315
|
}
|
@@ -4105,8 +4331,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4105
4331
|
const matchStatus = status === "published" ? v.publishedAt !== null : v.publishedAt === null;
|
4106
4332
|
return matchLocale && matchStatus;
|
4107
4333
|
});
|
4108
|
-
if (!availableStatus)
|
4109
|
-
return availableStatus;
|
4334
|
+
if (!availableStatus) return availableStatus;
|
4110
4335
|
return pick(AVAILABLE_STATUS_FIELDS, availableStatus);
|
4111
4336
|
},
|
4112
4337
|
/**
|
@@ -4116,18 +4341,19 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4116
4341
|
* @returns
|
4117
4342
|
*/
|
4118
4343
|
async getManyAvailableStatus(uid2, documents) {
|
4119
|
-
if (!documents.length)
|
4120
|
-
return [];
|
4344
|
+
if (!documents.length) return [];
|
4121
4345
|
const status = documents[0].publishedAt !== null ? "published" : "draft";
|
4122
|
-
const
|
4123
|
-
const
|
4124
|
-
|
4125
|
-
|
4126
|
-
|
4127
|
-
|
4128
|
-
|
4129
|
-
|
4130
|
-
|
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"]
|
4131
4357
|
});
|
4132
4358
|
},
|
4133
4359
|
getStatus(version, otherDocumentStatuses) {
|
@@ -4144,10 +4370,8 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4144
4370
|
} else if (otherVersion) {
|
4145
4371
|
draftVersion = otherVersion;
|
4146
4372
|
}
|
4147
|
-
if (!draftVersion)
|
4148
|
-
|
4149
|
-
if (!publishedVersion)
|
4150
|
-
return CONTENT_MANAGER_STATUS.DRAFT;
|
4373
|
+
if (!draftVersion) return CONTENT_MANAGER_STATUS.PUBLISHED;
|
4374
|
+
if (!publishedVersion) return CONTENT_MANAGER_STATUS.DRAFT;
|
4151
4375
|
const isDraftModified = getIsVersionLatestModification(draftVersion, publishedVersion);
|
4152
4376
|
return isDraftModified ? CONTENT_MANAGER_STATUS.MODIFIED : CONTENT_MANAGER_STATUS.PUBLISHED;
|
4153
4377
|
},
|
@@ -4155,11 +4379,9 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4155
4379
|
// We could refactor this so the locales are only loaded when they're
|
4156
4380
|
// needed. e.g. in the bulk locale action modal.
|
4157
4381
|
async getMetadata(uid2, version, { availableLocales = true, availableStatus = true } = {}) {
|
4158
|
-
const populate =
|
4159
|
-
const
|
4160
|
-
where: { documentId: version.documentId },
|
4382
|
+
const { populate = {}, fields = [] } = getPopulateForValidation(uid2);
|
4383
|
+
const params = {
|
4161
4384
|
populate: {
|
4162
|
-
// Populate only fields that require validation for bulk locale actions
|
4163
4385
|
...populate,
|
4164
4386
|
// NOTE: creator fields are selected in this way to avoid exposing sensitive data
|
4165
4387
|
createdBy: {
|
@@ -4168,9 +4390,15 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4168
4390
|
updatedBy: {
|
4169
4391
|
select: ["id", "firstname", "lastname", "email"]
|
4170
4392
|
}
|
4393
|
+
},
|
4394
|
+
fields: uniq([...AVAILABLE_LOCALES_FIELDS, ...fields]),
|
4395
|
+
filters: {
|
4396
|
+
documentId: version.documentId
|
4171
4397
|
}
|
4172
|
-
}
|
4173
|
-
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) : [];
|
4174
4402
|
const availableStatusResult = availableStatus ? this.getAvailableStatus(version, versions) : null;
|
4175
4403
|
return {
|
4176
4404
|
availableLocales: availableLocalesResult,
|
@@ -4197,6 +4425,16 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4197
4425
|
opts.availableStatus = false;
|
4198
4426
|
}
|
4199
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
|
+
}
|
4200
4438
|
return {
|
4201
4439
|
data: {
|
4202
4440
|
...document,
|
@@ -4414,7 +4652,8 @@ const services = {
|
|
4414
4652
|
permission,
|
4415
4653
|
"populate-builder": populateBuilder$1,
|
4416
4654
|
uid,
|
4417
|
-
...history.services ? history.services : {}
|
4655
|
+
...history.services ? history.services : {},
|
4656
|
+
...preview.services ? preview.services : {}
|
4418
4657
|
};
|
4419
4658
|
const index = () => {
|
4420
4659
|
return {
|