@strapi/content-manager 0.0.0-experimental.779667bd163026468f566293decf331a0246fff9 → 0.0.0-experimental.7b750d18de359d0a42233cb8707e3c31c5983345
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/{ComponentConfigurationPage-Bqgx7Mes.js → ComponentConfigurationPage-DnnZJc1F.js} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-Bqgx7Mes.js.map → ComponentConfigurationPage-DnnZJc1F.js.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-B1bIXVuX.mjs → ComponentConfigurationPage-hLMNf7KI.mjs} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-B1bIXVuX.mjs.map → ComponentConfigurationPage-hLMNf7KI.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-BFEwvdMW.js → EditConfigurationPage-CpLj5gYZ.js} +3 -3
- package/dist/_chunks/{EditConfigurationPage-BFEwvdMW.js.map → EditConfigurationPage-CpLj5gYZ.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-ZO0vOO8q.mjs → EditConfigurationPage-Dh6sq-G4.mjs} +3 -3
- package/dist/_chunks/{EditConfigurationPage-ZO0vOO8q.mjs.map → EditConfigurationPage-Dh6sq-G4.mjs.map} +1 -1
- package/dist/_chunks/{EditViewPage-DlLEyUL6.mjs → EditViewPage-BU1ugeVi.mjs} +19 -8
- package/dist/_chunks/EditViewPage-BU1ugeVi.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-DA95Ha6J.js → EditViewPage-D2QVRr_2.js} +19 -8
- package/dist/_chunks/EditViewPage-D2QVRr_2.js.map +1 -0
- package/dist/_chunks/{Field-CnK8dO8N.js → Field-BEDX9i_V.js} +125 -97
- package/dist/_chunks/Field-BEDX9i_V.js.map +1 -0
- package/dist/_chunks/{Field-Dq7bDnuh.mjs → Field-VSPY6uzs.mjs} +123 -95
- package/dist/_chunks/Field-VSPY6uzs.mjs.map +1 -0
- package/dist/_chunks/{Form-B_JE0dbz.mjs → Form-05Oaes1N.mjs} +35 -16
- package/dist/_chunks/Form-05Oaes1N.mjs.map +1 -0
- package/dist/_chunks/{Form-BpiR4piS.js → Form-DCaY8xBX.js} +35 -16
- package/dist/_chunks/Form-DCaY8xBX.js.map +1 -0
- package/dist/_chunks/{History-CBNGU7a-.mjs → History-BqO2G3MV.mjs} +21 -11
- package/dist/_chunks/History-BqO2G3MV.mjs.map +1 -0
- package/dist/_chunks/{History-DdIstl8b.js → History-BrJ1tUvt.js} +21 -11
- package/dist/_chunks/History-BrJ1tUvt.js.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-5dr4qpue.mjs → ListConfigurationPage-C6rsFlme.mjs} +14 -4
- package/dist/_chunks/ListConfigurationPage-C6rsFlme.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DkKRparB.js → ListConfigurationPage-Eane5LKE.js} +14 -4
- package/dist/_chunks/ListConfigurationPage-Eane5LKE.js.map +1 -0
- package/dist/_chunks/{ListViewPage-wE0lXqoD.js → ListViewPage-Coj-RPsx.js} +49 -40
- package/dist/_chunks/ListViewPage-Coj-RPsx.js.map +1 -0
- package/dist/_chunks/{ListViewPage-DecLrYV6.mjs → ListViewPage-yE_zYhcI.mjs} +47 -38
- package/dist/_chunks/ListViewPage-yE_zYhcI.mjs.map +1 -0
- package/dist/_chunks/{NoContentTypePage-DEKR6tf9.js → NoContentTypePage-BDJ0dshy.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-DEKR6tf9.js.map → NoContentTypePage-BDJ0dshy.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-CiIcfYsd.mjs → NoContentTypePage-NW_FSVdY.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-CiIcfYsd.mjs.map → NoContentTypePage-NW_FSVdY.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DmNfF2Bb.js → NoPermissionsPage-BOtb5FTM.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DmNfF2Bb.js.map → NoPermissionsPage-BOtb5FTM.js.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-CM5UD8ee.mjs → NoPermissionsPage-h0I3ImsX.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-CM5UD8ee.mjs.map → NoPermissionsPage-h0I3ImsX.mjs.map} +1 -1
- package/dist/_chunks/{Relations-L0xYRoSQ.js → Relations-CVh0DOKv.js} +4 -4
- package/dist/_chunks/{Relations-L0xYRoSQ.js.map → Relations-CVh0DOKv.js.map} +1 -1
- package/dist/_chunks/{Relations-Dqz0C1fz.mjs → Relations-FP0uWpBz.mjs} +4 -4
- package/dist/_chunks/{Relations-Dqz0C1fz.mjs.map → Relations-FP0uWpBz.mjs.map} +1 -1
- package/dist/_chunks/{en-uOUIxfcQ.js → en-BlhnxQfj.js} +7 -6
- package/dist/_chunks/{en-uOUIxfcQ.js.map → en-BlhnxQfj.js.map} +1 -1
- package/dist/_chunks/{en-BrCTWlZv.mjs → en-C8YBvRrK.mjs} +7 -6
- package/dist/_chunks/{en-BrCTWlZv.mjs.map → en-C8YBvRrK.mjs.map} +1 -1
- package/dist/_chunks/{index-BSn97i8U.mjs → index-CPCHQ3X_.mjs} +1942 -1773
- package/dist/_chunks/index-CPCHQ3X_.mjs.map +1 -0
- package/dist/_chunks/{index-DyvUPg1a.js → index-DTKVhcla.js} +1922 -1753
- package/dist/_chunks/index-DTKVhcla.js.map +1 -0
- package/dist/_chunks/{layout-DPaHUusj.mjs → layout-B4UhJ8MJ.mjs} +22 -9
- package/dist/_chunks/layout-B4UhJ8MJ.mjs.map +1 -0
- package/dist/_chunks/{layout-TPqF2oJ5.js → layout-CWgZzMYf.js} +21 -8
- package/dist/_chunks/layout-CWgZzMYf.js.map +1 -0
- package/dist/_chunks/{relations-Ck7-ecDT.mjs → relations-B83Ge9a7.mjs} +2 -2
- package/dist/_chunks/{relations-Ck7-ecDT.mjs.map → relations-B83Ge9a7.mjs.map} +1 -1
- package/dist/_chunks/{relations-BWYS9gkn.js → relations-D81a_2zw.js} +2 -2
- package/dist/_chunks/{relations-BWYS9gkn.js.map → relations-D81a_2zw.js.map} +1 -1
- 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/admin/index.js +2 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +5 -4
- package/dist/admin/src/exports.d.ts +1 -1
- package/dist/admin/src/history/services/historyVersion.d.ts +1 -1
- package/dist/admin/src/hooks/useDocument.d.ts +30 -1
- package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/EditorLayout.d.ts +2 -2
- package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/WysiwygFooter.d.ts +2 -2
- package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/WysiwygStyles.d.ts +4 -48
- package/dist/admin/src/pages/EditView/components/Header.d.ts +10 -11
- package/dist/admin/src/services/api.d.ts +1 -1
- package/dist/admin/src/services/components.d.ts +2 -2
- package/dist/admin/src/services/contentTypes.d.ts +3 -3
- package/dist/admin/src/services/documents.d.ts +19 -17
- package/dist/admin/src/services/init.d.ts +1 -1
- package/dist/admin/src/services/relations.d.ts +2 -2
- package/dist/admin/src/services/uid.d.ts +3 -3
- package/dist/admin/src/utils/validation.d.ts +4 -1
- package/dist/server/index.js +178 -108
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +179 -109
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/controllers/collection-types.d.ts.map +1 -1
- package/dist/server/src/controllers/relations.d.ts.map +1 -1
- package/dist/server/src/controllers/uid.d.ts.map +1 -1
- package/dist/server/src/controllers/validation/dimensions.d.ts +4 -2
- package/dist/server/src/controllers/validation/dimensions.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 -1
- package/dist/server/src/history/services/utils.d.ts.map +1 -1
- package/dist/server/src/policies/hasPermissions.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.map +1 -1
- package/dist/server/src/services/permission-checker.d.ts.map +1 -1
- package/dist/server/src/services/utils/populate.d.ts.map +1 -1
- package/dist/shared/contracts/collection-types.d.ts +3 -1
- package/dist/shared/contracts/collection-types.d.ts.map +1 -1
- package/package.json +11 -11
- package/dist/_chunks/EditViewPage-DA95Ha6J.js.map +0 -1
- package/dist/_chunks/EditViewPage-DlLEyUL6.mjs.map +0 -1
- package/dist/_chunks/Field-CnK8dO8N.js.map +0 -1
- package/dist/_chunks/Field-Dq7bDnuh.mjs.map +0 -1
- package/dist/_chunks/Form-B_JE0dbz.mjs.map +0 -1
- package/dist/_chunks/Form-BpiR4piS.js.map +0 -1
- package/dist/_chunks/History-CBNGU7a-.mjs.map +0 -1
- package/dist/_chunks/History-DdIstl8b.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-5dr4qpue.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-DkKRparB.js.map +0 -1
- package/dist/_chunks/ListViewPage-DecLrYV6.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-wE0lXqoD.js.map +0 -1
- package/dist/_chunks/index-BSn97i8U.mjs.map +0 -1
- package/dist/_chunks/index-DyvUPg1a.js.map +0 -1
- package/dist/_chunks/layout-DPaHUusj.mjs.map +0 -1
- package/dist/_chunks/layout-TPqF2oJ5.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.js
CHANGED
@@ -199,7 +199,9 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
199
199
|
return strapi2.db.query("plugin::upload.file").findOne({ where: { id: versionRelationData.id } });
|
200
200
|
};
|
201
201
|
const localesService = strapi2.plugin("i18n")?.service("locales");
|
202
|
+
const i18nContentTypeService = strapi2.plugin("i18n")?.service("content-types");
|
202
203
|
const getDefaultLocale = async () => localesService ? localesService.getDefaultLocale() : null;
|
204
|
+
const isLocalizedContentType = (model) => i18nContentTypeService ? i18nContentTypeService.isLocalizedContentType(model) : false;
|
203
205
|
const getLocaleDictionary = async () => {
|
204
206
|
if (!localesService)
|
205
207
|
return {};
|
@@ -226,9 +228,10 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
226
228
|
const meta = await documentMetadataService.getMetadata(contentTypeUid, document);
|
227
229
|
return documentMetadataService.getStatus(document, meta.availableStatus);
|
228
230
|
};
|
229
|
-
const getDeepPopulate2 = (uid2) => {
|
231
|
+
const getDeepPopulate2 = (uid2, useDatabaseSyntax = false) => {
|
230
232
|
const model = strapi2.getModel(uid2);
|
231
233
|
const attributes = Object.entries(model.attributes);
|
234
|
+
const fieldSelector = useDatabaseSyntax ? "select" : "fields";
|
232
235
|
return attributes.reduce((acc, [attributeName, attribute]) => {
|
233
236
|
switch (attribute.type) {
|
234
237
|
case "relation": {
|
@@ -238,12 +241,12 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
238
241
|
}
|
239
242
|
const isVisible2 = strapiUtils.contentTypes.isVisibleAttribute(model, attributeName);
|
240
243
|
if (isVisible2) {
|
241
|
-
acc[attributeName] = {
|
244
|
+
acc[attributeName] = { [fieldSelector]: ["documentId", "locale", "publishedAt"] };
|
242
245
|
}
|
243
246
|
break;
|
244
247
|
}
|
245
248
|
case "media": {
|
246
|
-
acc[attributeName] = {
|
249
|
+
acc[attributeName] = { [fieldSelector]: ["id"] };
|
247
250
|
break;
|
248
251
|
}
|
249
252
|
case "component": {
|
@@ -316,6 +319,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
316
319
|
getRelationRestoreValue,
|
317
320
|
getMediaRestoreValue,
|
318
321
|
getDefaultLocale,
|
322
|
+
isLocalizedContentType,
|
319
323
|
getLocaleDictionary,
|
320
324
|
getRetentionDays,
|
321
325
|
getVersionStatus,
|
@@ -338,7 +342,13 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
338
342
|
});
|
339
343
|
},
|
340
344
|
async findVersionsPage(params) {
|
341
|
-
const
|
345
|
+
const model = strapi2.getModel(params.query.contentType);
|
346
|
+
const isLocalizedContentType = serviceUtils.isLocalizedContentType(model);
|
347
|
+
const defaultLocale = await serviceUtils.getDefaultLocale();
|
348
|
+
let locale = null;
|
349
|
+
if (isLocalizedContentType) {
|
350
|
+
locale = params.query.locale || defaultLocale;
|
351
|
+
}
|
342
352
|
const [{ results, pagination }, localeDictionary] = await Promise.all([
|
343
353
|
query.findPage({
|
344
354
|
...params.query,
|
@@ -494,6 +504,42 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
494
504
|
}
|
495
505
|
};
|
496
506
|
};
|
507
|
+
const shouldCreateHistoryVersion = (context) => {
|
508
|
+
if (!strapi.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
509
|
+
return false;
|
510
|
+
}
|
511
|
+
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
512
|
+
return false;
|
513
|
+
}
|
514
|
+
if (context.action === "update" && strapi.requestContext.get()?.request.url.endsWith("/actions/publish")) {
|
515
|
+
return false;
|
516
|
+
}
|
517
|
+
if (!context.contentType.uid.startsWith("api::")) {
|
518
|
+
return false;
|
519
|
+
}
|
520
|
+
return true;
|
521
|
+
};
|
522
|
+
const getSchemas = (uid2) => {
|
523
|
+
const attributesSchema = strapi.getModel(uid2).attributes;
|
524
|
+
const componentsSchemas = Object.keys(attributesSchema).reduce(
|
525
|
+
(currentComponentSchemas, key) => {
|
526
|
+
const fieldSchema = attributesSchema[key];
|
527
|
+
if (fieldSchema.type === "component") {
|
528
|
+
const componentSchema = strapi.getModel(fieldSchema.component).attributes;
|
529
|
+
return {
|
530
|
+
...currentComponentSchemas,
|
531
|
+
[fieldSchema.component]: componentSchema
|
532
|
+
};
|
533
|
+
}
|
534
|
+
return currentComponentSchemas;
|
535
|
+
},
|
536
|
+
{}
|
537
|
+
);
|
538
|
+
return {
|
539
|
+
schema: fp.omit(FIELDS_TO_IGNORE, attributesSchema),
|
540
|
+
componentsSchemas
|
541
|
+
};
|
542
|
+
};
|
497
543
|
const createLifecyclesService = ({ strapi: strapi2 }) => {
|
498
544
|
const state = {
|
499
545
|
deleteExpiredJob: null,
|
@@ -506,63 +552,45 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
506
552
|
return;
|
507
553
|
}
|
508
554
|
strapi2.documents.use(async (context, next) => {
|
509
|
-
if (!strapi2.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
510
|
-
return next();
|
511
|
-
}
|
512
|
-
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
513
|
-
return next();
|
514
|
-
}
|
515
|
-
if (context.action === "update" && strapi2.requestContext.get()?.request.url.endsWith("/actions/publish")) {
|
516
|
-
return next();
|
517
|
-
}
|
518
|
-
const contentTypeUid = context.contentType.uid;
|
519
|
-
if (!contentTypeUid.startsWith("api::")) {
|
520
|
-
return next();
|
521
|
-
}
|
522
555
|
const result = await next();
|
523
|
-
|
524
|
-
|
525
|
-
|
526
|
-
|
556
|
+
if (!shouldCreateHistoryVersion(context)) {
|
557
|
+
return result;
|
558
|
+
}
|
559
|
+
const documentId = context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId;
|
527
560
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
528
|
-
const
|
529
|
-
if (
|
530
|
-
|
531
|
-
"[Content manager history middleware]: An array of locales was provided, but only a single locale is supported for the findOne operation."
|
532
|
-
);
|
533
|
-
return next();
|
561
|
+
const locales = fp.castArray(context.params?.locale || defaultLocale);
|
562
|
+
if (!locales.length) {
|
563
|
+
return result;
|
534
564
|
}
|
535
|
-
const
|
536
|
-
|
537
|
-
|
538
|
-
|
565
|
+
const uid2 = context.contentType.uid;
|
566
|
+
const schemas = getSchemas(uid2);
|
567
|
+
const model = strapi2.getModel(uid2);
|
568
|
+
const isLocalizedContentType = serviceUtils.isLocalizedContentType(model);
|
569
|
+
const localeEntries = await strapi2.db.query(uid2).findMany({
|
570
|
+
where: {
|
571
|
+
documentId,
|
572
|
+
...isLocalizedContentType ? { locale: { $in: locales } } : {},
|
573
|
+
...strapiUtils.contentTypes.hasDraftAndPublish(strapi2.contentTypes[uid2]) ? { publishedAt: null } : {}
|
574
|
+
},
|
575
|
+
populate: serviceUtils.getDeepPopulate(
|
576
|
+
uid2,
|
577
|
+
true
|
578
|
+
/* use database syntax */
|
579
|
+
)
|
539
580
|
});
|
540
|
-
const status = await serviceUtils.getVersionStatus(contentTypeUid, document);
|
541
|
-
const attributesSchema = strapi2.getModel(contentTypeUid).attributes;
|
542
|
-
const componentsSchemas = Object.keys(
|
543
|
-
attributesSchema
|
544
|
-
).reduce((currentComponentSchemas, key) => {
|
545
|
-
const fieldSchema = attributesSchema[key];
|
546
|
-
if (fieldSchema.type === "component") {
|
547
|
-
const componentSchema = strapi2.getModel(fieldSchema.component).attributes;
|
548
|
-
return {
|
549
|
-
...currentComponentSchemas,
|
550
|
-
[fieldSchema.component]: componentSchema
|
551
|
-
};
|
552
|
-
}
|
553
|
-
return currentComponentSchemas;
|
554
|
-
}, {});
|
555
581
|
await strapi2.db.transaction(async ({ onCommit }) => {
|
556
|
-
onCommit(() => {
|
557
|
-
|
558
|
-
|
559
|
-
|
560
|
-
|
561
|
-
|
562
|
-
|
563
|
-
|
564
|
-
|
565
|
-
|
582
|
+
onCommit(async () => {
|
583
|
+
for (const entry of localeEntries) {
|
584
|
+
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
585
|
+
await getService(strapi2, "history").createVersion({
|
586
|
+
contentType: uid2,
|
587
|
+
data: fp.omit(FIELDS_TO_IGNORE, entry),
|
588
|
+
relatedDocumentId: documentId,
|
589
|
+
locale: entry.locale,
|
590
|
+
status,
|
591
|
+
...schemas
|
592
|
+
});
|
593
|
+
}
|
566
594
|
});
|
567
595
|
});
|
568
596
|
return result;
|
@@ -1202,6 +1230,11 @@ const { createPolicy } = strapiUtils.policy;
|
|
1202
1230
|
const hasPermissions = createPolicy({
|
1203
1231
|
name: "plugin::content-manager.hasPermissions",
|
1204
1232
|
validator: validateHasPermissionsInput,
|
1233
|
+
/**
|
1234
|
+
* NOTE: Action aliases are currently not checked at this level (policy).
|
1235
|
+
* This is currently the intended behavior to avoid changing the behavior of API related permissions.
|
1236
|
+
* If you want to add support for it, please create a dedicated RFC with a list of potential side effect this could have.
|
1237
|
+
*/
|
1205
1238
|
handler(ctx, config = {}) {
|
1206
1239
|
const { actions = [], hasAtLeastOne = false } = config;
|
1207
1240
|
const { userAbility } = ctx.state;
|
@@ -1595,9 +1628,11 @@ const multipleLocaleSchema = strapiUtils.yup.lazy(
|
|
1595
1628
|
(value) => Array.isArray(value) ? strapiUtils.yup.array().of(singleLocaleSchema.required()) : singleLocaleSchema
|
1596
1629
|
);
|
1597
1630
|
const statusSchema = strapiUtils.yup.mixed().oneOf(["draft", "published"], "Invalid status");
|
1598
|
-
const getDocumentLocaleAndStatus = async (request, opts = { allowMultipleLocales: false }) => {
|
1631
|
+
const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultipleLocales: false }) => {
|
1599
1632
|
const { allowMultipleLocales } = opts;
|
1600
|
-
const { locale, status, ...rest } = request || {};
|
1633
|
+
const { locale, status: providedStatus, ...rest } = request || {};
|
1634
|
+
const defaultStatus = strapiUtils.contentTypes.hasDraftAndPublish(strapi.getModel(model)) ? void 0 : "published";
|
1635
|
+
const status = providedStatus !== void 0 ? providedStatus : defaultStatus;
|
1601
1636
|
const schema = strapiUtils.yup.object().shape({
|
1602
1637
|
locale: allowMultipleLocales ? multipleLocaleSchema : singleLocaleSchema,
|
1603
1638
|
status: statusSchema
|
@@ -1645,7 +1680,7 @@ const createDocument = async (ctx, opts) => {
|
|
1645
1680
|
const setCreator = strapiUtils.setCreatorFields({ user });
|
1646
1681
|
const sanitizeFn = strapiUtils.async.pipe(pickPermittedFields, setCreator);
|
1647
1682
|
const sanitizedBody = await sanitizeFn(body);
|
1648
|
-
const { locale, status
|
1683
|
+
const { locale, status } = await getDocumentLocaleAndStatus(body, model);
|
1649
1684
|
return documentManager2.create(model, {
|
1650
1685
|
data: sanitizedBody,
|
1651
1686
|
locale,
|
@@ -1664,7 +1699,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1664
1699
|
}
|
1665
1700
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1666
1701
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1667
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1702
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1668
1703
|
const [documentVersion, documentExists] = await Promise.all([
|
1669
1704
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
1670
1705
|
documentManager2.exists(model, id)
|
@@ -1702,7 +1737,7 @@ const collectionTypes = {
|
|
1702
1737
|
}
|
1703
1738
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1704
1739
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1705
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
1740
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1706
1741
|
const { results: documents, pagination } = await documentManager2.findPage(
|
1707
1742
|
{ ...permissionQuery, populate, locale, status },
|
1708
1743
|
model
|
@@ -1737,7 +1772,7 @@ const collectionTypes = {
|
|
1737
1772
|
}
|
1738
1773
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1739
1774
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1740
|
-
const { locale, status
|
1775
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1741
1776
|
const version = await documentManager2.findOne(id, model, {
|
1742
1777
|
populate,
|
1743
1778
|
locale,
|
@@ -1752,7 +1787,7 @@ const collectionTypes = {
|
|
1752
1787
|
permissionChecker2,
|
1753
1788
|
model,
|
1754
1789
|
// @ts-expect-error TODO: fix
|
1755
|
-
{ id, locale, publishedAt: null },
|
1790
|
+
{ documentId: id, locale, publishedAt: null },
|
1756
1791
|
{ availableLocales: true, availableStatus: false }
|
1757
1792
|
);
|
1758
1793
|
ctx.body = { data: {}, meta };
|
@@ -1804,7 +1839,7 @@ const collectionTypes = {
|
|
1804
1839
|
}
|
1805
1840
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1806
1841
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1807
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1842
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1808
1843
|
const document = await documentManager2.findOne(id, model, {
|
1809
1844
|
populate,
|
1810
1845
|
locale,
|
@@ -1849,7 +1884,7 @@ const collectionTypes = {
|
|
1849
1884
|
}
|
1850
1885
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1851
1886
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1852
|
-
const { locale } = await getDocumentLocaleAndStatus(ctx.query);
|
1887
|
+
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1853
1888
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1854
1889
|
if (documentLocales.length === 0) {
|
1855
1890
|
return ctx.notFound();
|
@@ -1878,11 +1913,28 @@ const collectionTypes = {
|
|
1878
1913
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1879
1914
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1880
1915
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1881
|
-
|
1916
|
+
let document;
|
1917
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1918
|
+
const isCreate = fp.isNil(id);
|
1919
|
+
if (isCreate) {
|
1920
|
+
if (permissionChecker2.cannot.create()) {
|
1921
|
+
throw new strapiUtils.errors.ForbiddenError();
|
1922
|
+
}
|
1923
|
+
document = await createDocument(ctx, { populate });
|
1924
|
+
}
|
1925
|
+
const isUpdate = !isCreate;
|
1926
|
+
if (isUpdate) {
|
1927
|
+
document = await documentManager2.findOne(id, model, { populate, locale });
|
1928
|
+
if (!document) {
|
1929
|
+
throw new strapiUtils.errors.NotFoundError("Document not found");
|
1930
|
+
}
|
1931
|
+
if (permissionChecker2.can.update(document)) {
|
1932
|
+
await updateDocument(ctx);
|
1933
|
+
}
|
1934
|
+
}
|
1882
1935
|
if (permissionChecker2.cannot.publish(document)) {
|
1883
1936
|
throw new strapiUtils.errors.ForbiddenError();
|
1884
1937
|
}
|
1885
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1886
1938
|
const publishResult = await documentManager2.publish(document.documentId, model, {
|
1887
1939
|
locale
|
1888
1940
|
// TODO: Allow setting creator fields on publish
|
@@ -1909,7 +1961,9 @@ const collectionTypes = {
|
|
1909
1961
|
}
|
1910
1962
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1911
1963
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1912
|
-
const { locale } = await getDocumentLocaleAndStatus(body, {
|
1964
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1965
|
+
allowMultipleLocales: true
|
1966
|
+
});
|
1913
1967
|
const entityPromises = documentIds.map(
|
1914
1968
|
(documentId) => documentManager2.findLocales(documentId, model, { populate, locale, isPublished: false })
|
1915
1969
|
);
|
@@ -1936,7 +1990,9 @@ const collectionTypes = {
|
|
1936
1990
|
if (permissionChecker2.cannot.unpublish()) {
|
1937
1991
|
return ctx.forbidden();
|
1938
1992
|
}
|
1939
|
-
const { locale } = await getDocumentLocaleAndStatus(body
|
1993
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1994
|
+
allowMultipleLocales: true
|
1995
|
+
});
|
1940
1996
|
const entityPromises = documentIds.map(
|
1941
1997
|
(documentId) => documentManager2.findLocales(documentId, model, { locale, isPublished: true })
|
1942
1998
|
);
|
@@ -1969,7 +2025,7 @@ const collectionTypes = {
|
|
1969
2025
|
}
|
1970
2026
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
1971
2027
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1972
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2028
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1973
2029
|
const document = await documentManager2.findOne(id, model, {
|
1974
2030
|
populate,
|
1975
2031
|
locale,
|
@@ -2006,7 +2062,7 @@ const collectionTypes = {
|
|
2006
2062
|
}
|
2007
2063
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2008
2064
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2009
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2065
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2010
2066
|
const document = await documentManager2.findOne(id, model, {
|
2011
2067
|
populate,
|
2012
2068
|
locale,
|
@@ -2037,7 +2093,7 @@ const collectionTypes = {
|
|
2037
2093
|
}
|
2038
2094
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2039
2095
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2040
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2096
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2041
2097
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2042
2098
|
populate,
|
2043
2099
|
locale
|
@@ -2064,7 +2120,7 @@ const collectionTypes = {
|
|
2064
2120
|
}
|
2065
2121
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2066
2122
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2067
|
-
const { locale, status
|
2123
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2068
2124
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2069
2125
|
if (!entity) {
|
2070
2126
|
return ctx.notFound();
|
@@ -2287,20 +2343,13 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2287
2343
|
userAbility,
|
2288
2344
|
model: model.uid
|
2289
2345
|
});
|
2290
|
-
|
2346
|
+
const isMainFieldListable = isListable(model, mainField);
|
2347
|
+
const canReadMainField = permissionChecker2.can.read(null, mainField);
|
2348
|
+
if (!isMainFieldListable || !canReadMainField) {
|
2291
2349
|
return "id";
|
2292
2350
|
}
|
2293
|
-
if (
|
2294
|
-
|
2295
|
-
const userPermissionChecker = getService$1("permission-checker").create({
|
2296
|
-
userAbility,
|
2297
|
-
model: "plugin::users-permissions.user"
|
2298
|
-
});
|
2299
|
-
if (userPermissionChecker.can.read()) {
|
2300
|
-
return "name";
|
2301
|
-
}
|
2302
|
-
}
|
2303
|
-
return "id";
|
2351
|
+
if (model.uid === "plugin::users-permissions.role") {
|
2352
|
+
return "name";
|
2304
2353
|
}
|
2305
2354
|
return mainField;
|
2306
2355
|
};
|
@@ -2500,8 +2549,9 @@ const relations = {
|
|
2500
2549
|
} else {
|
2501
2550
|
where.id = id;
|
2502
2551
|
}
|
2503
|
-
|
2504
|
-
|
2552
|
+
const publishedAt = getPublishedAtClause(status, targetUid);
|
2553
|
+
if (!fp.isEmpty(publishedAt)) {
|
2554
|
+
where[`${alias}.published_at`] = publishedAt;
|
2505
2555
|
}
|
2506
2556
|
if (filterByLocale) {
|
2507
2557
|
where[`${alias}.locale`] = locale;
|
@@ -2558,9 +2608,7 @@ const relations = {
|
|
2558
2608
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
2559
2609
|
const sanitizedRes = await loadRelations({ id: entryId }, targetField, {
|
2560
2610
|
...strapi.get("query-params").transform(targetUid, permissionQuery),
|
2561
|
-
ordering: "desc"
|
2562
|
-
page: ctx.request.query.page,
|
2563
|
-
pageSize: ctx.request.query.pageSize
|
2611
|
+
ordering: "desc"
|
2564
2612
|
});
|
2565
2613
|
const relationsUnion = fp.uniqBy("id", fp.concat(sanitizedRes.results, res.results));
|
2566
2614
|
ctx.body = {
|
@@ -2592,7 +2640,7 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2592
2640
|
throw new strapiUtils.errors.ForbiddenError();
|
2593
2641
|
}
|
2594
2642
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.update(query);
|
2595
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2643
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2596
2644
|
const [documentVersion, otherDocumentVersion] = await Promise.all([
|
2597
2645
|
findDocument(sanitizedQuery, model, { locale, status: "draft" }),
|
2598
2646
|
// Find the first document to check if it exists
|
@@ -2633,7 +2681,7 @@ const singleTypes = {
|
|
2633
2681
|
return ctx.forbidden();
|
2634
2682
|
}
|
2635
2683
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
2636
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
2684
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
2637
2685
|
const version = await findDocument(permissionQuery, model, { locale, status });
|
2638
2686
|
if (!version) {
|
2639
2687
|
if (permissionChecker2.cannot.create()) {
|
@@ -2647,7 +2695,7 @@ const singleTypes = {
|
|
2647
2695
|
permissionChecker2,
|
2648
2696
|
model,
|
2649
2697
|
// @ts-expect-error - fix types
|
2650
|
-
{
|
2698
|
+
{ documentId: document.documentId, locale, publishedAt: null },
|
2651
2699
|
{ availableLocales: true, availableStatus: false }
|
2652
2700
|
);
|
2653
2701
|
ctx.body = { data: {}, meta };
|
@@ -2678,7 +2726,7 @@ const singleTypes = {
|
|
2678
2726
|
}
|
2679
2727
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2680
2728
|
const populate = await buildPopulateFromQuery(sanitizedQuery, model);
|
2681
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2729
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2682
2730
|
const documentLocales = await documentManager2.findLocales(void 0, model, {
|
2683
2731
|
populate,
|
2684
2732
|
locale
|
@@ -2715,7 +2763,7 @@ const singleTypes = {
|
|
2715
2763
|
if (permissionChecker2.cannot.publish(document)) {
|
2716
2764
|
throw new strapiUtils.errors.ForbiddenError();
|
2717
2765
|
}
|
2718
|
-
const { locale } = await getDocumentLocaleAndStatus(document);
|
2766
|
+
const { locale } = await getDocumentLocaleAndStatus(document, model);
|
2719
2767
|
const publishResult = await documentManager2.publish(document.documentId, model, { locale });
|
2720
2768
|
return publishResult.at(0);
|
2721
2769
|
});
|
@@ -2738,7 +2786,7 @@ const singleTypes = {
|
|
2738
2786
|
return ctx.forbidden();
|
2739
2787
|
}
|
2740
2788
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.unpublish(query);
|
2741
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2789
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2742
2790
|
const document = await findDocument(sanitizedQuery, model, { locale });
|
2743
2791
|
if (!document) {
|
2744
2792
|
return ctx.notFound();
|
@@ -2770,7 +2818,7 @@ const singleTypes = {
|
|
2770
2818
|
return ctx.forbidden();
|
2771
2819
|
}
|
2772
2820
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.discard(query);
|
2773
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2821
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2774
2822
|
const document = await findDocument(sanitizedQuery, model, { locale, status: "published" });
|
2775
2823
|
if (!document) {
|
2776
2824
|
return ctx.notFound();
|
@@ -2790,7 +2838,7 @@ const singleTypes = {
|
|
2790
2838
|
const { query } = ctx.request;
|
2791
2839
|
const documentManager2 = getService$1("document-manager");
|
2792
2840
|
const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
|
2793
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2841
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2794
2842
|
if (permissionChecker2.cannot.read()) {
|
2795
2843
|
return ctx.forbidden();
|
2796
2844
|
}
|
@@ -2811,7 +2859,7 @@ const uid$1 = {
|
|
2811
2859
|
async generateUID(ctx) {
|
2812
2860
|
const { contentTypeUID, field, data } = await validateGenerateUIDInput(ctx.request.body);
|
2813
2861
|
const { query = {} } = ctx.request;
|
2814
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2862
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2815
2863
|
await validateUIDField(contentTypeUID, field);
|
2816
2864
|
const uidService = getService$1("uid");
|
2817
2865
|
ctx.body = {
|
@@ -2823,7 +2871,7 @@ const uid$1 = {
|
|
2823
2871
|
ctx.request.body
|
2824
2872
|
);
|
2825
2873
|
const { query = {} } = ctx.request;
|
2826
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2874
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2827
2875
|
await validateUIDField(contentTypeUID, field);
|
2828
2876
|
const uidService = getService$1("uid");
|
2829
2877
|
const isAvailable = await uidService.checkUIDAvailability({
|
@@ -3466,12 +3514,27 @@ const createPermissionChecker = (strapi2) => ({ userAbility, model }) => {
|
|
3466
3514
|
ability: userAbility,
|
3467
3515
|
model
|
3468
3516
|
});
|
3469
|
-
const
|
3517
|
+
const { actionProvider } = strapi2.service("admin::permission");
|
3518
|
+
const toSubject = (entity) => {
|
3519
|
+
return entity ? permissionsManager.toSubject(entity, model) : model;
|
3520
|
+
};
|
3470
3521
|
const can = (action, entity, field) => {
|
3471
|
-
|
3522
|
+
const subject = toSubject(entity);
|
3523
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3524
|
+
return (
|
3525
|
+
// Test the original action to see if it passes
|
3526
|
+
userAbility.can(action, subject, field) || // Else try every known alias if at least one of them succeed, then the user "can"
|
3527
|
+
aliases.some((alias) => userAbility.can(alias, subject, field))
|
3528
|
+
);
|
3472
3529
|
};
|
3473
3530
|
const cannot = (action, entity, field) => {
|
3474
|
-
|
3531
|
+
const subject = toSubject(entity);
|
3532
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3533
|
+
return (
|
3534
|
+
// Test both the original action
|
3535
|
+
userAbility.cannot(action, subject, field) && // and every known alias, if all of them fail (cannot), then the user truly "cannot"
|
3536
|
+
aliases.every((alias) => userAbility.cannot(alias, subject, field))
|
3537
|
+
);
|
3475
3538
|
};
|
3476
3539
|
const sanitizeOutput = (data, { action = ACTIONS.read } = {}) => {
|
3477
3540
|
return permissionsManager.sanitizeOutput(data, { subject: toSubject(data), action });
|
@@ -3748,6 +3811,10 @@ const getDeepPopulateDraftCount = (uid2) => {
|
|
3748
3811
|
const attribute = model.attributes[attributeName];
|
3749
3812
|
switch (attribute.type) {
|
3750
3813
|
case "relation": {
|
3814
|
+
const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
|
3815
|
+
if (isMorphRelation) {
|
3816
|
+
break;
|
3817
|
+
}
|
3751
3818
|
if (isVisibleAttribute$1(model, attributeName)) {
|
3752
3819
|
populateAcc[attributeName] = {
|
3753
3820
|
count: true,
|
@@ -4125,7 +4192,13 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4125
4192
|
*/
|
4126
4193
|
async formatDocumentWithMetadata(uid2, document, opts = {}) {
|
4127
4194
|
if (!document) {
|
4128
|
-
return
|
4195
|
+
return {
|
4196
|
+
data: document,
|
4197
|
+
meta: {
|
4198
|
+
availableLocales: [],
|
4199
|
+
availableStatus: []
|
4200
|
+
}
|
4201
|
+
};
|
4129
4202
|
}
|
4130
4203
|
const hasDraftAndPublish = strapiUtils.contentTypes.hasDraftAndPublish(strapi2.getModel(uid2));
|
4131
4204
|
if (!hasDraftAndPublish) {
|
@@ -4233,10 +4306,7 @@ const documentManager = ({ strapi: strapi2 }) => {
|
|
4233
4306
|
async clone(id, body, uid2) {
|
4234
4307
|
const populate = await buildDeepPopulate(uid2);
|
4235
4308
|
const params = {
|
4236
|
-
data:
|
4237
|
-
...omitIdField(body),
|
4238
|
-
[PUBLISHED_AT_ATTRIBUTE]: null
|
4239
|
-
},
|
4309
|
+
data: omitIdField(body),
|
4240
4310
|
populate
|
4241
4311
|
};
|
4242
4312
|
return strapi2.documents(uid2).clone({ ...params, documentId: id }).then((result) => result?.entries.at(0));
|