@strapi/content-manager 0.0.0-experimental.f6c00790e260ea5a9b6b86abac5fea02b05d569c → 0.0.0-experimental.f736daceb203b33d9ed36a1149e21f2814d1935c
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-CnL10QYC.mjs → ComponentConfigurationPage-D4H-v0et.mjs} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-CnL10QYC.mjs.map → ComponentConfigurationPage-D4H-v0et.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-G4EIirP8.js → ComponentConfigurationPage-DdkVGfXC.js} +5 -6
- package/dist/_chunks/{ComponentConfigurationPage-G4EIirP8.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-I2kKh9dx.mjs → EditConfigurationPage-D1nvB7Br.mjs} +4 -4
- package/dist/_chunks/{EditConfigurationPage-I2kKh9dx.mjs.map → EditConfigurationPage-D1nvB7Br.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-B2AA1kVF.js → EditConfigurationPage-LYEvR4fW.js} +5 -6
- package/dist/_chunks/{EditConfigurationPage-B2AA1kVF.js.map → EditConfigurationPage-LYEvR4fW.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-zFjJK0s8.mjs → EditViewPage-Bcnff6Vd.mjs} +32 -55
- package/dist/_chunks/EditViewPage-Bcnff6Vd.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-CHgoNwlc.js → EditViewPage-DqelJ9UK.js} +34 -58
- 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-DPm-KZ1A.js → Form-CnHfBeiB.js} +6 -7
- package/dist/_chunks/Form-CnHfBeiB.js.map +1 -0
- package/dist/_chunks/{Form-CEkENbkF.mjs → Form-CzPCJi3B.mjs} +4 -4
- package/dist/_chunks/Form-CzPCJi3B.mjs.map +1 -0
- package/dist/_chunks/{History-utls71em.mjs → History-CcmSn3Mj.mjs} +71 -104
- package/dist/_chunks/History-CcmSn3Mj.mjs.map +1 -0
- package/dist/_chunks/{History-DXSbTWez.js → History-zArjENzj.js} +81 -115
- package/dist/_chunks/History-zArjENzj.js.map +1 -0
- package/dist/_chunks/{Field-9DePZh-0.js → Input-CDHKQd7o.js} +1304 -1237
- package/dist/_chunks/Input-CDHKQd7o.js.map +1 -0
- package/dist/_chunks/{Field-DPAzUS1M.mjs → Input-aV8SSoTa.mjs} +1288 -1221
- package/dist/_chunks/Input-aV8SSoTa.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-CuMXWWqb.mjs → ListConfigurationPage-BPvzENJJ.mjs} +7 -6
- package/dist/_chunks/ListConfigurationPage-BPvzENJJ.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-D5C7ACZ_.js → ListConfigurationPage-ByZAO_9H.js} +7 -7
- package/dist/_chunks/ListConfigurationPage-ByZAO_9H.js.map +1 -0
- package/dist/_chunks/{ListViewPage-DfuwH1tt.js → ListViewPage-BVKBeQAA.js} +74 -49
- package/dist/_chunks/ListViewPage-BVKBeQAA.js.map +1 -0
- package/dist/_chunks/{ListViewPage-CdKd-PS_.mjs → ListViewPage-HljQVnFH.mjs} +68 -42
- package/dist/_chunks/ListViewPage-HljQVnFH.mjs.map +1 -0
- package/dist/_chunks/{NoContentTypePage-BIxlkWWi.js → NoContentTypePage-BV5zfDxr.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-BIxlkWWi.js.map → NoContentTypePage-BV5zfDxr.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-DkToTT7u.mjs → NoContentTypePage-BfHaSM-K.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-DkToTT7u.mjs.map → NoContentTypePage-BfHaSM-K.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DlWi4BAH.mjs → NoPermissionsPage-D6ze2nQL.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DlWi4BAH.mjs.map → NoPermissionsPage-D6ze2nQL.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-Bu4GWYb-.js → NoPermissionsPage-vdNpc6jb.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-Bu4GWYb-.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-QP5yn9_z.mjs → Relations-B7_hbF0w.mjs} +78 -43
- package/dist/_chunks/Relations-B7_hbF0w.mjs.map +1 -0
- package/dist/_chunks/{Relations-CFjTESWQ.js → Relations-DcoOBejP.js} +78 -44
- package/dist/_chunks/Relations-DcoOBejP.js.map +1 -0
- package/dist/_chunks/{en-BVzUkPxZ.js → en-BR48D_RH.js} +30 -11
- package/dist/_chunks/{en-BVzUkPxZ.js.map → en-BR48D_RH.js.map} +1 -1
- package/dist/_chunks/{en-CPTj6CjC.mjs → en-D65uIF6Y.mjs} +30 -11
- package/dist/_chunks/{en-CPTj6CjC.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-DXiHxy70.js → index-CxLSGwnk.js} +1162 -706
- package/dist/_chunks/index-CxLSGwnk.js.map +1 -0
- package/dist/_chunks/{index-BHfS6_D5.mjs → index-EH8ZtHd5.mjs} +1178 -722
- 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-DX_52HSH.mjs → layout-CxDMdJ13.mjs} +4 -4
- package/dist/_chunks/{layout-DX_52HSH.mjs.map → layout-CxDMdJ13.mjs.map} +1 -1
- package/dist/_chunks/{layout-bE-WUnQ0.js → layout-DSeUTfMv.js} +5 -6
- package/dist/_chunks/{layout-bE-WUnQ0.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-SCVAL_aJ.mjs → relations-B8_Uu38Q.mjs} +21 -8
- package/dist/_chunks/relations-B8_Uu38Q.mjs.map +1 -0
- package/dist/_chunks/{relations-D706vblp.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 +3 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +6 -4
- package/dist/admin/src/content-manager.d.ts +3 -2
- package/dist/admin/src/exports.d.ts +2 -1
- package/dist/admin/src/history/services/historyVersion.d.ts +1 -1
- package/dist/admin/src/hooks/useDocument.d.ts +49 -1
- package/dist/admin/src/pages/EditView/EditViewPage.d.ts +9 -1
- package/dist/admin/src/pages/EditView/components/DocumentActions.d.ts +1 -1
- package/dist/admin/src/pages/EditView/components/DocumentStatus.d.ts +3 -3
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/Blocks/Code.d.ts +7 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/Blocks/utils/prismLanguages.d.ts +49 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/utils/constants.d.ts +1 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/DynamicZone/DynamicComponent.d.ts +4 -1
- package/dist/admin/src/pages/EditView/components/FormInputs/DynamicZone/Field.d.ts +4 -1
- package/dist/admin/src/pages/EditView/components/FormLayout.d.ts +27 -0
- package/dist/admin/src/pages/EditView/components/Header.d.ts +1 -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 +590 -333
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +591 -333
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/bootstrap.d.ts.map +1 -1
- package/dist/server/src/controllers/collection-types.d.ts.map +1 -1
- package/dist/server/src/controllers/index.d.ts.map +1 -1
- package/dist/server/src/controllers/relations.d.ts.map +1 -1
- package/dist/server/src/controllers/utils/metadata.d.ts +16 -1
- package/dist/server/src/controllers/utils/metadata.d.ts.map +1 -1
- package/dist/server/src/history/controllers/history-version.d.ts +1 -1
- package/dist/server/src/history/controllers/history-version.d.ts.map +1 -1
- package/dist/server/src/history/services/history.d.ts +3 -3
- package/dist/server/src/history/services/history.d.ts.map +1 -1
- package/dist/server/src/history/services/lifecycles.d.ts.map +1 -1
- package/dist/server/src/history/services/utils.d.ts +6 -11
- package/dist/server/src/history/services/utils.d.ts.map +1 -1
- package/dist/server/src/index.d.ts +7 -6
- package/dist/server/src/index.d.ts.map +1 -1
- package/dist/server/src/preview/controllers/index.d.ts +2 -0
- package/dist/server/src/preview/controllers/index.d.ts.map +1 -0
- package/dist/server/src/preview/controllers/preview.d.ts +13 -0
- package/dist/server/src/preview/controllers/preview.d.ts.map +1 -0
- package/dist/server/src/preview/controllers/validation/preview.d.ts +6 -0
- package/dist/server/src/preview/controllers/validation/preview.d.ts.map +1 -0
- package/dist/server/src/preview/index.d.ts +4 -0
- package/dist/server/src/preview/index.d.ts.map +1 -0
- package/dist/server/src/preview/routes/index.d.ts +8 -0
- package/dist/server/src/preview/routes/index.d.ts.map +1 -0
- package/dist/server/src/preview/routes/preview.d.ts +4 -0
- package/dist/server/src/preview/routes/preview.d.ts.map +1 -0
- package/dist/server/src/preview/services/index.d.ts +16 -0
- package/dist/server/src/preview/services/index.d.ts.map +1 -0
- package/dist/server/src/preview/services/preview-config.d.ts +32 -0
- package/dist/server/src/preview/services/preview-config.d.ts.map +1 -0
- package/dist/server/src/preview/services/preview.d.ts +12 -0
- package/dist/server/src/preview/services/preview.d.ts.map +1 -0
- package/dist/server/src/preview/utils.d.ts +19 -0
- package/dist/server/src/preview/utils.d.ts.map +1 -0
- package/dist/server/src/register.d.ts.map +1 -1
- package/dist/server/src/routes/index.d.ts.map +1 -1
- package/dist/server/src/services/document-manager.d.ts.map +1 -1
- package/dist/server/src/services/document-metadata.d.ts +12 -10
- package/dist/server/src/services/document-metadata.d.ts.map +1 -1
- package/dist/server/src/services/index.d.ts +7 -6
- package/dist/server/src/services/index.d.ts.map +1 -1
- package/dist/server/src/services/utils/populate.d.ts +2 -2
- package/dist/server/src/services/utils/populate.d.ts.map +1 -1
- package/dist/server/src/utils/index.d.ts +2 -0
- package/dist/server/src/utils/index.d.ts.map +1 -1
- package/dist/shared/contracts/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 +16 -15
- package/dist/_chunks/EditViewPage-CHgoNwlc.js.map +0 -1
- package/dist/_chunks/EditViewPage-zFjJK0s8.mjs.map +0 -1
- package/dist/_chunks/Field-9DePZh-0.js.map +0 -1
- package/dist/_chunks/Field-DPAzUS1M.mjs.map +0 -1
- package/dist/_chunks/Form-CEkENbkF.mjs.map +0 -1
- package/dist/_chunks/Form-DPm-KZ1A.js.map +0 -1
- package/dist/_chunks/History-DXSbTWez.js.map +0 -1
- package/dist/_chunks/History-utls71em.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-CuMXWWqb.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-D5C7ACZ_.js.map +0 -1
- package/dist/_chunks/ListViewPage-CdKd-PS_.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-DfuwH1tt.js.map +0 -1
- package/dist/_chunks/Relations-CFjTESWQ.js.map +0 -1
- package/dist/_chunks/Relations-QP5yn9_z.mjs.map +0 -1
- package/dist/_chunks/index-BHfS6_D5.mjs.map +0 -1
- package/dist/_chunks/index-DXiHxy70.js.map +0 -1
- package/dist/_chunks/relations-D706vblp.js.map +0 -1
- package/dist/_chunks/relations-SCVAL_aJ.mjs.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/strapi-server.js +0 -3
package/dist/server/index.mjs
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1,
|
2
|
-
import { pick, omit, difference, castArray, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
|
1
|
+
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, traverseEntity, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1, pagination } from "@strapi/utils";
|
2
|
+
import { pick, omit, difference, castArray, mergeWith, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
|
3
3
|
import "@strapi/types";
|
4
4
|
import * as yup from "yup";
|
5
5
|
import { scheduleJob } from "node-schedule";
|
@@ -7,10 +7,10 @@ import isNil from "lodash/isNil";
|
|
7
7
|
import _, { intersection as intersection$1, difference as difference$1 } from "lodash";
|
8
8
|
import qs from "qs";
|
9
9
|
import slugify from "@sindresorhus/slugify";
|
10
|
-
const getService$
|
10
|
+
const getService$2 = (name) => {
|
11
11
|
return strapi.plugin("content-manager").service(name);
|
12
12
|
};
|
13
|
-
function getService(strapi2, name) {
|
13
|
+
function getService$1(strapi2, name) {
|
14
14
|
return strapi2.service(`plugin::content-manager.${name}`);
|
15
15
|
}
|
16
16
|
const historyRestoreVersionSchema = yup.object().shape({
|
@@ -46,7 +46,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
46
46
|
if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {
|
47
47
|
throw new errors.ForbiddenError("contentType and documentId are required");
|
48
48
|
}
|
49
|
-
const permissionChecker2 = getService$
|
49
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
50
50
|
userAbility: ctx.state.userAbility,
|
51
51
|
model: ctx.query.contentType
|
52
52
|
});
|
@@ -54,7 +54,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
54
54
|
return ctx.forbidden();
|
55
55
|
}
|
56
56
|
const query = await permissionChecker2.sanitizeQuery(ctx.query);
|
57
|
-
const { results, pagination: pagination2 } = await getService(strapi2, "history").findVersionsPage({
|
57
|
+
const { results, pagination: pagination2 } = await getService$1(strapi2, "history").findVersionsPage({
|
58
58
|
query: {
|
59
59
|
...query,
|
60
60
|
...getValidPagination({ page: query.page, pageSize: query.pageSize })
|
@@ -79,14 +79,14 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
79
79
|
async restoreVersion(ctx) {
|
80
80
|
const request = ctx.request;
|
81
81
|
await validateRestoreVersion(request.body, "contentType is required");
|
82
|
-
const permissionChecker2 = getService$
|
82
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
83
83
|
userAbility: ctx.state.userAbility,
|
84
84
|
model: request.body.contentType
|
85
85
|
});
|
86
86
|
if (permissionChecker2.cannot.update()) {
|
87
87
|
throw new errors.ForbiddenError();
|
88
88
|
}
|
89
|
-
const restoredDocument = await getService(strapi2, "history").restoreVersion(
|
89
|
+
const restoredDocument = await getService$1(strapi2, "history").restoreVersion(
|
90
90
|
request.params.versionId
|
91
91
|
);
|
92
92
|
return {
|
@@ -95,7 +95,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
95
95
|
}
|
96
96
|
};
|
97
97
|
};
|
98
|
-
const controllers$
|
98
|
+
const controllers$2 = {
|
99
99
|
"history-version": createHistoryVersionController
|
100
100
|
/**
|
101
101
|
* Casting is needed because the types aren't aware that Strapi supports
|
@@ -141,8 +141,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
141
141
|
};
|
142
142
|
const getRelationRestoreValue = async (versionRelationData, attribute) => {
|
143
143
|
if (Array.isArray(versionRelationData)) {
|
144
|
-
if (versionRelationData.length === 0)
|
145
|
-
return versionRelationData;
|
144
|
+
if (versionRelationData.length === 0) return versionRelationData;
|
146
145
|
const existingAndMissingRelations = await Promise.all(
|
147
146
|
versionRelationData.map((relation) => {
|
148
147
|
return strapi2.documents(attribute.target).findOne({
|
@@ -151,19 +150,16 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
151
150
|
});
|
152
151
|
})
|
153
152
|
);
|
154
|
-
return existingAndMissingRelations.filter(
|
155
|
-
(relation) => relation !== null
|
156
|
-
);
|
153
|
+
return existingAndMissingRelations.filter((relation) => relation !== null);
|
157
154
|
}
|
158
155
|
return strapi2.documents(attribute.target).findOne({
|
159
156
|
documentId: versionRelationData.documentId,
|
160
157
|
locale: versionRelationData.locale || void 0
|
161
158
|
});
|
162
159
|
};
|
163
|
-
const getMediaRestoreValue = async (versionRelationData
|
164
|
-
if (
|
160
|
+
const getMediaRestoreValue = async (versionRelationData) => {
|
161
|
+
if (Array.isArray(versionRelationData)) {
|
165
162
|
const existingAndMissingMedias = await Promise.all(
|
166
|
-
// @ts-expect-error Fix the type definitions so this isn't any
|
167
163
|
versionRelationData.map((media) => {
|
168
164
|
return strapi2.db.query("plugin::upload.file").findOne({ where: { id: media.id } });
|
169
165
|
})
|
@@ -177,8 +173,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
177
173
|
const getDefaultLocale = async () => localesService ? localesService.getDefaultLocale() : null;
|
178
174
|
const isLocalizedContentType = (model) => i18nContentTypeService ? i18nContentTypeService.isLocalizedContentType(model) : false;
|
179
175
|
const getLocaleDictionary = async () => {
|
180
|
-
if (!localesService)
|
181
|
-
return {};
|
176
|
+
if (!localesService) return {};
|
182
177
|
const locales = await localesService.find() || [];
|
183
178
|
return locales.reduce(
|
184
179
|
(acc, locale) => {
|
@@ -202,6 +197,17 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
202
197
|
const meta = await documentMetadataService.getMetadata(contentTypeUid, document);
|
203
198
|
return documentMetadataService.getStatus(document, meta.availableStatus);
|
204
199
|
};
|
200
|
+
const getComponentFields = (componentUID) => {
|
201
|
+
return Object.entries(strapi2.getModel(componentUID).attributes).reduce(
|
202
|
+
(fieldsAcc, [key, attribute]) => {
|
203
|
+
if (!["relation", "media", "component", "dynamiczone"].includes(attribute.type)) {
|
204
|
+
fieldsAcc.push(key);
|
205
|
+
}
|
206
|
+
return fieldsAcc;
|
207
|
+
},
|
208
|
+
[]
|
209
|
+
);
|
210
|
+
};
|
205
211
|
const getDeepPopulate2 = (uid2, useDatabaseSyntax = false) => {
|
206
212
|
const model = strapi2.getModel(uid2);
|
207
213
|
const attributes = Object.entries(model.attributes);
|
@@ -225,13 +231,19 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
225
231
|
}
|
226
232
|
case "component": {
|
227
233
|
const populate = getDeepPopulate2(attribute.component);
|
228
|
-
acc[attributeName] = {
|
234
|
+
acc[attributeName] = {
|
235
|
+
populate,
|
236
|
+
[fieldSelector]: getComponentFields(attribute.component)
|
237
|
+
};
|
229
238
|
break;
|
230
239
|
}
|
231
240
|
case "dynamiczone": {
|
232
241
|
const populatedComponents = (attribute.components || []).reduce(
|
233
242
|
(acc2, componentUID) => {
|
234
|
-
acc2[componentUID] = {
|
243
|
+
acc2[componentUID] = {
|
244
|
+
populate: getDeepPopulate2(componentUID),
|
245
|
+
[fieldSelector]: getComponentFields(componentUID)
|
246
|
+
};
|
235
247
|
return acc2;
|
236
248
|
},
|
237
249
|
{}
|
@@ -316,8 +328,8 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
316
328
|
});
|
317
329
|
},
|
318
330
|
async findVersionsPage(params) {
|
319
|
-
const
|
320
|
-
const isLocalizedContentType = serviceUtils.isLocalizedContentType(
|
331
|
+
const schema = strapi2.getModel(params.query.contentType);
|
332
|
+
const isLocalizedContentType = serviceUtils.isLocalizedContentType(schema);
|
321
333
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
322
334
|
let locale = null;
|
323
335
|
if (isLocalizedContentType) {
|
@@ -338,78 +350,76 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
338
350
|
}),
|
339
351
|
serviceUtils.getLocaleDictionary()
|
340
352
|
]);
|
341
|
-
const
|
342
|
-
|
343
|
-
async (
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
|
348
|
-
|
349
|
-
model: "plugin::upload.file"
|
350
|
-
});
|
351
|
-
const response = await serviceUtils.buildMediaResponse(attributeValues);
|
352
|
-
const sanitizedResults = await Promise.all(
|
353
|
-
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
354
|
-
);
|
355
|
-
return {
|
356
|
-
...await currentDataWithRelations,
|
357
|
-
[attributeKey]: {
|
358
|
-
results: sanitizedResults,
|
359
|
-
meta: response.meta
|
360
|
-
}
|
361
|
-
};
|
353
|
+
const populateEntry = async (entry) => {
|
354
|
+
return traverseEntity(
|
355
|
+
async (options, utils) => {
|
356
|
+
if (!options.attribute) return;
|
357
|
+
if (!options.value) return;
|
358
|
+
const currentValue = Array.isArray(options.value) ? options.value : [options.value];
|
359
|
+
if (options.attribute.type === "component") {
|
360
|
+
utils.remove("id");
|
362
361
|
}
|
363
|
-
if (
|
364
|
-
|
362
|
+
if (options.attribute.type === "relation" && // TODO: handle polymorphic relations
|
363
|
+
options.attribute.relation !== "morphToOne" && options.attribute.relation !== "morphToMany") {
|
364
|
+
if (options.attribute.target === "admin::user") {
|
365
365
|
const adminUsers = await Promise.all(
|
366
|
-
|
366
|
+
currentValue.map((userToPopulate) => {
|
367
367
|
if (userToPopulate == null) {
|
368
368
|
return null;
|
369
369
|
}
|
370
|
-
return strapi2.query("admin::user").findOne({
|
370
|
+
return strapi2.query("admin::user").findOne({
|
371
|
+
where: {
|
372
|
+
...userToPopulate.id ? { id: userToPopulate.id } : {},
|
373
|
+
...userToPopulate.documentId ? { documentId: userToPopulate.documentId } : {}
|
374
|
+
}
|
375
|
+
});
|
371
376
|
})
|
372
377
|
);
|
373
|
-
|
374
|
-
...await currentDataWithRelations,
|
375
|
-
/**
|
376
|
-
* Ideally we would return the same "{results: [], meta: {}}" shape, however,
|
377
|
-
* when sanitizing the data as a whole in the controller before sending to the client,
|
378
|
-
* the data for admin relation user is completely sanitized if we return an object here as opposed to an array.
|
379
|
-
*/
|
380
|
-
[attributeKey]: adminUsers
|
381
|
-
};
|
378
|
+
utils.set(options.key, adminUsers);
|
382
379
|
}
|
383
|
-
const permissionChecker2 = getService$
|
380
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
384
381
|
userAbility: params.state.userAbility,
|
385
|
-
model:
|
382
|
+
model: options.attribute.target
|
386
383
|
});
|
387
384
|
const response = await serviceUtils.buildRelationReponse(
|
388
|
-
|
389
|
-
|
385
|
+
currentValue,
|
386
|
+
options.attribute
|
390
387
|
);
|
391
388
|
const sanitizedResults = await Promise.all(
|
392
389
|
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
393
390
|
);
|
394
|
-
|
395
|
-
|
396
|
-
|
397
|
-
|
398
|
-
|
399
|
-
|
400
|
-
|
391
|
+
utils.set(options.key, {
|
392
|
+
results: sanitizedResults,
|
393
|
+
meta: response.meta
|
394
|
+
});
|
395
|
+
}
|
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
|
+
});
|
401
409
|
}
|
402
|
-
return currentDataWithRelations;
|
403
410
|
},
|
404
|
-
|
411
|
+
{
|
412
|
+
schema,
|
413
|
+
getModel: strapi2.getModel.bind(strapi2)
|
414
|
+
},
|
415
|
+
entry.data
|
405
416
|
);
|
406
|
-
return entryWithRelations;
|
407
417
|
};
|
408
418
|
const formattedResults = await Promise.all(
|
409
419
|
results.map(async (result) => {
|
410
420
|
return {
|
411
421
|
...result,
|
412
|
-
data: await
|
422
|
+
data: await populateEntry(result),
|
413
423
|
meta: {
|
414
424
|
unknownAttributes: serviceUtils.getSchemaAttributesDiff(
|
415
425
|
result.schema,
|
@@ -440,30 +450,44 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
440
450
|
// Clone to avoid mutating the original version data
|
441
451
|
structuredClone(version.data)
|
442
452
|
);
|
443
|
-
const
|
444
|
-
|
445
|
-
|
446
|
-
|
447
|
-
|
448
|
-
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
+
const schema = structuredClone(version.schema);
|
454
|
+
schema.attributes = omit(FIELDS_TO_IGNORE, contentTypeSchemaAttributes);
|
455
|
+
const dataWithoutMissingRelations = await traverseEntity(
|
456
|
+
async (options, utils) => {
|
457
|
+
if (!options.attribute) return;
|
458
|
+
if (options.attribute.type === "component") {
|
459
|
+
utils.remove("id");
|
460
|
+
if (options.attribute.repeatable && options.value === null) {
|
461
|
+
utils.set(options.key, []);
|
462
|
+
}
|
463
|
+
}
|
464
|
+
if (options.attribute.type === "dynamiczone") {
|
465
|
+
if (options.value === null) {
|
466
|
+
utils.set(options.key, []);
|
467
|
+
}
|
453
468
|
}
|
454
|
-
if (attribute.type === "relation" && // TODO: handle polymorphic relations
|
455
|
-
attribute.relation !== "morphToOne" && attribute.relation !== "morphToMany") {
|
456
|
-
|
457
|
-
|
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);
|
458
477
|
}
|
459
|
-
if (attribute.type === "media") {
|
460
|
-
|
461
|
-
|
478
|
+
if (options.attribute.type === "media") {
|
479
|
+
if (!options.value) return;
|
480
|
+
const data2 = await serviceUtils.getMediaRestoreValue(
|
481
|
+
options.value
|
482
|
+
);
|
483
|
+
utils.set(options.key, data2);
|
462
484
|
}
|
463
|
-
return previousRelationAttributes;
|
464
485
|
},
|
465
|
-
|
466
|
-
|
486
|
+
{
|
487
|
+
schema,
|
488
|
+
getModel: strapi2.getModel.bind(strapi2)
|
489
|
+
},
|
490
|
+
dataWithoutAddedAttributes
|
467
491
|
);
|
468
492
|
const data = omit(["id", ...Object.keys(schemaDiff.removed)], dataWithoutMissingRelations);
|
469
493
|
const restoredDocument = await strapi2.documents(version.contentType).update({
|
@@ -556,7 +580,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
556
580
|
onCommit(async () => {
|
557
581
|
for (const entry of localeEntries) {
|
558
582
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
559
|
-
await getService(strapi2, "history").createVersion({
|
583
|
+
await getService$1(strapi2, "history").createVersion({
|
560
584
|
contentType: uid2,
|
561
585
|
data: omit(FIELDS_TO_IGNORE, entry),
|
562
586
|
relatedDocumentId: documentId,
|
@@ -569,15 +593,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
569
593
|
});
|
570
594
|
return result;
|
571
595
|
});
|
572
|
-
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
596
|
+
state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
|
573
597
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
574
598
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
575
599
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
576
600
|
where: {
|
577
601
|
created_at: {
|
578
|
-
$lt: expirationDate
|
602
|
+
$lt: expirationDate
|
579
603
|
}
|
580
604
|
}
|
605
|
+
}).catch((error) => {
|
606
|
+
if (error instanceof Error) {
|
607
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
608
|
+
}
|
581
609
|
});
|
582
610
|
});
|
583
611
|
state.isInitialized = true;
|
@@ -589,17 +617,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
589
617
|
}
|
590
618
|
};
|
591
619
|
};
|
592
|
-
const services$
|
620
|
+
const services$2 = {
|
593
621
|
history: createHistoryService,
|
594
622
|
lifecycles: createLifecyclesService
|
595
623
|
};
|
596
|
-
const info = { pluginName: "content-manager", type: "admin" };
|
624
|
+
const info$1 = { pluginName: "content-manager", type: "admin" };
|
597
625
|
const historyVersionRouter = {
|
598
626
|
type: "admin",
|
599
627
|
routes: [
|
600
628
|
{
|
601
629
|
method: "GET",
|
602
|
-
info,
|
630
|
+
info: info$1,
|
603
631
|
path: "/history-versions",
|
604
632
|
handler: "history-version.findMany",
|
605
633
|
config: {
|
@@ -608,7 +636,7 @@ const historyVersionRouter = {
|
|
608
636
|
},
|
609
637
|
{
|
610
638
|
method: "PUT",
|
611
|
-
info,
|
639
|
+
info: info$1,
|
612
640
|
path: "/history-versions/:versionId/restore",
|
613
641
|
handler: "history-version.restoreVersion",
|
614
642
|
config: {
|
@@ -617,7 +645,7 @@ const historyVersionRouter = {
|
|
617
645
|
}
|
618
646
|
]
|
619
647
|
};
|
620
|
-
const routes$
|
648
|
+
const routes$2 = {
|
621
649
|
"history-version": historyVersionRouter
|
622
650
|
};
|
623
651
|
const historyVersion = {
|
@@ -664,21 +692,21 @@ const historyVersion = {
|
|
664
692
|
}
|
665
693
|
}
|
666
694
|
};
|
667
|
-
const getFeature = () => {
|
695
|
+
const getFeature$1 = () => {
|
668
696
|
if (strapi.ee.features.isEnabled("cms-content-history")) {
|
669
697
|
return {
|
670
698
|
register({ strapi: strapi2 }) {
|
671
699
|
strapi2.get("models").add(historyVersion);
|
672
700
|
},
|
673
701
|
bootstrap({ strapi: strapi2 }) {
|
674
|
-
getService(strapi2, "lifecycles").bootstrap();
|
702
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
675
703
|
},
|
676
704
|
destroy({ strapi: strapi2 }) {
|
677
|
-
getService(strapi2, "lifecycles").destroy();
|
705
|
+
getService$1(strapi2, "lifecycles").destroy();
|
678
706
|
},
|
679
|
-
controllers: controllers$
|
680
|
-
services: services$
|
681
|
-
routes: routes$
|
707
|
+
controllers: controllers$2,
|
708
|
+
services: services$2,
|
709
|
+
routes: routes$2
|
682
710
|
};
|
683
711
|
}
|
684
712
|
return {
|
@@ -687,9 +715,201 @@ const getFeature = () => {
|
|
687
715
|
}
|
688
716
|
};
|
689
717
|
};
|
690
|
-
const history = getFeature();
|
718
|
+
const history = getFeature$1();
|
719
|
+
const info = { pluginName: "content-manager", type: "admin" };
|
720
|
+
const previewRouter = {
|
721
|
+
type: "admin",
|
722
|
+
routes: [
|
723
|
+
{
|
724
|
+
method: "GET",
|
725
|
+
info,
|
726
|
+
path: "/preview/url/:contentType",
|
727
|
+
handler: "preview.getPreviewUrl",
|
728
|
+
config: {
|
729
|
+
policies: ["admin::isAuthenticatedAdmin"]
|
730
|
+
}
|
731
|
+
}
|
732
|
+
]
|
733
|
+
};
|
734
|
+
const routes$1 = {
|
735
|
+
preview: previewRouter
|
736
|
+
};
|
737
|
+
function getService(strapi2, name) {
|
738
|
+
return strapi2.service(`plugin::content-manager.${name}`);
|
739
|
+
}
|
740
|
+
const getPreviewUrlSchema = yup.object().shape({
|
741
|
+
// Will be undefined for single types
|
742
|
+
documentId: yup.string(),
|
743
|
+
locale: yup.string().nullable(),
|
744
|
+
status: yup.string()
|
745
|
+
}).required();
|
746
|
+
const validatePreviewUrl = async (strapi2, uid2, params) => {
|
747
|
+
await validateYupSchema(getPreviewUrlSchema)(params);
|
748
|
+
const newParams = pick(["documentId", "locale", "status"], params);
|
749
|
+
const model = strapi2.getModel(uid2);
|
750
|
+
if (!model || model.modelType !== "contentType") {
|
751
|
+
throw new errors.ValidationError("Invalid content type");
|
752
|
+
}
|
753
|
+
const isSingleType = model?.kind === "singleType";
|
754
|
+
if (!isSingleType && !params.documentId) {
|
755
|
+
throw new errors.ValidationError("documentId is required for Collection Types");
|
756
|
+
}
|
757
|
+
if (isSingleType) {
|
758
|
+
const doc = await strapi2.documents(uid2).findFirst();
|
759
|
+
if (!doc) {
|
760
|
+
throw new errors.NotFoundError("Document not found");
|
761
|
+
}
|
762
|
+
newParams.documentId = doc?.documentId;
|
763
|
+
}
|
764
|
+
if (!newParams.status) {
|
765
|
+
const isDPEnabled = model?.options?.draftAndPublish;
|
766
|
+
newParams.status = isDPEnabled ? "draft" : "published";
|
767
|
+
}
|
768
|
+
return newParams;
|
769
|
+
};
|
770
|
+
const createPreviewController = () => {
|
771
|
+
return {
|
772
|
+
/**
|
773
|
+
* Transforms an entry into a preview URL, so that it can be previewed
|
774
|
+
* in the Content Manager.
|
775
|
+
*/
|
776
|
+
async getPreviewUrl(ctx) {
|
777
|
+
const uid2 = ctx.params.contentType;
|
778
|
+
const query = ctx.request.query;
|
779
|
+
const params = await validatePreviewUrl(strapi, uid2, query);
|
780
|
+
const previewService = getService(strapi, "preview");
|
781
|
+
const url = await previewService.getPreviewUrl(uid2, params);
|
782
|
+
if (!url) {
|
783
|
+
ctx.status = 204;
|
784
|
+
}
|
785
|
+
return {
|
786
|
+
data: { url }
|
787
|
+
};
|
788
|
+
}
|
789
|
+
};
|
790
|
+
};
|
791
|
+
const controllers$1 = {
|
792
|
+
preview: createPreviewController
|
793
|
+
/**
|
794
|
+
* Casting is needed because the types aren't aware that Strapi supports
|
795
|
+
* passing a controller factory as the value, instead of a controller object directly
|
796
|
+
*/
|
797
|
+
};
|
798
|
+
const createPreviewService = ({ strapi: strapi2 }) => {
|
799
|
+
const config = getService(strapi2, "preview-config");
|
800
|
+
return {
|
801
|
+
async getPreviewUrl(uid2, params) {
|
802
|
+
const handler = config.getPreviewHandler();
|
803
|
+
try {
|
804
|
+
return handler(uid2, params);
|
805
|
+
} catch (error) {
|
806
|
+
strapi2.log.error(`Failed to get preview URL: ${error}`);
|
807
|
+
throw new errors.ApplicationError("Failed to get preview URL");
|
808
|
+
}
|
809
|
+
return;
|
810
|
+
}
|
811
|
+
};
|
812
|
+
};
|
813
|
+
const extendMiddlewareConfiguration = (middleware = { name: "", config: {} }) => {
|
814
|
+
const middlewares = strapi.config.get("middlewares");
|
815
|
+
const configuredMiddlewares = middlewares.map((currentMiddleware) => {
|
816
|
+
if (currentMiddleware === middleware.name) {
|
817
|
+
return middleware;
|
818
|
+
}
|
819
|
+
if (currentMiddleware.name === middleware.name) {
|
820
|
+
return mergeWith(
|
821
|
+
(objValue, srcValue) => {
|
822
|
+
if (Array.isArray(objValue)) {
|
823
|
+
return objValue.concat(srcValue);
|
824
|
+
}
|
825
|
+
return void 0;
|
826
|
+
},
|
827
|
+
currentMiddleware,
|
828
|
+
middleware
|
829
|
+
);
|
830
|
+
}
|
831
|
+
return currentMiddleware;
|
832
|
+
});
|
833
|
+
strapi.config.set("middlewares", configuredMiddlewares);
|
834
|
+
};
|
835
|
+
const createPreviewConfigService = ({ strapi: strapi2 }) => {
|
836
|
+
return {
|
837
|
+
register() {
|
838
|
+
if (!this.isEnabled()) {
|
839
|
+
return;
|
840
|
+
}
|
841
|
+
const config = strapi2.config.get("admin.preview");
|
842
|
+
if (config.config?.allowedOrigins) {
|
843
|
+
extendMiddlewareConfiguration({
|
844
|
+
name: "strapi::security",
|
845
|
+
config: {
|
846
|
+
contentSecurityPolicy: {
|
847
|
+
directives: {
|
848
|
+
"frame-src": config.config.allowedOrigins
|
849
|
+
}
|
850
|
+
}
|
851
|
+
}
|
852
|
+
});
|
853
|
+
}
|
854
|
+
},
|
855
|
+
isEnabled() {
|
856
|
+
const config = strapi2.config.get("admin.preview");
|
857
|
+
if (!config) {
|
858
|
+
return false;
|
859
|
+
}
|
860
|
+
return config?.enabled ?? true;
|
861
|
+
},
|
862
|
+
/**
|
863
|
+
* Validate if the configuration is valid
|
864
|
+
*/
|
865
|
+
validate() {
|
866
|
+
if (!this.isEnabled()) {
|
867
|
+
return;
|
868
|
+
}
|
869
|
+
const handler = this.getPreviewHandler();
|
870
|
+
if (typeof handler !== "function") {
|
871
|
+
throw new errors.ValidationError(
|
872
|
+
"Preview configuration is invalid. Handler must be a function"
|
873
|
+
);
|
874
|
+
}
|
875
|
+
},
|
876
|
+
/**
|
877
|
+
* Utility to get the preview handler from the configuration
|
878
|
+
*/
|
879
|
+
getPreviewHandler() {
|
880
|
+
const config = strapi2.config.get("admin.preview");
|
881
|
+
const emptyHandler = () => {
|
882
|
+
return void 0;
|
883
|
+
};
|
884
|
+
if (!this.isEnabled()) {
|
885
|
+
return emptyHandler;
|
886
|
+
}
|
887
|
+
return config?.config?.handler || emptyHandler;
|
888
|
+
}
|
889
|
+
};
|
890
|
+
};
|
891
|
+
const services$1 = {
|
892
|
+
preview: createPreviewService,
|
893
|
+
"preview-config": createPreviewConfigService
|
894
|
+
};
|
895
|
+
const getFeature = () => {
|
896
|
+
return {
|
897
|
+
register() {
|
898
|
+
const config = getService(strapi, "preview-config");
|
899
|
+
config.validate();
|
900
|
+
config.register();
|
901
|
+
},
|
902
|
+
bootstrap() {
|
903
|
+
},
|
904
|
+
routes: routes$1,
|
905
|
+
controllers: controllers$1,
|
906
|
+
services: services$1
|
907
|
+
};
|
908
|
+
};
|
909
|
+
const preview = getFeature();
|
691
910
|
const register = async ({ strapi: strapi2 }) => {
|
692
911
|
await history.register?.({ strapi: strapi2 });
|
912
|
+
await preview.register?.({ strapi: strapi2 });
|
693
913
|
};
|
694
914
|
const ALLOWED_WEBHOOK_EVENTS = {
|
695
915
|
ENTRY_PUBLISH: "entry.publish",
|
@@ -699,11 +919,12 @@ const bootstrap = async () => {
|
|
699
919
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
700
920
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
701
921
|
});
|
702
|
-
getService$
|
703
|
-
await getService$
|
704
|
-
await getService$
|
705
|
-
await getService$
|
922
|
+
getService$2("field-sizes").setCustomFieldInputSizes();
|
923
|
+
await getService$2("components").syncConfigurations();
|
924
|
+
await getService$2("content-types").syncConfigurations();
|
925
|
+
await getService$2("permission").registerPermissions();
|
706
926
|
await history.bootstrap?.({ strapi });
|
927
|
+
await preview.bootstrap?.({ strapi });
|
707
928
|
};
|
708
929
|
const destroy = async ({ strapi: strapi2 }) => {
|
709
930
|
await history.destroy?.({ strapi: strapi2 });
|
@@ -1193,7 +1414,8 @@ const admin = {
|
|
1193
1414
|
};
|
1194
1415
|
const routes = {
|
1195
1416
|
admin,
|
1196
|
-
...history.routes ? history.routes : {}
|
1417
|
+
...history.routes ? history.routes : {},
|
1418
|
+
...preview.routes ? preview.routes : {}
|
1197
1419
|
};
|
1198
1420
|
const hasPermissionsSchema = yup$1.object({
|
1199
1421
|
actions: yup$1.array().of(yup$1.string()),
|
@@ -1256,8 +1478,7 @@ const isSortable = (schema, name) => {
|
|
1256
1478
|
if (!_.has(schema.attributes, name)) {
|
1257
1479
|
return false;
|
1258
1480
|
}
|
1259
|
-
if (schema.modelType === "component" && name === "id")
|
1260
|
-
return false;
|
1481
|
+
if (schema.modelType === "component" && name === "id") return false;
|
1261
1482
|
const attribute = schema.attributes[name];
|
1262
1483
|
if (NON_SORTABLES.includes(attribute.type)) {
|
1263
1484
|
return false;
|
@@ -1402,8 +1623,7 @@ const createDefaultSettings = async (schema) => {
|
|
1402
1623
|
};
|
1403
1624
|
};
|
1404
1625
|
const syncSettings = async (configuration, schema) => {
|
1405
|
-
if (isEmpty(configuration.settings))
|
1406
|
-
return createDefaultSettings(schema);
|
1626
|
+
if (isEmpty(configuration.settings)) return createDefaultSettings(schema);
|
1407
1627
|
const defaultField = getDefaultMainField(schema);
|
1408
1628
|
const { mainField = defaultField, defaultSortBy = defaultField } = configuration.settings || {};
|
1409
1629
|
return {
|
@@ -1450,7 +1670,7 @@ const createMetadasSchema = (schema) => {
|
|
1450
1670
|
if (!value) {
|
1451
1671
|
return yup$1.string();
|
1452
1672
|
}
|
1453
|
-
const targetSchema = getService$
|
1673
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1454
1674
|
schema.attributes[key].targetModel
|
1455
1675
|
);
|
1456
1676
|
if (!targetSchema) {
|
@@ -1579,8 +1799,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1579
1799
|
}
|
1580
1800
|
switch (attribute.type) {
|
1581
1801
|
case "relation": {
|
1582
|
-
if (canCreate(attributePath))
|
1583
|
-
return body2;
|
1802
|
+
if (canCreate(attributePath)) return body2;
|
1584
1803
|
return set(attributePath, { set: [] }, body2);
|
1585
1804
|
}
|
1586
1805
|
case "component": {
|
@@ -1590,8 +1809,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1590
1809
|
]);
|
1591
1810
|
}
|
1592
1811
|
default: {
|
1593
|
-
if (canCreate(attributePath))
|
1594
|
-
return body2;
|
1812
|
+
if (canCreate(attributePath)) return body2;
|
1595
1813
|
return set(attributePath, null, body2);
|
1596
1814
|
}
|
1597
1815
|
}
|
@@ -1619,7 +1837,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1619
1837
|
}
|
1620
1838
|
};
|
1621
1839
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1622
|
-
const documentMetadata2 = getService$
|
1840
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1623
1841
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1624
1842
|
let {
|
1625
1843
|
meta: { availableLocales, availableStatus }
|
@@ -1645,8 +1863,8 @@ const createDocument = async (ctx, opts) => {
|
|
1645
1863
|
const { userAbility, user } = ctx.state;
|
1646
1864
|
const { model } = ctx.params;
|
1647
1865
|
const { body } = ctx.request;
|
1648
|
-
const documentManager2 = getService$
|
1649
|
-
const permissionChecker2 = getService$
|
1866
|
+
const documentManager2 = getService$2("document-manager");
|
1867
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1650
1868
|
if (permissionChecker2.cannot.create()) {
|
1651
1869
|
throw new errors.ForbiddenError();
|
1652
1870
|
}
|
@@ -1666,13 +1884,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1666
1884
|
const { userAbility, user } = ctx.state;
|
1667
1885
|
const { id, model } = ctx.params;
|
1668
1886
|
const { body } = ctx.request;
|
1669
|
-
const documentManager2 = getService$
|
1670
|
-
const permissionChecker2 = getService$
|
1887
|
+
const documentManager2 = getService$2("document-manager");
|
1888
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1671
1889
|
if (permissionChecker2.cannot.update()) {
|
1672
1890
|
throw new errors.ForbiddenError();
|
1673
1891
|
}
|
1674
1892
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1675
|
-
const populate = await getService$
|
1893
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1676
1894
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1677
1895
|
const [documentVersion, documentExists] = await Promise.all([
|
1678
1896
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1689,7 +1907,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1689
1907
|
throw new errors.ForbiddenError();
|
1690
1908
|
}
|
1691
1909
|
const pickPermittedFields = documentVersion ? permissionChecker2.sanitizeUpdateInput(documentVersion) : permissionChecker2.sanitizeCreateInput;
|
1692
|
-
const setCreator = setCreatorFields({ user, isEdition: true });
|
1910
|
+
const setCreator = documentVersion ? setCreatorFields({ user, isEdition: true }) : setCreatorFields({ user });
|
1693
1911
|
const sanitizeFn = async.pipe(pickPermittedFields, setCreator);
|
1694
1912
|
const sanitizedBody = await sanitizeFn(body);
|
1695
1913
|
return documentManager2.update(documentVersion?.documentId || id, model, {
|
@@ -1703,14 +1921,14 @@ const collectionTypes = {
|
|
1703
1921
|
const { userAbility } = ctx.state;
|
1704
1922
|
const { model } = ctx.params;
|
1705
1923
|
const { query } = ctx.request;
|
1706
|
-
const documentMetadata2 = getService$
|
1707
|
-
const documentManager2 = getService$
|
1708
|
-
const permissionChecker2 = getService$
|
1924
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1925
|
+
const documentManager2 = getService$2("document-manager");
|
1926
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1709
1927
|
if (permissionChecker2.cannot.read()) {
|
1710
1928
|
return ctx.forbidden();
|
1711
1929
|
}
|
1712
1930
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1713
|
-
const populate = await getService$
|
1931
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1714
1932
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1715
1933
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1716
1934
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1739,13 +1957,13 @@ const collectionTypes = {
|
|
1739
1957
|
async findOne(ctx) {
|
1740
1958
|
const { userAbility } = ctx.state;
|
1741
1959
|
const { model, id } = ctx.params;
|
1742
|
-
const documentManager2 = getService$
|
1743
|
-
const permissionChecker2 = getService$
|
1960
|
+
const documentManager2 = getService$2("document-manager");
|
1961
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1744
1962
|
if (permissionChecker2.cannot.read()) {
|
1745
1963
|
return ctx.forbidden();
|
1746
1964
|
}
|
1747
1965
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1748
|
-
const populate = await getService$
|
1966
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1749
1967
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1750
1968
|
const version = await documentManager2.findOne(id, model, {
|
1751
1969
|
populate,
|
@@ -1776,7 +1994,7 @@ const collectionTypes = {
|
|
1776
1994
|
async create(ctx) {
|
1777
1995
|
const { userAbility } = ctx.state;
|
1778
1996
|
const { model } = ctx.params;
|
1779
|
-
const permissionChecker2 = getService$
|
1997
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1780
1998
|
const [totalEntries, document] = await Promise.all([
|
1781
1999
|
strapi.db.query(model).count(),
|
1782
2000
|
createDocument(ctx)
|
@@ -1797,7 +2015,7 @@ const collectionTypes = {
|
|
1797
2015
|
async update(ctx) {
|
1798
2016
|
const { userAbility } = ctx.state;
|
1799
2017
|
const { model } = ctx.params;
|
1800
|
-
const permissionChecker2 = getService$
|
2018
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1801
2019
|
const updatedVersion = await updateDocument(ctx);
|
1802
2020
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1803
2021
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1806,13 +2024,13 @@ const collectionTypes = {
|
|
1806
2024
|
const { userAbility, user } = ctx.state;
|
1807
2025
|
const { model, sourceId: id } = ctx.params;
|
1808
2026
|
const { body } = ctx.request;
|
1809
|
-
const documentManager2 = getService$
|
1810
|
-
const permissionChecker2 = getService$
|
2027
|
+
const documentManager2 = getService$2("document-manager");
|
2028
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1811
2029
|
if (permissionChecker2.cannot.create()) {
|
1812
2030
|
return ctx.forbidden();
|
1813
2031
|
}
|
1814
2032
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1815
|
-
const populate = await getService$
|
2033
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1816
2034
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1817
2035
|
const document = await documentManager2.findOne(id, model, {
|
1818
2036
|
populate,
|
@@ -1851,13 +2069,13 @@ const collectionTypes = {
|
|
1851
2069
|
async delete(ctx) {
|
1852
2070
|
const { userAbility } = ctx.state;
|
1853
2071
|
const { id, model } = ctx.params;
|
1854
|
-
const documentManager2 = getService$
|
1855
|
-
const permissionChecker2 = getService$
|
2072
|
+
const documentManager2 = getService$2("document-manager");
|
2073
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1856
2074
|
if (permissionChecker2.cannot.delete()) {
|
1857
2075
|
return ctx.forbidden();
|
1858
2076
|
}
|
1859
2077
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1860
|
-
const populate = await getService$
|
2078
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1861
2079
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1862
2080
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1863
2081
|
if (documentLocales.length === 0) {
|
@@ -1879,14 +2097,14 @@ const collectionTypes = {
|
|
1879
2097
|
const { userAbility } = ctx.state;
|
1880
2098
|
const { id, model } = ctx.params;
|
1881
2099
|
const { body } = ctx.request;
|
1882
|
-
const documentManager2 = getService$
|
1883
|
-
const permissionChecker2 = getService$
|
2100
|
+
const documentManager2 = getService$2("document-manager");
|
2101
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1884
2102
|
if (permissionChecker2.cannot.publish()) {
|
1885
2103
|
return ctx.forbidden();
|
1886
2104
|
}
|
1887
2105
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1888
2106
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1889
|
-
const populate = await getService$
|
2107
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1890
2108
|
let document;
|
1891
2109
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1892
2110
|
const isCreate = isNil$1(id);
|
@@ -1898,11 +2116,17 @@ const collectionTypes = {
|
|
1898
2116
|
}
|
1899
2117
|
const isUpdate = !isCreate;
|
1900
2118
|
if (isUpdate) {
|
1901
|
-
|
1902
|
-
if (!
|
2119
|
+
const documentExists = documentManager2.exists(model, id);
|
2120
|
+
if (!documentExists) {
|
1903
2121
|
throw new errors.NotFoundError("Document not found");
|
1904
2122
|
}
|
1905
|
-
|
2123
|
+
document = await documentManager2.findOne(id, model, { populate, locale });
|
2124
|
+
if (!document) {
|
2125
|
+
if (permissionChecker2.cannot.create({ locale }) || permissionChecker2.cannot.publish({ locale })) {
|
2126
|
+
throw new errors.ForbiddenError();
|
2127
|
+
}
|
2128
|
+
document = await updateDocument(ctx);
|
2129
|
+
} else if (permissionChecker2.can.update(document)) {
|
1906
2130
|
await updateDocument(ctx);
|
1907
2131
|
}
|
1908
2132
|
}
|
@@ -1928,13 +2152,13 @@ const collectionTypes = {
|
|
1928
2152
|
const { body } = ctx.request;
|
1929
2153
|
const { documentIds } = body;
|
1930
2154
|
await validateBulkActionInput(body);
|
1931
|
-
const documentManager2 = getService$
|
1932
|
-
const permissionChecker2 = getService$
|
2155
|
+
const documentManager2 = getService$2("document-manager");
|
2156
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1933
2157
|
if (permissionChecker2.cannot.publish()) {
|
1934
2158
|
return ctx.forbidden();
|
1935
2159
|
}
|
1936
2160
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1937
|
-
const populate = await getService$
|
2161
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1938
2162
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1939
2163
|
allowMultipleLocales: true
|
1940
2164
|
});
|
@@ -1959,8 +2183,8 @@ const collectionTypes = {
|
|
1959
2183
|
const { body } = ctx.request;
|
1960
2184
|
const { documentIds } = body;
|
1961
2185
|
await validateBulkActionInput(body);
|
1962
|
-
const documentManager2 = getService$
|
1963
|
-
const permissionChecker2 = getService$
|
2186
|
+
const documentManager2 = getService$2("document-manager");
|
2187
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1964
2188
|
if (permissionChecker2.cannot.unpublish()) {
|
1965
2189
|
return ctx.forbidden();
|
1966
2190
|
}
|
@@ -1989,8 +2213,8 @@ const collectionTypes = {
|
|
1989
2213
|
const {
|
1990
2214
|
body: { discardDraft, ...body }
|
1991
2215
|
} = ctx.request;
|
1992
|
-
const documentManager2 = getService$
|
1993
|
-
const permissionChecker2 = getService$
|
2216
|
+
const documentManager2 = getService$2("document-manager");
|
2217
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1994
2218
|
if (permissionChecker2.cannot.unpublish()) {
|
1995
2219
|
return ctx.forbidden();
|
1996
2220
|
}
|
@@ -1998,7 +2222,7 @@ const collectionTypes = {
|
|
1998
2222
|
return ctx.forbidden();
|
1999
2223
|
}
|
2000
2224
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2001
|
-
const populate = await getService$
|
2225
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2002
2226
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2003
2227
|
const document = await documentManager2.findOne(id, model, {
|
2004
2228
|
populate,
|
@@ -2029,13 +2253,13 @@ const collectionTypes = {
|
|
2029
2253
|
const { userAbility } = ctx.state;
|
2030
2254
|
const { id, model } = ctx.params;
|
2031
2255
|
const { body } = ctx.request;
|
2032
|
-
const documentManager2 = getService$
|
2033
|
-
const permissionChecker2 = getService$
|
2256
|
+
const documentManager2 = getService$2("document-manager");
|
2257
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2034
2258
|
if (permissionChecker2.cannot.discard()) {
|
2035
2259
|
return ctx.forbidden();
|
2036
2260
|
}
|
2037
2261
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2038
|
-
const populate = await getService$
|
2262
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2039
2263
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2040
2264
|
const document = await documentManager2.findOne(id, model, {
|
2041
2265
|
populate,
|
@@ -2060,13 +2284,13 @@ const collectionTypes = {
|
|
2060
2284
|
const { query, body } = ctx.request;
|
2061
2285
|
const { documentIds } = body;
|
2062
2286
|
await validateBulkActionInput(body);
|
2063
|
-
const documentManager2 = getService$
|
2064
|
-
const permissionChecker2 = getService$
|
2287
|
+
const documentManager2 = getService$2("document-manager");
|
2288
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2065
2289
|
if (permissionChecker2.cannot.delete()) {
|
2066
2290
|
return ctx.forbidden();
|
2067
2291
|
}
|
2068
2292
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2069
|
-
const populate = await getService$
|
2293
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2070
2294
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2071
2295
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2072
2296
|
populate,
|
@@ -2087,13 +2311,13 @@ const collectionTypes = {
|
|
2087
2311
|
async countDraftRelations(ctx) {
|
2088
2312
|
const { userAbility } = ctx.state;
|
2089
2313
|
const { model, id } = ctx.params;
|
2090
|
-
const documentManager2 = getService$
|
2091
|
-
const permissionChecker2 = getService$
|
2314
|
+
const documentManager2 = getService$2("document-manager");
|
2315
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2092
2316
|
if (permissionChecker2.cannot.read()) {
|
2093
2317
|
return ctx.forbidden();
|
2094
2318
|
}
|
2095
2319
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2096
|
-
const populate = await getService$
|
2320
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2097
2321
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2098
2322
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2099
2323
|
if (!entity) {
|
@@ -2112,8 +2336,8 @@ const collectionTypes = {
|
|
2112
2336
|
const ids = ctx.request.query.documentIds;
|
2113
2337
|
const locale = ctx.request.query.locale;
|
2114
2338
|
const { model } = ctx.params;
|
2115
|
-
const documentManager2 = getService$
|
2116
|
-
const permissionChecker2 = getService$
|
2339
|
+
const documentManager2 = getService$2("document-manager");
|
2340
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2117
2341
|
if (permissionChecker2.cannot.read()) {
|
2118
2342
|
return ctx.forbidden();
|
2119
2343
|
}
|
@@ -2137,13 +2361,13 @@ const collectionTypes = {
|
|
2137
2361
|
};
|
2138
2362
|
const components$1 = {
|
2139
2363
|
findComponents(ctx) {
|
2140
|
-
const components2 = getService$
|
2141
|
-
const { toDto } = getService$
|
2364
|
+
const components2 = getService$2("components").findAllComponents();
|
2365
|
+
const { toDto } = getService$2("data-mapper");
|
2142
2366
|
ctx.body = { data: components2.map(toDto) };
|
2143
2367
|
},
|
2144
2368
|
async findComponentConfiguration(ctx) {
|
2145
2369
|
const { uid: uid2 } = ctx.params;
|
2146
|
-
const componentService = getService$
|
2370
|
+
const componentService = getService$2("components");
|
2147
2371
|
const component = componentService.findComponent(uid2);
|
2148
2372
|
if (!component) {
|
2149
2373
|
return ctx.notFound("component.notFound");
|
@@ -2160,7 +2384,7 @@ const components$1 = {
|
|
2160
2384
|
async updateComponentConfiguration(ctx) {
|
2161
2385
|
const { uid: uid2 } = ctx.params;
|
2162
2386
|
const { body } = ctx.request;
|
2163
|
-
const componentService = getService$
|
2387
|
+
const componentService = getService$2("components");
|
2164
2388
|
const component = componentService.findComponent(uid2);
|
2165
2389
|
if (!component) {
|
2166
2390
|
return ctx.notFound("component.notFound");
|
@@ -2194,12 +2418,12 @@ const contentTypes = {
|
|
2194
2418
|
} catch (error) {
|
2195
2419
|
return ctx.send({ error }, 400);
|
2196
2420
|
}
|
2197
|
-
const contentTypes2 = getService$
|
2198
|
-
const { toDto } = getService$
|
2421
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2422
|
+
const { toDto } = getService$2("data-mapper");
|
2199
2423
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2200
2424
|
},
|
2201
2425
|
async findContentTypesSettings(ctx) {
|
2202
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2426
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2203
2427
|
const contentTypes2 = await findAllContentTypes();
|
2204
2428
|
const configurations = await Promise.all(
|
2205
2429
|
contentTypes2.map(async (contentType) => {
|
@@ -2213,7 +2437,7 @@ const contentTypes = {
|
|
2213
2437
|
},
|
2214
2438
|
async findContentTypeConfiguration(ctx) {
|
2215
2439
|
const { uid: uid2 } = ctx.params;
|
2216
|
-
const contentTypeService = getService$
|
2440
|
+
const contentTypeService = getService$2("content-types");
|
2217
2441
|
const contentType = await contentTypeService.findContentType(uid2);
|
2218
2442
|
if (!contentType) {
|
2219
2443
|
return ctx.notFound("contentType.notFound");
|
@@ -2235,13 +2459,13 @@ const contentTypes = {
|
|
2235
2459
|
const { userAbility } = ctx.state;
|
2236
2460
|
const { uid: uid2 } = ctx.params;
|
2237
2461
|
const { body } = ctx.request;
|
2238
|
-
const contentTypeService = getService$
|
2239
|
-
const metricsService = getService$
|
2462
|
+
const contentTypeService = getService$2("content-types");
|
2463
|
+
const metricsService = getService$2("metrics");
|
2240
2464
|
const contentType = await contentTypeService.findContentType(uid2);
|
2241
2465
|
if (!contentType) {
|
2242
2466
|
return ctx.notFound("contentType.notFound");
|
2243
2467
|
}
|
2244
|
-
if (!getService$
|
2468
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2245
2469
|
return ctx.forbidden();
|
2246
2470
|
}
|
2247
2471
|
let input;
|
@@ -2274,10 +2498,10 @@ const contentTypes = {
|
|
2274
2498
|
};
|
2275
2499
|
const init = {
|
2276
2500
|
getInitData(ctx) {
|
2277
|
-
const { toDto } = getService$
|
2278
|
-
const { findAllComponents } = getService$
|
2279
|
-
const { getAllFieldSizes } = getService$
|
2280
|
-
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");
|
2281
2505
|
ctx.body = {
|
2282
2506
|
data: {
|
2283
2507
|
fieldSizes: getAllFieldSizes(),
|
@@ -2313,7 +2537,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2313
2537
|
params.filters.$and.push(filtersClause);
|
2314
2538
|
};
|
2315
2539
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2316
|
-
const permissionChecker2 = getService$
|
2540
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2317
2541
|
userAbility,
|
2318
2542
|
model: model.uid
|
2319
2543
|
});
|
@@ -2327,15 +2551,27 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2327
2551
|
}
|
2328
2552
|
return mainField;
|
2329
2553
|
};
|
2330
|
-
const addStatusToRelations = async (
|
2331
|
-
if (!contentTypes$1.hasDraftAndPublish(strapi.
|
2554
|
+
const addStatusToRelations = async (targetUid, relations2) => {
|
2555
|
+
if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2556
|
+
return relations2;
|
2557
|
+
}
|
2558
|
+
const documentMetadata2 = getService$2("document-metadata");
|
2559
|
+
if (!relations2.length) {
|
2332
2560
|
return relations2;
|
2333
2561
|
}
|
2334
|
-
const
|
2335
|
-
const
|
2562
|
+
const firstRelation = relations2[0];
|
2563
|
+
const filters = {
|
2564
|
+
documentId: { $in: relations2.map((r) => r.documentId) },
|
2565
|
+
// NOTE: find the "opposite" status
|
2566
|
+
publishedAt: firstRelation.publishedAt !== null ? { $null: true } : { $notNull: true }
|
2567
|
+
};
|
2568
|
+
const availableStatus = await strapi.query(targetUid).findMany({
|
2569
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"],
|
2570
|
+
filters
|
2571
|
+
});
|
2336
2572
|
return relations2.map((relation) => {
|
2337
|
-
const availableStatuses =
|
2338
|
-
(availableDocument) => availableDocument.documentId === relation.documentId
|
2573
|
+
const availableStatuses = availableStatus.filter(
|
2574
|
+
(availableDocument) => availableDocument.documentId === relation.documentId && (relation.locale ? availableDocument.locale === relation.locale : true)
|
2339
2575
|
);
|
2340
2576
|
return {
|
2341
2577
|
...relation,
|
@@ -2356,11 +2592,8 @@ const validateLocale = (sourceUid, targetUid, locale) => {
|
|
2356
2592
|
const isLocalized = strapi.plugin("i18n").service("content-types").isLocalizedContentType;
|
2357
2593
|
const isSourceLocalized = isLocalized(sourceModel);
|
2358
2594
|
const isTargetLocalized = isLocalized(targetModel);
|
2359
|
-
let validatedLocale = locale;
|
2360
|
-
if (!targetModel || !isTargetLocalized)
|
2361
|
-
validatedLocale = void 0;
|
2362
2595
|
return {
|
2363
|
-
locale
|
2596
|
+
locale,
|
2364
2597
|
isSourceLocalized,
|
2365
2598
|
isTargetLocalized
|
2366
2599
|
};
|
@@ -2369,8 +2602,7 @@ const validateStatus = (sourceUid, status) => {
|
|
2369
2602
|
const sourceModel = strapi.getModel(sourceUid);
|
2370
2603
|
const isDP = contentTypes$1.hasDraftAndPublish;
|
2371
2604
|
const isSourceDP = isDP(sourceModel);
|
2372
|
-
if (!isSourceDP)
|
2373
|
-
return { status: void 0 };
|
2605
|
+
if (!isSourceDP) return { status: void 0 };
|
2374
2606
|
switch (status) {
|
2375
2607
|
case "published":
|
2376
2608
|
return { status: "published" };
|
@@ -2400,7 +2632,7 @@ const relations = {
|
|
2400
2632
|
ctx.request?.query?.locale
|
2401
2633
|
);
|
2402
2634
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2403
|
-
const permissionChecker2 = getService$
|
2635
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2404
2636
|
userAbility,
|
2405
2637
|
model
|
2406
2638
|
});
|
@@ -2425,7 +2657,7 @@ const relations = {
|
|
2425
2657
|
where.id = id;
|
2426
2658
|
}
|
2427
2659
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2428
|
-
const populate = await getService$
|
2660
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2429
2661
|
const currentEntity = await strapi.db.query(model).findOne({
|
2430
2662
|
where,
|
2431
2663
|
populate
|
@@ -2440,7 +2672,7 @@ const relations = {
|
|
2440
2672
|
}
|
2441
2673
|
entryId = currentEntity.id;
|
2442
2674
|
}
|
2443
|
-
const modelConfig = isComponent2 ? await getService$
|
2675
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2444
2676
|
const targetSchema = strapi.getModel(targetUid);
|
2445
2677
|
const mainField = flow(
|
2446
2678
|
prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2463,7 +2695,7 @@ const relations = {
|
|
2463
2695
|
attribute,
|
2464
2696
|
fieldsToSelect,
|
2465
2697
|
mainField,
|
2466
|
-
source: { schema: sourceSchema },
|
2698
|
+
source: { schema: sourceSchema, isLocalized: isSourceLocalized },
|
2467
2699
|
target: { schema: targetSchema, isLocalized: isTargetLocalized },
|
2468
2700
|
sourceSchema,
|
2469
2701
|
targetSchema,
|
@@ -2485,7 +2717,8 @@ const relations = {
|
|
2485
2717
|
fieldsToSelect,
|
2486
2718
|
mainField,
|
2487
2719
|
source: {
|
2488
|
-
schema: { uid: sourceUid, modelType: sourceModelType }
|
2720
|
+
schema: { uid: sourceUid, modelType: sourceModelType },
|
2721
|
+
isLocalized: isSourceLocalized
|
2489
2722
|
},
|
2490
2723
|
target: {
|
2491
2724
|
schema: { uid: targetUid },
|
@@ -2493,7 +2726,7 @@ const relations = {
|
|
2493
2726
|
}
|
2494
2727
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2495
2728
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2496
|
-
const permissionChecker2 = getService$
|
2729
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2497
2730
|
userAbility: ctx.state.userAbility,
|
2498
2731
|
model: targetUid
|
2499
2732
|
});
|
@@ -2523,12 +2756,16 @@ const relations = {
|
|
2523
2756
|
} else {
|
2524
2757
|
where.id = id;
|
2525
2758
|
}
|
2526
|
-
|
2527
|
-
|
2759
|
+
const publishedAt = getPublishedAtClause(status, targetUid);
|
2760
|
+
if (!isEmpty(publishedAt)) {
|
2761
|
+
where[`${alias}.published_at`] = publishedAt;
|
2528
2762
|
}
|
2529
|
-
if (
|
2763
|
+
if (isTargetLocalized && locale) {
|
2530
2764
|
where[`${alias}.locale`] = locale;
|
2531
2765
|
}
|
2766
|
+
if (isSourceLocalized && locale) {
|
2767
|
+
where.locale = locale;
|
2768
|
+
}
|
2532
2769
|
if ((idsToInclude?.length ?? 0) !== 0) {
|
2533
2770
|
where[`${alias}.id`].$notIn = idsToInclude;
|
2534
2771
|
}
|
@@ -2546,7 +2783,8 @@ const relations = {
|
|
2546
2783
|
id: { $notIn: uniq(idsToOmit) }
|
2547
2784
|
});
|
2548
2785
|
}
|
2549
|
-
const
|
2786
|
+
const dbQuery = strapi.get("query-params").transform(targetUid, queryParams);
|
2787
|
+
const res = await strapi.db.query(targetUid).findPage(dbQuery);
|
2550
2788
|
ctx.body = {
|
2551
2789
|
...res,
|
2552
2790
|
results: await addStatusToRelations(targetUid, res.results)
|
@@ -2561,21 +2799,33 @@ const relations = {
|
|
2561
2799
|
attribute,
|
2562
2800
|
targetField,
|
2563
2801
|
fieldsToSelect,
|
2564
|
-
|
2565
|
-
|
2566
|
-
}
|
2567
|
-
target: {
|
2568
|
-
schema: { uid: targetUid }
|
2569
|
-
}
|
2802
|
+
status,
|
2803
|
+
source: { schema: sourceSchema },
|
2804
|
+
target: { schema: targetSchema }
|
2570
2805
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2571
|
-
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 });
|
2572
2809
|
const dbQuery = strapi.db.query(sourceUid);
|
2573
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
|
+
}
|
2574
2823
|
const res = await loadRelations({ id: entryId }, targetField, {
|
2575
|
-
select: ["id", "documentId", "locale", "publishedAt"],
|
2824
|
+
select: ["id", "documentId", "locale", "publishedAt", "updatedAt"],
|
2576
2825
|
ordering: "desc",
|
2577
2826
|
page: ctx.request.query.page,
|
2578
|
-
pageSize: ctx.request.query.pageSize
|
2827
|
+
pageSize: ctx.request.query.pageSize,
|
2828
|
+
filters
|
2579
2829
|
});
|
2580
2830
|
const loadedIds = res.results.map((item) => item.id);
|
2581
2831
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
@@ -2596,10 +2846,10 @@ const relations = {
|
|
2596
2846
|
}
|
2597
2847
|
};
|
2598
2848
|
const buildPopulateFromQuery = async (query, model) => {
|
2599
|
-
return getService$
|
2849
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2600
2850
|
};
|
2601
2851
|
const findDocument = async (query, uid2, opts = {}) => {
|
2602
|
-
const documentManager2 = getService$
|
2852
|
+
const documentManager2 = getService$2("document-manager");
|
2603
2853
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2604
2854
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2605
2855
|
};
|
@@ -2607,8 +2857,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2607
2857
|
const { user, userAbility } = ctx.state;
|
2608
2858
|
const { model } = ctx.params;
|
2609
2859
|
const { body, query } = ctx.request;
|
2610
|
-
const documentManager2 = getService$
|
2611
|
-
const permissionChecker2 = getService$
|
2860
|
+
const documentManager2 = getService$2("document-manager");
|
2861
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2612
2862
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2613
2863
|
throw new errors.ForbiddenError();
|
2614
2864
|
}
|
@@ -2649,7 +2899,7 @@ const singleTypes = {
|
|
2649
2899
|
const { userAbility } = ctx.state;
|
2650
2900
|
const { model } = ctx.params;
|
2651
2901
|
const { query = {} } = ctx.request;
|
2652
|
-
const permissionChecker2 = getService$
|
2902
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2653
2903
|
if (permissionChecker2.cannot.read()) {
|
2654
2904
|
return ctx.forbidden();
|
2655
2905
|
}
|
@@ -2668,7 +2918,7 @@ const singleTypes = {
|
|
2668
2918
|
permissionChecker2,
|
2669
2919
|
model,
|
2670
2920
|
// @ts-expect-error - fix types
|
2671
|
-
{
|
2921
|
+
{ documentId: document.documentId, locale, publishedAt: null },
|
2672
2922
|
{ availableLocales: true, availableStatus: false }
|
2673
2923
|
);
|
2674
2924
|
ctx.body = { data: {}, meta };
|
@@ -2683,7 +2933,7 @@ const singleTypes = {
|
|
2683
2933
|
async createOrUpdate(ctx) {
|
2684
2934
|
const { userAbility } = ctx.state;
|
2685
2935
|
const { model } = ctx.params;
|
2686
|
-
const permissionChecker2 = getService$
|
2936
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2687
2937
|
const document = await createOrUpdateDocument(ctx);
|
2688
2938
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2689
2939
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2692,8 +2942,8 @@ const singleTypes = {
|
|
2692
2942
|
const { userAbility } = ctx.state;
|
2693
2943
|
const { model } = ctx.params;
|
2694
2944
|
const { query = {} } = ctx.request;
|
2695
|
-
const documentManager2 = getService$
|
2696
|
-
const permissionChecker2 = getService$
|
2945
|
+
const documentManager2 = getService$2("document-manager");
|
2946
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2697
2947
|
if (permissionChecker2.cannot.delete()) {
|
2698
2948
|
return ctx.forbidden();
|
2699
2949
|
}
|
@@ -2721,8 +2971,8 @@ const singleTypes = {
|
|
2721
2971
|
const { userAbility } = ctx.state;
|
2722
2972
|
const { model } = ctx.params;
|
2723
2973
|
const { query = {} } = ctx.request;
|
2724
|
-
const documentManager2 = getService$
|
2725
|
-
const permissionChecker2 = getService$
|
2974
|
+
const documentManager2 = getService$2("document-manager");
|
2975
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2726
2976
|
if (permissionChecker2.cannot.publish()) {
|
2727
2977
|
return ctx.forbidden();
|
2728
2978
|
}
|
@@ -2750,8 +3000,8 @@ const singleTypes = {
|
|
2750
3000
|
body: { discardDraft, ...body },
|
2751
3001
|
query = {}
|
2752
3002
|
} = ctx.request;
|
2753
|
-
const documentManager2 = getService$
|
2754
|
-
const permissionChecker2 = getService$
|
3003
|
+
const documentManager2 = getService$2("document-manager");
|
3004
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2755
3005
|
if (permissionChecker2.cannot.unpublish()) {
|
2756
3006
|
return ctx.forbidden();
|
2757
3007
|
}
|
@@ -2785,8 +3035,8 @@ const singleTypes = {
|
|
2785
3035
|
const { userAbility } = ctx.state;
|
2786
3036
|
const { model } = ctx.params;
|
2787
3037
|
const { body, query = {} } = ctx.request;
|
2788
|
-
const documentManager2 = getService$
|
2789
|
-
const permissionChecker2 = getService$
|
3038
|
+
const documentManager2 = getService$2("document-manager");
|
3039
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2790
3040
|
if (permissionChecker2.cannot.discard()) {
|
2791
3041
|
return ctx.forbidden();
|
2792
3042
|
}
|
@@ -2809,8 +3059,8 @@ const singleTypes = {
|
|
2809
3059
|
const { userAbility } = ctx.state;
|
2810
3060
|
const { model } = ctx.params;
|
2811
3061
|
const { query } = ctx.request;
|
2812
|
-
const documentManager2 = getService$
|
2813
|
-
const permissionChecker2 = getService$
|
3062
|
+
const documentManager2 = getService$2("document-manager");
|
3063
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2814
3064
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2815
3065
|
if (permissionChecker2.cannot.read()) {
|
2816
3066
|
return ctx.forbidden();
|
@@ -2834,7 +3084,7 @@ const uid$1 = {
|
|
2834
3084
|
const { query = {} } = ctx.request;
|
2835
3085
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2836
3086
|
await validateUIDField(contentTypeUID, field);
|
2837
|
-
const uidService = getService$
|
3087
|
+
const uidService = getService$2("uid");
|
2838
3088
|
ctx.body = {
|
2839
3089
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2840
3090
|
};
|
@@ -2846,7 +3096,7 @@ const uid$1 = {
|
|
2846
3096
|
const { query = {} } = ctx.request;
|
2847
3097
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2848
3098
|
await validateUIDField(contentTypeUID, field);
|
2849
|
-
const uidService = getService$
|
3099
|
+
const uidService = getService$2("uid");
|
2850
3100
|
const isAvailable = await uidService.checkUIDAvailability({
|
2851
3101
|
contentTypeUID,
|
2852
3102
|
field,
|
@@ -2867,7 +3117,8 @@ const controllers = {
|
|
2867
3117
|
relations,
|
2868
3118
|
"single-types": singleTypes,
|
2869
3119
|
uid: uid$1,
|
2870
|
-
...history.controllers ? history.controllers : {}
|
3120
|
+
...history.controllers ? history.controllers : {},
|
3121
|
+
...preview.controllers ? preview.controllers : {}
|
2871
3122
|
};
|
2872
3123
|
const keys = {
|
2873
3124
|
CONFIGURATION: "configuration"
|
@@ -2996,18 +3247,15 @@ async function syncMetadatas(configuration, schema) {
|
|
2996
3247
|
_.set(updatedMeta, ["list", "searchable"], false);
|
2997
3248
|
_.set(acc, [key], updatedMeta);
|
2998
3249
|
}
|
2999
|
-
if (!_.has(edit, "mainField"))
|
3000
|
-
return acc;
|
3250
|
+
if (!_.has(edit, "mainField")) return acc;
|
3001
3251
|
if (!isRelation$1(attr)) {
|
3002
3252
|
_.set(updatedMeta, "edit", _.omit(edit, ["mainField"]));
|
3003
3253
|
_.set(acc, [key], updatedMeta);
|
3004
3254
|
return acc;
|
3005
3255
|
}
|
3006
|
-
if (edit.mainField === "id")
|
3007
|
-
return acc;
|
3256
|
+
if (edit.mainField === "id") return acc;
|
3008
3257
|
const targetSchema = getTargetSchema(attr.targetModel);
|
3009
|
-
if (!targetSchema)
|
3010
|
-
return acc;
|
3258
|
+
if (!targetSchema) return acc;
|
3011
3259
|
if (!isSortable(targetSchema, edit.mainField) && !isListable(targetSchema, edit.mainField)) {
|
3012
3260
|
_.set(updatedMeta, ["edit", "mainField"], getDefaultMainField(targetSchema));
|
3013
3261
|
_.set(acc, [key], updatedMeta);
|
@@ -3018,12 +3266,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3018
3266
|
return _.assign(metasWithDefaults, updatedMetas);
|
3019
3267
|
}
|
3020
3268
|
const getTargetSchema = (targetModel) => {
|
3021
|
-
return getService$
|
3269
|
+
return getService$2("content-types").findContentType(targetModel);
|
3022
3270
|
};
|
3023
3271
|
const DEFAULT_LIST_LENGTH = 4;
|
3024
3272
|
const MAX_ROW_SIZE = 12;
|
3025
3273
|
const isAllowedFieldSize = (type, size) => {
|
3026
|
-
const { getFieldSize } = getService$
|
3274
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3027
3275
|
const fieldSize = getFieldSize(type);
|
3028
3276
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3029
3277
|
return false;
|
@@ -3031,7 +3279,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3031
3279
|
return size <= MAX_ROW_SIZE;
|
3032
3280
|
};
|
3033
3281
|
const getDefaultFieldSize = (attribute) => {
|
3034
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3282
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3035
3283
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3036
3284
|
};
|
3037
3285
|
async function createDefaultLayouts(schema) {
|
@@ -3052,8 +3300,7 @@ function createDefaultEditLayout(schema) {
|
|
3052
3300
|
return appendToEditLayout([], keys2, schema);
|
3053
3301
|
}
|
3054
3302
|
function syncLayouts(configuration, schema) {
|
3055
|
-
if (_.isEmpty(configuration.layouts))
|
3056
|
-
return createDefaultLayouts(schema);
|
3303
|
+
if (_.isEmpty(configuration.layouts)) return createDefaultLayouts(schema);
|
3057
3304
|
const { list = [], editRelations = [], edit = [] } = configuration.layouts || {};
|
3058
3305
|
let cleanList = list.filter((attr) => isListable(schema, attr));
|
3059
3306
|
const cleanEditRelations = editRelations.filter(
|
@@ -3064,9 +3311,8 @@ function syncLayouts(configuration, schema) {
|
|
3064
3311
|
for (const row of edit) {
|
3065
3312
|
const newRow = [];
|
3066
3313
|
for (const el of row) {
|
3067
|
-
if (!hasEditableAttribute(schema, el.name))
|
3068
|
-
|
3069
|
-
const { hasFieldSize } = getService$1("field-sizes");
|
3314
|
+
if (!hasEditableAttribute(schema, el.name)) continue;
|
3315
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3070
3316
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3071
3317
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3072
3318
|
elementsToReAppend.push(el.name);
|
@@ -3096,8 +3342,7 @@ function syncLayouts(configuration, schema) {
|
|
3096
3342
|
};
|
3097
3343
|
}
|
3098
3344
|
const appendToEditLayout = (layout = [], keysToAppend, schema) => {
|
3099
|
-
if (keysToAppend.length === 0)
|
3100
|
-
return layout;
|
3345
|
+
if (keysToAppend.length === 0) return layout;
|
3101
3346
|
let currentRowIndex = Math.max(layout.length - 1, 0);
|
3102
3347
|
if (!layout[currentRowIndex]) {
|
3103
3348
|
layout[currentRowIndex] = [];
|
@@ -3206,17 +3451,17 @@ const configurationService$1 = createConfigurationService({
|
|
3206
3451
|
isComponent: true,
|
3207
3452
|
prefix: STORE_KEY_PREFIX,
|
3208
3453
|
getModels() {
|
3209
|
-
const { toContentManagerModel } = getService$
|
3454
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3210
3455
|
return mapValues(toContentManagerModel, strapi.components);
|
3211
3456
|
}
|
3212
3457
|
});
|
3213
3458
|
const components = ({ strapi: strapi2 }) => ({
|
3214
3459
|
findAllComponents() {
|
3215
|
-
const { toContentManagerModel } = getService$
|
3460
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3216
3461
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3217
3462
|
},
|
3218
3463
|
findComponent(uid2) {
|
3219
|
-
const { toContentManagerModel } = getService$
|
3464
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3220
3465
|
const component = strapi2.components[uid2];
|
3221
3466
|
return isNil$1(component) ? component : toContentManagerModel(component);
|
3222
3467
|
},
|
@@ -3267,17 +3512,17 @@ const configurationService = createConfigurationService({
|
|
3267
3512
|
storeUtils,
|
3268
3513
|
prefix: "content_types",
|
3269
3514
|
getModels() {
|
3270
|
-
const { toContentManagerModel } = getService$
|
3515
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3271
3516
|
return mapValues(toContentManagerModel, strapi.contentTypes);
|
3272
3517
|
}
|
3273
3518
|
});
|
3274
3519
|
const service = ({ strapi: strapi2 }) => ({
|
3275
3520
|
findAllContentTypes() {
|
3276
|
-
const { toContentManagerModel } = getService$
|
3521
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3277
3522
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3278
3523
|
},
|
3279
3524
|
findContentType(uid2) {
|
3280
|
-
const { toContentManagerModel } = getService$
|
3525
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3281
3526
|
const contentType = strapi2.contentTypes[uid2];
|
3282
3527
|
return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
|
3283
3528
|
},
|
@@ -3306,7 +3551,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3306
3551
|
return this.findConfiguration(contentType);
|
3307
3552
|
},
|
3308
3553
|
findComponentsConfigurations(contentType) {
|
3309
|
-
return getService$
|
3554
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3310
3555
|
},
|
3311
3556
|
syncConfigurations() {
|
3312
3557
|
return configurationService.syncConfigurations();
|
@@ -3578,7 +3823,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3578
3823
|
return userAbility.can(action);
|
3579
3824
|
},
|
3580
3825
|
async registerPermissions() {
|
3581
|
-
const displayedContentTypes = getService$
|
3826
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3582
3827
|
const contentTypesUids = displayedContentTypes.map(prop("uid"));
|
3583
3828
|
const actions = [
|
3584
3829
|
{
|
@@ -3663,6 +3908,12 @@ function getPopulateForRelation(attribute, model, attributeName, { countMany, co
|
|
3663
3908
|
if (initialPopulate) {
|
3664
3909
|
return initialPopulate;
|
3665
3910
|
}
|
3911
|
+
if (attributeName === "localizations") {
|
3912
|
+
const validationPopulate = getPopulateForValidation(model.uid);
|
3913
|
+
return {
|
3914
|
+
populate: validationPopulate.populate
|
3915
|
+
};
|
3916
|
+
}
|
3666
3917
|
if (!isVisibleAttribute$1(model, attributeName)) {
|
3667
3918
|
return true;
|
3668
3919
|
}
|
@@ -3722,6 +3973,9 @@ const getDeepPopulate = (uid2, {
|
|
3722
3973
|
return {};
|
3723
3974
|
}
|
3724
3975
|
const model = strapi.getModel(uid2);
|
3976
|
+
if (!model) {
|
3977
|
+
return {};
|
3978
|
+
}
|
3725
3979
|
return Object.keys(model.attributes).reduce(
|
3726
3980
|
(populateAcc, attributeName) => merge(
|
3727
3981
|
populateAcc,
|
@@ -3741,40 +3995,46 @@ const getDeepPopulate = (uid2, {
|
|
3741
3995
|
{}
|
3742
3996
|
);
|
3743
3997
|
};
|
3744
|
-
const
|
3745
|
-
|
3746
|
-
|
3747
|
-
countOne = false,
|
3748
|
-
maxLevel = Infinity
|
3749
|
-
} = {}, level = 1) => {
|
3750
|
-
if (level > maxLevel) {
|
3998
|
+
const getPopulateForValidation = (uid2) => {
|
3999
|
+
const model = strapi.getModel(uid2);
|
4000
|
+
if (!model) {
|
3751
4001
|
return {};
|
3752
4002
|
}
|
3753
|
-
const model = strapi.getModel(uid2);
|
3754
4003
|
return Object.entries(model.attributes).reduce((populateAcc, [attributeName, attribute]) => {
|
3755
|
-
if (
|
4004
|
+
if (isScalarAttribute(attribute)) {
|
4005
|
+
if (getDoesAttributeRequireValidation(attribute)) {
|
4006
|
+
populateAcc.fields = populateAcc.fields || [];
|
4007
|
+
populateAcc.fields.push(attributeName);
|
4008
|
+
}
|
3756
4009
|
return populateAcc;
|
3757
4010
|
}
|
3758
|
-
if (
|
3759
|
-
|
3760
|
-
|
3761
|
-
|
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;
|
3762
4019
|
}
|
3763
|
-
|
3764
|
-
|
3765
|
-
|
3766
|
-
|
3767
|
-
|
3768
|
-
|
3769
|
-
|
3770
|
-
|
3771
|
-
|
3772
|
-
countOne,
|
3773
|
-
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;
|
3774
4029
|
},
|
3775
|
-
|
3776
|
-
)
|
3777
|
-
|
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;
|
3778
4038
|
}, {});
|
3779
4039
|
};
|
3780
4040
|
const getDeepPopulateDraftCount = (uid2) => {
|
@@ -3854,7 +4114,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3854
4114
|
return populateQuery;
|
3855
4115
|
};
|
3856
4116
|
const buildDeepPopulate = (uid2) => {
|
3857
|
-
return getService$
|
4117
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3858
4118
|
};
|
3859
4119
|
const populateBuilder = (uid2) => {
|
3860
4120
|
let getInitialPopulate = async () => {
|
@@ -4016,7 +4276,6 @@ const AVAILABLE_LOCALES_FIELDS = [
|
|
4016
4276
|
"locale",
|
4017
4277
|
"updatedAt",
|
4018
4278
|
"createdAt",
|
4019
|
-
"status",
|
4020
4279
|
"publishedAt",
|
4021
4280
|
"documentId"
|
4022
4281
|
];
|
@@ -4037,34 +4296,20 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4037
4296
|
/**
|
4038
4297
|
* Returns available locales of a document for the current status
|
4039
4298
|
*/
|
4040
|
-
async getAvailableLocales(uid2, version, allVersions
|
4299
|
+
async getAvailableLocales(uid2, version, allVersions) {
|
4041
4300
|
const versionsByLocale = groupBy("locale", allVersions);
|
4042
|
-
|
4301
|
+
if (version.locale) {
|
4302
|
+
delete versionsByLocale[version.locale];
|
4303
|
+
}
|
4043
4304
|
const model = strapi2.getModel(uid2);
|
4044
|
-
const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
|
4045
|
-
const traversalFunction = async (localeVersion) => traverseEntity(
|
4046
|
-
({ key }, { remove }) => {
|
4047
|
-
if (keysToKeep.includes(key)) {
|
4048
|
-
return;
|
4049
|
-
}
|
4050
|
-
remove(key);
|
4051
|
-
},
|
4052
|
-
{ schema: model, getModel: strapi2.getModel.bind(strapi2) },
|
4053
|
-
// @ts-expect-error fix types DocumentVersion incompatible with Data
|
4054
|
-
localeVersion
|
4055
|
-
);
|
4056
4305
|
const mappingResult = await async.map(
|
4057
4306
|
Object.values(versionsByLocale),
|
4058
4307
|
async (localeVersions) => {
|
4059
|
-
const mappedLocaleVersions = await async.map(
|
4060
|
-
localeVersions,
|
4061
|
-
traversalFunction
|
4062
|
-
);
|
4063
4308
|
if (!contentTypes$1.hasDraftAndPublish(model)) {
|
4064
|
-
return
|
4309
|
+
return localeVersions[0];
|
4065
4310
|
}
|
4066
|
-
const draftVersion =
|
4067
|
-
const otherVersions =
|
4311
|
+
const draftVersion = localeVersions.find((v) => v.publishedAt === null);
|
4312
|
+
const otherVersions = localeVersions.filter((v) => v.id !== draftVersion?.id);
|
4068
4313
|
if (!draftVersion) {
|
4069
4314
|
return;
|
4070
4315
|
}
|
@@ -4086,8 +4331,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4086
4331
|
const matchStatus = status === "published" ? v.publishedAt !== null : v.publishedAt === null;
|
4087
4332
|
return matchLocale && matchStatus;
|
4088
4333
|
});
|
4089
|
-
if (!availableStatus)
|
4090
|
-
return availableStatus;
|
4334
|
+
if (!availableStatus) return availableStatus;
|
4091
4335
|
return pick(AVAILABLE_STATUS_FIELDS, availableStatus);
|
4092
4336
|
},
|
4093
4337
|
/**
|
@@ -4097,18 +4341,19 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4097
4341
|
* @returns
|
4098
4342
|
*/
|
4099
4343
|
async getManyAvailableStatus(uid2, documents) {
|
4100
|
-
if (!documents.length)
|
4101
|
-
return [];
|
4344
|
+
if (!documents.length) return [];
|
4102
4345
|
const status = documents[0].publishedAt !== null ? "published" : "draft";
|
4103
|
-
const
|
4104
|
-
const
|
4105
|
-
|
4106
|
-
|
4107
|
-
|
4108
|
-
|
4109
|
-
|
4110
|
-
|
4111
|
-
|
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"]
|
4112
4357
|
});
|
4113
4358
|
},
|
4114
4359
|
getStatus(version, otherDocumentStatuses) {
|
@@ -4125,10 +4370,8 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4125
4370
|
} else if (otherVersion) {
|
4126
4371
|
draftVersion = otherVersion;
|
4127
4372
|
}
|
4128
|
-
if (!draftVersion)
|
4129
|
-
|
4130
|
-
if (!publishedVersion)
|
4131
|
-
return CONTENT_MANAGER_STATUS.DRAFT;
|
4373
|
+
if (!draftVersion) return CONTENT_MANAGER_STATUS.PUBLISHED;
|
4374
|
+
if (!publishedVersion) return CONTENT_MANAGER_STATUS.DRAFT;
|
4132
4375
|
const isDraftModified = getIsVersionLatestModification(draftVersion, publishedVersion);
|
4133
4376
|
return isDraftModified ? CONTENT_MANAGER_STATUS.MODIFIED : CONTENT_MANAGER_STATUS.PUBLISHED;
|
4134
4377
|
},
|
@@ -4136,11 +4379,9 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4136
4379
|
// We could refactor this so the locales are only loaded when they're
|
4137
4380
|
// needed. e.g. in the bulk locale action modal.
|
4138
4381
|
async getMetadata(uid2, version, { availableLocales = true, availableStatus = true } = {}) {
|
4139
|
-
const populate =
|
4140
|
-
const
|
4141
|
-
where: { documentId: version.documentId },
|
4382
|
+
const { populate = {}, fields = [] } = getPopulateForValidation(uid2);
|
4383
|
+
const params = {
|
4142
4384
|
populate: {
|
4143
|
-
// Populate only fields that require validation for bulk locale actions
|
4144
4385
|
...populate,
|
4145
4386
|
// NOTE: creator fields are selected in this way to avoid exposing sensitive data
|
4146
4387
|
createdBy: {
|
@@ -4149,9 +4390,15 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4149
4390
|
updatedBy: {
|
4150
4391
|
select: ["id", "firstname", "lastname", "email"]
|
4151
4392
|
}
|
4393
|
+
},
|
4394
|
+
fields: uniq([...AVAILABLE_LOCALES_FIELDS, ...fields]),
|
4395
|
+
filters: {
|
4396
|
+
documentId: version.documentId
|
4152
4397
|
}
|
4153
|
-
}
|
4154
|
-
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) : [];
|
4155
4402
|
const availableStatusResult = availableStatus ? this.getAvailableStatus(version, versions) : null;
|
4156
4403
|
return {
|
4157
4404
|
availableLocales: availableLocalesResult,
|
@@ -4178,6 +4425,16 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4178
4425
|
opts.availableStatus = false;
|
4179
4426
|
}
|
4180
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
|
+
}
|
4181
4438
|
return {
|
4182
4439
|
data: {
|
4183
4440
|
...document,
|
@@ -4395,7 +4652,8 @@ const services = {
|
|
4395
4652
|
permission,
|
4396
4653
|
"populate-builder": populateBuilder$1,
|
4397
4654
|
uid,
|
4398
|
-
...history.services ? history.services : {}
|
4655
|
+
...history.services ? history.services : {},
|
4656
|
+
...preview.services ? preview.services : {}
|
4399
4657
|
};
|
4400
4658
|
const index = () => {
|
4401
4659
|
return {
|