@strapi/content-manager 0.0.0-next.d2d15ef227d67cce89c2673764c0555c841cd29c → 0.0.0-next.d6ed4fcf2c833656b8c91a90909c1e77c79379e5
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-DfFSZQxe.mjs → ComponentConfigurationPage-BgCLcjXO.mjs} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-DfFSZQxe.mjs.map → ComponentConfigurationPage-BgCLcjXO.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-FqfsxQ1j.js → ComponentConfigurationPage-DywpTZeV.js} +5 -6
- package/dist/_chunks/{ComponentConfigurationPage-FqfsxQ1j.js.map → ComponentConfigurationPage-DywpTZeV.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-DdPNAbl3.mjs → EditConfigurationPage-BNjOAHNS.mjs} +4 -4
- package/dist/_chunks/{EditConfigurationPage-DdPNAbl3.mjs.map → EditConfigurationPage-BNjOAHNS.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-Cn0e8t3I.js → EditConfigurationPage-CxRlP5if.js} +5 -6
- package/dist/_chunks/{EditConfigurationPage-Cn0e8t3I.js.map → EditConfigurationPage-CxRlP5if.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-DlxEHhUt.js → EditViewPage-BRewdTqE.js} +38 -9
- package/dist/_chunks/EditViewPage-BRewdTqE.js.map +1 -0
- package/dist/_chunks/{EditViewPage-B82x_x1b.mjs → EditViewPage-CD_hqc1J.mjs} +38 -8
- package/dist/_chunks/EditViewPage-CD_hqc1J.mjs.map +1 -0
- package/dist/_chunks/{Field-DufHXW17.mjs → Field-BPkQ-3Ku.mjs} +64 -64
- package/dist/_chunks/Field-BPkQ-3Ku.mjs.map +1 -0
- package/dist/_chunks/{Field-COL25JiC.js → Field-DwvmENVf.js} +65 -66
- package/dist/_chunks/Field-DwvmENVf.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-BssUwrTO.js → Form-C_Gwv8P_.js} +5 -6
- package/dist/_chunks/{Form-BssUwrTO.js.map → Form-C_Gwv8P_.js.map} +1 -1
- package/dist/_chunks/{Form-u_kAOhwB.mjs → Form-Czi0cf_2.mjs} +3 -3
- package/dist/_chunks/{Form-u_kAOhwB.mjs.map → Form-Czi0cf_2.mjs.map} +1 -1
- package/dist/_chunks/{History-C9t9UqpO.js → History-C1TKAig-.js} +23 -94
- package/dist/_chunks/History-C1TKAig-.js.map +1 -0
- package/dist/_chunks/{History-DRwA3oMM.mjs → History-CIQHyi4T.mjs} +23 -93
- package/dist/_chunks/History-CIQHyi4T.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-BXYPohh-.js → ListConfigurationPage-D-NGRLYu.js} +7 -7
- package/dist/_chunks/ListConfigurationPage-D-NGRLYu.js.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-BxfQJzPk.mjs → ListConfigurationPage-DcZsfyEL.mjs} +7 -6
- package/dist/_chunks/ListConfigurationPage-DcZsfyEL.mjs.map +1 -0
- package/dist/_chunks/{ListViewPage-CELx2ysp.mjs → ListViewPage-C10McTK1.mjs} +62 -39
- package/dist/_chunks/ListViewPage-C10McTK1.mjs.map +1 -0
- package/dist/_chunks/{ListViewPage-D2VD8Szg.js → ListViewPage-xv5IQoZp.js} +63 -41
- package/dist/_chunks/ListViewPage-xv5IQoZp.js.map +1 -0
- package/dist/_chunks/{NoContentTypePage-DtJ9jcfk.mjs → NoContentTypePage-CPc0Cd3S.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-DtJ9jcfk.mjs.map → NoContentTypePage-CPc0Cd3S.mjs.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-BV9IjJSM.js → NoContentTypePage-Dzw5Yj5u.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-BV9IjJSM.js.map → NoContentTypePage-Dzw5Yj5u.js.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-Dp8NpF9I.js → NoPermissionsPage-DAe5CDCC.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-Dp8NpF9I.js.map → NoPermissionsPage-DAe5CDCC.js.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DWleVYK7.mjs → NoPermissionsPage-wfPBh2_0.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DWleVYK7.mjs.map → NoPermissionsPage-wfPBh2_0.mjs.map} +1 -1
- package/dist/_chunks/Preview-B7LyGT_b.js +290 -0
- package/dist/_chunks/Preview-B7LyGT_b.js.map +1 -0
- package/dist/_chunks/Preview-BVFFm7uB.mjs +272 -0
- package/dist/_chunks/Preview-BVFFm7uB.mjs.map +1 -0
- package/dist/_chunks/{Relations-DR7EUgyC.js → Relations-BmYR1AjY.js} +47 -23
- package/dist/_chunks/Relations-BmYR1AjY.js.map +1 -0
- package/dist/_chunks/{Relations-BTcf5xaw.mjs → Relations-JPhWxk-s.mjs} +47 -22
- package/dist/_chunks/Relations-JPhWxk-s.mjs.map +1 -0
- package/dist/_chunks/{en-Bm0D0IWz.js → en-BK8Xyl5I.js} +16 -4
- package/dist/_chunks/{en-Bm0D0IWz.js.map → en-BK8Xyl5I.js.map} +1 -1
- package/dist/_chunks/{en-DKV44jRb.mjs → en-Dtk_ot79.mjs} +16 -4
- package/dist/_chunks/{en-DKV44jRb.mjs.map → en-Dtk_ot79.mjs.map} +1 -1
- package/dist/_chunks/{es-EUonQTon.js → es-9K52xZIr.js} +2 -2
- package/dist/_chunks/{ja-CcFe8diO.js.map → es-9K52xZIr.js.map} +1 -1
- package/dist/_chunks/{es-CeXiYflN.mjs → es-D34tqjMw.mjs} +2 -2
- package/dist/_chunks/{es-CeXiYflN.mjs.map → es-D34tqjMw.mjs.map} +1 -1
- package/dist/_chunks/{fr-CD9VFbPM.mjs → fr--pg5jUbt.mjs} +13 -3
- package/dist/_chunks/{fr-CD9VFbPM.mjs.map → fr--pg5jUbt.mjs.map} +1 -1
- package/dist/_chunks/{fr-B7kGGg3E.js → fr-B2Kyv8Z9.js} +13 -3
- package/dist/_chunks/{fr-B7kGGg3E.js.map → fr-B2Kyv8Z9.js.map} +1 -1
- package/dist/_chunks/hooks-BAaaKPS_.js.map +1 -1
- package/dist/_chunks/{index-BdMf2lfT.js → index-C2Q_PLWj.js} +221 -106
- package/dist/_chunks/index-C2Q_PLWj.js.map +1 -0
- package/dist/_chunks/{index-wnqzm4Q8.mjs → index-DLIkNVnQ.mjs} +223 -108
- package/dist/_chunks/index-DLIkNVnQ.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-B2MyZU-_.js → layout-7AsWJzZJ.js} +5 -6
- package/dist/_chunks/{layout-B2MyZU-_.js.map → layout-7AsWJzZJ.js.map} +1 -1
- package/dist/_chunks/{layout-2CfjL0T9.mjs → layout-qE8qkNH_.mjs} +4 -4
- package/dist/_chunks/{layout-2CfjL0T9.mjs.map → layout-qE8qkNH_.mjs.map} +1 -1
- package/dist/_chunks/{objects-gigeqt7s.js → objects-BcXOv6_9.js} +2 -4
- package/dist/_chunks/{objects-gigeqt7s.js.map → objects-BcXOv6_9.js.map} +1 -1
- package/dist/_chunks/{objects-mKMAmfec.mjs → objects-D6yBsdmx.mjs} +2 -4
- package/dist/_chunks/{objects-mKMAmfec.mjs.map → objects-D6yBsdmx.mjs.map} +1 -1
- package/dist/_chunks/{relations-C0w0GcXi.mjs → relations-BjHH_1Am.mjs} +6 -7
- package/dist/_chunks/relations-BjHH_1Am.mjs.map +1 -0
- package/dist/_chunks/{relations-BH7JJGGe.js → relations-EifVzf_2.js} +6 -7
- package/dist/_chunks/relations-EifVzf_2.js.map +1 -0
- package/dist/_chunks/useDebounce-CtcjDB3L.js.map +1 -1
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs.map +1 -1
- package/dist/_chunks/{useDragAndDrop-J0TUUbR6.js → useDragAndDrop-BMtgCYzL.js} +5 -9
- package/dist/_chunks/{useDragAndDrop-J0TUUbR6.js.map → useDragAndDrop-BMtgCYzL.js.map} +1 -1
- package/dist/_chunks/{useDragAndDrop-DdHgKsqq.mjs → useDragAndDrop-DJ6jqvZN.mjs} +4 -7
- package/dist/_chunks/{useDragAndDrop-DdHgKsqq.mjs.map → useDragAndDrop-DJ6jqvZN.mjs.map} +1 -1
- package/dist/admin/index.js +1 -1
- package/dist/admin/index.mjs +4 -4
- package/dist/admin/src/pages/EditView/EditViewPage.d.ts +9 -1
- package/dist/admin/src/pages/EditView/components/DocumentStatus.d.ts +2 -2
- 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/constants.d.ts +1 -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/documents.d.ts +0 -3
- package/dist/server/index.js +409 -180
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +409 -179
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/bootstrap.d.ts.map +1 -1
- package/dist/server/src/controllers/index.d.ts.map +1 -1
- package/dist/server/src/controllers/relations.d.ts.map +1 -1
- package/dist/server/src/controllers/utils/metadata.d.ts +15 -1
- package/dist/server/src/controllers/utils/metadata.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 +2 -3
- package/dist/server/src/history/services/utils.d.ts.map +1 -1
- package/dist/server/src/index.d.ts +4 -4
- package/dist/server/src/preview/constants.d.ts +2 -0
- package/dist/server/src/preview/constants.d.ts.map +1 -0
- 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 +8 -8
- package/dist/server/src/services/document-metadata.d.ts.map +1 -1
- package/dist/server/src/services/index.d.ts +4 -4
- 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/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 +11 -11
- package/dist/_chunks/EditViewPage-B82x_x1b.mjs.map +0 -1
- package/dist/_chunks/EditViewPage-DlxEHhUt.js.map +0 -1
- package/dist/_chunks/Field-COL25JiC.js.map +0 -1
- package/dist/_chunks/Field-DufHXW17.mjs.map +0 -1
- package/dist/_chunks/History-C9t9UqpO.js.map +0 -1
- package/dist/_chunks/History-DRwA3oMM.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-BXYPohh-.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-BxfQJzPk.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-CELx2ysp.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-D2VD8Szg.js.map +0 -1
- package/dist/_chunks/Relations-BTcf5xaw.mjs.map +0 -1
- package/dist/_chunks/Relations-DR7EUgyC.js.map +0 -1
- package/dist/_chunks/index-BdMf2lfT.js.map +0 -1
- package/dist/_chunks/index-wnqzm4Q8.mjs.map +0 -1
- package/dist/_chunks/relations-BH7JJGGe.js.map +0 -1
- package/dist/_chunks/relations-C0w0GcXi.mjs.map +0 -1
package/dist/server/index.mjs
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1, traverseEntity, pagination } from "@strapi/utils";
|
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";
|
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({
|
@@ -177,8 +176,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
177
176
|
const getDefaultLocale = async () => localesService ? localesService.getDefaultLocale() : null;
|
178
177
|
const isLocalizedContentType = (model) => i18nContentTypeService ? i18nContentTypeService.isLocalizedContentType(model) : false;
|
179
178
|
const getLocaleDictionary = async () => {
|
180
|
-
if (!localesService)
|
181
|
-
return {};
|
179
|
+
if (!localesService) return {};
|
182
180
|
const locales = await localesService.find() || [];
|
183
181
|
return locales.reduce(
|
184
182
|
(acc, locale) => {
|
@@ -202,6 +200,17 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
202
200
|
const meta = await documentMetadataService.getMetadata(contentTypeUid, document);
|
203
201
|
return documentMetadataService.getStatus(document, meta.availableStatus);
|
204
202
|
};
|
203
|
+
const getComponentFields = (componentUID) => {
|
204
|
+
return Object.entries(strapi2.getModel(componentUID).attributes).reduce(
|
205
|
+
(fieldsAcc, [key, attribute]) => {
|
206
|
+
if (!["relation", "media", "component", "dynamiczone"].includes(attribute.type)) {
|
207
|
+
fieldsAcc.push(key);
|
208
|
+
}
|
209
|
+
return fieldsAcc;
|
210
|
+
},
|
211
|
+
[]
|
212
|
+
);
|
213
|
+
};
|
205
214
|
const getDeepPopulate2 = (uid2, useDatabaseSyntax = false) => {
|
206
215
|
const model = strapi2.getModel(uid2);
|
207
216
|
const attributes = Object.entries(model.attributes);
|
@@ -225,13 +234,19 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
225
234
|
}
|
226
235
|
case "component": {
|
227
236
|
const populate = getDeepPopulate2(attribute.component);
|
228
|
-
acc[attributeName] = {
|
237
|
+
acc[attributeName] = {
|
238
|
+
populate,
|
239
|
+
[fieldSelector]: getComponentFields(attribute.component)
|
240
|
+
};
|
229
241
|
break;
|
230
242
|
}
|
231
243
|
case "dynamiczone": {
|
232
244
|
const populatedComponents = (attribute.components || []).reduce(
|
233
245
|
(acc2, componentUID) => {
|
234
|
-
acc2[componentUID] = {
|
246
|
+
acc2[componentUID] = {
|
247
|
+
populate: getDeepPopulate2(componentUID),
|
248
|
+
[fieldSelector]: getComponentFields(componentUID)
|
249
|
+
};
|
235
250
|
return acc2;
|
236
251
|
},
|
237
252
|
{}
|
@@ -344,7 +359,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
344
359
|
const attributeValue = entry.data[attributeKey];
|
345
360
|
const attributeValues = Array.isArray(attributeValue) ? attributeValue : [attributeValue];
|
346
361
|
if (attributeSchema.type === "media") {
|
347
|
-
const permissionChecker2 = getService$
|
362
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
348
363
|
userAbility: params.state.userAbility,
|
349
364
|
model: "plugin::upload.file"
|
350
365
|
});
|
@@ -385,7 +400,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
385
400
|
[attributeKey]: adminUsers
|
386
401
|
};
|
387
402
|
}
|
388
|
-
const permissionChecker2 = getService$
|
403
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
389
404
|
userAbility: params.state.userAbility,
|
390
405
|
model: attributeSchema.target
|
391
406
|
});
|
@@ -561,7 +576,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
561
576
|
onCommit(async () => {
|
562
577
|
for (const entry of localeEntries) {
|
563
578
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
564
|
-
await getService(strapi2, "history").createVersion({
|
579
|
+
await getService$1(strapi2, "history").createVersion({
|
565
580
|
contentType: uid2,
|
566
581
|
data: omit(FIELDS_TO_IGNORE, entry),
|
567
582
|
relatedDocumentId: documentId,
|
@@ -574,15 +589,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
574
589
|
});
|
575
590
|
return result;
|
576
591
|
});
|
577
|
-
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
592
|
+
state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
|
578
593
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
579
594
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
580
595
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
581
596
|
where: {
|
582
597
|
created_at: {
|
583
|
-
$lt: expirationDate
|
598
|
+
$lt: expirationDate
|
584
599
|
}
|
585
600
|
}
|
601
|
+
}).catch((error) => {
|
602
|
+
if (error instanceof Error) {
|
603
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
604
|
+
}
|
586
605
|
});
|
587
606
|
});
|
588
607
|
state.isInitialized = true;
|
@@ -594,17 +613,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
594
613
|
}
|
595
614
|
};
|
596
615
|
};
|
597
|
-
const services$
|
616
|
+
const services$2 = {
|
598
617
|
history: createHistoryService,
|
599
618
|
lifecycles: createLifecyclesService
|
600
619
|
};
|
601
|
-
const info = { pluginName: "content-manager", type: "admin" };
|
620
|
+
const info$1 = { pluginName: "content-manager", type: "admin" };
|
602
621
|
const historyVersionRouter = {
|
603
622
|
type: "admin",
|
604
623
|
routes: [
|
605
624
|
{
|
606
625
|
method: "GET",
|
607
|
-
info,
|
626
|
+
info: info$1,
|
608
627
|
path: "/history-versions",
|
609
628
|
handler: "history-version.findMany",
|
610
629
|
config: {
|
@@ -613,7 +632,7 @@ const historyVersionRouter = {
|
|
613
632
|
},
|
614
633
|
{
|
615
634
|
method: "PUT",
|
616
|
-
info,
|
635
|
+
info: info$1,
|
617
636
|
path: "/history-versions/:versionId/restore",
|
618
637
|
handler: "history-version.restoreVersion",
|
619
638
|
config: {
|
@@ -622,7 +641,7 @@ const historyVersionRouter = {
|
|
622
641
|
}
|
623
642
|
]
|
624
643
|
};
|
625
|
-
const routes$
|
644
|
+
const routes$2 = {
|
626
645
|
"history-version": historyVersionRouter
|
627
646
|
};
|
628
647
|
const historyVersion = {
|
@@ -669,21 +688,21 @@ const historyVersion = {
|
|
669
688
|
}
|
670
689
|
}
|
671
690
|
};
|
672
|
-
const getFeature = () => {
|
691
|
+
const getFeature$1 = () => {
|
673
692
|
if (strapi.ee.features.isEnabled("cms-content-history")) {
|
674
693
|
return {
|
675
694
|
register({ strapi: strapi2 }) {
|
676
695
|
strapi2.get("models").add(historyVersion);
|
677
696
|
},
|
678
697
|
bootstrap({ strapi: strapi2 }) {
|
679
|
-
getService(strapi2, "lifecycles").bootstrap();
|
698
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
680
699
|
},
|
681
700
|
destroy({ strapi: strapi2 }) {
|
682
|
-
getService(strapi2, "lifecycles").destroy();
|
701
|
+
getService$1(strapi2, "lifecycles").destroy();
|
683
702
|
},
|
684
|
-
controllers: controllers$
|
685
|
-
services: services$
|
686
|
-
routes: routes$
|
703
|
+
controllers: controllers$2,
|
704
|
+
services: services$2,
|
705
|
+
routes: routes$2
|
687
706
|
};
|
688
707
|
}
|
689
708
|
return {
|
@@ -692,9 +711,205 @@ const getFeature = () => {
|
|
692
711
|
}
|
693
712
|
};
|
694
713
|
};
|
695
|
-
const history = getFeature();
|
714
|
+
const history = getFeature$1();
|
715
|
+
const FEATURE_ID = "preview";
|
716
|
+
const info = { pluginName: "content-manager", type: "admin" };
|
717
|
+
const previewRouter = {
|
718
|
+
type: "admin",
|
719
|
+
routes: [
|
720
|
+
{
|
721
|
+
method: "GET",
|
722
|
+
info,
|
723
|
+
path: "/preview/url/:contentType",
|
724
|
+
handler: "preview.getPreviewUrl",
|
725
|
+
config: {
|
726
|
+
policies: ["admin::isAuthenticatedAdmin"]
|
727
|
+
}
|
728
|
+
}
|
729
|
+
]
|
730
|
+
};
|
731
|
+
const routes$1 = {
|
732
|
+
preview: previewRouter
|
733
|
+
};
|
734
|
+
function getService(strapi2, name) {
|
735
|
+
return strapi2.service(`plugin::content-manager.${name}`);
|
736
|
+
}
|
737
|
+
const getPreviewUrlSchema = yup.object().shape({
|
738
|
+
// Will be undefined for single types
|
739
|
+
documentId: yup.string(),
|
740
|
+
locale: yup.string().nullable(),
|
741
|
+
status: yup.string()
|
742
|
+
}).required();
|
743
|
+
const validatePreviewUrl = async (strapi2, uid2, params) => {
|
744
|
+
await validateYupSchema(getPreviewUrlSchema)(params);
|
745
|
+
const newParams = pick(["documentId", "locale", "status"], params);
|
746
|
+
const model = strapi2.getModel(uid2);
|
747
|
+
if (!model || model.modelType !== "contentType") {
|
748
|
+
throw new errors.ValidationError("Invalid content type");
|
749
|
+
}
|
750
|
+
const isSingleType = model?.kind === "singleType";
|
751
|
+
if (!isSingleType && !params.documentId) {
|
752
|
+
throw new errors.ValidationError("documentId is required for Collection Types");
|
753
|
+
}
|
754
|
+
if (isSingleType) {
|
755
|
+
const doc = await strapi2.documents(uid2).findFirst();
|
756
|
+
if (!doc) {
|
757
|
+
throw new errors.NotFoundError("Document not found");
|
758
|
+
}
|
759
|
+
newParams.documentId = doc?.documentId;
|
760
|
+
}
|
761
|
+
if (!newParams.status) {
|
762
|
+
const isDPEnabled = model?.options?.draftAndPublish;
|
763
|
+
newParams.status = isDPEnabled ? "draft" : "published";
|
764
|
+
}
|
765
|
+
return newParams;
|
766
|
+
};
|
767
|
+
const createPreviewController = () => {
|
768
|
+
return {
|
769
|
+
/**
|
770
|
+
* Transforms an entry into a preview URL, so that it can be previewed
|
771
|
+
* in the Content Manager.
|
772
|
+
*/
|
773
|
+
async getPreviewUrl(ctx) {
|
774
|
+
const uid2 = ctx.params.contentType;
|
775
|
+
const query = ctx.request.query;
|
776
|
+
const params = await validatePreviewUrl(strapi, uid2, query);
|
777
|
+
const previewService = getService(strapi, "preview");
|
778
|
+
const url = await previewService.getPreviewUrl(uid2, params);
|
779
|
+
if (!url) {
|
780
|
+
ctx.status = 204;
|
781
|
+
}
|
782
|
+
return {
|
783
|
+
data: { url }
|
784
|
+
};
|
785
|
+
}
|
786
|
+
};
|
787
|
+
};
|
788
|
+
const controllers$1 = {
|
789
|
+
preview: createPreviewController
|
790
|
+
/**
|
791
|
+
* Casting is needed because the types aren't aware that Strapi supports
|
792
|
+
* passing a controller factory as the value, instead of a controller object directly
|
793
|
+
*/
|
794
|
+
};
|
795
|
+
const createPreviewService = ({ strapi: strapi2 }) => {
|
796
|
+
const config = getService(strapi2, "preview-config");
|
797
|
+
return {
|
798
|
+
async getPreviewUrl(uid2, params) {
|
799
|
+
const handler = config.getPreviewHandler();
|
800
|
+
try {
|
801
|
+
return handler(uid2, params);
|
802
|
+
} catch (error) {
|
803
|
+
strapi2.log.error(`Failed to get preview URL: ${error}`);
|
804
|
+
throw new errors.ApplicationError("Failed to get preview URL");
|
805
|
+
}
|
806
|
+
return;
|
807
|
+
}
|
808
|
+
};
|
809
|
+
};
|
810
|
+
const extendMiddlewareConfiguration = (middleware = { name: "", config: {} }) => {
|
811
|
+
const middlewares = strapi.config.get("middlewares");
|
812
|
+
const configuredMiddlewares = middlewares.map((currentMiddleware) => {
|
813
|
+
if (currentMiddleware === middleware.name) {
|
814
|
+
return middleware;
|
815
|
+
}
|
816
|
+
if (currentMiddleware.name === middleware.name) {
|
817
|
+
return mergeWith(
|
818
|
+
(objValue, srcValue) => {
|
819
|
+
if (Array.isArray(objValue)) {
|
820
|
+
return objValue.concat(srcValue);
|
821
|
+
}
|
822
|
+
return void 0;
|
823
|
+
},
|
824
|
+
currentMiddleware,
|
825
|
+
middleware
|
826
|
+
);
|
827
|
+
}
|
828
|
+
return currentMiddleware;
|
829
|
+
});
|
830
|
+
strapi.config.set("middlewares", configuredMiddlewares);
|
831
|
+
};
|
832
|
+
const createPreviewConfigService = ({ strapi: strapi2 }) => {
|
833
|
+
return {
|
834
|
+
register() {
|
835
|
+
if (!this.isEnabled()) {
|
836
|
+
return;
|
837
|
+
}
|
838
|
+
const config = strapi2.config.get("admin.preview");
|
839
|
+
if (config.config?.allowedOrigins) {
|
840
|
+
extendMiddlewareConfiguration({
|
841
|
+
name: "strapi::security",
|
842
|
+
config: {
|
843
|
+
contentSecurityPolicy: {
|
844
|
+
directives: {
|
845
|
+
"frame-src": config.config.allowedOrigins
|
846
|
+
}
|
847
|
+
}
|
848
|
+
}
|
849
|
+
});
|
850
|
+
}
|
851
|
+
},
|
852
|
+
isEnabled() {
|
853
|
+
const config = strapi2.config.get("admin.preview");
|
854
|
+
if (!config) {
|
855
|
+
return false;
|
856
|
+
}
|
857
|
+
return config?.enabled ?? true;
|
858
|
+
},
|
859
|
+
/**
|
860
|
+
* Validate if the configuration is valid
|
861
|
+
*/
|
862
|
+
validate() {
|
863
|
+
if (!this.isEnabled()) {
|
864
|
+
return;
|
865
|
+
}
|
866
|
+
const handler = this.getPreviewHandler();
|
867
|
+
if (typeof handler !== "function") {
|
868
|
+
throw new errors.ValidationError(
|
869
|
+
"Preview configuration is invalid. Handler must be a function"
|
870
|
+
);
|
871
|
+
}
|
872
|
+
},
|
873
|
+
/**
|
874
|
+
* Utility to get the preview handler from the configuration
|
875
|
+
*/
|
876
|
+
getPreviewHandler() {
|
877
|
+
const config = strapi2.config.get("admin.preview");
|
878
|
+
const emptyHandler = () => {
|
879
|
+
return void 0;
|
880
|
+
};
|
881
|
+
if (!this.isEnabled()) {
|
882
|
+
return emptyHandler;
|
883
|
+
}
|
884
|
+
return config?.config?.handler || emptyHandler;
|
885
|
+
}
|
886
|
+
};
|
887
|
+
};
|
888
|
+
const services$1 = {
|
889
|
+
preview: createPreviewService,
|
890
|
+
"preview-config": createPreviewConfigService
|
891
|
+
};
|
892
|
+
const getFeature = () => {
|
893
|
+
if (!strapi.features.future.isEnabled(FEATURE_ID)) {
|
894
|
+
return {};
|
895
|
+
}
|
896
|
+
return {
|
897
|
+
register() {
|
898
|
+
const config = getService(strapi, "preview-config");
|
899
|
+
config.validate();
|
900
|
+
config.register();
|
901
|
+
},
|
902
|
+
bootstrap() {
|
903
|
+
},
|
904
|
+
routes: routes$1,
|
905
|
+
controllers: controllers$1,
|
906
|
+
services: services$1
|
907
|
+
};
|
908
|
+
};
|
909
|
+
const preview = getFeature();
|
696
910
|
const register = async ({ strapi: strapi2 }) => {
|
697
911
|
await history.register?.({ strapi: strapi2 });
|
912
|
+
await preview.register?.({ strapi: strapi2 });
|
698
913
|
};
|
699
914
|
const ALLOWED_WEBHOOK_EVENTS = {
|
700
915
|
ENTRY_PUBLISH: "entry.publish",
|
@@ -704,11 +919,12 @@ const bootstrap = async () => {
|
|
704
919
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
705
920
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
706
921
|
});
|
707
|
-
getService$
|
708
|
-
await getService$
|
709
|
-
await getService$
|
710
|
-
await getService$
|
922
|
+
getService$2("field-sizes").setCustomFieldInputSizes();
|
923
|
+
await getService$2("components").syncConfigurations();
|
924
|
+
await getService$2("content-types").syncConfigurations();
|
925
|
+
await getService$2("permission").registerPermissions();
|
711
926
|
await history.bootstrap?.({ strapi });
|
927
|
+
await preview.bootstrap?.({ strapi });
|
712
928
|
};
|
713
929
|
const destroy = async ({ strapi: strapi2 }) => {
|
714
930
|
await history.destroy?.({ strapi: strapi2 });
|
@@ -1198,7 +1414,8 @@ const admin = {
|
|
1198
1414
|
};
|
1199
1415
|
const routes = {
|
1200
1416
|
admin,
|
1201
|
-
...history.routes ? history.routes : {}
|
1417
|
+
...history.routes ? history.routes : {},
|
1418
|
+
...preview.routes ? preview.routes : {}
|
1202
1419
|
};
|
1203
1420
|
const hasPermissionsSchema = yup$1.object({
|
1204
1421
|
actions: yup$1.array().of(yup$1.string()),
|
@@ -1261,8 +1478,7 @@ const isSortable = (schema, name) => {
|
|
1261
1478
|
if (!_.has(schema.attributes, name)) {
|
1262
1479
|
return false;
|
1263
1480
|
}
|
1264
|
-
if (schema.modelType === "component" && name === "id")
|
1265
|
-
return false;
|
1481
|
+
if (schema.modelType === "component" && name === "id") return false;
|
1266
1482
|
const attribute = schema.attributes[name];
|
1267
1483
|
if (NON_SORTABLES.includes(attribute.type)) {
|
1268
1484
|
return false;
|
@@ -1407,8 +1623,7 @@ const createDefaultSettings = async (schema) => {
|
|
1407
1623
|
};
|
1408
1624
|
};
|
1409
1625
|
const syncSettings = async (configuration, schema) => {
|
1410
|
-
if (isEmpty(configuration.settings))
|
1411
|
-
return createDefaultSettings(schema);
|
1626
|
+
if (isEmpty(configuration.settings)) return createDefaultSettings(schema);
|
1412
1627
|
const defaultField = getDefaultMainField(schema);
|
1413
1628
|
const { mainField = defaultField, defaultSortBy = defaultField } = configuration.settings || {};
|
1414
1629
|
return {
|
@@ -1455,7 +1670,7 @@ const createMetadasSchema = (schema) => {
|
|
1455
1670
|
if (!value) {
|
1456
1671
|
return yup$1.string();
|
1457
1672
|
}
|
1458
|
-
const targetSchema = getService$
|
1673
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1459
1674
|
schema.attributes[key].targetModel
|
1460
1675
|
);
|
1461
1676
|
if (!targetSchema) {
|
@@ -1584,8 +1799,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1584
1799
|
}
|
1585
1800
|
switch (attribute.type) {
|
1586
1801
|
case "relation": {
|
1587
|
-
if (canCreate(attributePath))
|
1588
|
-
return body2;
|
1802
|
+
if (canCreate(attributePath)) return body2;
|
1589
1803
|
return set(attributePath, { set: [] }, body2);
|
1590
1804
|
}
|
1591
1805
|
case "component": {
|
@@ -1595,8 +1809,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1595
1809
|
]);
|
1596
1810
|
}
|
1597
1811
|
default: {
|
1598
|
-
if (canCreate(attributePath))
|
1599
|
-
return body2;
|
1812
|
+
if (canCreate(attributePath)) return body2;
|
1600
1813
|
return set(attributePath, null, body2);
|
1601
1814
|
}
|
1602
1815
|
}
|
@@ -1624,7 +1837,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1624
1837
|
}
|
1625
1838
|
};
|
1626
1839
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1627
|
-
const documentMetadata2 = getService$
|
1840
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1628
1841
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1629
1842
|
let {
|
1630
1843
|
meta: { availableLocales, availableStatus }
|
@@ -1650,8 +1863,8 @@ const createDocument = async (ctx, opts) => {
|
|
1650
1863
|
const { userAbility, user } = ctx.state;
|
1651
1864
|
const { model } = ctx.params;
|
1652
1865
|
const { body } = ctx.request;
|
1653
|
-
const documentManager2 = getService$
|
1654
|
-
const permissionChecker2 = getService$
|
1866
|
+
const documentManager2 = getService$2("document-manager");
|
1867
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1655
1868
|
if (permissionChecker2.cannot.create()) {
|
1656
1869
|
throw new errors.ForbiddenError();
|
1657
1870
|
}
|
@@ -1671,13 +1884,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1671
1884
|
const { userAbility, user } = ctx.state;
|
1672
1885
|
const { id, model } = ctx.params;
|
1673
1886
|
const { body } = ctx.request;
|
1674
|
-
const documentManager2 = getService$
|
1675
|
-
const permissionChecker2 = getService$
|
1887
|
+
const documentManager2 = getService$2("document-manager");
|
1888
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1676
1889
|
if (permissionChecker2.cannot.update()) {
|
1677
1890
|
throw new errors.ForbiddenError();
|
1678
1891
|
}
|
1679
1892
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1680
|
-
const populate = await getService$
|
1893
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1681
1894
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1682
1895
|
const [documentVersion, documentExists] = await Promise.all([
|
1683
1896
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1708,14 +1921,14 @@ const collectionTypes = {
|
|
1708
1921
|
const { userAbility } = ctx.state;
|
1709
1922
|
const { model } = ctx.params;
|
1710
1923
|
const { query } = ctx.request;
|
1711
|
-
const documentMetadata2 = getService$
|
1712
|
-
const documentManager2 = getService$
|
1713
|
-
const permissionChecker2 = getService$
|
1924
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1925
|
+
const documentManager2 = getService$2("document-manager");
|
1926
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1714
1927
|
if (permissionChecker2.cannot.read()) {
|
1715
1928
|
return ctx.forbidden();
|
1716
1929
|
}
|
1717
1930
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1718
|
-
const populate = await getService$
|
1931
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1719
1932
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1720
1933
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1721
1934
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1744,13 +1957,13 @@ const collectionTypes = {
|
|
1744
1957
|
async findOne(ctx) {
|
1745
1958
|
const { userAbility } = ctx.state;
|
1746
1959
|
const { model, id } = ctx.params;
|
1747
|
-
const documentManager2 = getService$
|
1748
|
-
const permissionChecker2 = getService$
|
1960
|
+
const documentManager2 = getService$2("document-manager");
|
1961
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1749
1962
|
if (permissionChecker2.cannot.read()) {
|
1750
1963
|
return ctx.forbidden();
|
1751
1964
|
}
|
1752
1965
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1753
|
-
const populate = await getService$
|
1966
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1754
1967
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1755
1968
|
const version = await documentManager2.findOne(id, model, {
|
1756
1969
|
populate,
|
@@ -1781,7 +1994,7 @@ const collectionTypes = {
|
|
1781
1994
|
async create(ctx) {
|
1782
1995
|
const { userAbility } = ctx.state;
|
1783
1996
|
const { model } = ctx.params;
|
1784
|
-
const permissionChecker2 = getService$
|
1997
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1785
1998
|
const [totalEntries, document] = await Promise.all([
|
1786
1999
|
strapi.db.query(model).count(),
|
1787
2000
|
createDocument(ctx)
|
@@ -1802,7 +2015,7 @@ const collectionTypes = {
|
|
1802
2015
|
async update(ctx) {
|
1803
2016
|
const { userAbility } = ctx.state;
|
1804
2017
|
const { model } = ctx.params;
|
1805
|
-
const permissionChecker2 = getService$
|
2018
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1806
2019
|
const updatedVersion = await updateDocument(ctx);
|
1807
2020
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1808
2021
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1811,13 +2024,13 @@ const collectionTypes = {
|
|
1811
2024
|
const { userAbility, user } = ctx.state;
|
1812
2025
|
const { model, sourceId: id } = ctx.params;
|
1813
2026
|
const { body } = ctx.request;
|
1814
|
-
const documentManager2 = getService$
|
1815
|
-
const permissionChecker2 = getService$
|
2027
|
+
const documentManager2 = getService$2("document-manager");
|
2028
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1816
2029
|
if (permissionChecker2.cannot.create()) {
|
1817
2030
|
return ctx.forbidden();
|
1818
2031
|
}
|
1819
2032
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1820
|
-
const populate = await getService$
|
2033
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1821
2034
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1822
2035
|
const document = await documentManager2.findOne(id, model, {
|
1823
2036
|
populate,
|
@@ -1856,13 +2069,13 @@ const collectionTypes = {
|
|
1856
2069
|
async delete(ctx) {
|
1857
2070
|
const { userAbility } = ctx.state;
|
1858
2071
|
const { id, model } = ctx.params;
|
1859
|
-
const documentManager2 = getService$
|
1860
|
-
const permissionChecker2 = getService$
|
2072
|
+
const documentManager2 = getService$2("document-manager");
|
2073
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1861
2074
|
if (permissionChecker2.cannot.delete()) {
|
1862
2075
|
return ctx.forbidden();
|
1863
2076
|
}
|
1864
2077
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1865
|
-
const populate = await getService$
|
2078
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1866
2079
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1867
2080
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1868
2081
|
if (documentLocales.length === 0) {
|
@@ -1884,14 +2097,14 @@ const collectionTypes = {
|
|
1884
2097
|
const { userAbility } = ctx.state;
|
1885
2098
|
const { id, model } = ctx.params;
|
1886
2099
|
const { body } = ctx.request;
|
1887
|
-
const documentManager2 = getService$
|
1888
|
-
const permissionChecker2 = getService$
|
2100
|
+
const documentManager2 = getService$2("document-manager");
|
2101
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1889
2102
|
if (permissionChecker2.cannot.publish()) {
|
1890
2103
|
return ctx.forbidden();
|
1891
2104
|
}
|
1892
2105
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1893
2106
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1894
|
-
const populate = await getService$
|
2107
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1895
2108
|
let document;
|
1896
2109
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1897
2110
|
const isCreate = isNil$1(id);
|
@@ -1939,13 +2152,13 @@ const collectionTypes = {
|
|
1939
2152
|
const { body } = ctx.request;
|
1940
2153
|
const { documentIds } = body;
|
1941
2154
|
await validateBulkActionInput(body);
|
1942
|
-
const documentManager2 = getService$
|
1943
|
-
const permissionChecker2 = getService$
|
2155
|
+
const documentManager2 = getService$2("document-manager");
|
2156
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1944
2157
|
if (permissionChecker2.cannot.publish()) {
|
1945
2158
|
return ctx.forbidden();
|
1946
2159
|
}
|
1947
2160
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1948
|
-
const populate = await getService$
|
2161
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1949
2162
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1950
2163
|
allowMultipleLocales: true
|
1951
2164
|
});
|
@@ -1970,8 +2183,8 @@ const collectionTypes = {
|
|
1970
2183
|
const { body } = ctx.request;
|
1971
2184
|
const { documentIds } = body;
|
1972
2185
|
await validateBulkActionInput(body);
|
1973
|
-
const documentManager2 = getService$
|
1974
|
-
const permissionChecker2 = getService$
|
2186
|
+
const documentManager2 = getService$2("document-manager");
|
2187
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1975
2188
|
if (permissionChecker2.cannot.unpublish()) {
|
1976
2189
|
return ctx.forbidden();
|
1977
2190
|
}
|
@@ -2000,8 +2213,8 @@ const collectionTypes = {
|
|
2000
2213
|
const {
|
2001
2214
|
body: { discardDraft, ...body }
|
2002
2215
|
} = ctx.request;
|
2003
|
-
const documentManager2 = getService$
|
2004
|
-
const permissionChecker2 = getService$
|
2216
|
+
const documentManager2 = getService$2("document-manager");
|
2217
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2005
2218
|
if (permissionChecker2.cannot.unpublish()) {
|
2006
2219
|
return ctx.forbidden();
|
2007
2220
|
}
|
@@ -2009,7 +2222,7 @@ const collectionTypes = {
|
|
2009
2222
|
return ctx.forbidden();
|
2010
2223
|
}
|
2011
2224
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2012
|
-
const populate = await getService$
|
2225
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2013
2226
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2014
2227
|
const document = await documentManager2.findOne(id, model, {
|
2015
2228
|
populate,
|
@@ -2040,13 +2253,13 @@ const collectionTypes = {
|
|
2040
2253
|
const { userAbility } = ctx.state;
|
2041
2254
|
const { id, model } = ctx.params;
|
2042
2255
|
const { body } = ctx.request;
|
2043
|
-
const documentManager2 = getService$
|
2044
|
-
const permissionChecker2 = getService$
|
2256
|
+
const documentManager2 = getService$2("document-manager");
|
2257
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2045
2258
|
if (permissionChecker2.cannot.discard()) {
|
2046
2259
|
return ctx.forbidden();
|
2047
2260
|
}
|
2048
2261
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2049
|
-
const populate = await getService$
|
2262
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2050
2263
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2051
2264
|
const document = await documentManager2.findOne(id, model, {
|
2052
2265
|
populate,
|
@@ -2071,13 +2284,13 @@ const collectionTypes = {
|
|
2071
2284
|
const { query, body } = ctx.request;
|
2072
2285
|
const { documentIds } = body;
|
2073
2286
|
await validateBulkActionInput(body);
|
2074
|
-
const documentManager2 = getService$
|
2075
|
-
const permissionChecker2 = getService$
|
2287
|
+
const documentManager2 = getService$2("document-manager");
|
2288
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2076
2289
|
if (permissionChecker2.cannot.delete()) {
|
2077
2290
|
return ctx.forbidden();
|
2078
2291
|
}
|
2079
2292
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2080
|
-
const populate = await getService$
|
2293
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2081
2294
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2082
2295
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2083
2296
|
populate,
|
@@ -2098,13 +2311,13 @@ const collectionTypes = {
|
|
2098
2311
|
async countDraftRelations(ctx) {
|
2099
2312
|
const { userAbility } = ctx.state;
|
2100
2313
|
const { model, id } = ctx.params;
|
2101
|
-
const documentManager2 = getService$
|
2102
|
-
const permissionChecker2 = getService$
|
2314
|
+
const documentManager2 = getService$2("document-manager");
|
2315
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2103
2316
|
if (permissionChecker2.cannot.read()) {
|
2104
2317
|
return ctx.forbidden();
|
2105
2318
|
}
|
2106
2319
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2107
|
-
const populate = await getService$
|
2320
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2108
2321
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2109
2322
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2110
2323
|
if (!entity) {
|
@@ -2123,8 +2336,8 @@ const collectionTypes = {
|
|
2123
2336
|
const ids = ctx.request.query.documentIds;
|
2124
2337
|
const locale = ctx.request.query.locale;
|
2125
2338
|
const { model } = ctx.params;
|
2126
|
-
const documentManager2 = getService$
|
2127
|
-
const permissionChecker2 = getService$
|
2339
|
+
const documentManager2 = getService$2("document-manager");
|
2340
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2128
2341
|
if (permissionChecker2.cannot.read()) {
|
2129
2342
|
return ctx.forbidden();
|
2130
2343
|
}
|
@@ -2148,13 +2361,13 @@ const collectionTypes = {
|
|
2148
2361
|
};
|
2149
2362
|
const components$1 = {
|
2150
2363
|
findComponents(ctx) {
|
2151
|
-
const components2 = getService$
|
2152
|
-
const { toDto } = getService$
|
2364
|
+
const components2 = getService$2("components").findAllComponents();
|
2365
|
+
const { toDto } = getService$2("data-mapper");
|
2153
2366
|
ctx.body = { data: components2.map(toDto) };
|
2154
2367
|
},
|
2155
2368
|
async findComponentConfiguration(ctx) {
|
2156
2369
|
const { uid: uid2 } = ctx.params;
|
2157
|
-
const componentService = getService$
|
2370
|
+
const componentService = getService$2("components");
|
2158
2371
|
const component = componentService.findComponent(uid2);
|
2159
2372
|
if (!component) {
|
2160
2373
|
return ctx.notFound("component.notFound");
|
@@ -2171,7 +2384,7 @@ const components$1 = {
|
|
2171
2384
|
async updateComponentConfiguration(ctx) {
|
2172
2385
|
const { uid: uid2 } = ctx.params;
|
2173
2386
|
const { body } = ctx.request;
|
2174
|
-
const componentService = getService$
|
2387
|
+
const componentService = getService$2("components");
|
2175
2388
|
const component = componentService.findComponent(uid2);
|
2176
2389
|
if (!component) {
|
2177
2390
|
return ctx.notFound("component.notFound");
|
@@ -2205,12 +2418,12 @@ const contentTypes = {
|
|
2205
2418
|
} catch (error) {
|
2206
2419
|
return ctx.send({ error }, 400);
|
2207
2420
|
}
|
2208
|
-
const contentTypes2 = getService$
|
2209
|
-
const { toDto } = getService$
|
2421
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2422
|
+
const { toDto } = getService$2("data-mapper");
|
2210
2423
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2211
2424
|
},
|
2212
2425
|
async findContentTypesSettings(ctx) {
|
2213
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2426
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2214
2427
|
const contentTypes2 = await findAllContentTypes();
|
2215
2428
|
const configurations = await Promise.all(
|
2216
2429
|
contentTypes2.map(async (contentType) => {
|
@@ -2224,7 +2437,7 @@ const contentTypes = {
|
|
2224
2437
|
},
|
2225
2438
|
async findContentTypeConfiguration(ctx) {
|
2226
2439
|
const { uid: uid2 } = ctx.params;
|
2227
|
-
const contentTypeService = getService$
|
2440
|
+
const contentTypeService = getService$2("content-types");
|
2228
2441
|
const contentType = await contentTypeService.findContentType(uid2);
|
2229
2442
|
if (!contentType) {
|
2230
2443
|
return ctx.notFound("contentType.notFound");
|
@@ -2246,13 +2459,13 @@ const contentTypes = {
|
|
2246
2459
|
const { userAbility } = ctx.state;
|
2247
2460
|
const { uid: uid2 } = ctx.params;
|
2248
2461
|
const { body } = ctx.request;
|
2249
|
-
const contentTypeService = getService$
|
2250
|
-
const metricsService = getService$
|
2462
|
+
const contentTypeService = getService$2("content-types");
|
2463
|
+
const metricsService = getService$2("metrics");
|
2251
2464
|
const contentType = await contentTypeService.findContentType(uid2);
|
2252
2465
|
if (!contentType) {
|
2253
2466
|
return ctx.notFound("contentType.notFound");
|
2254
2467
|
}
|
2255
|
-
if (!getService$
|
2468
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2256
2469
|
return ctx.forbidden();
|
2257
2470
|
}
|
2258
2471
|
let input;
|
@@ -2285,10 +2498,10 @@ const contentTypes = {
|
|
2285
2498
|
};
|
2286
2499
|
const init = {
|
2287
2500
|
getInitData(ctx) {
|
2288
|
-
const { toDto } = getService$
|
2289
|
-
const { findAllComponents } = getService$
|
2290
|
-
const { getAllFieldSizes } = getService$
|
2291
|
-
const { findAllContentTypes } = getService$
|
2501
|
+
const { toDto } = getService$2("data-mapper");
|
2502
|
+
const { findAllComponents } = getService$2("components");
|
2503
|
+
const { getAllFieldSizes } = getService$2("field-sizes");
|
2504
|
+
const { findAllContentTypes } = getService$2("content-types");
|
2292
2505
|
ctx.body = {
|
2293
2506
|
data: {
|
2294
2507
|
fieldSizes: getAllFieldSizes(),
|
@@ -2324,7 +2537,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2324
2537
|
params.filters.$and.push(filtersClause);
|
2325
2538
|
};
|
2326
2539
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2327
|
-
const permissionChecker2 = getService$
|
2540
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2328
2541
|
userAbility,
|
2329
2542
|
model: model.uid
|
2330
2543
|
});
|
@@ -2338,15 +2551,27 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2338
2551
|
}
|
2339
2552
|
return mainField;
|
2340
2553
|
};
|
2341
|
-
const addStatusToRelations = async (
|
2342
|
-
if (!contentTypes$1.hasDraftAndPublish(strapi.
|
2554
|
+
const addStatusToRelations = async (targetUid, relations2) => {
|
2555
|
+
if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2343
2556
|
return relations2;
|
2344
2557
|
}
|
2345
|
-
const documentMetadata2 = getService$
|
2346
|
-
|
2558
|
+
const documentMetadata2 = getService$2("document-metadata");
|
2559
|
+
if (!relations2.length) {
|
2560
|
+
return relations2;
|
2561
|
+
}
|
2562
|
+
const firstRelation = relations2[0];
|
2563
|
+
const filters = {
|
2564
|
+
documentId: { $in: relations2.map((r) => r.documentId) },
|
2565
|
+
// NOTE: find the "opposite" status
|
2566
|
+
publishedAt: firstRelation.publishedAt !== null ? { $null: true } : { $notNull: true }
|
2567
|
+
};
|
2568
|
+
const availableStatus = await strapi.query(targetUid).findMany({
|
2569
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"],
|
2570
|
+
filters
|
2571
|
+
});
|
2347
2572
|
return relations2.map((relation) => {
|
2348
|
-
const availableStatuses =
|
2349
|
-
(availableDocument) => availableDocument.documentId === relation.documentId
|
2573
|
+
const availableStatuses = availableStatus.filter(
|
2574
|
+
(availableDocument) => availableDocument.documentId === relation.documentId && (relation.locale ? availableDocument.locale === relation.locale : true)
|
2350
2575
|
);
|
2351
2576
|
return {
|
2352
2577
|
...relation,
|
@@ -2377,8 +2602,7 @@ const validateStatus = (sourceUid, status) => {
|
|
2377
2602
|
const sourceModel = strapi.getModel(sourceUid);
|
2378
2603
|
const isDP = contentTypes$1.hasDraftAndPublish;
|
2379
2604
|
const isSourceDP = isDP(sourceModel);
|
2380
|
-
if (!isSourceDP)
|
2381
|
-
return { status: void 0 };
|
2605
|
+
if (!isSourceDP) return { status: void 0 };
|
2382
2606
|
switch (status) {
|
2383
2607
|
case "published":
|
2384
2608
|
return { status: "published" };
|
@@ -2408,7 +2632,7 @@ const relations = {
|
|
2408
2632
|
ctx.request?.query?.locale
|
2409
2633
|
);
|
2410
2634
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2411
|
-
const permissionChecker2 = getService$
|
2635
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2412
2636
|
userAbility,
|
2413
2637
|
model
|
2414
2638
|
});
|
@@ -2433,7 +2657,7 @@ const relations = {
|
|
2433
2657
|
where.id = id;
|
2434
2658
|
}
|
2435
2659
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2436
|
-
const populate = await getService$
|
2660
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2437
2661
|
const currentEntity = await strapi.db.query(model).findOne({
|
2438
2662
|
where,
|
2439
2663
|
populate
|
@@ -2448,7 +2672,7 @@ const relations = {
|
|
2448
2672
|
}
|
2449
2673
|
entryId = currentEntity.id;
|
2450
2674
|
}
|
2451
|
-
const modelConfig = isComponent2 ? await getService$
|
2675
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2452
2676
|
const targetSchema = strapi.getModel(targetUid);
|
2453
2677
|
const mainField = flow(
|
2454
2678
|
prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2502,7 +2726,7 @@ const relations = {
|
|
2502
2726
|
}
|
2503
2727
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2504
2728
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2505
|
-
const permissionChecker2 = getService$
|
2729
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2506
2730
|
userAbility: ctx.state.userAbility,
|
2507
2731
|
model: targetUid
|
2508
2732
|
});
|
@@ -2575,21 +2799,33 @@ const relations = {
|
|
2575
2799
|
attribute,
|
2576
2800
|
targetField,
|
2577
2801
|
fieldsToSelect,
|
2578
|
-
|
2579
|
-
|
2580
|
-
}
|
2581
|
-
target: {
|
2582
|
-
schema: { uid: targetUid }
|
2583
|
-
}
|
2802
|
+
status,
|
2803
|
+
source: { schema: sourceSchema },
|
2804
|
+
target: { schema: targetSchema }
|
2584
2805
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2585
|
-
const
|
2806
|
+
const { uid: sourceUid } = sourceSchema;
|
2807
|
+
const { uid: targetUid } = targetSchema;
|
2808
|
+
const permissionQuery = await getService$2("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
|
2586
2809
|
const dbQuery = strapi.db.query(sourceUid);
|
2587
2810
|
const loadRelations = relations$1.isAnyToMany(attribute) ? (...args) => dbQuery.loadPages(...args) : (...args) => dbQuery.load(...args).then((res2) => ({ results: res2 ? [res2] : [] }));
|
2811
|
+
const filters = {};
|
2812
|
+
if (sourceSchema?.options?.draftAndPublish) {
|
2813
|
+
if (targetSchema?.options?.draftAndPublish) {
|
2814
|
+
if (status === "published") {
|
2815
|
+
filters.publishedAt = { $notNull: true };
|
2816
|
+
} else {
|
2817
|
+
filters.publishedAt = { $null: true };
|
2818
|
+
}
|
2819
|
+
}
|
2820
|
+
} else if (targetSchema?.options?.draftAndPublish) {
|
2821
|
+
filters.publishedAt = { $null: true };
|
2822
|
+
}
|
2588
2823
|
const res = await loadRelations({ id: entryId }, targetField, {
|
2589
|
-
select: ["id", "documentId", "locale", "publishedAt"],
|
2824
|
+
select: ["id", "documentId", "locale", "publishedAt", "updatedAt"],
|
2590
2825
|
ordering: "desc",
|
2591
2826
|
page: ctx.request.query.page,
|
2592
|
-
pageSize: ctx.request.query.pageSize
|
2827
|
+
pageSize: ctx.request.query.pageSize,
|
2828
|
+
filters
|
2593
2829
|
});
|
2594
2830
|
const loadedIds = res.results.map((item) => item.id);
|
2595
2831
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
@@ -2610,10 +2846,10 @@ const relations = {
|
|
2610
2846
|
}
|
2611
2847
|
};
|
2612
2848
|
const buildPopulateFromQuery = async (query, model) => {
|
2613
|
-
return getService$
|
2849
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2614
2850
|
};
|
2615
2851
|
const findDocument = async (query, uid2, opts = {}) => {
|
2616
|
-
const documentManager2 = getService$
|
2852
|
+
const documentManager2 = getService$2("document-manager");
|
2617
2853
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2618
2854
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2619
2855
|
};
|
@@ -2621,8 +2857,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2621
2857
|
const { user, userAbility } = ctx.state;
|
2622
2858
|
const { model } = ctx.params;
|
2623
2859
|
const { body, query } = ctx.request;
|
2624
|
-
const documentManager2 = getService$
|
2625
|
-
const permissionChecker2 = getService$
|
2860
|
+
const documentManager2 = getService$2("document-manager");
|
2861
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2626
2862
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2627
2863
|
throw new errors.ForbiddenError();
|
2628
2864
|
}
|
@@ -2663,7 +2899,7 @@ const singleTypes = {
|
|
2663
2899
|
const { userAbility } = ctx.state;
|
2664
2900
|
const { model } = ctx.params;
|
2665
2901
|
const { query = {} } = ctx.request;
|
2666
|
-
const permissionChecker2 = getService$
|
2902
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2667
2903
|
if (permissionChecker2.cannot.read()) {
|
2668
2904
|
return ctx.forbidden();
|
2669
2905
|
}
|
@@ -2697,7 +2933,7 @@ const singleTypes = {
|
|
2697
2933
|
async createOrUpdate(ctx) {
|
2698
2934
|
const { userAbility } = ctx.state;
|
2699
2935
|
const { model } = ctx.params;
|
2700
|
-
const permissionChecker2 = getService$
|
2936
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2701
2937
|
const document = await createOrUpdateDocument(ctx);
|
2702
2938
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2703
2939
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2706,8 +2942,8 @@ const singleTypes = {
|
|
2706
2942
|
const { userAbility } = ctx.state;
|
2707
2943
|
const { model } = ctx.params;
|
2708
2944
|
const { query = {} } = ctx.request;
|
2709
|
-
const documentManager2 = getService$
|
2710
|
-
const permissionChecker2 = getService$
|
2945
|
+
const documentManager2 = getService$2("document-manager");
|
2946
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2711
2947
|
if (permissionChecker2.cannot.delete()) {
|
2712
2948
|
return ctx.forbidden();
|
2713
2949
|
}
|
@@ -2735,8 +2971,8 @@ const singleTypes = {
|
|
2735
2971
|
const { userAbility } = ctx.state;
|
2736
2972
|
const { model } = ctx.params;
|
2737
2973
|
const { query = {} } = ctx.request;
|
2738
|
-
const documentManager2 = getService$
|
2739
|
-
const permissionChecker2 = getService$
|
2974
|
+
const documentManager2 = getService$2("document-manager");
|
2975
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2740
2976
|
if (permissionChecker2.cannot.publish()) {
|
2741
2977
|
return ctx.forbidden();
|
2742
2978
|
}
|
@@ -2764,8 +3000,8 @@ const singleTypes = {
|
|
2764
3000
|
body: { discardDraft, ...body },
|
2765
3001
|
query = {}
|
2766
3002
|
} = ctx.request;
|
2767
|
-
const documentManager2 = getService$
|
2768
|
-
const permissionChecker2 = getService$
|
3003
|
+
const documentManager2 = getService$2("document-manager");
|
3004
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2769
3005
|
if (permissionChecker2.cannot.unpublish()) {
|
2770
3006
|
return ctx.forbidden();
|
2771
3007
|
}
|
@@ -2799,8 +3035,8 @@ const singleTypes = {
|
|
2799
3035
|
const { userAbility } = ctx.state;
|
2800
3036
|
const { model } = ctx.params;
|
2801
3037
|
const { body, query = {} } = ctx.request;
|
2802
|
-
const documentManager2 = getService$
|
2803
|
-
const permissionChecker2 = getService$
|
3038
|
+
const documentManager2 = getService$2("document-manager");
|
3039
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2804
3040
|
if (permissionChecker2.cannot.discard()) {
|
2805
3041
|
return ctx.forbidden();
|
2806
3042
|
}
|
@@ -2823,8 +3059,8 @@ const singleTypes = {
|
|
2823
3059
|
const { userAbility } = ctx.state;
|
2824
3060
|
const { model } = ctx.params;
|
2825
3061
|
const { query } = ctx.request;
|
2826
|
-
const documentManager2 = getService$
|
2827
|
-
const permissionChecker2 = getService$
|
3062
|
+
const documentManager2 = getService$2("document-manager");
|
3063
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2828
3064
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2829
3065
|
if (permissionChecker2.cannot.read()) {
|
2830
3066
|
return ctx.forbidden();
|
@@ -2848,7 +3084,7 @@ const uid$1 = {
|
|
2848
3084
|
const { query = {} } = ctx.request;
|
2849
3085
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2850
3086
|
await validateUIDField(contentTypeUID, field);
|
2851
|
-
const uidService = getService$
|
3087
|
+
const uidService = getService$2("uid");
|
2852
3088
|
ctx.body = {
|
2853
3089
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2854
3090
|
};
|
@@ -2860,7 +3096,7 @@ const uid$1 = {
|
|
2860
3096
|
const { query = {} } = ctx.request;
|
2861
3097
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2862
3098
|
await validateUIDField(contentTypeUID, field);
|
2863
|
-
const uidService = getService$
|
3099
|
+
const uidService = getService$2("uid");
|
2864
3100
|
const isAvailable = await uidService.checkUIDAvailability({
|
2865
3101
|
contentTypeUID,
|
2866
3102
|
field,
|
@@ -2881,7 +3117,8 @@ const controllers = {
|
|
2881
3117
|
relations,
|
2882
3118
|
"single-types": singleTypes,
|
2883
3119
|
uid: uid$1,
|
2884
|
-
...history.controllers ? history.controllers : {}
|
3120
|
+
...history.controllers ? history.controllers : {},
|
3121
|
+
...preview.controllers ? preview.controllers : {}
|
2885
3122
|
};
|
2886
3123
|
const keys = {
|
2887
3124
|
CONFIGURATION: "configuration"
|
@@ -3010,18 +3247,15 @@ async function syncMetadatas(configuration, schema) {
|
|
3010
3247
|
_.set(updatedMeta, ["list", "searchable"], false);
|
3011
3248
|
_.set(acc, [key], updatedMeta);
|
3012
3249
|
}
|
3013
|
-
if (!_.has(edit, "mainField"))
|
3014
|
-
return acc;
|
3250
|
+
if (!_.has(edit, "mainField")) return acc;
|
3015
3251
|
if (!isRelation$1(attr)) {
|
3016
3252
|
_.set(updatedMeta, "edit", _.omit(edit, ["mainField"]));
|
3017
3253
|
_.set(acc, [key], updatedMeta);
|
3018
3254
|
return acc;
|
3019
3255
|
}
|
3020
|
-
if (edit.mainField === "id")
|
3021
|
-
return acc;
|
3256
|
+
if (edit.mainField === "id") return acc;
|
3022
3257
|
const targetSchema = getTargetSchema(attr.targetModel);
|
3023
|
-
if (!targetSchema)
|
3024
|
-
return acc;
|
3258
|
+
if (!targetSchema) return acc;
|
3025
3259
|
if (!isSortable(targetSchema, edit.mainField) && !isListable(targetSchema, edit.mainField)) {
|
3026
3260
|
_.set(updatedMeta, ["edit", "mainField"], getDefaultMainField(targetSchema));
|
3027
3261
|
_.set(acc, [key], updatedMeta);
|
@@ -3032,12 +3266,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3032
3266
|
return _.assign(metasWithDefaults, updatedMetas);
|
3033
3267
|
}
|
3034
3268
|
const getTargetSchema = (targetModel) => {
|
3035
|
-
return getService$
|
3269
|
+
return getService$2("content-types").findContentType(targetModel);
|
3036
3270
|
};
|
3037
3271
|
const DEFAULT_LIST_LENGTH = 4;
|
3038
3272
|
const MAX_ROW_SIZE = 12;
|
3039
3273
|
const isAllowedFieldSize = (type, size) => {
|
3040
|
-
const { getFieldSize } = getService$
|
3274
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3041
3275
|
const fieldSize = getFieldSize(type);
|
3042
3276
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3043
3277
|
return false;
|
@@ -3045,7 +3279,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3045
3279
|
return size <= MAX_ROW_SIZE;
|
3046
3280
|
};
|
3047
3281
|
const getDefaultFieldSize = (attribute) => {
|
3048
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3282
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3049
3283
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3050
3284
|
};
|
3051
3285
|
async function createDefaultLayouts(schema) {
|
@@ -3066,8 +3300,7 @@ function createDefaultEditLayout(schema) {
|
|
3066
3300
|
return appendToEditLayout([], keys2, schema);
|
3067
3301
|
}
|
3068
3302
|
function syncLayouts(configuration, schema) {
|
3069
|
-
if (_.isEmpty(configuration.layouts))
|
3070
|
-
return createDefaultLayouts(schema);
|
3303
|
+
if (_.isEmpty(configuration.layouts)) return createDefaultLayouts(schema);
|
3071
3304
|
const { list = [], editRelations = [], edit = [] } = configuration.layouts || {};
|
3072
3305
|
let cleanList = list.filter((attr) => isListable(schema, attr));
|
3073
3306
|
const cleanEditRelations = editRelations.filter(
|
@@ -3078,9 +3311,8 @@ function syncLayouts(configuration, schema) {
|
|
3078
3311
|
for (const row of edit) {
|
3079
3312
|
const newRow = [];
|
3080
3313
|
for (const el of row) {
|
3081
|
-
if (!hasEditableAttribute(schema, el.name))
|
3082
|
-
|
3083
|
-
const { hasFieldSize } = getService$1("field-sizes");
|
3314
|
+
if (!hasEditableAttribute(schema, el.name)) continue;
|
3315
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3084
3316
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3085
3317
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3086
3318
|
elementsToReAppend.push(el.name);
|
@@ -3110,8 +3342,7 @@ function syncLayouts(configuration, schema) {
|
|
3110
3342
|
};
|
3111
3343
|
}
|
3112
3344
|
const appendToEditLayout = (layout = [], keysToAppend, schema) => {
|
3113
|
-
if (keysToAppend.length === 0)
|
3114
|
-
return layout;
|
3345
|
+
if (keysToAppend.length === 0) return layout;
|
3115
3346
|
let currentRowIndex = Math.max(layout.length - 1, 0);
|
3116
3347
|
if (!layout[currentRowIndex]) {
|
3117
3348
|
layout[currentRowIndex] = [];
|
@@ -3220,17 +3451,17 @@ const configurationService$1 = createConfigurationService({
|
|
3220
3451
|
isComponent: true,
|
3221
3452
|
prefix: STORE_KEY_PREFIX,
|
3222
3453
|
getModels() {
|
3223
|
-
const { toContentManagerModel } = getService$
|
3454
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3224
3455
|
return mapValues(toContentManagerModel, strapi.components);
|
3225
3456
|
}
|
3226
3457
|
});
|
3227
3458
|
const components = ({ strapi: strapi2 }) => ({
|
3228
3459
|
findAllComponents() {
|
3229
|
-
const { toContentManagerModel } = getService$
|
3460
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3230
3461
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3231
3462
|
},
|
3232
3463
|
findComponent(uid2) {
|
3233
|
-
const { toContentManagerModel } = getService$
|
3464
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3234
3465
|
const component = strapi2.components[uid2];
|
3235
3466
|
return isNil$1(component) ? component : toContentManagerModel(component);
|
3236
3467
|
},
|
@@ -3281,17 +3512,17 @@ const configurationService = createConfigurationService({
|
|
3281
3512
|
storeUtils,
|
3282
3513
|
prefix: "content_types",
|
3283
3514
|
getModels() {
|
3284
|
-
const { toContentManagerModel } = getService$
|
3515
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3285
3516
|
return mapValues(toContentManagerModel, strapi.contentTypes);
|
3286
3517
|
}
|
3287
3518
|
});
|
3288
3519
|
const service = ({ strapi: strapi2 }) => ({
|
3289
3520
|
findAllContentTypes() {
|
3290
|
-
const { toContentManagerModel } = getService$
|
3521
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3291
3522
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3292
3523
|
},
|
3293
3524
|
findContentType(uid2) {
|
3294
|
-
const { toContentManagerModel } = getService$
|
3525
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3295
3526
|
const contentType = strapi2.contentTypes[uid2];
|
3296
3527
|
return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
|
3297
3528
|
},
|
@@ -3320,7 +3551,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3320
3551
|
return this.findConfiguration(contentType);
|
3321
3552
|
},
|
3322
3553
|
findComponentsConfigurations(contentType) {
|
3323
|
-
return getService$
|
3554
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3324
3555
|
},
|
3325
3556
|
syncConfigurations() {
|
3326
3557
|
return configurationService.syncConfigurations();
|
@@ -3592,7 +3823,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3592
3823
|
return userAbility.can(action);
|
3593
3824
|
},
|
3594
3825
|
async registerPermissions() {
|
3595
|
-
const displayedContentTypes = getService$
|
3826
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3596
3827
|
const contentTypesUids = displayedContentTypes.map(prop("uid"));
|
3597
3828
|
const actions = [
|
3598
3829
|
{
|
@@ -3868,7 +4099,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3868
4099
|
return populateQuery;
|
3869
4100
|
};
|
3870
4101
|
const buildDeepPopulate = (uid2) => {
|
3871
|
-
return getService$
|
4102
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3872
4103
|
};
|
3873
4104
|
const populateBuilder = (uid2) => {
|
3874
4105
|
let getInitialPopulate = async () => {
|
@@ -4053,7 +4284,9 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4053
4284
|
*/
|
4054
4285
|
async getAvailableLocales(uid2, version, allVersions, validatableFields = []) {
|
4055
4286
|
const versionsByLocale = groupBy("locale", allVersions);
|
4056
|
-
|
4287
|
+
if (version.locale) {
|
4288
|
+
delete versionsByLocale[version.locale];
|
4289
|
+
}
|
4057
4290
|
const model = strapi2.getModel(uid2);
|
4058
4291
|
const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
|
4059
4292
|
const traversalFunction = async (localeVersion) => traverseEntity(
|
@@ -4100,8 +4333,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4100
4333
|
const matchStatus = status === "published" ? v.publishedAt !== null : v.publishedAt === null;
|
4101
4334
|
return matchLocale && matchStatus;
|
4102
4335
|
});
|
4103
|
-
if (!availableStatus)
|
4104
|
-
return availableStatus;
|
4336
|
+
if (!availableStatus) return availableStatus;
|
4105
4337
|
return pick(AVAILABLE_STATUS_FIELDS, availableStatus);
|
4106
4338
|
},
|
4107
4339
|
/**
|
@@ -4111,8 +4343,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4111
4343
|
* @returns
|
4112
4344
|
*/
|
4113
4345
|
async getManyAvailableStatus(uid2, documents) {
|
4114
|
-
if (!documents.length)
|
4115
|
-
return [];
|
4346
|
+
if (!documents.length) return [];
|
4116
4347
|
const status = documents[0].publishedAt !== null ? "published" : "draft";
|
4117
4348
|
const locale = documents[0]?.locale;
|
4118
4349
|
const otherStatus = status === "published" ? "draft" : "published";
|
@@ -4139,10 +4370,8 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4139
4370
|
} else if (otherVersion) {
|
4140
4371
|
draftVersion = otherVersion;
|
4141
4372
|
}
|
4142
|
-
if (!draftVersion)
|
4143
|
-
|
4144
|
-
if (!publishedVersion)
|
4145
|
-
return CONTENT_MANAGER_STATUS.DRAFT;
|
4373
|
+
if (!draftVersion) return CONTENT_MANAGER_STATUS.PUBLISHED;
|
4374
|
+
if (!publishedVersion) return CONTENT_MANAGER_STATUS.DRAFT;
|
4146
4375
|
const isDraftModified = getIsVersionLatestModification(draftVersion, publishedVersion);
|
4147
4376
|
return isDraftModified ? CONTENT_MANAGER_STATUS.MODIFIED : CONTENT_MANAGER_STATUS.PUBLISHED;
|
4148
4377
|
},
|
@@ -4409,7 +4638,8 @@ const services = {
|
|
4409
4638
|
permission,
|
4410
4639
|
"populate-builder": populateBuilder$1,
|
4411
4640
|
uid,
|
4412
|
-
...history.services ? history.services : {}
|
4641
|
+
...history.services ? history.services : {},
|
4642
|
+
...preview.services ? preview.services : {}
|
4413
4643
|
};
|
4414
4644
|
const index = () => {
|
4415
4645
|
return {
|