@strapi/content-manager 0.0.0-experimental.fd379e4937e431407d784eaa5fe7f93cf2a53386 → 0.0.0-experimental.fd51913e4ee4e81a845e6f5bcfd4916cac70ca2e
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-CIjXcRAB.mjs → ComponentConfigurationPage-9_4yUE9L.mjs} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-CIjXcRAB.mjs.map → ComponentConfigurationPage-9_4yUE9L.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-gsCd80MU.js → ComponentConfigurationPage-DBSh-kET.js} +4 -5
- package/dist/_chunks/{ComponentConfigurationPage-gsCd80MU.js.map → ComponentConfigurationPage-DBSh-kET.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-DHDQKBzw.js → EditConfigurationPage-Bl_U2JgH.js} +4 -5
- package/dist/_chunks/{EditConfigurationPage-DHDQKBzw.js.map → EditConfigurationPage-Bl_U2JgH.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-BglmD_BF.mjs → EditConfigurationPage-COe6hjPC.mjs} +3 -3
- package/dist/_chunks/{EditConfigurationPage-BglmD_BF.mjs.map → EditConfigurationPage-COe6hjPC.mjs.map} +1 -1
- package/dist/_chunks/{EditViewPage-C4iTxUPU.js → EditViewPage-D4yFJET6.js} +23 -57
- package/dist/_chunks/EditViewPage-D4yFJET6.js.map +1 -0
- package/dist/_chunks/{EditViewPage-CiwVPMaK.mjs → EditViewPage-DrmVmYN0.mjs} +21 -54
- package/dist/_chunks/EditViewPage-DrmVmYN0.mjs.map +1 -0
- package/dist/_chunks/FieldTypeIcon-CMlNO8PE.mjs.map +1 -1
- package/dist/_chunks/FieldTypeIcon-Dnwq_IRF.js.map +1 -1
- package/dist/_chunks/{Form-CwmJ4sWe.js → Form-C4rSaGsz.js} +5 -6
- package/dist/_chunks/{Form-CwmJ4sWe.js.map → Form-C4rSaGsz.js.map} +1 -1
- package/dist/_chunks/{Form-CmNesrvR.mjs → Form-DamaxNpG.mjs} +3 -3
- package/dist/_chunks/{Form-CmNesrvR.mjs.map → Form-DamaxNpG.mjs.map} +1 -1
- package/dist/_chunks/{History-D-99Wh30.mjs → History-D1PreDSY.mjs} +50 -96
- package/dist/_chunks/History-D1PreDSY.mjs.map +1 -0
- package/dist/_chunks/{History-BLCCNgCt.js → History-DTm8UCCQ.js} +61 -108
- package/dist/_chunks/History-DTm8UCCQ.js.map +1 -0
- package/dist/_chunks/{Field-DhXEK8y1.js → Input-B7sapvBG.js} +1293 -1271
- package/dist/_chunks/Input-B7sapvBG.js.map +1 -0
- package/dist/_chunks/{Field-DIjL1b5d.mjs → Input-CZ1YvjHR.mjs} +1332 -1310
- package/dist/_chunks/Input-CZ1YvjHR.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-JPWZz7Kg.mjs → ListConfigurationPage-Bbi32isk.mjs} +6 -5
- package/dist/_chunks/ListConfigurationPage-Bbi32isk.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DxWpeZrO.js → ListConfigurationPage-ysFMjKI3.js} +6 -6
- package/dist/_chunks/ListConfigurationPage-ysFMjKI3.js.map +1 -0
- package/dist/_chunks/{ListViewPage-DSK3f0ST.mjs → ListViewPage-Bud_jBDQ.mjs} +68 -53
- package/dist/_chunks/ListViewPage-Bud_jBDQ.mjs.map +1 -0
- package/dist/_chunks/{ListViewPage-CIQekSFz.js → ListViewPage-DTuuxU3n.js} +74 -60
- package/dist/_chunks/ListViewPage-DTuuxU3n.js.map +1 -0
- package/dist/_chunks/{NoContentTypePage-C5cxKvC2.js → NoContentTypePage-CL7VVeYs.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-C5cxKvC2.js.map → NoContentTypePage-CL7VVeYs.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-D99LU1YP.mjs → NoContentTypePage-DVhkugsf.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-D99LU1YP.mjs.map → NoContentTypePage-DVhkugsf.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DBrBw-0y.mjs → NoPermissionsPage-CMdM-dCo.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DBrBw-0y.mjs.map → NoPermissionsPage-CMdM-dCo.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-Oy4tmUrW.js → NoPermissionsPage-v7I599vC.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-Oy4tmUrW.js.map → NoPermissionsPage-v7I599vC.js.map} +1 -1
- package/dist/_chunks/Preview-BNuU0SuQ.mjs +287 -0
- package/dist/_chunks/Preview-BNuU0SuQ.mjs.map +1 -0
- package/dist/_chunks/Preview-Cxq-uI6D.js +305 -0
- package/dist/_chunks/Preview-Cxq-uI6D.js.map +1 -0
- package/dist/_chunks/{Relations-BBmhcWFV.mjs → Relations-C2Ahkrdg.mjs} +9 -8
- package/dist/_chunks/Relations-C2Ahkrdg.mjs.map +1 -0
- package/dist/_chunks/{Relations-eG-9p_qS.js → Relations-CWS79QQn.js} +10 -10
- package/dist/_chunks/Relations-CWS79QQn.js.map +1 -0
- package/dist/_chunks/{en-Bm0D0IWz.js → en-BR48D_RH.js} +23 -4
- package/dist/_chunks/{en-Bm0D0IWz.js.map → en-BR48D_RH.js.map} +1 -1
- package/dist/_chunks/{en-DKV44jRb.mjs → en-D65uIF6Y.mjs} +23 -4
- package/dist/_chunks/{en-DKV44jRb.mjs.map → en-D65uIF6Y.mjs.map} +1 -1
- package/dist/_chunks/{es-EUonQTon.js → es-9K52xZIr.js} +2 -2
- package/dist/_chunks/{ja-CcFe8diO.js.map → es-9K52xZIr.js.map} +1 -1
- package/dist/_chunks/{es-CeXiYflN.mjs → es-D34tqjMw.mjs} +2 -2
- package/dist/_chunks/{es-CeXiYflN.mjs.map → es-D34tqjMw.mjs.map} +1 -1
- package/dist/_chunks/{fr-B7kGGg3E.js → fr-C43IbhA_.js} +16 -3
- package/dist/_chunks/{fr-B7kGGg3E.js.map → fr-C43IbhA_.js.map} +1 -1
- package/dist/_chunks/{fr-CD9VFbPM.mjs → fr-DBseuRuB.mjs} +16 -3
- package/dist/_chunks/{fr-CD9VFbPM.mjs.map → fr-DBseuRuB.mjs.map} +1 -1
- package/dist/_chunks/hooks-BAaaKPS_.js.map +1 -1
- package/dist/_chunks/{index-BIWDoFLK.js → index-DQsvBb_N.js} +604 -237
- package/dist/_chunks/index-DQsvBb_N.js.map +1 -0
- package/dist/_chunks/{index-BrUzbQ30.mjs → index-ZKrsjv-2.mjs} +621 -253
- package/dist/_chunks/index-ZKrsjv-2.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-lMc9i1-Z.js → layout-Cl0NhlQB.js} +5 -6
- package/dist/_chunks/{layout-lMc9i1-Z.js.map → layout-Cl0NhlQB.js.map} +1 -1
- package/dist/_chunks/{layout-_5-cXs34.mjs → layout-fQk1rMk9.mjs} +4 -4
- package/dist/_chunks/{layout-_5-cXs34.mjs.map → layout-fQk1rMk9.mjs.map} +1 -1
- package/dist/_chunks/objects-BcXOv6_9.js.map +1 -1
- package/dist/_chunks/objects-D6yBsdmx.mjs.map +1 -1
- package/dist/_chunks/{relations-BRHithi8.js → relations-BRfBxVbX.js} +6 -3
- package/dist/_chunks/relations-BRfBxVbX.js.map +1 -0
- package/dist/_chunks/{relations-B_VLk-DD.mjs → relations-BakOFl_1.mjs} +6 -3
- package/dist/_chunks/relations-BakOFl_1.mjs.map +1 -0
- package/dist/_chunks/{useDragAndDrop-J0TUUbR6.js → useDragAndDrop-BMtgCYzL.js} +5 -9
- package/dist/_chunks/{useDragAndDrop-J0TUUbR6.js.map → useDragAndDrop-BMtgCYzL.js.map} +1 -1
- package/dist/_chunks/{useDragAndDrop-DdHgKsqq.mjs → useDragAndDrop-DJ6jqvZN.mjs} +4 -7
- package/dist/_chunks/{useDragAndDrop-DdHgKsqq.mjs.map → useDragAndDrop-DJ6jqvZN.mjs.map} +1 -1
- package/dist/_chunks/{useDebounce-DmuSJIF3.mjs → usePrev-CZGy2Vjf.mjs} +11 -11
- package/dist/_chunks/usePrev-CZGy2Vjf.mjs.map +1 -0
- package/dist/_chunks/{useDebounce-CtcjDB3L.js → usePrev-D5J_2fEu.js} +8 -8
- package/dist/_chunks/usePrev-D5J_2fEu.js.map +1 -0
- package/dist/admin/index.js +2 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +6 -5
- package/dist/admin/src/content-manager.d.ts +3 -2
- package/dist/admin/src/exports.d.ts +1 -0
- package/dist/admin/src/history/services/historyVersion.d.ts +1 -1
- package/dist/admin/src/hooks/useDocument.d.ts +19 -2
- package/dist/admin/src/pages/EditView/EditViewPage.d.ts +9 -1
- package/dist/admin/src/pages/EditView/components/DocumentActions.d.ts +1 -1
- package/dist/admin/src/pages/EditView/components/DocumentStatus.d.ts +3 -3
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/Blocks/Code.d.ts +7 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/Blocks/utils/prismLanguages.d.ts +49 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/utils/constants.d.ts +1 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/DynamicZone/DynamicComponent.d.ts +4 -1
- package/dist/admin/src/pages/EditView/components/FormInputs/DynamicZone/Field.d.ts +4 -1
- package/dist/admin/src/pages/EditView/components/FormLayout.d.ts +27 -0
- package/dist/admin/src/pages/EditView/utils/data.d.ts +1 -0
- package/dist/admin/src/preview/components/PreviewContent.d.ts +2 -0
- package/dist/admin/src/preview/components/PreviewHeader.d.ts +2 -0
- package/dist/admin/src/preview/components/PreviewSidePanel.d.ts +3 -0
- package/dist/admin/src/preview/index.d.ts +1 -1
- 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 +465 -308
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +466 -308
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/controllers/utils/metadata.d.ts +1 -0
- 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 +3 -2
- package/dist/server/src/index.d.ts.map +1 -1
- package/dist/server/src/preview/controllers/preview.d.ts +6 -2
- package/dist/server/src/preview/controllers/preview.d.ts.map +1 -1
- 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.map +1 -1
- package/dist/server/src/preview/services/index.d.ts +13 -1
- package/dist/server/src/preview/services/index.d.ts.map +1 -1
- 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 +7 -1
- package/dist/server/src/preview/services/preview.d.ts.map +1 -1
- package/dist/server/src/preview/utils.d.ts +13 -1
- package/dist/server/src/preview/utils.d.ts.map +1 -1
- package/dist/server/src/register.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 +4 -2
- package/dist/server/src/services/document-metadata.d.ts.map +1 -1
- package/dist/server/src/services/index.d.ts +3 -2
- package/dist/server/src/services/index.d.ts.map +1 -1
- package/dist/server/src/services/utils/configuration/index.d.ts +2 -2
- package/dist/server/src/services/utils/configuration/layouts.d.ts +2 -2
- 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/shared/contracts/index.d.ts +1 -0
- package/dist/shared/contracts/index.d.ts.map +1 -1
- package/dist/shared/contracts/preview.d.ts +27 -0
- package/dist/shared/contracts/preview.d.ts.map +1 -0
- package/dist/shared/index.js +4 -0
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/index.mjs +4 -0
- package/dist/shared/index.mjs.map +1 -1
- package/package.json +13 -12
- package/dist/_chunks/EditViewPage-C4iTxUPU.js.map +0 -1
- package/dist/_chunks/EditViewPage-CiwVPMaK.mjs.map +0 -1
- package/dist/_chunks/Field-DIjL1b5d.mjs.map +0 -1
- package/dist/_chunks/Field-DhXEK8y1.js.map +0 -1
- package/dist/_chunks/History-BLCCNgCt.js.map +0 -1
- package/dist/_chunks/History-D-99Wh30.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-DxWpeZrO.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-JPWZz7Kg.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-CIQekSFz.js.map +0 -1
- package/dist/_chunks/ListViewPage-DSK3f0ST.mjs.map +0 -1
- package/dist/_chunks/Relations-BBmhcWFV.mjs.map +0 -1
- package/dist/_chunks/Relations-eG-9p_qS.js.map +0 -1
- package/dist/_chunks/index-BIWDoFLK.js.map +0 -1
- package/dist/_chunks/index-BrUzbQ30.mjs.map +0 -1
- package/dist/_chunks/relations-BRHithi8.js.map +0 -1
- package/dist/_chunks/relations-B_VLk-DD.mjs.map +0 -1
- package/dist/_chunks/useDebounce-CtcjDB3L.js.map +0 -1
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs.map +0 -1
- package/dist/admin/src/preview/constants.d.ts +0 -1
- package/dist/server/src/preview/constants.d.ts +0 -2
- package/dist/server/src/preview/constants.d.ts.map +0 -1
package/dist/server/index.mjs
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1,
|
2
|
-
import { pick, omit, difference, castArray, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
|
1
|
+
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, traverseEntity, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1, pagination } from "@strapi/utils";
|
2
|
+
import { pick, omit, difference, castArray, mergeWith, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
|
3
3
|
import "@strapi/types";
|
4
4
|
import * as yup from "yup";
|
5
5
|
import { scheduleJob } from "node-schedule";
|
@@ -7,10 +7,10 @@ import isNil from "lodash/isNil";
|
|
7
7
|
import _, { intersection as intersection$1, difference as difference$1 } from "lodash";
|
8
8
|
import qs from "qs";
|
9
9
|
import slugify from "@sindresorhus/slugify";
|
10
|
-
const getService$
|
10
|
+
const getService$2 = (name) => {
|
11
11
|
return strapi.plugin("content-manager").service(name);
|
12
12
|
};
|
13
|
-
function getService(strapi2, name) {
|
13
|
+
function getService$1(strapi2, name) {
|
14
14
|
return strapi2.service(`plugin::content-manager.${name}`);
|
15
15
|
}
|
16
16
|
const historyRestoreVersionSchema = yup.object().shape({
|
@@ -46,7 +46,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
46
46
|
if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {
|
47
47
|
throw new errors.ForbiddenError("contentType and documentId are required");
|
48
48
|
}
|
49
|
-
const permissionChecker2 = getService$
|
49
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
50
50
|
userAbility: ctx.state.userAbility,
|
51
51
|
model: ctx.query.contentType
|
52
52
|
});
|
@@ -54,7 +54,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
54
54
|
return ctx.forbidden();
|
55
55
|
}
|
56
56
|
const query = await permissionChecker2.sanitizeQuery(ctx.query);
|
57
|
-
const { results, pagination: pagination2 } = await getService(strapi2, "history").findVersionsPage({
|
57
|
+
const { results, pagination: pagination2 } = await getService$1(strapi2, "history").findVersionsPage({
|
58
58
|
query: {
|
59
59
|
...query,
|
60
60
|
...getValidPagination({ page: query.page, pageSize: query.pageSize })
|
@@ -79,14 +79,14 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
79
79
|
async restoreVersion(ctx) {
|
80
80
|
const request = ctx.request;
|
81
81
|
await validateRestoreVersion(request.body, "contentType is required");
|
82
|
-
const permissionChecker2 = getService$
|
82
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
83
83
|
userAbility: ctx.state.userAbility,
|
84
84
|
model: request.body.contentType
|
85
85
|
});
|
86
86
|
if (permissionChecker2.cannot.update()) {
|
87
87
|
throw new errors.ForbiddenError();
|
88
88
|
}
|
89
|
-
const restoredDocument = await getService(strapi2, "history").restoreVersion(
|
89
|
+
const restoredDocument = await getService$1(strapi2, "history").restoreVersion(
|
90
90
|
request.params.versionId
|
91
91
|
);
|
92
92
|
return {
|
@@ -141,8 +141,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
141
141
|
};
|
142
142
|
const getRelationRestoreValue = async (versionRelationData, attribute) => {
|
143
143
|
if (Array.isArray(versionRelationData)) {
|
144
|
-
if (versionRelationData.length === 0)
|
145
|
-
return versionRelationData;
|
144
|
+
if (versionRelationData.length === 0) return versionRelationData;
|
146
145
|
const existingAndMissingRelations = await Promise.all(
|
147
146
|
versionRelationData.map((relation) => {
|
148
147
|
return strapi2.documents(attribute.target).findOne({
|
@@ -151,19 +150,16 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
151
150
|
});
|
152
151
|
})
|
153
152
|
);
|
154
|
-
return existingAndMissingRelations.filter(
|
155
|
-
(relation) => relation !== null
|
156
|
-
);
|
153
|
+
return existingAndMissingRelations.filter((relation) => relation !== null);
|
157
154
|
}
|
158
155
|
return strapi2.documents(attribute.target).findOne({
|
159
156
|
documentId: versionRelationData.documentId,
|
160
157
|
locale: versionRelationData.locale || void 0
|
161
158
|
});
|
162
159
|
};
|
163
|
-
const getMediaRestoreValue = async (versionRelationData
|
164
|
-
if (
|
160
|
+
const getMediaRestoreValue = async (versionRelationData) => {
|
161
|
+
if (Array.isArray(versionRelationData)) {
|
165
162
|
const existingAndMissingMedias = await Promise.all(
|
166
|
-
// @ts-expect-error Fix the type definitions so this isn't any
|
167
163
|
versionRelationData.map((media) => {
|
168
164
|
return strapi2.db.query("plugin::upload.file").findOne({ where: { id: media.id } });
|
169
165
|
})
|
@@ -177,8 +173,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
177
173
|
const getDefaultLocale = async () => localesService ? localesService.getDefaultLocale() : null;
|
178
174
|
const isLocalizedContentType = (model) => i18nContentTypeService ? i18nContentTypeService.isLocalizedContentType(model) : false;
|
179
175
|
const getLocaleDictionary = async () => {
|
180
|
-
if (!localesService)
|
181
|
-
return {};
|
176
|
+
if (!localesService) return {};
|
182
177
|
const locales = await localesService.find() || [];
|
183
178
|
return locales.reduce(
|
184
179
|
(acc, locale) => {
|
@@ -202,6 +197,17 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
202
197
|
const meta = await documentMetadataService.getMetadata(contentTypeUid, document);
|
203
198
|
return documentMetadataService.getStatus(document, meta.availableStatus);
|
204
199
|
};
|
200
|
+
const getComponentFields = (componentUID) => {
|
201
|
+
return Object.entries(strapi2.getModel(componentUID).attributes).reduce(
|
202
|
+
(fieldsAcc, [key, attribute]) => {
|
203
|
+
if (!["relation", "media", "component", "dynamiczone"].includes(attribute.type)) {
|
204
|
+
fieldsAcc.push(key);
|
205
|
+
}
|
206
|
+
return fieldsAcc;
|
207
|
+
},
|
208
|
+
[]
|
209
|
+
);
|
210
|
+
};
|
205
211
|
const getDeepPopulate2 = (uid2, useDatabaseSyntax = false) => {
|
206
212
|
const model = strapi2.getModel(uid2);
|
207
213
|
const attributes = Object.entries(model.attributes);
|
@@ -225,13 +231,19 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
225
231
|
}
|
226
232
|
case "component": {
|
227
233
|
const populate = getDeepPopulate2(attribute.component);
|
228
|
-
acc[attributeName] = {
|
234
|
+
acc[attributeName] = {
|
235
|
+
populate,
|
236
|
+
[fieldSelector]: getComponentFields(attribute.component)
|
237
|
+
};
|
229
238
|
break;
|
230
239
|
}
|
231
240
|
case "dynamiczone": {
|
232
241
|
const populatedComponents = (attribute.components || []).reduce(
|
233
242
|
(acc2, componentUID) => {
|
234
|
-
acc2[componentUID] = {
|
243
|
+
acc2[componentUID] = {
|
244
|
+
populate: getDeepPopulate2(componentUID),
|
245
|
+
[fieldSelector]: getComponentFields(componentUID)
|
246
|
+
};
|
235
247
|
return acc2;
|
236
248
|
},
|
237
249
|
{}
|
@@ -316,8 +328,8 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
316
328
|
});
|
317
329
|
},
|
318
330
|
async findVersionsPage(params) {
|
319
|
-
const
|
320
|
-
const isLocalizedContentType = serviceUtils.isLocalizedContentType(
|
331
|
+
const schema = strapi2.getModel(params.query.contentType);
|
332
|
+
const isLocalizedContentType = serviceUtils.isLocalizedContentType(schema);
|
321
333
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
322
334
|
let locale = null;
|
323
335
|
if (isLocalizedContentType) {
|
@@ -338,32 +350,20 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
338
350
|
}),
|
339
351
|
serviceUtils.getLocaleDictionary()
|
340
352
|
]);
|
341
|
-
const
|
342
|
-
|
343
|
-
async (
|
344
|
-
|
345
|
-
|
346
|
-
|
347
|
-
|
348
|
-
|
349
|
-
model: "plugin::upload.file"
|
350
|
-
});
|
351
|
-
const response = await serviceUtils.buildMediaResponse(attributeValues);
|
352
|
-
const sanitizedResults = await Promise.all(
|
353
|
-
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
354
|
-
);
|
355
|
-
return {
|
356
|
-
...await currentDataWithRelations,
|
357
|
-
[attributeKey]: {
|
358
|
-
results: sanitizedResults,
|
359
|
-
meta: response.meta
|
360
|
-
}
|
361
|
-
};
|
353
|
+
const populateEntry = async (entry) => {
|
354
|
+
return traverseEntity(
|
355
|
+
async (options, utils) => {
|
356
|
+
if (!options.attribute) return;
|
357
|
+
if (!options.value) return;
|
358
|
+
const currentValue = Array.isArray(options.value) ? options.value : [options.value];
|
359
|
+
if (options.attribute.type === "component") {
|
360
|
+
utils.remove("id");
|
362
361
|
}
|
363
|
-
if (
|
364
|
-
|
362
|
+
if (options.attribute.type === "relation" && // TODO: handle polymorphic relations
|
363
|
+
options.attribute.relation !== "morphToOne" && options.attribute.relation !== "morphToMany") {
|
364
|
+
if (options.attribute.target === "admin::user") {
|
365
365
|
const adminUsers = await Promise.all(
|
366
|
-
|
366
|
+
currentValue.map((userToPopulate) => {
|
367
367
|
if (userToPopulate == null) {
|
368
368
|
return null;
|
369
369
|
}
|
@@ -375,46 +375,51 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
375
375
|
});
|
376
376
|
})
|
377
377
|
);
|
378
|
-
|
379
|
-
...await currentDataWithRelations,
|
380
|
-
/**
|
381
|
-
* Ideally we would return the same "{results: [], meta: {}}" shape, however,
|
382
|
-
* when sanitizing the data as a whole in the controller before sending to the client,
|
383
|
-
* the data for admin relation user is completely sanitized if we return an object here as opposed to an array.
|
384
|
-
*/
|
385
|
-
[attributeKey]: adminUsers
|
386
|
-
};
|
378
|
+
utils.set(options.key, adminUsers);
|
387
379
|
}
|
388
|
-
const permissionChecker2 = getService$
|
380
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
389
381
|
userAbility: params.state.userAbility,
|
390
|
-
model:
|
382
|
+
model: options.attribute.target
|
391
383
|
});
|
392
384
|
const response = await serviceUtils.buildRelationReponse(
|
393
|
-
|
394
|
-
|
385
|
+
currentValue,
|
386
|
+
options.attribute
|
395
387
|
);
|
396
388
|
const sanitizedResults = await Promise.all(
|
397
389
|
response.results.map((media) => permissionChecker2.sanitizeOutput(media))
|
398
390
|
);
|
399
|
-
|
400
|
-
|
401
|
-
|
402
|
-
|
403
|
-
|
404
|
-
|
405
|
-
|
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
|
+
});
|
406
409
|
}
|
407
|
-
return currentDataWithRelations;
|
408
410
|
},
|
409
|
-
|
411
|
+
{
|
412
|
+
schema,
|
413
|
+
getModel: strapi2.getModel.bind(strapi2)
|
414
|
+
},
|
415
|
+
entry.data
|
410
416
|
);
|
411
|
-
return entryWithRelations;
|
412
417
|
};
|
413
418
|
const formattedResults = await Promise.all(
|
414
419
|
results.map(async (result) => {
|
415
420
|
return {
|
416
421
|
...result,
|
417
|
-
data: await
|
422
|
+
data: await populateEntry(result),
|
418
423
|
meta: {
|
419
424
|
unknownAttributes: serviceUtils.getSchemaAttributesDiff(
|
420
425
|
result.schema,
|
@@ -445,30 +450,44 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
445
450
|
// Clone to avoid mutating the original version data
|
446
451
|
structuredClone(version.data)
|
447
452
|
);
|
448
|
-
const
|
449
|
-
|
450
|
-
|
451
|
-
|
452
|
-
|
453
|
-
|
454
|
-
|
455
|
-
|
456
|
-
|
457
|
-
|
453
|
+
const schema = structuredClone(version.schema);
|
454
|
+
schema.attributes = omit(FIELDS_TO_IGNORE, contentTypeSchemaAttributes);
|
455
|
+
const dataWithoutMissingRelations = await traverseEntity(
|
456
|
+
async (options, utils) => {
|
457
|
+
if (!options.attribute) return;
|
458
|
+
if (options.attribute.type === "component") {
|
459
|
+
utils.remove("id");
|
460
|
+
if (options.attribute.repeatable && options.value === null) {
|
461
|
+
utils.set(options.key, []);
|
462
|
+
}
|
458
463
|
}
|
459
|
-
if (attribute.type === "
|
460
|
-
|
461
|
-
|
462
|
-
|
464
|
+
if (options.attribute.type === "dynamiczone") {
|
465
|
+
if (options.value === null) {
|
466
|
+
utils.set(options.key, []);
|
467
|
+
}
|
463
468
|
}
|
464
|
-
if (attribute.type === "
|
465
|
-
|
466
|
-
|
469
|
+
if (options.attribute.type === "relation" && // TODO: handle polymorphic relations
|
470
|
+
options.attribute.relation !== "morphToOne" && options.attribute.relation !== "morphToMany") {
|
471
|
+
if (!options.value) return;
|
472
|
+
const data2 = await serviceUtils.getRelationRestoreValue(
|
473
|
+
options.value,
|
474
|
+
options.attribute
|
475
|
+
);
|
476
|
+
utils.set(options.key, data2);
|
477
|
+
}
|
478
|
+
if (options.attribute.type === "media") {
|
479
|
+
if (!options.value) return;
|
480
|
+
const data2 = await serviceUtils.getMediaRestoreValue(
|
481
|
+
options.value
|
482
|
+
);
|
483
|
+
utils.set(options.key, data2);
|
467
484
|
}
|
468
|
-
return previousRelationAttributes;
|
469
485
|
},
|
470
|
-
|
471
|
-
|
486
|
+
{
|
487
|
+
schema,
|
488
|
+
getModel: strapi2.getModel.bind(strapi2)
|
489
|
+
},
|
490
|
+
dataWithoutAddedAttributes
|
472
491
|
);
|
473
492
|
const data = omit(["id", ...Object.keys(schemaDiff.removed)], dataWithoutMissingRelations);
|
474
493
|
const restoredDocument = await strapi2.documents(version.contentType).update({
|
@@ -561,7 +580,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
561
580
|
onCommit(async () => {
|
562
581
|
for (const entry of localeEntries) {
|
563
582
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
564
|
-
await getService(strapi2, "history").createVersion({
|
583
|
+
await getService$1(strapi2, "history").createVersion({
|
565
584
|
contentType: uid2,
|
566
585
|
data: omit(FIELDS_TO_IGNORE, entry),
|
567
586
|
relatedDocumentId: documentId,
|
@@ -574,15 +593,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
574
593
|
});
|
575
594
|
return result;
|
576
595
|
});
|
577
|
-
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
596
|
+
state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
|
578
597
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
579
598
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
580
599
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
581
600
|
where: {
|
582
601
|
created_at: {
|
583
|
-
$lt: expirationDate
|
602
|
+
$lt: expirationDate
|
584
603
|
}
|
585
604
|
}
|
605
|
+
}).catch((error) => {
|
606
|
+
if (error instanceof Error) {
|
607
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
608
|
+
}
|
586
609
|
});
|
587
610
|
});
|
588
611
|
state.isInitialized = true;
|
@@ -676,10 +699,10 @@ const getFeature$1 = () => {
|
|
676
699
|
strapi2.get("models").add(historyVersion);
|
677
700
|
},
|
678
701
|
bootstrap({ strapi: strapi2 }) {
|
679
|
-
getService(strapi2, "lifecycles").bootstrap();
|
702
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
680
703
|
},
|
681
704
|
destroy({ strapi: strapi2 }) {
|
682
|
-
getService(strapi2, "lifecycles").destroy();
|
705
|
+
getService$1(strapi2, "lifecycles").destroy();
|
683
706
|
},
|
684
707
|
controllers: controllers$2,
|
685
708
|
services: services$2,
|
@@ -693,14 +716,6 @@ const getFeature$1 = () => {
|
|
693
716
|
};
|
694
717
|
};
|
695
718
|
const history = getFeature$1();
|
696
|
-
const register = async ({ strapi: strapi2 }) => {
|
697
|
-
await history.register?.({ strapi: strapi2 });
|
698
|
-
};
|
699
|
-
const ALLOWED_WEBHOOK_EVENTS = {
|
700
|
-
ENTRY_PUBLISH: "entry.publish",
|
701
|
-
ENTRY_UNPUBLISH: "entry.unpublish"
|
702
|
-
};
|
703
|
-
const FEATURE_ID = "preview";
|
704
719
|
const info = { pluginName: "content-manager", type: "admin" };
|
705
720
|
const previewRouter = {
|
706
721
|
type: "admin",
|
@@ -709,7 +724,7 @@ const previewRouter = {
|
|
709
724
|
method: "GET",
|
710
725
|
info,
|
711
726
|
path: "/preview/url/:contentType",
|
712
|
-
handler: "preview.
|
727
|
+
handler: "preview.getPreviewUrl",
|
713
728
|
config: {
|
714
729
|
policies: ["admin::isAuthenticatedAdmin"]
|
715
730
|
}
|
@@ -719,12 +734,56 @@ const previewRouter = {
|
|
719
734
|
const routes$1 = {
|
720
735
|
preview: previewRouter
|
721
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
|
+
};
|
722
770
|
const createPreviewController = () => {
|
723
771
|
return {
|
724
|
-
|
725
|
-
|
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
|
+
}
|
726
785
|
return {
|
727
|
-
data: { url
|
786
|
+
data: { url }
|
728
787
|
};
|
729
788
|
}
|
730
789
|
};
|
@@ -736,19 +795,111 @@ const controllers$1 = {
|
|
736
795
|
* passing a controller factory as the value, instead of a controller object directly
|
737
796
|
*/
|
738
797
|
};
|
739
|
-
const createPreviewService = () => {
|
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
|
+
};
|
740
890
|
};
|
741
891
|
const services$1 = {
|
742
|
-
preview: createPreviewService
|
892
|
+
preview: createPreviewService,
|
893
|
+
"preview-config": createPreviewConfigService
|
743
894
|
};
|
744
895
|
const getFeature = () => {
|
745
|
-
if (!strapi.features.future.isEnabled(FEATURE_ID)) {
|
746
|
-
return {};
|
747
|
-
}
|
748
896
|
return {
|
897
|
+
register() {
|
898
|
+
const config = getService(strapi, "preview-config");
|
899
|
+
config.validate();
|
900
|
+
config.register();
|
901
|
+
},
|
749
902
|
bootstrap() {
|
750
|
-
console.log("Bootstrapping preview server");
|
751
|
-
strapi.config.get("admin.preview");
|
752
903
|
},
|
753
904
|
routes: routes$1,
|
754
905
|
controllers: controllers$1,
|
@@ -756,14 +907,22 @@ const getFeature = () => {
|
|
756
907
|
};
|
757
908
|
};
|
758
909
|
const preview = getFeature();
|
910
|
+
const register = async ({ strapi: strapi2 }) => {
|
911
|
+
await history.register?.({ strapi: strapi2 });
|
912
|
+
await preview.register?.({ strapi: strapi2 });
|
913
|
+
};
|
914
|
+
const ALLOWED_WEBHOOK_EVENTS = {
|
915
|
+
ENTRY_PUBLISH: "entry.publish",
|
916
|
+
ENTRY_UNPUBLISH: "entry.unpublish"
|
917
|
+
};
|
759
918
|
const bootstrap = async () => {
|
760
919
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
761
920
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
762
921
|
});
|
763
|
-
getService$
|
764
|
-
await getService$
|
765
|
-
await getService$
|
766
|
-
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();
|
767
926
|
await history.bootstrap?.({ strapi });
|
768
927
|
await preview.bootstrap?.({ strapi });
|
769
928
|
};
|
@@ -1319,8 +1478,7 @@ const isSortable = (schema, name) => {
|
|
1319
1478
|
if (!_.has(schema.attributes, name)) {
|
1320
1479
|
return false;
|
1321
1480
|
}
|
1322
|
-
if (schema.modelType === "component" && name === "id")
|
1323
|
-
return false;
|
1481
|
+
if (schema.modelType === "component" && name === "id") return false;
|
1324
1482
|
const attribute = schema.attributes[name];
|
1325
1483
|
if (NON_SORTABLES.includes(attribute.type)) {
|
1326
1484
|
return false;
|
@@ -1465,8 +1623,7 @@ const createDefaultSettings = async (schema) => {
|
|
1465
1623
|
};
|
1466
1624
|
};
|
1467
1625
|
const syncSettings = async (configuration, schema) => {
|
1468
|
-
if (isEmpty(configuration.settings))
|
1469
|
-
return createDefaultSettings(schema);
|
1626
|
+
if (isEmpty(configuration.settings)) return createDefaultSettings(schema);
|
1470
1627
|
const defaultField = getDefaultMainField(schema);
|
1471
1628
|
const { mainField = defaultField, defaultSortBy = defaultField } = configuration.settings || {};
|
1472
1629
|
return {
|
@@ -1513,7 +1670,7 @@ const createMetadasSchema = (schema) => {
|
|
1513
1670
|
if (!value) {
|
1514
1671
|
return yup$1.string();
|
1515
1672
|
}
|
1516
|
-
const targetSchema = getService$
|
1673
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1517
1674
|
schema.attributes[key].targetModel
|
1518
1675
|
);
|
1519
1676
|
if (!targetSchema) {
|
@@ -1642,8 +1799,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1642
1799
|
}
|
1643
1800
|
switch (attribute.type) {
|
1644
1801
|
case "relation": {
|
1645
|
-
if (canCreate(attributePath))
|
1646
|
-
return body2;
|
1802
|
+
if (canCreate(attributePath)) return body2;
|
1647
1803
|
return set(attributePath, { set: [] }, body2);
|
1648
1804
|
}
|
1649
1805
|
case "component": {
|
@@ -1653,8 +1809,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1653
1809
|
]);
|
1654
1810
|
}
|
1655
1811
|
default: {
|
1656
|
-
if (canCreate(attributePath))
|
1657
|
-
return body2;
|
1812
|
+
if (canCreate(attributePath)) return body2;
|
1658
1813
|
return set(attributePath, null, body2);
|
1659
1814
|
}
|
1660
1815
|
}
|
@@ -1682,7 +1837,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1682
1837
|
}
|
1683
1838
|
};
|
1684
1839
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1685
|
-
const documentMetadata2 = getService$
|
1840
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1686
1841
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1687
1842
|
let {
|
1688
1843
|
meta: { availableLocales, availableStatus }
|
@@ -1708,8 +1863,8 @@ const createDocument = async (ctx, opts) => {
|
|
1708
1863
|
const { userAbility, user } = ctx.state;
|
1709
1864
|
const { model } = ctx.params;
|
1710
1865
|
const { body } = ctx.request;
|
1711
|
-
const documentManager2 = getService$
|
1712
|
-
const permissionChecker2 = getService$
|
1866
|
+
const documentManager2 = getService$2("document-manager");
|
1867
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1713
1868
|
if (permissionChecker2.cannot.create()) {
|
1714
1869
|
throw new errors.ForbiddenError();
|
1715
1870
|
}
|
@@ -1729,13 +1884,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1729
1884
|
const { userAbility, user } = ctx.state;
|
1730
1885
|
const { id, model } = ctx.params;
|
1731
1886
|
const { body } = ctx.request;
|
1732
|
-
const documentManager2 = getService$
|
1733
|
-
const permissionChecker2 = getService$
|
1887
|
+
const documentManager2 = getService$2("document-manager");
|
1888
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1734
1889
|
if (permissionChecker2.cannot.update()) {
|
1735
1890
|
throw new errors.ForbiddenError();
|
1736
1891
|
}
|
1737
1892
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1738
|
-
const populate = await getService$
|
1893
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1739
1894
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1740
1895
|
const [documentVersion, documentExists] = await Promise.all([
|
1741
1896
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1766,14 +1921,14 @@ const collectionTypes = {
|
|
1766
1921
|
const { userAbility } = ctx.state;
|
1767
1922
|
const { model } = ctx.params;
|
1768
1923
|
const { query } = ctx.request;
|
1769
|
-
const documentMetadata2 = getService$
|
1770
|
-
const documentManager2 = getService$
|
1771
|
-
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 });
|
1772
1927
|
if (permissionChecker2.cannot.read()) {
|
1773
1928
|
return ctx.forbidden();
|
1774
1929
|
}
|
1775
1930
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1776
|
-
const populate = await getService$
|
1931
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1777
1932
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1778
1933
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1779
1934
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1802,13 +1957,13 @@ const collectionTypes = {
|
|
1802
1957
|
async findOne(ctx) {
|
1803
1958
|
const { userAbility } = ctx.state;
|
1804
1959
|
const { model, id } = ctx.params;
|
1805
|
-
const documentManager2 = getService$
|
1806
|
-
const permissionChecker2 = getService$
|
1960
|
+
const documentManager2 = getService$2("document-manager");
|
1961
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1807
1962
|
if (permissionChecker2.cannot.read()) {
|
1808
1963
|
return ctx.forbidden();
|
1809
1964
|
}
|
1810
1965
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1811
|
-
const populate = await getService$
|
1966
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1812
1967
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1813
1968
|
const version = await documentManager2.findOne(id, model, {
|
1814
1969
|
populate,
|
@@ -1839,7 +1994,7 @@ const collectionTypes = {
|
|
1839
1994
|
async create(ctx) {
|
1840
1995
|
const { userAbility } = ctx.state;
|
1841
1996
|
const { model } = ctx.params;
|
1842
|
-
const permissionChecker2 = getService$
|
1997
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1843
1998
|
const [totalEntries, document] = await Promise.all([
|
1844
1999
|
strapi.db.query(model).count(),
|
1845
2000
|
createDocument(ctx)
|
@@ -1860,7 +2015,7 @@ const collectionTypes = {
|
|
1860
2015
|
async update(ctx) {
|
1861
2016
|
const { userAbility } = ctx.state;
|
1862
2017
|
const { model } = ctx.params;
|
1863
|
-
const permissionChecker2 = getService$
|
2018
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1864
2019
|
const updatedVersion = await updateDocument(ctx);
|
1865
2020
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1866
2021
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1869,13 +2024,13 @@ const collectionTypes = {
|
|
1869
2024
|
const { userAbility, user } = ctx.state;
|
1870
2025
|
const { model, sourceId: id } = ctx.params;
|
1871
2026
|
const { body } = ctx.request;
|
1872
|
-
const documentManager2 = getService$
|
1873
|
-
const permissionChecker2 = getService$
|
2027
|
+
const documentManager2 = getService$2("document-manager");
|
2028
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1874
2029
|
if (permissionChecker2.cannot.create()) {
|
1875
2030
|
return ctx.forbidden();
|
1876
2031
|
}
|
1877
2032
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1878
|
-
const populate = await getService$
|
2033
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1879
2034
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1880
2035
|
const document = await documentManager2.findOne(id, model, {
|
1881
2036
|
populate,
|
@@ -1914,13 +2069,13 @@ const collectionTypes = {
|
|
1914
2069
|
async delete(ctx) {
|
1915
2070
|
const { userAbility } = ctx.state;
|
1916
2071
|
const { id, model } = ctx.params;
|
1917
|
-
const documentManager2 = getService$
|
1918
|
-
const permissionChecker2 = getService$
|
2072
|
+
const documentManager2 = getService$2("document-manager");
|
2073
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1919
2074
|
if (permissionChecker2.cannot.delete()) {
|
1920
2075
|
return ctx.forbidden();
|
1921
2076
|
}
|
1922
2077
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1923
|
-
const populate = await getService$
|
2078
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1924
2079
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1925
2080
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1926
2081
|
if (documentLocales.length === 0) {
|
@@ -1942,14 +2097,14 @@ const collectionTypes = {
|
|
1942
2097
|
const { userAbility } = ctx.state;
|
1943
2098
|
const { id, model } = ctx.params;
|
1944
2099
|
const { body } = ctx.request;
|
1945
|
-
const documentManager2 = getService$
|
1946
|
-
const permissionChecker2 = getService$
|
2100
|
+
const documentManager2 = getService$2("document-manager");
|
2101
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1947
2102
|
if (permissionChecker2.cannot.publish()) {
|
1948
2103
|
return ctx.forbidden();
|
1949
2104
|
}
|
1950
2105
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1951
2106
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1952
|
-
const populate = await getService$
|
2107
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1953
2108
|
let document;
|
1954
2109
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1955
2110
|
const isCreate = isNil$1(id);
|
@@ -1997,13 +2152,13 @@ const collectionTypes = {
|
|
1997
2152
|
const { body } = ctx.request;
|
1998
2153
|
const { documentIds } = body;
|
1999
2154
|
await validateBulkActionInput(body);
|
2000
|
-
const documentManager2 = getService$
|
2001
|
-
const permissionChecker2 = getService$
|
2155
|
+
const documentManager2 = getService$2("document-manager");
|
2156
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2002
2157
|
if (permissionChecker2.cannot.publish()) {
|
2003
2158
|
return ctx.forbidden();
|
2004
2159
|
}
|
2005
2160
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
2006
|
-
const populate = await getService$
|
2161
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
2007
2162
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
2008
2163
|
allowMultipleLocales: true
|
2009
2164
|
});
|
@@ -2028,8 +2183,8 @@ const collectionTypes = {
|
|
2028
2183
|
const { body } = ctx.request;
|
2029
2184
|
const { documentIds } = body;
|
2030
2185
|
await validateBulkActionInput(body);
|
2031
|
-
const documentManager2 = getService$
|
2032
|
-
const permissionChecker2 = getService$
|
2186
|
+
const documentManager2 = getService$2("document-manager");
|
2187
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2033
2188
|
if (permissionChecker2.cannot.unpublish()) {
|
2034
2189
|
return ctx.forbidden();
|
2035
2190
|
}
|
@@ -2058,8 +2213,8 @@ const collectionTypes = {
|
|
2058
2213
|
const {
|
2059
2214
|
body: { discardDraft, ...body }
|
2060
2215
|
} = ctx.request;
|
2061
|
-
const documentManager2 = getService$
|
2062
|
-
const permissionChecker2 = getService$
|
2216
|
+
const documentManager2 = getService$2("document-manager");
|
2217
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2063
2218
|
if (permissionChecker2.cannot.unpublish()) {
|
2064
2219
|
return ctx.forbidden();
|
2065
2220
|
}
|
@@ -2067,7 +2222,7 @@ const collectionTypes = {
|
|
2067
2222
|
return ctx.forbidden();
|
2068
2223
|
}
|
2069
2224
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2070
|
-
const populate = await getService$
|
2225
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2071
2226
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2072
2227
|
const document = await documentManager2.findOne(id, model, {
|
2073
2228
|
populate,
|
@@ -2098,13 +2253,13 @@ const collectionTypes = {
|
|
2098
2253
|
const { userAbility } = ctx.state;
|
2099
2254
|
const { id, model } = ctx.params;
|
2100
2255
|
const { body } = ctx.request;
|
2101
|
-
const documentManager2 = getService$
|
2102
|
-
const permissionChecker2 = getService$
|
2256
|
+
const documentManager2 = getService$2("document-manager");
|
2257
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2103
2258
|
if (permissionChecker2.cannot.discard()) {
|
2104
2259
|
return ctx.forbidden();
|
2105
2260
|
}
|
2106
2261
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2107
|
-
const populate = await getService$
|
2262
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2108
2263
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2109
2264
|
const document = await documentManager2.findOne(id, model, {
|
2110
2265
|
populate,
|
@@ -2129,13 +2284,13 @@ const collectionTypes = {
|
|
2129
2284
|
const { query, body } = ctx.request;
|
2130
2285
|
const { documentIds } = body;
|
2131
2286
|
await validateBulkActionInput(body);
|
2132
|
-
const documentManager2 = getService$
|
2133
|
-
const permissionChecker2 = getService$
|
2287
|
+
const documentManager2 = getService$2("document-manager");
|
2288
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2134
2289
|
if (permissionChecker2.cannot.delete()) {
|
2135
2290
|
return ctx.forbidden();
|
2136
2291
|
}
|
2137
2292
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2138
|
-
const populate = await getService$
|
2293
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2139
2294
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2140
2295
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2141
2296
|
populate,
|
@@ -2156,13 +2311,13 @@ const collectionTypes = {
|
|
2156
2311
|
async countDraftRelations(ctx) {
|
2157
2312
|
const { userAbility } = ctx.state;
|
2158
2313
|
const { model, id } = ctx.params;
|
2159
|
-
const documentManager2 = getService$
|
2160
|
-
const permissionChecker2 = getService$
|
2314
|
+
const documentManager2 = getService$2("document-manager");
|
2315
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2161
2316
|
if (permissionChecker2.cannot.read()) {
|
2162
2317
|
return ctx.forbidden();
|
2163
2318
|
}
|
2164
2319
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2165
|
-
const populate = await getService$
|
2320
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2166
2321
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2167
2322
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2168
2323
|
if (!entity) {
|
@@ -2181,8 +2336,8 @@ const collectionTypes = {
|
|
2181
2336
|
const ids = ctx.request.query.documentIds;
|
2182
2337
|
const locale = ctx.request.query.locale;
|
2183
2338
|
const { model } = ctx.params;
|
2184
|
-
const documentManager2 = getService$
|
2185
|
-
const permissionChecker2 = getService$
|
2339
|
+
const documentManager2 = getService$2("document-manager");
|
2340
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2186
2341
|
if (permissionChecker2.cannot.read()) {
|
2187
2342
|
return ctx.forbidden();
|
2188
2343
|
}
|
@@ -2206,13 +2361,13 @@ const collectionTypes = {
|
|
2206
2361
|
};
|
2207
2362
|
const components$1 = {
|
2208
2363
|
findComponents(ctx) {
|
2209
|
-
const components2 = getService$
|
2210
|
-
const { toDto } = getService$
|
2364
|
+
const components2 = getService$2("components").findAllComponents();
|
2365
|
+
const { toDto } = getService$2("data-mapper");
|
2211
2366
|
ctx.body = { data: components2.map(toDto) };
|
2212
2367
|
},
|
2213
2368
|
async findComponentConfiguration(ctx) {
|
2214
2369
|
const { uid: uid2 } = ctx.params;
|
2215
|
-
const componentService = getService$
|
2370
|
+
const componentService = getService$2("components");
|
2216
2371
|
const component = componentService.findComponent(uid2);
|
2217
2372
|
if (!component) {
|
2218
2373
|
return ctx.notFound("component.notFound");
|
@@ -2229,7 +2384,7 @@ const components$1 = {
|
|
2229
2384
|
async updateComponentConfiguration(ctx) {
|
2230
2385
|
const { uid: uid2 } = ctx.params;
|
2231
2386
|
const { body } = ctx.request;
|
2232
|
-
const componentService = getService$
|
2387
|
+
const componentService = getService$2("components");
|
2233
2388
|
const component = componentService.findComponent(uid2);
|
2234
2389
|
if (!component) {
|
2235
2390
|
return ctx.notFound("component.notFound");
|
@@ -2263,12 +2418,12 @@ const contentTypes = {
|
|
2263
2418
|
} catch (error) {
|
2264
2419
|
return ctx.send({ error }, 400);
|
2265
2420
|
}
|
2266
|
-
const contentTypes2 = getService$
|
2267
|
-
const { toDto } = getService$
|
2421
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2422
|
+
const { toDto } = getService$2("data-mapper");
|
2268
2423
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2269
2424
|
},
|
2270
2425
|
async findContentTypesSettings(ctx) {
|
2271
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2426
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2272
2427
|
const contentTypes2 = await findAllContentTypes();
|
2273
2428
|
const configurations = await Promise.all(
|
2274
2429
|
contentTypes2.map(async (contentType) => {
|
@@ -2282,7 +2437,7 @@ const contentTypes = {
|
|
2282
2437
|
},
|
2283
2438
|
async findContentTypeConfiguration(ctx) {
|
2284
2439
|
const { uid: uid2 } = ctx.params;
|
2285
|
-
const contentTypeService = getService$
|
2440
|
+
const contentTypeService = getService$2("content-types");
|
2286
2441
|
const contentType = await contentTypeService.findContentType(uid2);
|
2287
2442
|
if (!contentType) {
|
2288
2443
|
return ctx.notFound("contentType.notFound");
|
@@ -2304,13 +2459,13 @@ const contentTypes = {
|
|
2304
2459
|
const { userAbility } = ctx.state;
|
2305
2460
|
const { uid: uid2 } = ctx.params;
|
2306
2461
|
const { body } = ctx.request;
|
2307
|
-
const contentTypeService = getService$
|
2308
|
-
const metricsService = getService$
|
2462
|
+
const contentTypeService = getService$2("content-types");
|
2463
|
+
const metricsService = getService$2("metrics");
|
2309
2464
|
const contentType = await contentTypeService.findContentType(uid2);
|
2310
2465
|
if (!contentType) {
|
2311
2466
|
return ctx.notFound("contentType.notFound");
|
2312
2467
|
}
|
2313
|
-
if (!getService$
|
2468
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2314
2469
|
return ctx.forbidden();
|
2315
2470
|
}
|
2316
2471
|
let input;
|
@@ -2343,10 +2498,10 @@ const contentTypes = {
|
|
2343
2498
|
};
|
2344
2499
|
const init = {
|
2345
2500
|
getInitData(ctx) {
|
2346
|
-
const { toDto } = getService$
|
2347
|
-
const { findAllComponents } = getService$
|
2348
|
-
const { getAllFieldSizes } = getService$
|
2349
|
-
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");
|
2350
2505
|
ctx.body = {
|
2351
2506
|
data: {
|
2352
2507
|
fieldSizes: getAllFieldSizes(),
|
@@ -2382,7 +2537,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2382
2537
|
params.filters.$and.push(filtersClause);
|
2383
2538
|
};
|
2384
2539
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2385
|
-
const permissionChecker2 = getService$
|
2540
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2386
2541
|
userAbility,
|
2387
2542
|
model: model.uid
|
2388
2543
|
});
|
@@ -2400,7 +2555,7 @@ const addStatusToRelations = async (targetUid, relations2) => {
|
|
2400
2555
|
if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2401
2556
|
return relations2;
|
2402
2557
|
}
|
2403
|
-
const documentMetadata2 = getService$
|
2558
|
+
const documentMetadata2 = getService$2("document-metadata");
|
2404
2559
|
if (!relations2.length) {
|
2405
2560
|
return relations2;
|
2406
2561
|
}
|
@@ -2447,8 +2602,7 @@ const validateStatus = (sourceUid, status) => {
|
|
2447
2602
|
const sourceModel = strapi.getModel(sourceUid);
|
2448
2603
|
const isDP = contentTypes$1.hasDraftAndPublish;
|
2449
2604
|
const isSourceDP = isDP(sourceModel);
|
2450
|
-
if (!isSourceDP)
|
2451
|
-
return { status: void 0 };
|
2605
|
+
if (!isSourceDP) return { status: void 0 };
|
2452
2606
|
switch (status) {
|
2453
2607
|
case "published":
|
2454
2608
|
return { status: "published" };
|
@@ -2478,7 +2632,7 @@ const relations = {
|
|
2478
2632
|
ctx.request?.query?.locale
|
2479
2633
|
);
|
2480
2634
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2481
|
-
const permissionChecker2 = getService$
|
2635
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2482
2636
|
userAbility,
|
2483
2637
|
model
|
2484
2638
|
});
|
@@ -2503,7 +2657,7 @@ const relations = {
|
|
2503
2657
|
where.id = id;
|
2504
2658
|
}
|
2505
2659
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2506
|
-
const populate = await getService$
|
2660
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2507
2661
|
const currentEntity = await strapi.db.query(model).findOne({
|
2508
2662
|
where,
|
2509
2663
|
populate
|
@@ -2518,7 +2672,7 @@ const relations = {
|
|
2518
2672
|
}
|
2519
2673
|
entryId = currentEntity.id;
|
2520
2674
|
}
|
2521
|
-
const modelConfig = isComponent2 ? await getService$
|
2675
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2522
2676
|
const targetSchema = strapi.getModel(targetUid);
|
2523
2677
|
const mainField = flow(
|
2524
2678
|
prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2572,7 +2726,7 @@ const relations = {
|
|
2572
2726
|
}
|
2573
2727
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2574
2728
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2575
|
-
const permissionChecker2 = getService$
|
2729
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2576
2730
|
userAbility: ctx.state.userAbility,
|
2577
2731
|
model: targetUid
|
2578
2732
|
});
|
@@ -2651,7 +2805,7 @@ const relations = {
|
|
2651
2805
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2652
2806
|
const { uid: sourceUid } = sourceSchema;
|
2653
2807
|
const { uid: targetUid } = targetSchema;
|
2654
|
-
const permissionQuery = await getService$
|
2808
|
+
const permissionQuery = await getService$2("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
|
2655
2809
|
const dbQuery = strapi.db.query(sourceUid);
|
2656
2810
|
const loadRelations = relations$1.isAnyToMany(attribute) ? (...args) => dbQuery.loadPages(...args) : (...args) => dbQuery.load(...args).then((res2) => ({ results: res2 ? [res2] : [] }));
|
2657
2811
|
const filters = {};
|
@@ -2692,10 +2846,10 @@ const relations = {
|
|
2692
2846
|
}
|
2693
2847
|
};
|
2694
2848
|
const buildPopulateFromQuery = async (query, model) => {
|
2695
|
-
return getService$
|
2849
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2696
2850
|
};
|
2697
2851
|
const findDocument = async (query, uid2, opts = {}) => {
|
2698
|
-
const documentManager2 = getService$
|
2852
|
+
const documentManager2 = getService$2("document-manager");
|
2699
2853
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2700
2854
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2701
2855
|
};
|
@@ -2703,8 +2857,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2703
2857
|
const { user, userAbility } = ctx.state;
|
2704
2858
|
const { model } = ctx.params;
|
2705
2859
|
const { body, query } = ctx.request;
|
2706
|
-
const documentManager2 = getService$
|
2707
|
-
const permissionChecker2 = getService$
|
2860
|
+
const documentManager2 = getService$2("document-manager");
|
2861
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2708
2862
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2709
2863
|
throw new errors.ForbiddenError();
|
2710
2864
|
}
|
@@ -2745,7 +2899,7 @@ const singleTypes = {
|
|
2745
2899
|
const { userAbility } = ctx.state;
|
2746
2900
|
const { model } = ctx.params;
|
2747
2901
|
const { query = {} } = ctx.request;
|
2748
|
-
const permissionChecker2 = getService$
|
2902
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2749
2903
|
if (permissionChecker2.cannot.read()) {
|
2750
2904
|
return ctx.forbidden();
|
2751
2905
|
}
|
@@ -2779,7 +2933,7 @@ const singleTypes = {
|
|
2779
2933
|
async createOrUpdate(ctx) {
|
2780
2934
|
const { userAbility } = ctx.state;
|
2781
2935
|
const { model } = ctx.params;
|
2782
|
-
const permissionChecker2 = getService$
|
2936
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2783
2937
|
const document = await createOrUpdateDocument(ctx);
|
2784
2938
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2785
2939
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2788,8 +2942,8 @@ const singleTypes = {
|
|
2788
2942
|
const { userAbility } = ctx.state;
|
2789
2943
|
const { model } = ctx.params;
|
2790
2944
|
const { query = {} } = ctx.request;
|
2791
|
-
const documentManager2 = getService$
|
2792
|
-
const permissionChecker2 = getService$
|
2945
|
+
const documentManager2 = getService$2("document-manager");
|
2946
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2793
2947
|
if (permissionChecker2.cannot.delete()) {
|
2794
2948
|
return ctx.forbidden();
|
2795
2949
|
}
|
@@ -2817,8 +2971,8 @@ const singleTypes = {
|
|
2817
2971
|
const { userAbility } = ctx.state;
|
2818
2972
|
const { model } = ctx.params;
|
2819
2973
|
const { query = {} } = ctx.request;
|
2820
|
-
const documentManager2 = getService$
|
2821
|
-
const permissionChecker2 = getService$
|
2974
|
+
const documentManager2 = getService$2("document-manager");
|
2975
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2822
2976
|
if (permissionChecker2.cannot.publish()) {
|
2823
2977
|
return ctx.forbidden();
|
2824
2978
|
}
|
@@ -2846,8 +3000,8 @@ const singleTypes = {
|
|
2846
3000
|
body: { discardDraft, ...body },
|
2847
3001
|
query = {}
|
2848
3002
|
} = ctx.request;
|
2849
|
-
const documentManager2 = getService$
|
2850
|
-
const permissionChecker2 = getService$
|
3003
|
+
const documentManager2 = getService$2("document-manager");
|
3004
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2851
3005
|
if (permissionChecker2.cannot.unpublish()) {
|
2852
3006
|
return ctx.forbidden();
|
2853
3007
|
}
|
@@ -2881,8 +3035,8 @@ const singleTypes = {
|
|
2881
3035
|
const { userAbility } = ctx.state;
|
2882
3036
|
const { model } = ctx.params;
|
2883
3037
|
const { body, query = {} } = ctx.request;
|
2884
|
-
const documentManager2 = getService$
|
2885
|
-
const permissionChecker2 = getService$
|
3038
|
+
const documentManager2 = getService$2("document-manager");
|
3039
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2886
3040
|
if (permissionChecker2.cannot.discard()) {
|
2887
3041
|
return ctx.forbidden();
|
2888
3042
|
}
|
@@ -2905,8 +3059,8 @@ const singleTypes = {
|
|
2905
3059
|
const { userAbility } = ctx.state;
|
2906
3060
|
const { model } = ctx.params;
|
2907
3061
|
const { query } = ctx.request;
|
2908
|
-
const documentManager2 = getService$
|
2909
|
-
const permissionChecker2 = getService$
|
3062
|
+
const documentManager2 = getService$2("document-manager");
|
3063
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2910
3064
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2911
3065
|
if (permissionChecker2.cannot.read()) {
|
2912
3066
|
return ctx.forbidden();
|
@@ -2930,7 +3084,7 @@ const uid$1 = {
|
|
2930
3084
|
const { query = {} } = ctx.request;
|
2931
3085
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2932
3086
|
await validateUIDField(contentTypeUID, field);
|
2933
|
-
const uidService = getService$
|
3087
|
+
const uidService = getService$2("uid");
|
2934
3088
|
ctx.body = {
|
2935
3089
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2936
3090
|
};
|
@@ -2942,7 +3096,7 @@ const uid$1 = {
|
|
2942
3096
|
const { query = {} } = ctx.request;
|
2943
3097
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2944
3098
|
await validateUIDField(contentTypeUID, field);
|
2945
|
-
const uidService = getService$
|
3099
|
+
const uidService = getService$2("uid");
|
2946
3100
|
const isAvailable = await uidService.checkUIDAvailability({
|
2947
3101
|
contentTypeUID,
|
2948
3102
|
field,
|
@@ -3093,18 +3247,15 @@ async function syncMetadatas(configuration, schema) {
|
|
3093
3247
|
_.set(updatedMeta, ["list", "searchable"], false);
|
3094
3248
|
_.set(acc, [key], updatedMeta);
|
3095
3249
|
}
|
3096
|
-
if (!_.has(edit, "mainField"))
|
3097
|
-
return acc;
|
3250
|
+
if (!_.has(edit, "mainField")) return acc;
|
3098
3251
|
if (!isRelation$1(attr)) {
|
3099
3252
|
_.set(updatedMeta, "edit", _.omit(edit, ["mainField"]));
|
3100
3253
|
_.set(acc, [key], updatedMeta);
|
3101
3254
|
return acc;
|
3102
3255
|
}
|
3103
|
-
if (edit.mainField === "id")
|
3104
|
-
return acc;
|
3256
|
+
if (edit.mainField === "id") return acc;
|
3105
3257
|
const targetSchema = getTargetSchema(attr.targetModel);
|
3106
|
-
if (!targetSchema)
|
3107
|
-
return acc;
|
3258
|
+
if (!targetSchema) return acc;
|
3108
3259
|
if (!isSortable(targetSchema, edit.mainField) && !isListable(targetSchema, edit.mainField)) {
|
3109
3260
|
_.set(updatedMeta, ["edit", "mainField"], getDefaultMainField(targetSchema));
|
3110
3261
|
_.set(acc, [key], updatedMeta);
|
@@ -3115,12 +3266,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3115
3266
|
return _.assign(metasWithDefaults, updatedMetas);
|
3116
3267
|
}
|
3117
3268
|
const getTargetSchema = (targetModel) => {
|
3118
|
-
return getService$
|
3269
|
+
return getService$2("content-types").findContentType(targetModel);
|
3119
3270
|
};
|
3120
3271
|
const DEFAULT_LIST_LENGTH = 4;
|
3121
3272
|
const MAX_ROW_SIZE = 12;
|
3122
3273
|
const isAllowedFieldSize = (type, size) => {
|
3123
|
-
const { getFieldSize } = getService$
|
3274
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3124
3275
|
const fieldSize = getFieldSize(type);
|
3125
3276
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3126
3277
|
return false;
|
@@ -3128,7 +3279,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3128
3279
|
return size <= MAX_ROW_SIZE;
|
3129
3280
|
};
|
3130
3281
|
const getDefaultFieldSize = (attribute) => {
|
3131
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3282
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3132
3283
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3133
3284
|
};
|
3134
3285
|
async function createDefaultLayouts(schema) {
|
@@ -3149,8 +3300,7 @@ function createDefaultEditLayout(schema) {
|
|
3149
3300
|
return appendToEditLayout([], keys2, schema);
|
3150
3301
|
}
|
3151
3302
|
function syncLayouts(configuration, schema) {
|
3152
|
-
if (_.isEmpty(configuration.layouts))
|
3153
|
-
return createDefaultLayouts(schema);
|
3303
|
+
if (_.isEmpty(configuration.layouts)) return createDefaultLayouts(schema);
|
3154
3304
|
const { list = [], editRelations = [], edit = [] } = configuration.layouts || {};
|
3155
3305
|
let cleanList = list.filter((attr) => isListable(schema, attr));
|
3156
3306
|
const cleanEditRelations = editRelations.filter(
|
@@ -3161,9 +3311,8 @@ function syncLayouts(configuration, schema) {
|
|
3161
3311
|
for (const row of edit) {
|
3162
3312
|
const newRow = [];
|
3163
3313
|
for (const el of row) {
|
3164
|
-
if (!hasEditableAttribute(schema, el.name))
|
3165
|
-
|
3166
|
-
const { hasFieldSize } = getService$1("field-sizes");
|
3314
|
+
if (!hasEditableAttribute(schema, el.name)) continue;
|
3315
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3167
3316
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3168
3317
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3169
3318
|
elementsToReAppend.push(el.name);
|
@@ -3193,8 +3342,7 @@ function syncLayouts(configuration, schema) {
|
|
3193
3342
|
};
|
3194
3343
|
}
|
3195
3344
|
const appendToEditLayout = (layout = [], keysToAppend, schema) => {
|
3196
|
-
if (keysToAppend.length === 0)
|
3197
|
-
return layout;
|
3345
|
+
if (keysToAppend.length === 0) return layout;
|
3198
3346
|
let currentRowIndex = Math.max(layout.length - 1, 0);
|
3199
3347
|
if (!layout[currentRowIndex]) {
|
3200
3348
|
layout[currentRowIndex] = [];
|
@@ -3303,17 +3451,17 @@ const configurationService$1 = createConfigurationService({
|
|
3303
3451
|
isComponent: true,
|
3304
3452
|
prefix: STORE_KEY_PREFIX,
|
3305
3453
|
getModels() {
|
3306
|
-
const { toContentManagerModel } = getService$
|
3454
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3307
3455
|
return mapValues(toContentManagerModel, strapi.components);
|
3308
3456
|
}
|
3309
3457
|
});
|
3310
3458
|
const components = ({ strapi: strapi2 }) => ({
|
3311
3459
|
findAllComponents() {
|
3312
|
-
const { toContentManagerModel } = getService$
|
3460
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3313
3461
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3314
3462
|
},
|
3315
3463
|
findComponent(uid2) {
|
3316
|
-
const { toContentManagerModel } = getService$
|
3464
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3317
3465
|
const component = strapi2.components[uid2];
|
3318
3466
|
return isNil$1(component) ? component : toContentManagerModel(component);
|
3319
3467
|
},
|
@@ -3364,17 +3512,17 @@ const configurationService = createConfigurationService({
|
|
3364
3512
|
storeUtils,
|
3365
3513
|
prefix: "content_types",
|
3366
3514
|
getModels() {
|
3367
|
-
const { toContentManagerModel } = getService$
|
3515
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3368
3516
|
return mapValues(toContentManagerModel, strapi.contentTypes);
|
3369
3517
|
}
|
3370
3518
|
});
|
3371
3519
|
const service = ({ strapi: strapi2 }) => ({
|
3372
3520
|
findAllContentTypes() {
|
3373
|
-
const { toContentManagerModel } = getService$
|
3521
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3374
3522
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3375
3523
|
},
|
3376
3524
|
findContentType(uid2) {
|
3377
|
-
const { toContentManagerModel } = getService$
|
3525
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3378
3526
|
const contentType = strapi2.contentTypes[uid2];
|
3379
3527
|
return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
|
3380
3528
|
},
|
@@ -3403,7 +3551,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3403
3551
|
return this.findConfiguration(contentType);
|
3404
3552
|
},
|
3405
3553
|
findComponentsConfigurations(contentType) {
|
3406
|
-
return getService$
|
3554
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3407
3555
|
},
|
3408
3556
|
syncConfigurations() {
|
3409
3557
|
return configurationService.syncConfigurations();
|
@@ -3675,7 +3823,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3675
3823
|
return userAbility.can(action);
|
3676
3824
|
},
|
3677
3825
|
async registerPermissions() {
|
3678
|
-
const displayedContentTypes = getService$
|
3826
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3679
3827
|
const contentTypesUids = displayedContentTypes.map(prop("uid"));
|
3680
3828
|
const actions = [
|
3681
3829
|
{
|
@@ -3760,6 +3908,12 @@ function getPopulateForRelation(attribute, model, attributeName, { countMany, co
|
|
3760
3908
|
if (initialPopulate) {
|
3761
3909
|
return initialPopulate;
|
3762
3910
|
}
|
3911
|
+
if (attributeName === "localizations") {
|
3912
|
+
const validationPopulate = getPopulateForValidation(model.uid);
|
3913
|
+
return {
|
3914
|
+
populate: validationPopulate.populate
|
3915
|
+
};
|
3916
|
+
}
|
3763
3917
|
if (!isVisibleAttribute$1(model, attributeName)) {
|
3764
3918
|
return true;
|
3765
3919
|
}
|
@@ -3819,6 +3973,9 @@ const getDeepPopulate = (uid2, {
|
|
3819
3973
|
return {};
|
3820
3974
|
}
|
3821
3975
|
const model = strapi.getModel(uid2);
|
3976
|
+
if (!model) {
|
3977
|
+
return {};
|
3978
|
+
}
|
3822
3979
|
return Object.keys(model.attributes).reduce(
|
3823
3980
|
(populateAcc, attributeName) => merge(
|
3824
3981
|
populateAcc,
|
@@ -3838,40 +3995,46 @@ const getDeepPopulate = (uid2, {
|
|
3838
3995
|
{}
|
3839
3996
|
);
|
3840
3997
|
};
|
3841
|
-
const
|
3842
|
-
|
3843
|
-
|
3844
|
-
countOne = false,
|
3845
|
-
maxLevel = Infinity
|
3846
|
-
} = {}, level = 1) => {
|
3847
|
-
if (level > maxLevel) {
|
3998
|
+
const getPopulateForValidation = (uid2) => {
|
3999
|
+
const model = strapi.getModel(uid2);
|
4000
|
+
if (!model) {
|
3848
4001
|
return {};
|
3849
4002
|
}
|
3850
|
-
const model = strapi.getModel(uid2);
|
3851
4003
|
return Object.entries(model.attributes).reduce((populateAcc, [attributeName, attribute]) => {
|
3852
|
-
if (
|
4004
|
+
if (isScalarAttribute(attribute)) {
|
4005
|
+
if (getDoesAttributeRequireValidation(attribute)) {
|
4006
|
+
populateAcc.fields = populateAcc.fields || [];
|
4007
|
+
populateAcc.fields.push(attributeName);
|
4008
|
+
}
|
3853
4009
|
return populateAcc;
|
3854
4010
|
}
|
3855
|
-
if (
|
3856
|
-
|
3857
|
-
|
3858
|
-
|
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;
|
3859
4019
|
}
|
3860
|
-
|
3861
|
-
|
3862
|
-
|
3863
|
-
|
3864
|
-
|
3865
|
-
|
3866
|
-
|
3867
|
-
|
3868
|
-
|
3869
|
-
countOne,
|
3870
|
-
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;
|
3871
4029
|
},
|
3872
|
-
|
3873
|
-
)
|
3874
|
-
|
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;
|
3875
4038
|
}, {});
|
3876
4039
|
};
|
3877
4040
|
const getDeepPopulateDraftCount = (uid2) => {
|
@@ -3951,7 +4114,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3951
4114
|
return populateQuery;
|
3952
4115
|
};
|
3953
4116
|
const buildDeepPopulate = (uid2) => {
|
3954
|
-
return getService$
|
4117
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3955
4118
|
};
|
3956
4119
|
const populateBuilder = (uid2) => {
|
3957
4120
|
let getInitialPopulate = async () => {
|
@@ -4113,7 +4276,6 @@ const AVAILABLE_LOCALES_FIELDS = [
|
|
4113
4276
|
"locale",
|
4114
4277
|
"updatedAt",
|
4115
4278
|
"createdAt",
|
4116
|
-
"status",
|
4117
4279
|
"publishedAt",
|
4118
4280
|
"documentId"
|
4119
4281
|
];
|
@@ -4134,36 +4296,20 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4134
4296
|
/**
|
4135
4297
|
* Returns available locales of a document for the current status
|
4136
4298
|
*/
|
4137
|
-
async getAvailableLocales(uid2, version, allVersions
|
4299
|
+
async getAvailableLocales(uid2, version, allVersions) {
|
4138
4300
|
const versionsByLocale = groupBy("locale", allVersions);
|
4139
4301
|
if (version.locale) {
|
4140
4302
|
delete versionsByLocale[version.locale];
|
4141
4303
|
}
|
4142
4304
|
const model = strapi2.getModel(uid2);
|
4143
|
-
const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
|
4144
|
-
const traversalFunction = async (localeVersion) => traverseEntity(
|
4145
|
-
({ key }, { remove }) => {
|
4146
|
-
if (keysToKeep.includes(key)) {
|
4147
|
-
return;
|
4148
|
-
}
|
4149
|
-
remove(key);
|
4150
|
-
},
|
4151
|
-
{ schema: model, getModel: strapi2.getModel.bind(strapi2) },
|
4152
|
-
// @ts-expect-error fix types DocumentVersion incompatible with Data
|
4153
|
-
localeVersion
|
4154
|
-
);
|
4155
4305
|
const mappingResult = await async.map(
|
4156
4306
|
Object.values(versionsByLocale),
|
4157
4307
|
async (localeVersions) => {
|
4158
|
-
const mappedLocaleVersions = await async.map(
|
4159
|
-
localeVersions,
|
4160
|
-
traversalFunction
|
4161
|
-
);
|
4162
4308
|
if (!contentTypes$1.hasDraftAndPublish(model)) {
|
4163
|
-
return
|
4309
|
+
return localeVersions[0];
|
4164
4310
|
}
|
4165
|
-
const draftVersion =
|
4166
|
-
const otherVersions =
|
4311
|
+
const draftVersion = localeVersions.find((v) => v.publishedAt === null);
|
4312
|
+
const otherVersions = localeVersions.filter((v) => v.id !== draftVersion?.id);
|
4167
4313
|
if (!draftVersion) {
|
4168
4314
|
return;
|
4169
4315
|
}
|
@@ -4185,8 +4331,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4185
4331
|
const matchStatus = status === "published" ? v.publishedAt !== null : v.publishedAt === null;
|
4186
4332
|
return matchLocale && matchStatus;
|
4187
4333
|
});
|
4188
|
-
if (!availableStatus)
|
4189
|
-
return availableStatus;
|
4334
|
+
if (!availableStatus) return availableStatus;
|
4190
4335
|
return pick(AVAILABLE_STATUS_FIELDS, availableStatus);
|
4191
4336
|
},
|
4192
4337
|
/**
|
@@ -4196,18 +4341,19 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4196
4341
|
* @returns
|
4197
4342
|
*/
|
4198
4343
|
async getManyAvailableStatus(uid2, documents) {
|
4199
|
-
if (!documents.length)
|
4200
|
-
return [];
|
4344
|
+
if (!documents.length) return [];
|
4201
4345
|
const status = documents[0].publishedAt !== null ? "published" : "draft";
|
4202
|
-
const
|
4203
|
-
const
|
4204
|
-
|
4205
|
-
|
4206
|
-
|
4207
|
-
|
4208
|
-
|
4209
|
-
|
4210
|
-
|
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"]
|
4211
4357
|
});
|
4212
4358
|
},
|
4213
4359
|
getStatus(version, otherDocumentStatuses) {
|
@@ -4224,10 +4370,8 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4224
4370
|
} else if (otherVersion) {
|
4225
4371
|
draftVersion = otherVersion;
|
4226
4372
|
}
|
4227
|
-
if (!draftVersion)
|
4228
|
-
|
4229
|
-
if (!publishedVersion)
|
4230
|
-
return CONTENT_MANAGER_STATUS.DRAFT;
|
4373
|
+
if (!draftVersion) return CONTENT_MANAGER_STATUS.PUBLISHED;
|
4374
|
+
if (!publishedVersion) return CONTENT_MANAGER_STATUS.DRAFT;
|
4231
4375
|
const isDraftModified = getIsVersionLatestModification(draftVersion, publishedVersion);
|
4232
4376
|
return isDraftModified ? CONTENT_MANAGER_STATUS.MODIFIED : CONTENT_MANAGER_STATUS.PUBLISHED;
|
4233
4377
|
},
|
@@ -4235,11 +4379,9 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4235
4379
|
// We could refactor this so the locales are only loaded when they're
|
4236
4380
|
// needed. e.g. in the bulk locale action modal.
|
4237
4381
|
async getMetadata(uid2, version, { availableLocales = true, availableStatus = true } = {}) {
|
4238
|
-
const populate =
|
4239
|
-
const
|
4240
|
-
where: { documentId: version.documentId },
|
4382
|
+
const { populate = {}, fields = [] } = getPopulateForValidation(uid2);
|
4383
|
+
const params = {
|
4241
4384
|
populate: {
|
4242
|
-
// Populate only fields that require validation for bulk locale actions
|
4243
4385
|
...populate,
|
4244
4386
|
// NOTE: creator fields are selected in this way to avoid exposing sensitive data
|
4245
4387
|
createdBy: {
|
@@ -4248,9 +4390,15 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4248
4390
|
updatedBy: {
|
4249
4391
|
select: ["id", "firstname", "lastname", "email"]
|
4250
4392
|
}
|
4393
|
+
},
|
4394
|
+
fields: uniq([...AVAILABLE_LOCALES_FIELDS, ...fields]),
|
4395
|
+
filters: {
|
4396
|
+
documentId: version.documentId
|
4251
4397
|
}
|
4252
|
-
}
|
4253
|
-
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) : [];
|
4254
4402
|
const availableStatusResult = availableStatus ? this.getAvailableStatus(version, versions) : null;
|
4255
4403
|
return {
|
4256
4404
|
availableLocales: availableLocalesResult,
|
@@ -4277,6 +4425,16 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4277
4425
|
opts.availableStatus = false;
|
4278
4426
|
}
|
4279
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
|
+
}
|
4280
4438
|
return {
|
4281
4439
|
data: {
|
4282
4440
|
...document,
|