@strapi/content-manager 0.0.0-experimental.145e7d7ddefd1aef71aaf3d9bb86440d013035bf → 0.0.0-experimental.146a31b564bc8232686331f6b28f7ff966817963
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-D_g11bYV.js → ComponentConfigurationPage-BSEZcJVB.js} +5 -6
- package/dist/_chunks/{ComponentConfigurationPage-D_g11bYV.js.map → ComponentConfigurationPage-BSEZcJVB.js.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-DJEJ49QD.mjs → ComponentConfigurationPage-BiASGi7x.mjs} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-DJEJ49QD.mjs.map → ComponentConfigurationPage-BiASGi7x.mjs.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-CeL712KW.js → EditConfigurationPage-D2rtvneE.js} +5 -6
- package/dist/_chunks/{EditConfigurationPage-CeL712KW.js.map → EditConfigurationPage-D2rtvneE.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-QBZdUYyG.mjs → EditConfigurationPage-vN4zupij.mjs} +4 -4
- package/dist/_chunks/{EditConfigurationPage-QBZdUYyG.mjs.map → EditConfigurationPage-vN4zupij.mjs.map} +1 -1
- package/dist/_chunks/{EditViewPage-g5TwrgRY.js → EditViewPage-BwisF04Q.js} +50 -11
- package/dist/_chunks/EditViewPage-BwisF04Q.js.map +1 -0
- package/dist/_chunks/{EditViewPage-CvRUUpVh.mjs → EditViewPage-_A31Cl4g.mjs} +50 -10
- package/dist/_chunks/EditViewPage-_A31Cl4g.mjs.map +1 -0
- package/dist/_chunks/{Field-reyvfnop.mjs → Field-CvIunNOj.mjs} +238 -152
- package/dist/_chunks/Field-CvIunNOj.mjs.map +1 -0
- package/dist/_chunks/{Field-ncdInvxS.js → Field-Dsu6-FrM.js} +244 -158
- package/dist/_chunks/Field-Dsu6-FrM.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-DoMGsYxH.mjs → Form-DK0fG0Gj.mjs} +15 -9
- package/dist/_chunks/Form-DK0fG0Gj.mjs.map +1 -0
- package/dist/_chunks/{Form-BJ7bYiUx.js → Form-DUwWcCmA.js} +17 -12
- package/dist/_chunks/Form-DUwWcCmA.js.map +1 -0
- package/dist/_chunks/{History-pbhkxIrf.js → History-CeCDhoJG.js} +42 -100
- package/dist/_chunks/History-CeCDhoJG.js.map +1 -0
- package/dist/_chunks/{History-BseDJOrj.mjs → History-DP8gmXpm.mjs} +43 -100
- package/dist/_chunks/History-DP8gmXpm.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DWE_fr5B.mjs → ListConfigurationPage-BCkO5iuN.mjs} +7 -6
- package/dist/_chunks/ListConfigurationPage-BCkO5iuN.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-Bna8zfjr.js → ListConfigurationPage-C-bAd44a.js} +7 -7
- package/dist/_chunks/ListConfigurationPage-C-bAd44a.js.map +1 -0
- package/dist/_chunks/{ListViewPage-Dymsvnv6.js → ListViewPage-BKTZFhsM.js} +88 -54
- package/dist/_chunks/ListViewPage-BKTZFhsM.js.map +1 -0
- package/dist/_chunks/{ListViewPage-lQ-VLV2G.mjs → ListViewPage-Cf_DgaFV.mjs} +83 -48
- package/dist/_chunks/ListViewPage-Cf_DgaFV.mjs.map +1 -0
- package/dist/_chunks/{NoContentTypePage-B4t_OsDR.js → NoContentTypePage-D3Cm3v3q.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-B4t_OsDR.js.map → NoContentTypePage-D3Cm3v3q.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-VCQOMwlf.mjs → NoContentTypePage-nHIyvJcB.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-VCQOMwlf.mjs.map → NoContentTypePage-nHIyvJcB.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-TV830k4P.mjs → NoPermissionsPage-BALVSJ7x.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-TV830k4P.mjs.map → NoPermissionsPage-BALVSJ7x.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-BOwB6hki.js → NoPermissionsPage-CChGWBj5.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-BOwB6hki.js.map → NoPermissionsPage-CChGWBj5.js.map} +1 -1
- package/dist/_chunks/Preview-C4NBzKUV.mjs +294 -0
- package/dist/_chunks/Preview-C4NBzKUV.mjs.map +1 -0
- package/dist/_chunks/Preview-CT28Ckpg.js +312 -0
- package/dist/_chunks/Preview-CT28Ckpg.js.map +1 -0
- package/dist/_chunks/{Relations-D6NAlnsl.mjs → Relations-C8uC89cT.mjs} +75 -41
- package/dist/_chunks/Relations-C8uC89cT.mjs.map +1 -0
- package/dist/_chunks/{Relations-DdlstXTu.js → Relations-CvkPCng_.js} +75 -42
- package/dist/_chunks/Relations-CvkPCng_.js.map +1 -0
- package/dist/_chunks/{en-Cf41pH5f.js → en-BK8Xyl5I.js} +24 -12
- package/dist/_chunks/{en-Cf41pH5f.js.map → en-BK8Xyl5I.js.map} +1 -1
- package/dist/_chunks/{en-DCszE74t.mjs → en-Dtk_ot79.mjs} +24 -12
- package/dist/_chunks/{en-DCszE74t.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-CQos-KS0.js → index-CnX_j5h-.js} +1239 -942
- package/dist/_chunks/index-CnX_j5h-.js.map +1 -0
- package/dist/_chunks/{index-BYSWwHBJ.mjs → index-Dh2aGTGJ.mjs} +1241 -944
- package/dist/_chunks/index-Dh2aGTGJ.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-0TY7UtKO.mjs → layout-B5qsPihj.mjs} +6 -5
- package/dist/_chunks/{layout-0TY7UtKO.mjs.map → layout-B5qsPihj.mjs.map} +1 -1
- package/dist/_chunks/{layout-B4XAqu1v.js → layout-B_qdWGny.js} +7 -7
- package/dist/_chunks/{layout-B4XAqu1v.js.map → layout-B_qdWGny.js.map} +1 -1
- package/dist/_chunks/{objects-gigeqt7s.js → objects-BcXOv6_9.js} +2 -4
- package/dist/_chunks/{objects-gigeqt7s.js.map → objects-BcXOv6_9.js.map} +1 -1
- package/dist/_chunks/{objects-mKMAmfec.mjs → objects-D6yBsdmx.mjs} +2 -4
- package/dist/_chunks/{objects-mKMAmfec.mjs.map → objects-D6yBsdmx.mjs.map} +1 -1
- package/dist/_chunks/{relations-xZ2tMj1G.js → relations-ChcieiF5.js} +6 -7
- package/dist/_chunks/relations-ChcieiF5.js.map +1 -0
- package/dist/_chunks/{relations-DFDWfa0s.mjs → relations-DMXpNY-e.mjs} +6 -7
- package/dist/_chunks/relations-DMXpNY-e.mjs.map +1 -0
- package/dist/_chunks/{usePrev-B9w_-eYc.js → useDebounce-CtcjDB3L.js} +14 -1
- package/dist/_chunks/useDebounce-CtcjDB3L.js.map +1 -0
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs +29 -0
- package/dist/_chunks/useDebounce-DmuSJIF3.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/admin/index.js +2 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +4 -3
- package/dist/admin/src/content-manager.d.ts +3 -2
- package/dist/admin/src/exports.d.ts +1 -1
- package/dist/admin/src/hooks/useDocument.d.ts +32 -1
- package/dist/admin/src/pages/EditView/EditViewPage.d.ts +9 -1
- package/dist/admin/src/pages/EditView/components/DocumentActions.d.ts +1 -1
- package/dist/admin/src/pages/EditView/components/DocumentStatus.d.ts +2 -2
- 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/Header.d.ts +11 -11
- package/dist/admin/src/preview/components/PreviewContent.d.ts +2 -0
- package/dist/admin/src/preview/components/PreviewHeader.d.ts +2 -0
- package/dist/admin/src/preview/components/PreviewSidePanel.d.ts +3 -0
- package/dist/admin/src/preview/index.d.ts +4 -0
- package/dist/admin/src/preview/pages/Preview.d.ts +11 -0
- package/dist/admin/src/preview/routes.d.ts +3 -0
- package/dist/admin/src/preview/services/preview.d.ts +3 -0
- package/dist/admin/src/router.d.ts +1 -1
- package/dist/admin/src/services/documents.d.ts +0 -3
- package/dist/server/index.js +513 -260
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +514 -260
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/bootstrap.d.ts.map +1 -1
- package/dist/server/src/controllers/collection-types.d.ts.map +1 -1
- package/dist/server/src/controllers/index.d.ts.map +1 -1
- package/dist/server/src/controllers/relations.d.ts.map +1 -1
- package/dist/server/src/controllers/utils/metadata.d.ts +16 -1
- package/dist/server/src/controllers/utils/metadata.d.ts.map +1 -1
- package/dist/server/src/history/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 +2 -3
- package/dist/server/src/history/services/utils.d.ts.map +1 -1
- package/dist/server/src/index.d.ts +7 -6
- package/dist/server/src/index.d.ts.map +1 -1
- package/dist/server/src/preview/controllers/index.d.ts +2 -0
- package/dist/server/src/preview/controllers/index.d.ts.map +1 -0
- package/dist/server/src/preview/controllers/preview.d.ts +13 -0
- package/dist/server/src/preview/controllers/preview.d.ts.map +1 -0
- package/dist/server/src/preview/controllers/validation/preview.d.ts +6 -0
- package/dist/server/src/preview/controllers/validation/preview.d.ts.map +1 -0
- package/dist/server/src/preview/index.d.ts +4 -0
- package/dist/server/src/preview/index.d.ts.map +1 -0
- package/dist/server/src/preview/routes/index.d.ts +8 -0
- package/dist/server/src/preview/routes/index.d.ts.map +1 -0
- package/dist/server/src/preview/routes/preview.d.ts +4 -0
- package/dist/server/src/preview/routes/preview.d.ts.map +1 -0
- package/dist/server/src/preview/services/index.d.ts +16 -0
- package/dist/server/src/preview/services/index.d.ts.map +1 -0
- package/dist/server/src/preview/services/preview-config.d.ts +32 -0
- package/dist/server/src/preview/services/preview-config.d.ts.map +1 -0
- package/dist/server/src/preview/services/preview.d.ts +12 -0
- package/dist/server/src/preview/services/preview.d.ts.map +1 -0
- package/dist/server/src/preview/utils.d.ts +19 -0
- package/dist/server/src/preview/utils.d.ts.map +1 -0
- package/dist/server/src/register.d.ts.map +1 -1
- package/dist/server/src/routes/index.d.ts.map +1 -1
- package/dist/server/src/services/document-manager.d.ts.map +1 -1
- package/dist/server/src/services/document-metadata.d.ts +12 -10
- package/dist/server/src/services/document-metadata.d.ts.map +1 -1
- package/dist/server/src/services/index.d.ts +7 -6
- package/dist/server/src/services/index.d.ts.map +1 -1
- package/dist/server/src/services/utils/populate.d.ts +2 -2
- package/dist/server/src/services/utils/populate.d.ts.map +1 -1
- package/dist/server/src/utils/index.d.ts +2 -0
- package/dist/server/src/utils/index.d.ts.map +1 -1
- package/dist/shared/contracts/index.d.ts +1 -0
- package/dist/shared/contracts/index.d.ts.map +1 -1
- package/dist/shared/contracts/preview.d.ts +27 -0
- package/dist/shared/contracts/preview.d.ts.map +1 -0
- package/dist/shared/index.js +4 -0
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/index.mjs +4 -0
- package/dist/shared/index.mjs.map +1 -1
- package/package.json +17 -15
- package/dist/_chunks/EditViewPage-CvRUUpVh.mjs.map +0 -1
- package/dist/_chunks/EditViewPage-g5TwrgRY.js.map +0 -1
- package/dist/_chunks/Field-ncdInvxS.js.map +0 -1
- package/dist/_chunks/Field-reyvfnop.mjs.map +0 -1
- package/dist/_chunks/Form-BJ7bYiUx.js.map +0 -1
- package/dist/_chunks/Form-DoMGsYxH.mjs.map +0 -1
- package/dist/_chunks/History-BseDJOrj.mjs.map +0 -1
- package/dist/_chunks/History-pbhkxIrf.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-Bna8zfjr.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-DWE_fr5B.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-Dymsvnv6.js.map +0 -1
- package/dist/_chunks/ListViewPage-lQ-VLV2G.mjs.map +0 -1
- package/dist/_chunks/Relations-D6NAlnsl.mjs.map +0 -1
- package/dist/_chunks/Relations-DdlstXTu.js.map +0 -1
- package/dist/_chunks/index-BYSWwHBJ.mjs.map +0 -1
- package/dist/_chunks/index-CQos-KS0.js.map +0 -1
- package/dist/_chunks/relations-DFDWfa0s.mjs.map +0 -1
- package/dist/_chunks/relations-xZ2tMj1G.js.map +0 -1
- package/dist/_chunks/usePrev-B9w_-eYc.js.map +0 -1
- package/dist/_chunks/usePrev-DH6iah0A.mjs +0 -16
- package/dist/_chunks/usePrev-DH6iah0A.mjs.map +0 -1
- package/strapi-server.js +0 -3
package/dist/server/index.mjs
CHANGED
@@ -1,5 +1,5 @@
|
|
1
|
-
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1,
|
2
|
-
import { pick, omit, difference, castArray, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
|
1
|
+
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1, pagination } from "@strapi/utils";
|
2
|
+
import { pick, omit, difference, castArray, mergeWith, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
|
3
3
|
import "@strapi/types";
|
4
4
|
import * as yup from "yup";
|
5
5
|
import { scheduleJob } from "node-schedule";
|
@@ -7,10 +7,10 @@ import isNil from "lodash/isNil";
|
|
7
7
|
import _, { intersection as intersection$1, difference as difference$1 } from "lodash";
|
8
8
|
import qs from "qs";
|
9
9
|
import slugify from "@sindresorhus/slugify";
|
10
|
-
const getService$
|
10
|
+
const getService$2 = (name) => {
|
11
11
|
return strapi.plugin("content-manager").service(name);
|
12
12
|
};
|
13
|
-
function getService(strapi2, name) {
|
13
|
+
function getService$1(strapi2, name) {
|
14
14
|
return strapi2.service(`plugin::content-manager.${name}`);
|
15
15
|
}
|
16
16
|
const historyRestoreVersionSchema = yup.object().shape({
|
@@ -46,7 +46,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
46
46
|
if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {
|
47
47
|
throw new errors.ForbiddenError("contentType and documentId are required");
|
48
48
|
}
|
49
|
-
const permissionChecker2 = getService$
|
49
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
50
50
|
userAbility: ctx.state.userAbility,
|
51
51
|
model: ctx.query.contentType
|
52
52
|
});
|
@@ -54,7 +54,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
54
54
|
return ctx.forbidden();
|
55
55
|
}
|
56
56
|
const query = await permissionChecker2.sanitizeQuery(ctx.query);
|
57
|
-
const { results, pagination: pagination2 } = await getService(strapi2, "history").findVersionsPage({
|
57
|
+
const { results, pagination: pagination2 } = await getService$1(strapi2, "history").findVersionsPage({
|
58
58
|
query: {
|
59
59
|
...query,
|
60
60
|
...getValidPagination({ page: query.page, pageSize: query.pageSize })
|
@@ -79,14 +79,14 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
79
79
|
async restoreVersion(ctx) {
|
80
80
|
const request = ctx.request;
|
81
81
|
await validateRestoreVersion(request.body, "contentType is required");
|
82
|
-
const permissionChecker2 = getService$
|
82
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
83
83
|
userAbility: ctx.state.userAbility,
|
84
84
|
model: request.body.contentType
|
85
85
|
});
|
86
86
|
if (permissionChecker2.cannot.update()) {
|
87
87
|
throw new errors.ForbiddenError();
|
88
88
|
}
|
89
|
-
const restoredDocument = await getService(strapi2, "history").restoreVersion(
|
89
|
+
const restoredDocument = await getService$1(strapi2, "history").restoreVersion(
|
90
90
|
request.params.versionId
|
91
91
|
);
|
92
92
|
return {
|
@@ -95,7 +95,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
95
95
|
}
|
96
96
|
};
|
97
97
|
};
|
98
|
-
const controllers$
|
98
|
+
const controllers$2 = {
|
99
99
|
"history-version": createHistoryVersionController
|
100
100
|
/**
|
101
101
|
* Casting is needed because the types aren't aware that Strapi supports
|
@@ -141,8 +141,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
141
141
|
};
|
142
142
|
const getRelationRestoreValue = async (versionRelationData, attribute) => {
|
143
143
|
if (Array.isArray(versionRelationData)) {
|
144
|
-
if (versionRelationData.length === 0)
|
145
|
-
return versionRelationData;
|
144
|
+
if (versionRelationData.length === 0) return versionRelationData;
|
146
145
|
const existingAndMissingRelations = await Promise.all(
|
147
146
|
versionRelationData.map((relation) => {
|
148
147
|
return strapi2.documents(attribute.target).findOne({
|
@@ -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
|
});
|
@@ -367,7 +382,12 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
367
382
|
if (userToPopulate == null) {
|
368
383
|
return null;
|
369
384
|
}
|
370
|
-
return strapi2.query("admin::user").findOne({
|
385
|
+
return strapi2.query("admin::user").findOne({
|
386
|
+
where: {
|
387
|
+
...userToPopulate.id ? { id: userToPopulate.id } : {},
|
388
|
+
...userToPopulate.documentId ? { documentId: userToPopulate.documentId } : {}
|
389
|
+
}
|
390
|
+
});
|
371
391
|
})
|
372
392
|
);
|
373
393
|
return {
|
@@ -380,7 +400,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
380
400
|
[attributeKey]: adminUsers
|
381
401
|
};
|
382
402
|
}
|
383
|
-
const permissionChecker2 = getService$
|
403
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
384
404
|
userAbility: params.state.userAbility,
|
385
405
|
model: attributeSchema.target
|
386
406
|
});
|
@@ -556,7 +576,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
556
576
|
onCommit(async () => {
|
557
577
|
for (const entry of localeEntries) {
|
558
578
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
559
|
-
await getService(strapi2, "history").createVersion({
|
579
|
+
await getService$1(strapi2, "history").createVersion({
|
560
580
|
contentType: uid2,
|
561
581
|
data: omit(FIELDS_TO_IGNORE, entry),
|
562
582
|
relatedDocumentId: documentId,
|
@@ -569,15 +589,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
569
589
|
});
|
570
590
|
return result;
|
571
591
|
});
|
572
|
-
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
592
|
+
state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
|
573
593
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
574
594
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
575
595
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
576
596
|
where: {
|
577
597
|
created_at: {
|
578
|
-
$lt: expirationDate
|
598
|
+
$lt: expirationDate
|
579
599
|
}
|
580
600
|
}
|
601
|
+
}).catch((error) => {
|
602
|
+
if (error instanceof Error) {
|
603
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
604
|
+
}
|
581
605
|
});
|
582
606
|
});
|
583
607
|
state.isInitialized = true;
|
@@ -589,17 +613,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
589
613
|
}
|
590
614
|
};
|
591
615
|
};
|
592
|
-
const services$
|
616
|
+
const services$2 = {
|
593
617
|
history: createHistoryService,
|
594
618
|
lifecycles: createLifecyclesService
|
595
619
|
};
|
596
|
-
const info = { pluginName: "content-manager", type: "admin" };
|
620
|
+
const info$1 = { pluginName: "content-manager", type: "admin" };
|
597
621
|
const historyVersionRouter = {
|
598
622
|
type: "admin",
|
599
623
|
routes: [
|
600
624
|
{
|
601
625
|
method: "GET",
|
602
|
-
info,
|
626
|
+
info: info$1,
|
603
627
|
path: "/history-versions",
|
604
628
|
handler: "history-version.findMany",
|
605
629
|
config: {
|
@@ -608,7 +632,7 @@ const historyVersionRouter = {
|
|
608
632
|
},
|
609
633
|
{
|
610
634
|
method: "PUT",
|
611
|
-
info,
|
635
|
+
info: info$1,
|
612
636
|
path: "/history-versions/:versionId/restore",
|
613
637
|
handler: "history-version.restoreVersion",
|
614
638
|
config: {
|
@@ -617,7 +641,7 @@ const historyVersionRouter = {
|
|
617
641
|
}
|
618
642
|
]
|
619
643
|
};
|
620
|
-
const routes$
|
644
|
+
const routes$2 = {
|
621
645
|
"history-version": historyVersionRouter
|
622
646
|
};
|
623
647
|
const historyVersion = {
|
@@ -664,21 +688,21 @@ const historyVersion = {
|
|
664
688
|
}
|
665
689
|
}
|
666
690
|
};
|
667
|
-
const getFeature = () => {
|
691
|
+
const getFeature$1 = () => {
|
668
692
|
if (strapi.ee.features.isEnabled("cms-content-history")) {
|
669
693
|
return {
|
670
694
|
register({ strapi: strapi2 }) {
|
671
695
|
strapi2.get("models").add(historyVersion);
|
672
696
|
},
|
673
697
|
bootstrap({ strapi: strapi2 }) {
|
674
|
-
getService(strapi2, "lifecycles").bootstrap();
|
698
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
675
699
|
},
|
676
700
|
destroy({ strapi: strapi2 }) {
|
677
|
-
getService(strapi2, "lifecycles").destroy();
|
701
|
+
getService$1(strapi2, "lifecycles").destroy();
|
678
702
|
},
|
679
|
-
controllers: controllers$
|
680
|
-
services: services$
|
681
|
-
routes: routes$
|
703
|
+
controllers: controllers$2,
|
704
|
+
services: services$2,
|
705
|
+
routes: routes$2
|
682
706
|
};
|
683
707
|
}
|
684
708
|
return {
|
@@ -687,9 +711,201 @@ const getFeature = () => {
|
|
687
711
|
}
|
688
712
|
};
|
689
713
|
};
|
690
|
-
const history = getFeature();
|
714
|
+
const history = getFeature$1();
|
715
|
+
const info = { pluginName: "content-manager", type: "admin" };
|
716
|
+
const previewRouter = {
|
717
|
+
type: "admin",
|
718
|
+
routes: [
|
719
|
+
{
|
720
|
+
method: "GET",
|
721
|
+
info,
|
722
|
+
path: "/preview/url/:contentType",
|
723
|
+
handler: "preview.getPreviewUrl",
|
724
|
+
config: {
|
725
|
+
policies: ["admin::isAuthenticatedAdmin"]
|
726
|
+
}
|
727
|
+
}
|
728
|
+
]
|
729
|
+
};
|
730
|
+
const routes$1 = {
|
731
|
+
preview: previewRouter
|
732
|
+
};
|
733
|
+
function getService(strapi2, name) {
|
734
|
+
return strapi2.service(`plugin::content-manager.${name}`);
|
735
|
+
}
|
736
|
+
const getPreviewUrlSchema = yup.object().shape({
|
737
|
+
// Will be undefined for single types
|
738
|
+
documentId: yup.string(),
|
739
|
+
locale: yup.string().nullable(),
|
740
|
+
status: yup.string()
|
741
|
+
}).required();
|
742
|
+
const validatePreviewUrl = async (strapi2, uid2, params) => {
|
743
|
+
await validateYupSchema(getPreviewUrlSchema)(params);
|
744
|
+
const newParams = pick(["documentId", "locale", "status"], params);
|
745
|
+
const model = strapi2.getModel(uid2);
|
746
|
+
if (!model || model.modelType !== "contentType") {
|
747
|
+
throw new errors.ValidationError("Invalid content type");
|
748
|
+
}
|
749
|
+
const isSingleType = model?.kind === "singleType";
|
750
|
+
if (!isSingleType && !params.documentId) {
|
751
|
+
throw new errors.ValidationError("documentId is required for Collection Types");
|
752
|
+
}
|
753
|
+
if (isSingleType) {
|
754
|
+
const doc = await strapi2.documents(uid2).findFirst();
|
755
|
+
if (!doc) {
|
756
|
+
throw new errors.NotFoundError("Document not found");
|
757
|
+
}
|
758
|
+
newParams.documentId = doc?.documentId;
|
759
|
+
}
|
760
|
+
if (!newParams.status) {
|
761
|
+
const isDPEnabled = model?.options?.draftAndPublish;
|
762
|
+
newParams.status = isDPEnabled ? "draft" : "published";
|
763
|
+
}
|
764
|
+
return newParams;
|
765
|
+
};
|
766
|
+
const createPreviewController = () => {
|
767
|
+
return {
|
768
|
+
/**
|
769
|
+
* Transforms an entry into a preview URL, so that it can be previewed
|
770
|
+
* in the Content Manager.
|
771
|
+
*/
|
772
|
+
async getPreviewUrl(ctx) {
|
773
|
+
const uid2 = ctx.params.contentType;
|
774
|
+
const query = ctx.request.query;
|
775
|
+
const params = await validatePreviewUrl(strapi, uid2, query);
|
776
|
+
const previewService = getService(strapi, "preview");
|
777
|
+
const url = await previewService.getPreviewUrl(uid2, params);
|
778
|
+
if (!url) {
|
779
|
+
ctx.status = 204;
|
780
|
+
}
|
781
|
+
return {
|
782
|
+
data: { url }
|
783
|
+
};
|
784
|
+
}
|
785
|
+
};
|
786
|
+
};
|
787
|
+
const controllers$1 = {
|
788
|
+
preview: createPreviewController
|
789
|
+
/**
|
790
|
+
* Casting is needed because the types aren't aware that Strapi supports
|
791
|
+
* passing a controller factory as the value, instead of a controller object directly
|
792
|
+
*/
|
793
|
+
};
|
794
|
+
const createPreviewService = ({ strapi: strapi2 }) => {
|
795
|
+
const config = getService(strapi2, "preview-config");
|
796
|
+
return {
|
797
|
+
async getPreviewUrl(uid2, params) {
|
798
|
+
const handler = config.getPreviewHandler();
|
799
|
+
try {
|
800
|
+
return handler(uid2, params);
|
801
|
+
} catch (error) {
|
802
|
+
strapi2.log.error(`Failed to get preview URL: ${error}`);
|
803
|
+
throw new errors.ApplicationError("Failed to get preview URL");
|
804
|
+
}
|
805
|
+
return;
|
806
|
+
}
|
807
|
+
};
|
808
|
+
};
|
809
|
+
const extendMiddlewareConfiguration = (middleware = { name: "", config: {} }) => {
|
810
|
+
const middlewares = strapi.config.get("middlewares");
|
811
|
+
const configuredMiddlewares = middlewares.map((currentMiddleware) => {
|
812
|
+
if (currentMiddleware === middleware.name) {
|
813
|
+
return middleware;
|
814
|
+
}
|
815
|
+
if (currentMiddleware.name === middleware.name) {
|
816
|
+
return mergeWith(
|
817
|
+
(objValue, srcValue) => {
|
818
|
+
if (Array.isArray(objValue)) {
|
819
|
+
return objValue.concat(srcValue);
|
820
|
+
}
|
821
|
+
return void 0;
|
822
|
+
},
|
823
|
+
currentMiddleware,
|
824
|
+
middleware
|
825
|
+
);
|
826
|
+
}
|
827
|
+
return currentMiddleware;
|
828
|
+
});
|
829
|
+
strapi.config.set("middlewares", configuredMiddlewares);
|
830
|
+
};
|
831
|
+
const createPreviewConfigService = ({ strapi: strapi2 }) => {
|
832
|
+
return {
|
833
|
+
register() {
|
834
|
+
if (!this.isEnabled()) {
|
835
|
+
return;
|
836
|
+
}
|
837
|
+
const config = strapi2.config.get("admin.preview");
|
838
|
+
if (config.config?.allowedOrigins) {
|
839
|
+
extendMiddlewareConfiguration({
|
840
|
+
name: "strapi::security",
|
841
|
+
config: {
|
842
|
+
contentSecurityPolicy: {
|
843
|
+
directives: {
|
844
|
+
"frame-src": config.config.allowedOrigins
|
845
|
+
}
|
846
|
+
}
|
847
|
+
}
|
848
|
+
});
|
849
|
+
}
|
850
|
+
},
|
851
|
+
isEnabled() {
|
852
|
+
const config = strapi2.config.get("admin.preview");
|
853
|
+
if (!config) {
|
854
|
+
return false;
|
855
|
+
}
|
856
|
+
return config?.enabled ?? true;
|
857
|
+
},
|
858
|
+
/**
|
859
|
+
* Validate if the configuration is valid
|
860
|
+
*/
|
861
|
+
validate() {
|
862
|
+
if (!this.isEnabled()) {
|
863
|
+
return;
|
864
|
+
}
|
865
|
+
const handler = this.getPreviewHandler();
|
866
|
+
if (typeof handler !== "function") {
|
867
|
+
throw new errors.ValidationError(
|
868
|
+
"Preview configuration is invalid. Handler must be a function"
|
869
|
+
);
|
870
|
+
}
|
871
|
+
},
|
872
|
+
/**
|
873
|
+
* Utility to get the preview handler from the configuration
|
874
|
+
*/
|
875
|
+
getPreviewHandler() {
|
876
|
+
const config = strapi2.config.get("admin.preview");
|
877
|
+
const emptyHandler = () => {
|
878
|
+
return void 0;
|
879
|
+
};
|
880
|
+
if (!this.isEnabled()) {
|
881
|
+
return emptyHandler;
|
882
|
+
}
|
883
|
+
return config?.config?.handler || emptyHandler;
|
884
|
+
}
|
885
|
+
};
|
886
|
+
};
|
887
|
+
const services$1 = {
|
888
|
+
preview: createPreviewService,
|
889
|
+
"preview-config": createPreviewConfigService
|
890
|
+
};
|
891
|
+
const getFeature = () => {
|
892
|
+
return {
|
893
|
+
register() {
|
894
|
+
const config = getService(strapi, "preview-config");
|
895
|
+
config.validate();
|
896
|
+
config.register();
|
897
|
+
},
|
898
|
+
bootstrap() {
|
899
|
+
},
|
900
|
+
routes: routes$1,
|
901
|
+
controllers: controllers$1,
|
902
|
+
services: services$1
|
903
|
+
};
|
904
|
+
};
|
905
|
+
const preview = getFeature();
|
691
906
|
const register = async ({ strapi: strapi2 }) => {
|
692
907
|
await history.register?.({ strapi: strapi2 });
|
908
|
+
await preview.register?.({ strapi: strapi2 });
|
693
909
|
};
|
694
910
|
const ALLOWED_WEBHOOK_EVENTS = {
|
695
911
|
ENTRY_PUBLISH: "entry.publish",
|
@@ -699,11 +915,12 @@ const bootstrap = async () => {
|
|
699
915
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
700
916
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
701
917
|
});
|
702
|
-
getService$
|
703
|
-
await getService$
|
704
|
-
await getService$
|
705
|
-
await getService$
|
918
|
+
getService$2("field-sizes").setCustomFieldInputSizes();
|
919
|
+
await getService$2("components").syncConfigurations();
|
920
|
+
await getService$2("content-types").syncConfigurations();
|
921
|
+
await getService$2("permission").registerPermissions();
|
706
922
|
await history.bootstrap?.({ strapi });
|
923
|
+
await preview.bootstrap?.({ strapi });
|
707
924
|
};
|
708
925
|
const destroy = async ({ strapi: strapi2 }) => {
|
709
926
|
await history.destroy?.({ strapi: strapi2 });
|
@@ -1193,7 +1410,8 @@ const admin = {
|
|
1193
1410
|
};
|
1194
1411
|
const routes = {
|
1195
1412
|
admin,
|
1196
|
-
...history.routes ? history.routes : {}
|
1413
|
+
...history.routes ? history.routes : {},
|
1414
|
+
...preview.routes ? preview.routes : {}
|
1197
1415
|
};
|
1198
1416
|
const hasPermissionsSchema = yup$1.object({
|
1199
1417
|
actions: yup$1.array().of(yup$1.string()),
|
@@ -1256,8 +1474,7 @@ const isSortable = (schema, name) => {
|
|
1256
1474
|
if (!_.has(schema.attributes, name)) {
|
1257
1475
|
return false;
|
1258
1476
|
}
|
1259
|
-
if (schema.modelType === "component" && name === "id")
|
1260
|
-
return false;
|
1477
|
+
if (schema.modelType === "component" && name === "id") return false;
|
1261
1478
|
const attribute = schema.attributes[name];
|
1262
1479
|
if (NON_SORTABLES.includes(attribute.type)) {
|
1263
1480
|
return false;
|
@@ -1402,8 +1619,7 @@ const createDefaultSettings = async (schema) => {
|
|
1402
1619
|
};
|
1403
1620
|
};
|
1404
1621
|
const syncSettings = async (configuration, schema) => {
|
1405
|
-
if (isEmpty(configuration.settings))
|
1406
|
-
return createDefaultSettings(schema);
|
1622
|
+
if (isEmpty(configuration.settings)) return createDefaultSettings(schema);
|
1407
1623
|
const defaultField = getDefaultMainField(schema);
|
1408
1624
|
const { mainField = defaultField, defaultSortBy = defaultField } = configuration.settings || {};
|
1409
1625
|
return {
|
@@ -1450,7 +1666,7 @@ const createMetadasSchema = (schema) => {
|
|
1450
1666
|
if (!value) {
|
1451
1667
|
return yup$1.string();
|
1452
1668
|
}
|
1453
|
-
const targetSchema = getService$
|
1669
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1454
1670
|
schema.attributes[key].targetModel
|
1455
1671
|
);
|
1456
1672
|
if (!targetSchema) {
|
@@ -1579,8 +1795,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1579
1795
|
}
|
1580
1796
|
switch (attribute.type) {
|
1581
1797
|
case "relation": {
|
1582
|
-
if (canCreate(attributePath))
|
1583
|
-
return body2;
|
1798
|
+
if (canCreate(attributePath)) return body2;
|
1584
1799
|
return set(attributePath, { set: [] }, body2);
|
1585
1800
|
}
|
1586
1801
|
case "component": {
|
@@ -1590,8 +1805,7 @@ const excludeNotCreatableFields = (uid2, permissionChecker2) => (body, path = []
|
|
1590
1805
|
]);
|
1591
1806
|
}
|
1592
1807
|
default: {
|
1593
|
-
if (canCreate(attributePath))
|
1594
|
-
return body2;
|
1808
|
+
if (canCreate(attributePath)) return body2;
|
1595
1809
|
return set(attributePath, null, body2);
|
1596
1810
|
}
|
1597
1811
|
}
|
@@ -1619,7 +1833,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1619
1833
|
}
|
1620
1834
|
};
|
1621
1835
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1622
|
-
const documentMetadata2 = getService$
|
1836
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1623
1837
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1624
1838
|
let {
|
1625
1839
|
meta: { availableLocales, availableStatus }
|
@@ -1645,8 +1859,8 @@ const createDocument = async (ctx, opts) => {
|
|
1645
1859
|
const { userAbility, user } = ctx.state;
|
1646
1860
|
const { model } = ctx.params;
|
1647
1861
|
const { body } = ctx.request;
|
1648
|
-
const documentManager2 = getService$
|
1649
|
-
const permissionChecker2 = getService$
|
1862
|
+
const documentManager2 = getService$2("document-manager");
|
1863
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1650
1864
|
if (permissionChecker2.cannot.create()) {
|
1651
1865
|
throw new errors.ForbiddenError();
|
1652
1866
|
}
|
@@ -1666,13 +1880,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1666
1880
|
const { userAbility, user } = ctx.state;
|
1667
1881
|
const { id, model } = ctx.params;
|
1668
1882
|
const { body } = ctx.request;
|
1669
|
-
const documentManager2 = getService$
|
1670
|
-
const permissionChecker2 = getService$
|
1883
|
+
const documentManager2 = getService$2("document-manager");
|
1884
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1671
1885
|
if (permissionChecker2.cannot.update()) {
|
1672
1886
|
throw new errors.ForbiddenError();
|
1673
1887
|
}
|
1674
1888
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1675
|
-
const populate = await getService$
|
1889
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1676
1890
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1677
1891
|
const [documentVersion, documentExists] = await Promise.all([
|
1678
1892
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1689,7 +1903,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1689
1903
|
throw new errors.ForbiddenError();
|
1690
1904
|
}
|
1691
1905
|
const pickPermittedFields = documentVersion ? permissionChecker2.sanitizeUpdateInput(documentVersion) : permissionChecker2.sanitizeCreateInput;
|
1692
|
-
const setCreator = setCreatorFields({ user, isEdition: true });
|
1906
|
+
const setCreator = documentVersion ? setCreatorFields({ user, isEdition: true }) : setCreatorFields({ user });
|
1693
1907
|
const sanitizeFn = async.pipe(pickPermittedFields, setCreator);
|
1694
1908
|
const sanitizedBody = await sanitizeFn(body);
|
1695
1909
|
return documentManager2.update(documentVersion?.documentId || id, model, {
|
@@ -1703,14 +1917,14 @@ const collectionTypes = {
|
|
1703
1917
|
const { userAbility } = ctx.state;
|
1704
1918
|
const { model } = ctx.params;
|
1705
1919
|
const { query } = ctx.request;
|
1706
|
-
const documentMetadata2 = getService$
|
1707
|
-
const documentManager2 = getService$
|
1708
|
-
const permissionChecker2 = getService$
|
1920
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1921
|
+
const documentManager2 = getService$2("document-manager");
|
1922
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1709
1923
|
if (permissionChecker2.cannot.read()) {
|
1710
1924
|
return ctx.forbidden();
|
1711
1925
|
}
|
1712
1926
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1713
|
-
const populate = await getService$
|
1927
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1714
1928
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1715
1929
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1716
1930
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1739,13 +1953,13 @@ const collectionTypes = {
|
|
1739
1953
|
async findOne(ctx) {
|
1740
1954
|
const { userAbility } = ctx.state;
|
1741
1955
|
const { model, id } = ctx.params;
|
1742
|
-
const documentManager2 = getService$
|
1743
|
-
const permissionChecker2 = getService$
|
1956
|
+
const documentManager2 = getService$2("document-manager");
|
1957
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1744
1958
|
if (permissionChecker2.cannot.read()) {
|
1745
1959
|
return ctx.forbidden();
|
1746
1960
|
}
|
1747
1961
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1748
|
-
const populate = await getService$
|
1962
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1749
1963
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1750
1964
|
const version = await documentManager2.findOne(id, model, {
|
1751
1965
|
populate,
|
@@ -1761,7 +1975,7 @@ const collectionTypes = {
|
|
1761
1975
|
permissionChecker2,
|
1762
1976
|
model,
|
1763
1977
|
// @ts-expect-error TODO: fix
|
1764
|
-
{ id, locale, publishedAt: null },
|
1978
|
+
{ documentId: id, locale, publishedAt: null },
|
1765
1979
|
{ availableLocales: true, availableStatus: false }
|
1766
1980
|
);
|
1767
1981
|
ctx.body = { data: {}, meta };
|
@@ -1776,7 +1990,7 @@ const collectionTypes = {
|
|
1776
1990
|
async create(ctx) {
|
1777
1991
|
const { userAbility } = ctx.state;
|
1778
1992
|
const { model } = ctx.params;
|
1779
|
-
const permissionChecker2 = getService$
|
1993
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1780
1994
|
const [totalEntries, document] = await Promise.all([
|
1781
1995
|
strapi.db.query(model).count(),
|
1782
1996
|
createDocument(ctx)
|
@@ -1797,7 +2011,7 @@ const collectionTypes = {
|
|
1797
2011
|
async update(ctx) {
|
1798
2012
|
const { userAbility } = ctx.state;
|
1799
2013
|
const { model } = ctx.params;
|
1800
|
-
const permissionChecker2 = getService$
|
2014
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1801
2015
|
const updatedVersion = await updateDocument(ctx);
|
1802
2016
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1803
2017
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1806,13 +2020,13 @@ const collectionTypes = {
|
|
1806
2020
|
const { userAbility, user } = ctx.state;
|
1807
2021
|
const { model, sourceId: id } = ctx.params;
|
1808
2022
|
const { body } = ctx.request;
|
1809
|
-
const documentManager2 = getService$
|
1810
|
-
const permissionChecker2 = getService$
|
2023
|
+
const documentManager2 = getService$2("document-manager");
|
2024
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1811
2025
|
if (permissionChecker2.cannot.create()) {
|
1812
2026
|
return ctx.forbidden();
|
1813
2027
|
}
|
1814
2028
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1815
|
-
const populate = await getService$
|
2029
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1816
2030
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1817
2031
|
const document = await documentManager2.findOne(id, model, {
|
1818
2032
|
populate,
|
@@ -1851,13 +2065,13 @@ const collectionTypes = {
|
|
1851
2065
|
async delete(ctx) {
|
1852
2066
|
const { userAbility } = ctx.state;
|
1853
2067
|
const { id, model } = ctx.params;
|
1854
|
-
const documentManager2 = getService$
|
1855
|
-
const permissionChecker2 = getService$
|
2068
|
+
const documentManager2 = getService$2("document-manager");
|
2069
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1856
2070
|
if (permissionChecker2.cannot.delete()) {
|
1857
2071
|
return ctx.forbidden();
|
1858
2072
|
}
|
1859
2073
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1860
|
-
const populate = await getService$
|
2074
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1861
2075
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1862
2076
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1863
2077
|
if (documentLocales.length === 0) {
|
@@ -1879,14 +2093,14 @@ const collectionTypes = {
|
|
1879
2093
|
const { userAbility } = ctx.state;
|
1880
2094
|
const { id, model } = ctx.params;
|
1881
2095
|
const { body } = ctx.request;
|
1882
|
-
const documentManager2 = getService$
|
1883
|
-
const permissionChecker2 = getService$
|
2096
|
+
const documentManager2 = getService$2("document-manager");
|
2097
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1884
2098
|
if (permissionChecker2.cannot.publish()) {
|
1885
2099
|
return ctx.forbidden();
|
1886
2100
|
}
|
1887
2101
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1888
2102
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1889
|
-
const populate = await getService$
|
2103
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1890
2104
|
let document;
|
1891
2105
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1892
2106
|
const isCreate = isNil$1(id);
|
@@ -1898,11 +2112,17 @@ const collectionTypes = {
|
|
1898
2112
|
}
|
1899
2113
|
const isUpdate = !isCreate;
|
1900
2114
|
if (isUpdate) {
|
1901
|
-
|
1902
|
-
if (!
|
2115
|
+
const documentExists = documentManager2.exists(model, id);
|
2116
|
+
if (!documentExists) {
|
1903
2117
|
throw new errors.NotFoundError("Document not found");
|
1904
2118
|
}
|
1905
|
-
|
2119
|
+
document = await documentManager2.findOne(id, model, { populate, locale });
|
2120
|
+
if (!document) {
|
2121
|
+
if (permissionChecker2.cannot.create({ locale }) || permissionChecker2.cannot.publish({ locale })) {
|
2122
|
+
throw new errors.ForbiddenError();
|
2123
|
+
}
|
2124
|
+
document = await updateDocument(ctx);
|
2125
|
+
} else if (permissionChecker2.can.update(document)) {
|
1906
2126
|
await updateDocument(ctx);
|
1907
2127
|
}
|
1908
2128
|
}
|
@@ -1928,13 +2148,13 @@ const collectionTypes = {
|
|
1928
2148
|
const { body } = ctx.request;
|
1929
2149
|
const { documentIds } = body;
|
1930
2150
|
await validateBulkActionInput(body);
|
1931
|
-
const documentManager2 = getService$
|
1932
|
-
const permissionChecker2 = getService$
|
2151
|
+
const documentManager2 = getService$2("document-manager");
|
2152
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1933
2153
|
if (permissionChecker2.cannot.publish()) {
|
1934
2154
|
return ctx.forbidden();
|
1935
2155
|
}
|
1936
2156
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1937
|
-
const populate = await getService$
|
2157
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1938
2158
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1939
2159
|
allowMultipleLocales: true
|
1940
2160
|
});
|
@@ -1959,8 +2179,8 @@ const collectionTypes = {
|
|
1959
2179
|
const { body } = ctx.request;
|
1960
2180
|
const { documentIds } = body;
|
1961
2181
|
await validateBulkActionInput(body);
|
1962
|
-
const documentManager2 = getService$
|
1963
|
-
const permissionChecker2 = getService$
|
2182
|
+
const documentManager2 = getService$2("document-manager");
|
2183
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1964
2184
|
if (permissionChecker2.cannot.unpublish()) {
|
1965
2185
|
return ctx.forbidden();
|
1966
2186
|
}
|
@@ -1989,8 +2209,8 @@ const collectionTypes = {
|
|
1989
2209
|
const {
|
1990
2210
|
body: { discardDraft, ...body }
|
1991
2211
|
} = ctx.request;
|
1992
|
-
const documentManager2 = getService$
|
1993
|
-
const permissionChecker2 = getService$
|
2212
|
+
const documentManager2 = getService$2("document-manager");
|
2213
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1994
2214
|
if (permissionChecker2.cannot.unpublish()) {
|
1995
2215
|
return ctx.forbidden();
|
1996
2216
|
}
|
@@ -1998,7 +2218,7 @@ const collectionTypes = {
|
|
1998
2218
|
return ctx.forbidden();
|
1999
2219
|
}
|
2000
2220
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2001
|
-
const populate = await getService$
|
2221
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2002
2222
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2003
2223
|
const document = await documentManager2.findOne(id, model, {
|
2004
2224
|
populate,
|
@@ -2029,13 +2249,13 @@ const collectionTypes = {
|
|
2029
2249
|
const { userAbility } = ctx.state;
|
2030
2250
|
const { id, model } = ctx.params;
|
2031
2251
|
const { body } = ctx.request;
|
2032
|
-
const documentManager2 = getService$
|
2033
|
-
const permissionChecker2 = getService$
|
2252
|
+
const documentManager2 = getService$2("document-manager");
|
2253
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2034
2254
|
if (permissionChecker2.cannot.discard()) {
|
2035
2255
|
return ctx.forbidden();
|
2036
2256
|
}
|
2037
2257
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2038
|
-
const populate = await getService$
|
2258
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2039
2259
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2040
2260
|
const document = await documentManager2.findOne(id, model, {
|
2041
2261
|
populate,
|
@@ -2060,13 +2280,13 @@ const collectionTypes = {
|
|
2060
2280
|
const { query, body } = ctx.request;
|
2061
2281
|
const { documentIds } = body;
|
2062
2282
|
await validateBulkActionInput(body);
|
2063
|
-
const documentManager2 = getService$
|
2064
|
-
const permissionChecker2 = getService$
|
2283
|
+
const documentManager2 = getService$2("document-manager");
|
2284
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2065
2285
|
if (permissionChecker2.cannot.delete()) {
|
2066
2286
|
return ctx.forbidden();
|
2067
2287
|
}
|
2068
2288
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2069
|
-
const populate = await getService$
|
2289
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2070
2290
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2071
2291
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2072
2292
|
populate,
|
@@ -2087,13 +2307,13 @@ const collectionTypes = {
|
|
2087
2307
|
async countDraftRelations(ctx) {
|
2088
2308
|
const { userAbility } = ctx.state;
|
2089
2309
|
const { model, id } = ctx.params;
|
2090
|
-
const documentManager2 = getService$
|
2091
|
-
const permissionChecker2 = getService$
|
2310
|
+
const documentManager2 = getService$2("document-manager");
|
2311
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2092
2312
|
if (permissionChecker2.cannot.read()) {
|
2093
2313
|
return ctx.forbidden();
|
2094
2314
|
}
|
2095
2315
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2096
|
-
const populate = await getService$
|
2316
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2097
2317
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2098
2318
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2099
2319
|
if (!entity) {
|
@@ -2112,8 +2332,8 @@ const collectionTypes = {
|
|
2112
2332
|
const ids = ctx.request.query.documentIds;
|
2113
2333
|
const locale = ctx.request.query.locale;
|
2114
2334
|
const { model } = ctx.params;
|
2115
|
-
const documentManager2 = getService$
|
2116
|
-
const permissionChecker2 = getService$
|
2335
|
+
const documentManager2 = getService$2("document-manager");
|
2336
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2117
2337
|
if (permissionChecker2.cannot.read()) {
|
2118
2338
|
return ctx.forbidden();
|
2119
2339
|
}
|
@@ -2137,13 +2357,13 @@ const collectionTypes = {
|
|
2137
2357
|
};
|
2138
2358
|
const components$1 = {
|
2139
2359
|
findComponents(ctx) {
|
2140
|
-
const components2 = getService$
|
2141
|
-
const { toDto } = getService$
|
2360
|
+
const components2 = getService$2("components").findAllComponents();
|
2361
|
+
const { toDto } = getService$2("data-mapper");
|
2142
2362
|
ctx.body = { data: components2.map(toDto) };
|
2143
2363
|
},
|
2144
2364
|
async findComponentConfiguration(ctx) {
|
2145
2365
|
const { uid: uid2 } = ctx.params;
|
2146
|
-
const componentService = getService$
|
2366
|
+
const componentService = getService$2("components");
|
2147
2367
|
const component = componentService.findComponent(uid2);
|
2148
2368
|
if (!component) {
|
2149
2369
|
return ctx.notFound("component.notFound");
|
@@ -2160,7 +2380,7 @@ const components$1 = {
|
|
2160
2380
|
async updateComponentConfiguration(ctx) {
|
2161
2381
|
const { uid: uid2 } = ctx.params;
|
2162
2382
|
const { body } = ctx.request;
|
2163
|
-
const componentService = getService$
|
2383
|
+
const componentService = getService$2("components");
|
2164
2384
|
const component = componentService.findComponent(uid2);
|
2165
2385
|
if (!component) {
|
2166
2386
|
return ctx.notFound("component.notFound");
|
@@ -2194,12 +2414,12 @@ const contentTypes = {
|
|
2194
2414
|
} catch (error) {
|
2195
2415
|
return ctx.send({ error }, 400);
|
2196
2416
|
}
|
2197
|
-
const contentTypes2 = getService$
|
2198
|
-
const { toDto } = getService$
|
2417
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2418
|
+
const { toDto } = getService$2("data-mapper");
|
2199
2419
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2200
2420
|
},
|
2201
2421
|
async findContentTypesSettings(ctx) {
|
2202
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2422
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2203
2423
|
const contentTypes2 = await findAllContentTypes();
|
2204
2424
|
const configurations = await Promise.all(
|
2205
2425
|
contentTypes2.map(async (contentType) => {
|
@@ -2213,7 +2433,7 @@ const contentTypes = {
|
|
2213
2433
|
},
|
2214
2434
|
async findContentTypeConfiguration(ctx) {
|
2215
2435
|
const { uid: uid2 } = ctx.params;
|
2216
|
-
const contentTypeService = getService$
|
2436
|
+
const contentTypeService = getService$2("content-types");
|
2217
2437
|
const contentType = await contentTypeService.findContentType(uid2);
|
2218
2438
|
if (!contentType) {
|
2219
2439
|
return ctx.notFound("contentType.notFound");
|
@@ -2235,13 +2455,13 @@ const contentTypes = {
|
|
2235
2455
|
const { userAbility } = ctx.state;
|
2236
2456
|
const { uid: uid2 } = ctx.params;
|
2237
2457
|
const { body } = ctx.request;
|
2238
|
-
const contentTypeService = getService$
|
2239
|
-
const metricsService = getService$
|
2458
|
+
const contentTypeService = getService$2("content-types");
|
2459
|
+
const metricsService = getService$2("metrics");
|
2240
2460
|
const contentType = await contentTypeService.findContentType(uid2);
|
2241
2461
|
if (!contentType) {
|
2242
2462
|
return ctx.notFound("contentType.notFound");
|
2243
2463
|
}
|
2244
|
-
if (!getService$
|
2464
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2245
2465
|
return ctx.forbidden();
|
2246
2466
|
}
|
2247
2467
|
let input;
|
@@ -2274,10 +2494,10 @@ const contentTypes = {
|
|
2274
2494
|
};
|
2275
2495
|
const init = {
|
2276
2496
|
getInitData(ctx) {
|
2277
|
-
const { toDto } = getService$
|
2278
|
-
const { findAllComponents } = getService$
|
2279
|
-
const { getAllFieldSizes } = getService$
|
2280
|
-
const { findAllContentTypes } = getService$
|
2497
|
+
const { toDto } = getService$2("data-mapper");
|
2498
|
+
const { findAllComponents } = getService$2("components");
|
2499
|
+
const { getAllFieldSizes } = getService$2("field-sizes");
|
2500
|
+
const { findAllContentTypes } = getService$2("content-types");
|
2281
2501
|
ctx.body = {
|
2282
2502
|
data: {
|
2283
2503
|
fieldSizes: getAllFieldSizes(),
|
@@ -2313,7 +2533,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2313
2533
|
params.filters.$and.push(filtersClause);
|
2314
2534
|
};
|
2315
2535
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2316
|
-
const permissionChecker2 = getService$
|
2536
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2317
2537
|
userAbility,
|
2318
2538
|
model: model.uid
|
2319
2539
|
});
|
@@ -2327,15 +2547,27 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2327
2547
|
}
|
2328
2548
|
return mainField;
|
2329
2549
|
};
|
2330
|
-
const addStatusToRelations = async (
|
2331
|
-
if (!contentTypes$1.hasDraftAndPublish(strapi.
|
2550
|
+
const addStatusToRelations = async (targetUid, relations2) => {
|
2551
|
+
if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2552
|
+
return relations2;
|
2553
|
+
}
|
2554
|
+
const documentMetadata2 = getService$2("document-metadata");
|
2555
|
+
if (!relations2.length) {
|
2332
2556
|
return relations2;
|
2333
2557
|
}
|
2334
|
-
const
|
2335
|
-
const
|
2558
|
+
const firstRelation = relations2[0];
|
2559
|
+
const filters = {
|
2560
|
+
documentId: { $in: relations2.map((r) => r.documentId) },
|
2561
|
+
// NOTE: find the "opposite" status
|
2562
|
+
publishedAt: firstRelation.publishedAt !== null ? { $null: true } : { $notNull: true }
|
2563
|
+
};
|
2564
|
+
const availableStatus = await strapi.query(targetUid).findMany({
|
2565
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"],
|
2566
|
+
filters
|
2567
|
+
});
|
2336
2568
|
return relations2.map((relation) => {
|
2337
|
-
const availableStatuses =
|
2338
|
-
(availableDocument) => availableDocument.documentId === relation.documentId
|
2569
|
+
const availableStatuses = availableStatus.filter(
|
2570
|
+
(availableDocument) => availableDocument.documentId === relation.documentId && (relation.locale ? availableDocument.locale === relation.locale : true)
|
2339
2571
|
);
|
2340
2572
|
return {
|
2341
2573
|
...relation,
|
@@ -2356,11 +2588,8 @@ const validateLocale = (sourceUid, targetUid, locale) => {
|
|
2356
2588
|
const isLocalized = strapi.plugin("i18n").service("content-types").isLocalizedContentType;
|
2357
2589
|
const isSourceLocalized = isLocalized(sourceModel);
|
2358
2590
|
const isTargetLocalized = isLocalized(targetModel);
|
2359
|
-
let validatedLocale = locale;
|
2360
|
-
if (!targetModel || !isTargetLocalized)
|
2361
|
-
validatedLocale = void 0;
|
2362
2591
|
return {
|
2363
|
-
locale
|
2592
|
+
locale,
|
2364
2593
|
isSourceLocalized,
|
2365
2594
|
isTargetLocalized
|
2366
2595
|
};
|
@@ -2369,8 +2598,7 @@ const validateStatus = (sourceUid, status) => {
|
|
2369
2598
|
const sourceModel = strapi.getModel(sourceUid);
|
2370
2599
|
const isDP = contentTypes$1.hasDraftAndPublish;
|
2371
2600
|
const isSourceDP = isDP(sourceModel);
|
2372
|
-
if (!isSourceDP)
|
2373
|
-
return { status: void 0 };
|
2601
|
+
if (!isSourceDP) return { status: void 0 };
|
2374
2602
|
switch (status) {
|
2375
2603
|
case "published":
|
2376
2604
|
return { status: "published" };
|
@@ -2400,7 +2628,7 @@ const relations = {
|
|
2400
2628
|
ctx.request?.query?.locale
|
2401
2629
|
);
|
2402
2630
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2403
|
-
const permissionChecker2 = getService$
|
2631
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2404
2632
|
userAbility,
|
2405
2633
|
model
|
2406
2634
|
});
|
@@ -2425,7 +2653,7 @@ const relations = {
|
|
2425
2653
|
where.id = id;
|
2426
2654
|
}
|
2427
2655
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2428
|
-
const populate = await getService$
|
2656
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2429
2657
|
const currentEntity = await strapi.db.query(model).findOne({
|
2430
2658
|
where,
|
2431
2659
|
populate
|
@@ -2440,7 +2668,7 @@ const relations = {
|
|
2440
2668
|
}
|
2441
2669
|
entryId = currentEntity.id;
|
2442
2670
|
}
|
2443
|
-
const modelConfig = isComponent2 ? await getService$
|
2671
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2444
2672
|
const targetSchema = strapi.getModel(targetUid);
|
2445
2673
|
const mainField = flow(
|
2446
2674
|
prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2463,7 +2691,7 @@ const relations = {
|
|
2463
2691
|
attribute,
|
2464
2692
|
fieldsToSelect,
|
2465
2693
|
mainField,
|
2466
|
-
source: { schema: sourceSchema },
|
2694
|
+
source: { schema: sourceSchema, isLocalized: isSourceLocalized },
|
2467
2695
|
target: { schema: targetSchema, isLocalized: isTargetLocalized },
|
2468
2696
|
sourceSchema,
|
2469
2697
|
targetSchema,
|
@@ -2485,7 +2713,8 @@ const relations = {
|
|
2485
2713
|
fieldsToSelect,
|
2486
2714
|
mainField,
|
2487
2715
|
source: {
|
2488
|
-
schema: { uid: sourceUid, modelType: sourceModelType }
|
2716
|
+
schema: { uid: sourceUid, modelType: sourceModelType },
|
2717
|
+
isLocalized: isSourceLocalized
|
2489
2718
|
},
|
2490
2719
|
target: {
|
2491
2720
|
schema: { uid: targetUid },
|
@@ -2493,7 +2722,7 @@ const relations = {
|
|
2493
2722
|
}
|
2494
2723
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2495
2724
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2496
|
-
const permissionChecker2 = getService$
|
2725
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2497
2726
|
userAbility: ctx.state.userAbility,
|
2498
2727
|
model: targetUid
|
2499
2728
|
});
|
@@ -2523,12 +2752,16 @@ const relations = {
|
|
2523
2752
|
} else {
|
2524
2753
|
where.id = id;
|
2525
2754
|
}
|
2526
|
-
|
2527
|
-
|
2755
|
+
const publishedAt = getPublishedAtClause(status, targetUid);
|
2756
|
+
if (!isEmpty(publishedAt)) {
|
2757
|
+
where[`${alias}.published_at`] = publishedAt;
|
2528
2758
|
}
|
2529
|
-
if (
|
2759
|
+
if (isTargetLocalized && locale) {
|
2530
2760
|
where[`${alias}.locale`] = locale;
|
2531
2761
|
}
|
2762
|
+
if (isSourceLocalized && locale) {
|
2763
|
+
where.locale = locale;
|
2764
|
+
}
|
2532
2765
|
if ((idsToInclude?.length ?? 0) !== 0) {
|
2533
2766
|
where[`${alias}.id`].$notIn = idsToInclude;
|
2534
2767
|
}
|
@@ -2546,7 +2779,8 @@ const relations = {
|
|
2546
2779
|
id: { $notIn: uniq(idsToOmit) }
|
2547
2780
|
});
|
2548
2781
|
}
|
2549
|
-
const
|
2782
|
+
const dbQuery = strapi.get("query-params").transform(targetUid, queryParams);
|
2783
|
+
const res = await strapi.db.query(targetUid).findPage(dbQuery);
|
2550
2784
|
ctx.body = {
|
2551
2785
|
...res,
|
2552
2786
|
results: await addStatusToRelations(targetUid, res.results)
|
@@ -2561,21 +2795,33 @@ const relations = {
|
|
2561
2795
|
attribute,
|
2562
2796
|
targetField,
|
2563
2797
|
fieldsToSelect,
|
2564
|
-
|
2565
|
-
|
2566
|
-
}
|
2567
|
-
target: {
|
2568
|
-
schema: { uid: targetUid }
|
2569
|
-
}
|
2798
|
+
status,
|
2799
|
+
source: { schema: sourceSchema },
|
2800
|
+
target: { schema: targetSchema }
|
2570
2801
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2571
|
-
const
|
2802
|
+
const { uid: sourceUid } = sourceSchema;
|
2803
|
+
const { uid: targetUid } = targetSchema;
|
2804
|
+
const permissionQuery = await getService$2("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
|
2572
2805
|
const dbQuery = strapi.db.query(sourceUid);
|
2573
2806
|
const loadRelations = relations$1.isAnyToMany(attribute) ? (...args) => dbQuery.loadPages(...args) : (...args) => dbQuery.load(...args).then((res2) => ({ results: res2 ? [res2] : [] }));
|
2807
|
+
const filters = {};
|
2808
|
+
if (sourceSchema?.options?.draftAndPublish) {
|
2809
|
+
if (targetSchema?.options?.draftAndPublish) {
|
2810
|
+
if (status === "published") {
|
2811
|
+
filters.publishedAt = { $notNull: true };
|
2812
|
+
} else {
|
2813
|
+
filters.publishedAt = { $null: true };
|
2814
|
+
}
|
2815
|
+
}
|
2816
|
+
} else if (targetSchema?.options?.draftAndPublish) {
|
2817
|
+
filters.publishedAt = { $null: true };
|
2818
|
+
}
|
2574
2819
|
const res = await loadRelations({ id: entryId }, targetField, {
|
2575
|
-
select: ["id", "documentId", "locale", "publishedAt"],
|
2820
|
+
select: ["id", "documentId", "locale", "publishedAt", "updatedAt"],
|
2576
2821
|
ordering: "desc",
|
2577
2822
|
page: ctx.request.query.page,
|
2578
|
-
pageSize: ctx.request.query.pageSize
|
2823
|
+
pageSize: ctx.request.query.pageSize,
|
2824
|
+
filters
|
2579
2825
|
});
|
2580
2826
|
const loadedIds = res.results.map((item) => item.id);
|
2581
2827
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
@@ -2596,10 +2842,10 @@ const relations = {
|
|
2596
2842
|
}
|
2597
2843
|
};
|
2598
2844
|
const buildPopulateFromQuery = async (query, model) => {
|
2599
|
-
return getService$
|
2845
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2600
2846
|
};
|
2601
2847
|
const findDocument = async (query, uid2, opts = {}) => {
|
2602
|
-
const documentManager2 = getService$
|
2848
|
+
const documentManager2 = getService$2("document-manager");
|
2603
2849
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2604
2850
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2605
2851
|
};
|
@@ -2607,8 +2853,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2607
2853
|
const { user, userAbility } = ctx.state;
|
2608
2854
|
const { model } = ctx.params;
|
2609
2855
|
const { body, query } = ctx.request;
|
2610
|
-
const documentManager2 = getService$
|
2611
|
-
const permissionChecker2 = getService$
|
2856
|
+
const documentManager2 = getService$2("document-manager");
|
2857
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2612
2858
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2613
2859
|
throw new errors.ForbiddenError();
|
2614
2860
|
}
|
@@ -2649,7 +2895,7 @@ const singleTypes = {
|
|
2649
2895
|
const { userAbility } = ctx.state;
|
2650
2896
|
const { model } = ctx.params;
|
2651
2897
|
const { query = {} } = ctx.request;
|
2652
|
-
const permissionChecker2 = getService$
|
2898
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2653
2899
|
if (permissionChecker2.cannot.read()) {
|
2654
2900
|
return ctx.forbidden();
|
2655
2901
|
}
|
@@ -2668,7 +2914,7 @@ const singleTypes = {
|
|
2668
2914
|
permissionChecker2,
|
2669
2915
|
model,
|
2670
2916
|
// @ts-expect-error - fix types
|
2671
|
-
{
|
2917
|
+
{ documentId: document.documentId, locale, publishedAt: null },
|
2672
2918
|
{ availableLocales: true, availableStatus: false }
|
2673
2919
|
);
|
2674
2920
|
ctx.body = { data: {}, meta };
|
@@ -2683,7 +2929,7 @@ const singleTypes = {
|
|
2683
2929
|
async createOrUpdate(ctx) {
|
2684
2930
|
const { userAbility } = ctx.state;
|
2685
2931
|
const { model } = ctx.params;
|
2686
|
-
const permissionChecker2 = getService$
|
2932
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2687
2933
|
const document = await createOrUpdateDocument(ctx);
|
2688
2934
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2689
2935
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2692,8 +2938,8 @@ const singleTypes = {
|
|
2692
2938
|
const { userAbility } = ctx.state;
|
2693
2939
|
const { model } = ctx.params;
|
2694
2940
|
const { query = {} } = ctx.request;
|
2695
|
-
const documentManager2 = getService$
|
2696
|
-
const permissionChecker2 = getService$
|
2941
|
+
const documentManager2 = getService$2("document-manager");
|
2942
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2697
2943
|
if (permissionChecker2.cannot.delete()) {
|
2698
2944
|
return ctx.forbidden();
|
2699
2945
|
}
|
@@ -2721,8 +2967,8 @@ const singleTypes = {
|
|
2721
2967
|
const { userAbility } = ctx.state;
|
2722
2968
|
const { model } = ctx.params;
|
2723
2969
|
const { query = {} } = ctx.request;
|
2724
|
-
const documentManager2 = getService$
|
2725
|
-
const permissionChecker2 = getService$
|
2970
|
+
const documentManager2 = getService$2("document-manager");
|
2971
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2726
2972
|
if (permissionChecker2.cannot.publish()) {
|
2727
2973
|
return ctx.forbidden();
|
2728
2974
|
}
|
@@ -2750,8 +2996,8 @@ const singleTypes = {
|
|
2750
2996
|
body: { discardDraft, ...body },
|
2751
2997
|
query = {}
|
2752
2998
|
} = ctx.request;
|
2753
|
-
const documentManager2 = getService$
|
2754
|
-
const permissionChecker2 = getService$
|
2999
|
+
const documentManager2 = getService$2("document-manager");
|
3000
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2755
3001
|
if (permissionChecker2.cannot.unpublish()) {
|
2756
3002
|
return ctx.forbidden();
|
2757
3003
|
}
|
@@ -2785,8 +3031,8 @@ const singleTypes = {
|
|
2785
3031
|
const { userAbility } = ctx.state;
|
2786
3032
|
const { model } = ctx.params;
|
2787
3033
|
const { body, query = {} } = ctx.request;
|
2788
|
-
const documentManager2 = getService$
|
2789
|
-
const permissionChecker2 = getService$
|
3034
|
+
const documentManager2 = getService$2("document-manager");
|
3035
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2790
3036
|
if (permissionChecker2.cannot.discard()) {
|
2791
3037
|
return ctx.forbidden();
|
2792
3038
|
}
|
@@ -2809,8 +3055,8 @@ const singleTypes = {
|
|
2809
3055
|
const { userAbility } = ctx.state;
|
2810
3056
|
const { model } = ctx.params;
|
2811
3057
|
const { query } = ctx.request;
|
2812
|
-
const documentManager2 = getService$
|
2813
|
-
const permissionChecker2 = getService$
|
3058
|
+
const documentManager2 = getService$2("document-manager");
|
3059
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2814
3060
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2815
3061
|
if (permissionChecker2.cannot.read()) {
|
2816
3062
|
return ctx.forbidden();
|
@@ -2834,7 +3080,7 @@ const uid$1 = {
|
|
2834
3080
|
const { query = {} } = ctx.request;
|
2835
3081
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2836
3082
|
await validateUIDField(contentTypeUID, field);
|
2837
|
-
const uidService = getService$
|
3083
|
+
const uidService = getService$2("uid");
|
2838
3084
|
ctx.body = {
|
2839
3085
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2840
3086
|
};
|
@@ -2846,7 +3092,7 @@ const uid$1 = {
|
|
2846
3092
|
const { query = {} } = ctx.request;
|
2847
3093
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2848
3094
|
await validateUIDField(contentTypeUID, field);
|
2849
|
-
const uidService = getService$
|
3095
|
+
const uidService = getService$2("uid");
|
2850
3096
|
const isAvailable = await uidService.checkUIDAvailability({
|
2851
3097
|
contentTypeUID,
|
2852
3098
|
field,
|
@@ -2867,7 +3113,8 @@ const controllers = {
|
|
2867
3113
|
relations,
|
2868
3114
|
"single-types": singleTypes,
|
2869
3115
|
uid: uid$1,
|
2870
|
-
...history.controllers ? history.controllers : {}
|
3116
|
+
...history.controllers ? history.controllers : {},
|
3117
|
+
...preview.controllers ? preview.controllers : {}
|
2871
3118
|
};
|
2872
3119
|
const keys = {
|
2873
3120
|
CONFIGURATION: "configuration"
|
@@ -2996,18 +3243,15 @@ async function syncMetadatas(configuration, schema) {
|
|
2996
3243
|
_.set(updatedMeta, ["list", "searchable"], false);
|
2997
3244
|
_.set(acc, [key], updatedMeta);
|
2998
3245
|
}
|
2999
|
-
if (!_.has(edit, "mainField"))
|
3000
|
-
return acc;
|
3246
|
+
if (!_.has(edit, "mainField")) return acc;
|
3001
3247
|
if (!isRelation$1(attr)) {
|
3002
3248
|
_.set(updatedMeta, "edit", _.omit(edit, ["mainField"]));
|
3003
3249
|
_.set(acc, [key], updatedMeta);
|
3004
3250
|
return acc;
|
3005
3251
|
}
|
3006
|
-
if (edit.mainField === "id")
|
3007
|
-
return acc;
|
3252
|
+
if (edit.mainField === "id") return acc;
|
3008
3253
|
const targetSchema = getTargetSchema(attr.targetModel);
|
3009
|
-
if (!targetSchema)
|
3010
|
-
return acc;
|
3254
|
+
if (!targetSchema) return acc;
|
3011
3255
|
if (!isSortable(targetSchema, edit.mainField) && !isListable(targetSchema, edit.mainField)) {
|
3012
3256
|
_.set(updatedMeta, ["edit", "mainField"], getDefaultMainField(targetSchema));
|
3013
3257
|
_.set(acc, [key], updatedMeta);
|
@@ -3018,12 +3262,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3018
3262
|
return _.assign(metasWithDefaults, updatedMetas);
|
3019
3263
|
}
|
3020
3264
|
const getTargetSchema = (targetModel) => {
|
3021
|
-
return getService$
|
3265
|
+
return getService$2("content-types").findContentType(targetModel);
|
3022
3266
|
};
|
3023
3267
|
const DEFAULT_LIST_LENGTH = 4;
|
3024
3268
|
const MAX_ROW_SIZE = 12;
|
3025
3269
|
const isAllowedFieldSize = (type, size) => {
|
3026
|
-
const { getFieldSize } = getService$
|
3270
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3027
3271
|
const fieldSize = getFieldSize(type);
|
3028
3272
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3029
3273
|
return false;
|
@@ -3031,7 +3275,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3031
3275
|
return size <= MAX_ROW_SIZE;
|
3032
3276
|
};
|
3033
3277
|
const getDefaultFieldSize = (attribute) => {
|
3034
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3278
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3035
3279
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3036
3280
|
};
|
3037
3281
|
async function createDefaultLayouts(schema) {
|
@@ -3052,8 +3296,7 @@ function createDefaultEditLayout(schema) {
|
|
3052
3296
|
return appendToEditLayout([], keys2, schema);
|
3053
3297
|
}
|
3054
3298
|
function syncLayouts(configuration, schema) {
|
3055
|
-
if (_.isEmpty(configuration.layouts))
|
3056
|
-
return createDefaultLayouts(schema);
|
3299
|
+
if (_.isEmpty(configuration.layouts)) return createDefaultLayouts(schema);
|
3057
3300
|
const { list = [], editRelations = [], edit = [] } = configuration.layouts || {};
|
3058
3301
|
let cleanList = list.filter((attr) => isListable(schema, attr));
|
3059
3302
|
const cleanEditRelations = editRelations.filter(
|
@@ -3064,9 +3307,8 @@ function syncLayouts(configuration, schema) {
|
|
3064
3307
|
for (const row of edit) {
|
3065
3308
|
const newRow = [];
|
3066
3309
|
for (const el of row) {
|
3067
|
-
if (!hasEditableAttribute(schema, el.name))
|
3068
|
-
|
3069
|
-
const { hasFieldSize } = getService$1("field-sizes");
|
3310
|
+
if (!hasEditableAttribute(schema, el.name)) continue;
|
3311
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3070
3312
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3071
3313
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3072
3314
|
elementsToReAppend.push(el.name);
|
@@ -3096,8 +3338,7 @@ function syncLayouts(configuration, schema) {
|
|
3096
3338
|
};
|
3097
3339
|
}
|
3098
3340
|
const appendToEditLayout = (layout = [], keysToAppend, schema) => {
|
3099
|
-
if (keysToAppend.length === 0)
|
3100
|
-
return layout;
|
3341
|
+
if (keysToAppend.length === 0) return layout;
|
3101
3342
|
let currentRowIndex = Math.max(layout.length - 1, 0);
|
3102
3343
|
if (!layout[currentRowIndex]) {
|
3103
3344
|
layout[currentRowIndex] = [];
|
@@ -3206,17 +3447,17 @@ const configurationService$1 = createConfigurationService({
|
|
3206
3447
|
isComponent: true,
|
3207
3448
|
prefix: STORE_KEY_PREFIX,
|
3208
3449
|
getModels() {
|
3209
|
-
const { toContentManagerModel } = getService$
|
3450
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3210
3451
|
return mapValues(toContentManagerModel, strapi.components);
|
3211
3452
|
}
|
3212
3453
|
});
|
3213
3454
|
const components = ({ strapi: strapi2 }) => ({
|
3214
3455
|
findAllComponents() {
|
3215
|
-
const { toContentManagerModel } = getService$
|
3456
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3216
3457
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3217
3458
|
},
|
3218
3459
|
findComponent(uid2) {
|
3219
|
-
const { toContentManagerModel } = getService$
|
3460
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3220
3461
|
const component = strapi2.components[uid2];
|
3221
3462
|
return isNil$1(component) ? component : toContentManagerModel(component);
|
3222
3463
|
},
|
@@ -3267,17 +3508,17 @@ const configurationService = createConfigurationService({
|
|
3267
3508
|
storeUtils,
|
3268
3509
|
prefix: "content_types",
|
3269
3510
|
getModels() {
|
3270
|
-
const { toContentManagerModel } = getService$
|
3511
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3271
3512
|
return mapValues(toContentManagerModel, strapi.contentTypes);
|
3272
3513
|
}
|
3273
3514
|
});
|
3274
3515
|
const service = ({ strapi: strapi2 }) => ({
|
3275
3516
|
findAllContentTypes() {
|
3276
|
-
const { toContentManagerModel } = getService$
|
3517
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3277
3518
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3278
3519
|
},
|
3279
3520
|
findContentType(uid2) {
|
3280
|
-
const { toContentManagerModel } = getService$
|
3521
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3281
3522
|
const contentType = strapi2.contentTypes[uid2];
|
3282
3523
|
return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
|
3283
3524
|
},
|
@@ -3306,7 +3547,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3306
3547
|
return this.findConfiguration(contentType);
|
3307
3548
|
},
|
3308
3549
|
findComponentsConfigurations(contentType) {
|
3309
|
-
return getService$
|
3550
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3310
3551
|
},
|
3311
3552
|
syncConfigurations() {
|
3312
3553
|
return configurationService.syncConfigurations();
|
@@ -3578,7 +3819,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3578
3819
|
return userAbility.can(action);
|
3579
3820
|
},
|
3580
3821
|
async registerPermissions() {
|
3581
|
-
const displayedContentTypes = getService$
|
3822
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3582
3823
|
const contentTypesUids = displayedContentTypes.map(prop("uid"));
|
3583
3824
|
const actions = [
|
3584
3825
|
{
|
@@ -3663,6 +3904,12 @@ function getPopulateForRelation(attribute, model, attributeName, { countMany, co
|
|
3663
3904
|
if (initialPopulate) {
|
3664
3905
|
return initialPopulate;
|
3665
3906
|
}
|
3907
|
+
if (attributeName === "localizations") {
|
3908
|
+
const validationPopulate = getPopulateForValidation(model.uid);
|
3909
|
+
return {
|
3910
|
+
populate: validationPopulate.populate
|
3911
|
+
};
|
3912
|
+
}
|
3666
3913
|
if (!isVisibleAttribute$1(model, attributeName)) {
|
3667
3914
|
return true;
|
3668
3915
|
}
|
@@ -3722,6 +3969,9 @@ const getDeepPopulate = (uid2, {
|
|
3722
3969
|
return {};
|
3723
3970
|
}
|
3724
3971
|
const model = strapi.getModel(uid2);
|
3972
|
+
if (!model) {
|
3973
|
+
return {};
|
3974
|
+
}
|
3725
3975
|
return Object.keys(model.attributes).reduce(
|
3726
3976
|
(populateAcc, attributeName) => merge(
|
3727
3977
|
populateAcc,
|
@@ -3741,40 +3991,46 @@ const getDeepPopulate = (uid2, {
|
|
3741
3991
|
{}
|
3742
3992
|
);
|
3743
3993
|
};
|
3744
|
-
const
|
3745
|
-
|
3746
|
-
|
3747
|
-
countOne = false,
|
3748
|
-
maxLevel = Infinity
|
3749
|
-
} = {}, level = 1) => {
|
3750
|
-
if (level > maxLevel) {
|
3994
|
+
const getPopulateForValidation = (uid2) => {
|
3995
|
+
const model = strapi.getModel(uid2);
|
3996
|
+
if (!model) {
|
3751
3997
|
return {};
|
3752
3998
|
}
|
3753
|
-
const model = strapi.getModel(uid2);
|
3754
3999
|
return Object.entries(model.attributes).reduce((populateAcc, [attributeName, attribute]) => {
|
3755
|
-
if (
|
4000
|
+
if (isScalarAttribute(attribute)) {
|
4001
|
+
if (getDoesAttributeRequireValidation(attribute)) {
|
4002
|
+
populateAcc.fields = populateAcc.fields || [];
|
4003
|
+
populateAcc.fields.push(attributeName);
|
4004
|
+
}
|
3756
4005
|
return populateAcc;
|
3757
4006
|
}
|
3758
|
-
if (
|
3759
|
-
|
3760
|
-
|
3761
|
-
|
4007
|
+
if (isComponent(attribute)) {
|
4008
|
+
const component = attribute.component;
|
4009
|
+
const componentResult = getPopulateForValidation(component);
|
4010
|
+
if (Object.keys(componentResult).length > 0) {
|
4011
|
+
populateAcc.populate = populateAcc.populate || {};
|
4012
|
+
populateAcc.populate[attributeName] = componentResult;
|
4013
|
+
}
|
4014
|
+
return populateAcc;
|
3762
4015
|
}
|
3763
|
-
|
3764
|
-
|
3765
|
-
|
3766
|
-
|
3767
|
-
|
3768
|
-
|
3769
|
-
|
3770
|
-
|
3771
|
-
|
3772
|
-
countOne,
|
3773
|
-
maxLevel
|
4016
|
+
if (isDynamicZone(attribute)) {
|
4017
|
+
const components2 = attribute.components;
|
4018
|
+
const componentsResult = (components2 || []).reduce(
|
4019
|
+
(acc, componentUID) => {
|
4020
|
+
const componentResult = getPopulateForValidation(componentUID);
|
4021
|
+
if (Object.keys(componentResult).length > 0) {
|
4022
|
+
acc[componentUID] = componentResult;
|
4023
|
+
}
|
4024
|
+
return acc;
|
3774
4025
|
},
|
3775
|
-
|
3776
|
-
)
|
3777
|
-
|
4026
|
+
{}
|
4027
|
+
);
|
4028
|
+
if (Object.keys(componentsResult).length > 0) {
|
4029
|
+
populateAcc.populate = populateAcc.populate || {};
|
4030
|
+
populateAcc.populate[attributeName] = { on: componentsResult };
|
4031
|
+
}
|
4032
|
+
}
|
4033
|
+
return populateAcc;
|
3778
4034
|
}, {});
|
3779
4035
|
};
|
3780
4036
|
const getDeepPopulateDraftCount = (uid2) => {
|
@@ -3854,7 +4110,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3854
4110
|
return populateQuery;
|
3855
4111
|
};
|
3856
4112
|
const buildDeepPopulate = (uid2) => {
|
3857
|
-
return getService$
|
4113
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3858
4114
|
};
|
3859
4115
|
const populateBuilder = (uid2) => {
|
3860
4116
|
let getInitialPopulate = async () => {
|
@@ -4016,7 +4272,6 @@ const AVAILABLE_LOCALES_FIELDS = [
|
|
4016
4272
|
"locale",
|
4017
4273
|
"updatedAt",
|
4018
4274
|
"createdAt",
|
4019
|
-
"status",
|
4020
4275
|
"publishedAt",
|
4021
4276
|
"documentId"
|
4022
4277
|
];
|
@@ -4037,34 +4292,20 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4037
4292
|
/**
|
4038
4293
|
* Returns available locales of a document for the current status
|
4039
4294
|
*/
|
4040
|
-
async getAvailableLocales(uid2, version, allVersions
|
4295
|
+
async getAvailableLocales(uid2, version, allVersions) {
|
4041
4296
|
const versionsByLocale = groupBy("locale", allVersions);
|
4042
|
-
|
4297
|
+
if (version.locale) {
|
4298
|
+
delete versionsByLocale[version.locale];
|
4299
|
+
}
|
4043
4300
|
const model = strapi2.getModel(uid2);
|
4044
|
-
const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
|
4045
|
-
const traversalFunction = async (localeVersion) => traverseEntity(
|
4046
|
-
({ key }, { remove }) => {
|
4047
|
-
if (keysToKeep.includes(key)) {
|
4048
|
-
return;
|
4049
|
-
}
|
4050
|
-
remove(key);
|
4051
|
-
},
|
4052
|
-
{ schema: model, getModel: strapi2.getModel.bind(strapi2) },
|
4053
|
-
// @ts-expect-error fix types DocumentVersion incompatible with Data
|
4054
|
-
localeVersion
|
4055
|
-
);
|
4056
4301
|
const mappingResult = await async.map(
|
4057
4302
|
Object.values(versionsByLocale),
|
4058
4303
|
async (localeVersions) => {
|
4059
|
-
const mappedLocaleVersions = await async.map(
|
4060
|
-
localeVersions,
|
4061
|
-
traversalFunction
|
4062
|
-
);
|
4063
4304
|
if (!contentTypes$1.hasDraftAndPublish(model)) {
|
4064
|
-
return
|
4305
|
+
return localeVersions[0];
|
4065
4306
|
}
|
4066
|
-
const draftVersion =
|
4067
|
-
const otherVersions =
|
4307
|
+
const draftVersion = localeVersions.find((v) => v.publishedAt === null);
|
4308
|
+
const otherVersions = localeVersions.filter((v) => v.id !== draftVersion?.id);
|
4068
4309
|
if (!draftVersion) {
|
4069
4310
|
return;
|
4070
4311
|
}
|
@@ -4086,8 +4327,7 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4086
4327
|
const matchStatus = status === "published" ? v.publishedAt !== null : v.publishedAt === null;
|
4087
4328
|
return matchLocale && matchStatus;
|
4088
4329
|
});
|
4089
|
-
if (!availableStatus)
|
4090
|
-
return availableStatus;
|
4330
|
+
if (!availableStatus) return availableStatus;
|
4091
4331
|
return pick(AVAILABLE_STATUS_FIELDS, availableStatus);
|
4092
4332
|
},
|
4093
4333
|
/**
|
@@ -4097,18 +4337,19 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4097
4337
|
* @returns
|
4098
4338
|
*/
|
4099
4339
|
async getManyAvailableStatus(uid2, documents) {
|
4100
|
-
if (!documents.length)
|
4101
|
-
return [];
|
4340
|
+
if (!documents.length) return [];
|
4102
4341
|
const status = documents[0].publishedAt !== null ? "published" : "draft";
|
4103
|
-
const
|
4104
|
-
const
|
4105
|
-
|
4106
|
-
|
4107
|
-
|
4108
|
-
|
4109
|
-
|
4110
|
-
|
4111
|
-
|
4342
|
+
const locales = documents.map((d) => d.locale).filter(Boolean);
|
4343
|
+
const where = {
|
4344
|
+
documentId: { $in: documents.map((d) => d.documentId).filter(Boolean) },
|
4345
|
+
publishedAt: { $null: status === "published" }
|
4346
|
+
};
|
4347
|
+
if (locales.length) {
|
4348
|
+
where.locale = { $in: locales };
|
4349
|
+
}
|
4350
|
+
return strapi2.query(uid2).findMany({
|
4351
|
+
where,
|
4352
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"]
|
4112
4353
|
});
|
4113
4354
|
},
|
4114
4355
|
getStatus(version, otherDocumentStatuses) {
|
@@ -4125,10 +4366,8 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4125
4366
|
} else if (otherVersion) {
|
4126
4367
|
draftVersion = otherVersion;
|
4127
4368
|
}
|
4128
|
-
if (!draftVersion)
|
4129
|
-
|
4130
|
-
if (!publishedVersion)
|
4131
|
-
return CONTENT_MANAGER_STATUS.DRAFT;
|
4369
|
+
if (!draftVersion) return CONTENT_MANAGER_STATUS.PUBLISHED;
|
4370
|
+
if (!publishedVersion) return CONTENT_MANAGER_STATUS.DRAFT;
|
4132
4371
|
const isDraftModified = getIsVersionLatestModification(draftVersion, publishedVersion);
|
4133
4372
|
return isDraftModified ? CONTENT_MANAGER_STATUS.MODIFIED : CONTENT_MANAGER_STATUS.PUBLISHED;
|
4134
4373
|
},
|
@@ -4136,11 +4375,9 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4136
4375
|
// We could refactor this so the locales are only loaded when they're
|
4137
4376
|
// needed. e.g. in the bulk locale action modal.
|
4138
4377
|
async getMetadata(uid2, version, { availableLocales = true, availableStatus = true } = {}) {
|
4139
|
-
const populate =
|
4140
|
-
const
|
4141
|
-
where: { documentId: version.documentId },
|
4378
|
+
const { populate = {}, fields = [] } = getPopulateForValidation(uid2);
|
4379
|
+
const params = {
|
4142
4380
|
populate: {
|
4143
|
-
// Populate only fields that require validation for bulk locale actions
|
4144
4381
|
...populate,
|
4145
4382
|
// NOTE: creator fields are selected in this way to avoid exposing sensitive data
|
4146
4383
|
createdBy: {
|
@@ -4149,9 +4386,15 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4149
4386
|
updatedBy: {
|
4150
4387
|
select: ["id", "firstname", "lastname", "email"]
|
4151
4388
|
}
|
4389
|
+
},
|
4390
|
+
fields: uniq([...AVAILABLE_LOCALES_FIELDS, ...fields]),
|
4391
|
+
filters: {
|
4392
|
+
documentId: version.documentId
|
4152
4393
|
}
|
4153
|
-
}
|
4154
|
-
const
|
4394
|
+
};
|
4395
|
+
const dbParams = strapi2.get("query-params").transform(uid2, params);
|
4396
|
+
const versions = await strapi2.db.query(uid2).findMany(dbParams);
|
4397
|
+
const availableLocalesResult = availableLocales ? await this.getAvailableLocales(uid2, version, versions) : [];
|
4155
4398
|
const availableStatusResult = availableStatus ? this.getAvailableStatus(version, versions) : null;
|
4156
4399
|
return {
|
4157
4400
|
availableLocales: availableLocalesResult,
|
@@ -4178,6 +4421,16 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4178
4421
|
opts.availableStatus = false;
|
4179
4422
|
}
|
4180
4423
|
const meta = await this.getMetadata(uid2, document, opts);
|
4424
|
+
if (document.localizations) {
|
4425
|
+
const otherStatus = await this.getManyAvailableStatus(uid2, document.localizations);
|
4426
|
+
document.localizations = document.localizations.map((d) => {
|
4427
|
+
const status = otherStatus.find((s) => s.documentId === d.documentId);
|
4428
|
+
return {
|
4429
|
+
...d,
|
4430
|
+
status: this.getStatus(d, status ? [status] : [])
|
4431
|
+
};
|
4432
|
+
});
|
4433
|
+
}
|
4181
4434
|
return {
|
4182
4435
|
data: {
|
4183
4436
|
...document,
|
@@ -4395,7 +4648,8 @@ const services = {
|
|
4395
4648
|
permission,
|
4396
4649
|
"populate-builder": populateBuilder$1,
|
4397
4650
|
uid,
|
4398
|
-
...history.services ? history.services : {}
|
4651
|
+
...history.services ? history.services : {},
|
4652
|
+
...preview.services ? preview.services : {}
|
4399
4653
|
};
|
4400
4654
|
const index = () => {
|
4401
4655
|
return {
|