@strapi/content-manager 0.0.0-experimental.25e22c6cc9bc6b35392bb55d09f641a0a65e7403 → 0.0.0-experimental.31a5317d54179a9ce6225bf1b6e1f9fb6c372fa9

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.
Files changed (127) hide show
  1. package/LICENSE +18 -3
  2. package/dist/_chunks/{ComponentConfigurationPage-WRPUXGd6.js → ComponentConfigurationPage-BlAzljQ6.js} +3 -3
  3. package/dist/_chunks/{ComponentConfigurationPage-WRPUXGd6.js.map → ComponentConfigurationPage-BlAzljQ6.js.map} +1 -1
  4. package/dist/_chunks/{ComponentConfigurationPage-gdUj_t-O.mjs → ComponentConfigurationPage-Ccwb19Qj.mjs} +3 -3
  5. package/dist/_chunks/{ComponentConfigurationPage-gdUj_t-O.mjs.map → ComponentConfigurationPage-Ccwb19Qj.mjs.map} +1 -1
  6. package/dist/_chunks/{EditConfigurationPage-C1vjMBgy.js → EditConfigurationPage-BPoOzhCM.js} +3 -3
  7. package/dist/_chunks/{EditConfigurationPage-C1vjMBgy.js.map → EditConfigurationPage-BPoOzhCM.js.map} +1 -1
  8. package/dist/_chunks/{EditConfigurationPage-BwuIPOJG.mjs → EditConfigurationPage-C19b_9RL.mjs} +3 -3
  9. package/dist/_chunks/{EditConfigurationPage-BwuIPOJG.mjs.map → EditConfigurationPage-C19b_9RL.mjs.map} +1 -1
  10. package/dist/_chunks/{EditViewPage-DbcGfyqK.js → EditViewPage-D9xH8HYD.js} +19 -8
  11. package/dist/_chunks/EditViewPage-D9xH8HYD.js.map +1 -0
  12. package/dist/_chunks/{EditViewPage-0MiFkXa8.mjs → EditViewPage-nmrHNiJ9.mjs} +19 -8
  13. package/dist/_chunks/EditViewPage-nmrHNiJ9.mjs.map +1 -0
  14. package/dist/_chunks/{Field-BDMSCcy5.mjs → Field--kmlJuSb.mjs} +463 -143
  15. package/dist/_chunks/Field--kmlJuSb.mjs.map +1 -0
  16. package/dist/_chunks/{Field-BG1xu38N.js → Field-BB_pHo6D.js} +465 -145
  17. package/dist/_chunks/Field-BB_pHo6D.js.map +1 -0
  18. package/dist/_chunks/{Form-CPVWavB8.mjs → Form-CUtOiC4S.mjs} +39 -17
  19. package/dist/_chunks/Form-CUtOiC4S.mjs.map +1 -0
  20. package/dist/_chunks/{Form-9BnFyUjy.js → Form-iwbkoaAF.js} +39 -17
  21. package/dist/_chunks/Form-iwbkoaAF.js.map +1 -0
  22. package/dist/_chunks/{History-BVpd8LP3.mjs → History-BKR3KyU3.mjs} +44 -19
  23. package/dist/_chunks/History-BKR3KyU3.mjs.map +1 -0
  24. package/dist/_chunks/{History-BWWxLt2Z.js → History-guuZF4lR.js} +44 -19
  25. package/dist/_chunks/History-guuZF4lR.js.map +1 -0
  26. package/dist/_chunks/{ListConfigurationPage-DozVMKcR.mjs → ListConfigurationPage-B_O3hiLT.mjs} +20 -8
  27. package/dist/_chunks/ListConfigurationPage-B_O3hiLT.mjs.map +1 -0
  28. package/dist/_chunks/{ListConfigurationPage-6swzjdAZ.js → ListConfigurationPage-Cu26t5sE.js} +20 -8
  29. package/dist/_chunks/ListConfigurationPage-Cu26t5sE.js.map +1 -0
  30. package/dist/_chunks/{ListViewPage-Ds0ulgfG.mjs → ListViewPage-B4sTBfu6.mjs} +58 -40
  31. package/dist/_chunks/ListViewPage-B4sTBfu6.mjs.map +1 -0
  32. package/dist/_chunks/{ListViewPage-BlzfjS2Q.js → ListViewPage-DWqqGno8.js} +60 -42
  33. package/dist/_chunks/ListViewPage-DWqqGno8.js.map +1 -0
  34. package/dist/_chunks/{NoContentTypePage-BH11kaKt.mjs → NoContentTypePage-Daktt4t9.mjs} +2 -2
  35. package/dist/_chunks/{NoContentTypePage-BH11kaKt.mjs.map → NoContentTypePage-Daktt4t9.mjs.map} +1 -1
  36. package/dist/_chunks/{NoContentTypePage-D2nCCWEl.js → NoContentTypePage-TTkwA8uk.js} +2 -2
  37. package/dist/_chunks/{NoContentTypePage-D2nCCWEl.js.map → NoContentTypePage-TTkwA8uk.js.map} +1 -1
  38. package/dist/_chunks/{NoPermissionsPage-BT2Tn0D_.mjs → NoPermissionsPage-CBUXY2Pt.mjs} +2 -2
  39. package/dist/_chunks/{NoPermissionsPage-BT2Tn0D_.mjs.map → NoPermissionsPage-CBUXY2Pt.mjs.map} +1 -1
  40. package/dist/_chunks/{NoPermissionsPage-DN_JlsU2.js → NoPermissionsPage-D8_k39Q0.js} +2 -2
  41. package/dist/_chunks/{NoPermissionsPage-DN_JlsU2.js.map → NoPermissionsPage-D8_k39Q0.js.map} +1 -1
  42. package/dist/_chunks/{Relations-CcgFTcWo.js → Relations-DjvmZ_XQ.js} +4 -4
  43. package/dist/_chunks/Relations-DjvmZ_XQ.js.map +1 -0
  44. package/dist/_chunks/{Relations-Dnag3fhV.mjs → Relations-HKmXF7eO.mjs} +4 -4
  45. package/dist/_chunks/Relations-HKmXF7eO.mjs.map +1 -0
  46. package/dist/_chunks/{en-fbKQxLGn.js → en-BVzUkPxZ.js} +10 -8
  47. package/dist/_chunks/{en-fbKQxLGn.js.map → en-BVzUkPxZ.js.map} +1 -1
  48. package/dist/_chunks/{en-Ux26r5pl.mjs → en-CPTj6CjC.mjs} +10 -8
  49. package/dist/_chunks/{en-Ux26r5pl.mjs.map → en-CPTj6CjC.mjs.map} +1 -1
  50. package/dist/_chunks/{index-JNNNKUHs.mjs → index-CB1AN26E.mjs} +461 -195
  51. package/dist/_chunks/index-CB1AN26E.mjs.map +1 -0
  52. package/dist/_chunks/{index-CWpLBSt0.js → index-jDJgW_Lf.js} +454 -188
  53. package/dist/_chunks/index-jDJgW_Lf.js.map +1 -0
  54. package/dist/_chunks/{layout-DC503LnF.mjs → layout-BCzDsMgN.mjs} +27 -14
  55. package/dist/_chunks/layout-BCzDsMgN.mjs.map +1 -0
  56. package/dist/_chunks/{layout--iHdZzRk.js → layout-D6A3K-ut.js} +25 -12
  57. package/dist/_chunks/layout-D6A3K-ut.js.map +1 -0
  58. package/dist/_chunks/{relations-CTje5t-a.mjs → relations-B5Jnw32V.mjs} +2 -2
  59. package/dist/_chunks/{relations-CTje5t-a.mjs.map → relations-B5Jnw32V.mjs.map} +1 -1
  60. package/dist/_chunks/{relations-BbHizA5K.js → relations-C10QoukP.js} +2 -2
  61. package/dist/_chunks/{relations-BbHizA5K.js.map → relations-C10QoukP.js.map} +1 -1
  62. package/dist/_chunks/{usePrev-B9w_-eYc.js → useDebounce-CtcjDB3L.js} +14 -1
  63. package/dist/_chunks/useDebounce-CtcjDB3L.js.map +1 -0
  64. package/dist/_chunks/useDebounce-DmuSJIF3.mjs +29 -0
  65. package/dist/_chunks/useDebounce-DmuSJIF3.mjs.map +1 -0
  66. package/dist/admin/index.js +1 -1
  67. package/dist/admin/index.mjs +1 -1
  68. package/dist/admin/src/history/index.d.ts +3 -0
  69. package/dist/admin/src/history/services/historyVersion.d.ts +1 -1
  70. package/dist/admin/src/index.d.ts +1 -0
  71. package/dist/admin/src/pages/EditView/components/DocumentActions.d.ts +1 -0
  72. package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/utils/constants.d.ts +4 -0
  73. package/dist/admin/src/pages/EditView/components/FormInputs/Relations.d.ts +20 -0
  74. package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/EditorLayout.d.ts +2 -2
  75. package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/WysiwygFooter.d.ts +2 -2
  76. package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/WysiwygStyles.d.ts +4 -48
  77. package/dist/admin/src/pages/EditView/components/Header.d.ts +10 -11
  78. package/dist/admin/src/services/api.d.ts +1 -1
  79. package/dist/admin/src/services/components.d.ts +2 -2
  80. package/dist/admin/src/services/contentTypes.d.ts +3 -3
  81. package/dist/admin/src/services/documents.d.ts +19 -17
  82. package/dist/admin/src/services/init.d.ts +1 -1
  83. package/dist/admin/src/services/relations.d.ts +2 -2
  84. package/dist/admin/src/services/uid.d.ts +3 -3
  85. package/dist/admin/src/utils/validation.d.ts +4 -1
  86. package/dist/server/index.js +181 -110
  87. package/dist/server/index.js.map +1 -1
  88. package/dist/server/index.mjs +182 -111
  89. package/dist/server/index.mjs.map +1 -1
  90. package/dist/server/src/controllers/collection-types.d.ts.map +1 -1
  91. package/dist/server/src/controllers/relations.d.ts.map +1 -1
  92. package/dist/server/src/controllers/uid.d.ts.map +1 -1
  93. package/dist/server/src/controllers/validation/dimensions.d.ts +4 -2
  94. package/dist/server/src/controllers/validation/dimensions.d.ts.map +1 -1
  95. package/dist/server/src/history/services/history.d.ts.map +1 -1
  96. package/dist/server/src/history/services/lifecycles.d.ts.map +1 -1
  97. package/dist/server/src/history/services/utils.d.ts +2 -1
  98. package/dist/server/src/history/services/utils.d.ts.map +1 -1
  99. package/dist/server/src/policies/hasPermissions.d.ts.map +1 -1
  100. package/dist/server/src/services/document-manager.d.ts.map +1 -1
  101. package/dist/server/src/services/document-metadata.d.ts.map +1 -1
  102. package/dist/server/src/services/permission-checker.d.ts.map +1 -1
  103. package/dist/server/src/services/utils/populate.d.ts.map +1 -1
  104. package/dist/shared/contracts/collection-types.d.ts +3 -1
  105. package/dist/shared/contracts/collection-types.d.ts.map +1 -1
  106. package/package.json +9 -9
  107. package/dist/_chunks/EditViewPage-0MiFkXa8.mjs.map +0 -1
  108. package/dist/_chunks/EditViewPage-DbcGfyqK.js.map +0 -1
  109. package/dist/_chunks/Field-BDMSCcy5.mjs.map +0 -1
  110. package/dist/_chunks/Field-BG1xu38N.js.map +0 -1
  111. package/dist/_chunks/Form-9BnFyUjy.js.map +0 -1
  112. package/dist/_chunks/Form-CPVWavB8.mjs.map +0 -1
  113. package/dist/_chunks/History-BVpd8LP3.mjs.map +0 -1
  114. package/dist/_chunks/History-BWWxLt2Z.js.map +0 -1
  115. package/dist/_chunks/ListConfigurationPage-6swzjdAZ.js.map +0 -1
  116. package/dist/_chunks/ListConfigurationPage-DozVMKcR.mjs.map +0 -1
  117. package/dist/_chunks/ListViewPage-BlzfjS2Q.js.map +0 -1
  118. package/dist/_chunks/ListViewPage-Ds0ulgfG.mjs.map +0 -1
  119. package/dist/_chunks/Relations-CcgFTcWo.js.map +0 -1
  120. package/dist/_chunks/Relations-Dnag3fhV.mjs.map +0 -1
  121. package/dist/_chunks/index-CWpLBSt0.js.map +0 -1
  122. package/dist/_chunks/index-JNNNKUHs.mjs.map +0 -1
  123. package/dist/_chunks/layout--iHdZzRk.js.map +0 -1
  124. package/dist/_chunks/layout-DC503LnF.mjs.map +0 -1
  125. package/dist/_chunks/usePrev-B9w_-eYc.js.map +0 -1
  126. package/dist/_chunks/usePrev-DH6iah0A.mjs +0 -16
  127. package/dist/_chunks/usePrev-DH6iah0A.mjs.map +0 -1
@@ -1,5 +1,5 @@
1
1
  import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1, traverseEntity, pagination } from "@strapi/utils";
2
- import { pick, omit, difference, intersection, pipe, propOr, isEqual, isEmpty, set, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, isNil as isNil$1, getOr, propEq, merge, groupBy, castArray } from "lodash/fp";
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";
3
3
  import "@strapi/types";
4
4
  import * as yup from "yup";
5
5
  import { scheduleJob } from "node-schedule";
@@ -173,7 +173,9 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
173
173
  return strapi2.db.query("plugin::upload.file").findOne({ where: { id: versionRelationData.id } });
174
174
  };
175
175
  const localesService = strapi2.plugin("i18n")?.service("locales");
176
+ const i18nContentTypeService = strapi2.plugin("i18n")?.service("content-types");
176
177
  const getDefaultLocale = async () => localesService ? localesService.getDefaultLocale() : null;
178
+ const isLocalizedContentType = (model) => i18nContentTypeService ? i18nContentTypeService.isLocalizedContentType(model) : false;
177
179
  const getLocaleDictionary = async () => {
178
180
  if (!localesService)
179
181
  return {};
@@ -200,20 +202,25 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
200
202
  const meta = await documentMetadataService.getMetadata(contentTypeUid, document);
201
203
  return documentMetadataService.getStatus(document, meta.availableStatus);
202
204
  };
203
- const getDeepPopulate2 = (uid2) => {
205
+ const getDeepPopulate2 = (uid2, useDatabaseSyntax = false) => {
204
206
  const model = strapi2.getModel(uid2);
205
207
  const attributes = Object.entries(model.attributes);
208
+ const fieldSelector = useDatabaseSyntax ? "select" : "fields";
206
209
  return attributes.reduce((acc, [attributeName, attribute]) => {
207
210
  switch (attribute.type) {
208
211
  case "relation": {
212
+ const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
213
+ if (isMorphRelation) {
214
+ break;
215
+ }
209
216
  const isVisible2 = contentTypes$1.isVisibleAttribute(model, attributeName);
210
217
  if (isVisible2) {
211
- acc[attributeName] = { fields: ["documentId", "locale", "publishedAt"] };
218
+ acc[attributeName] = { [fieldSelector]: ["documentId", "locale", "publishedAt"] };
212
219
  }
213
220
  break;
214
221
  }
215
222
  case "media": {
216
- acc[attributeName] = { fields: ["id"] };
223
+ acc[attributeName] = { [fieldSelector]: ["id"] };
217
224
  break;
218
225
  }
219
226
  case "component": {
@@ -286,6 +293,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
286
293
  getRelationRestoreValue,
287
294
  getMediaRestoreValue,
288
295
  getDefaultLocale,
296
+ isLocalizedContentType,
289
297
  getLocaleDictionary,
290
298
  getRetentionDays,
291
299
  getVersionStatus,
@@ -308,7 +316,13 @@ const createHistoryService = ({ strapi: strapi2 }) => {
308
316
  });
309
317
  },
310
318
  async findVersionsPage(params) {
311
- const locale = params.query.locale || await serviceUtils.getDefaultLocale();
319
+ const model = strapi2.getModel(params.query.contentType);
320
+ const isLocalizedContentType = serviceUtils.isLocalizedContentType(model);
321
+ const defaultLocale = await serviceUtils.getDefaultLocale();
322
+ let locale = null;
323
+ if (isLocalizedContentType) {
324
+ locale = params.query.locale || defaultLocale;
325
+ }
312
326
  const [{ results, pagination: pagination2 }, localeDictionary] = await Promise.all([
313
327
  query.findPage({
314
328
  ...params.query,
@@ -464,13 +478,47 @@ const createHistoryService = ({ strapi: strapi2 }) => {
464
478
  }
465
479
  };
466
480
  };
481
+ const shouldCreateHistoryVersion = (context) => {
482
+ if (!strapi.requestContext.get()?.request.url.startsWith("/content-manager")) {
483
+ return false;
484
+ }
485
+ if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
486
+ return false;
487
+ }
488
+ if (context.action === "update" && strapi.requestContext.get()?.request.url.endsWith("/actions/publish")) {
489
+ return false;
490
+ }
491
+ if (!context.contentType.uid.startsWith("api::")) {
492
+ return false;
493
+ }
494
+ return true;
495
+ };
496
+ const getSchemas = (uid2) => {
497
+ const attributesSchema = strapi.getModel(uid2).attributes;
498
+ const componentsSchemas = Object.keys(attributesSchema).reduce(
499
+ (currentComponentSchemas, key) => {
500
+ const fieldSchema = attributesSchema[key];
501
+ if (fieldSchema.type === "component") {
502
+ const componentSchema = strapi.getModel(fieldSchema.component).attributes;
503
+ return {
504
+ ...currentComponentSchemas,
505
+ [fieldSchema.component]: componentSchema
506
+ };
507
+ }
508
+ return currentComponentSchemas;
509
+ },
510
+ {}
511
+ );
512
+ return {
513
+ schema: omit(FIELDS_TO_IGNORE, attributesSchema),
514
+ componentsSchemas
515
+ };
516
+ };
467
517
  const createLifecyclesService = ({ strapi: strapi2 }) => {
468
518
  const state = {
469
519
  deleteExpiredJob: null,
470
520
  isInitialized: false
471
521
  };
472
- const query = strapi2.db.query(HISTORY_VERSION_UID);
473
- const historyService = getService(strapi2, "history");
474
522
  const serviceUtils = createServiceUtils({ strapi: strapi2 });
475
523
  return {
476
524
  async bootstrap() {
@@ -478,63 +526,45 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
478
526
  return;
479
527
  }
480
528
  strapi2.documents.use(async (context, next) => {
481
- if (!strapi2.requestContext.get()?.request.url.startsWith("/content-manager")) {
482
- return next();
483
- }
484
- if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
485
- return next();
486
- }
487
- if (context.action === "update" && strapi2.requestContext.get()?.request.url.endsWith("/actions/publish")) {
488
- return next();
489
- }
490
- const contentTypeUid = context.contentType.uid;
491
- if (!contentTypeUid.startsWith("api::")) {
492
- return next();
493
- }
494
529
  const result = await next();
495
- const documentContext = {
496
- documentId: context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId,
497
- locale: context.params?.locale
498
- };
530
+ if (!shouldCreateHistoryVersion(context)) {
531
+ return result;
532
+ }
533
+ const documentId = context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId;
499
534
  const defaultLocale = await serviceUtils.getDefaultLocale();
500
- const locale = documentContext.locale || defaultLocale;
501
- if (Array.isArray(locale)) {
502
- strapi2.log.warn(
503
- "[Content manager history middleware]: An array of locales was provided, but only a single locale is supported for the findOne operation."
504
- );
505
- return next();
535
+ const locales = castArray(context.params?.locale || defaultLocale);
536
+ if (!locales.length) {
537
+ return result;
506
538
  }
507
- const document = await strapi2.documents(contentTypeUid).findOne({
508
- documentId: documentContext.documentId,
509
- locale,
510
- populate: serviceUtils.getDeepPopulate(contentTypeUid)
539
+ const uid2 = context.contentType.uid;
540
+ const schemas = getSchemas(uid2);
541
+ const model = strapi2.getModel(uid2);
542
+ const isLocalizedContentType = serviceUtils.isLocalizedContentType(model);
543
+ const localeEntries = await strapi2.db.query(uid2).findMany({
544
+ where: {
545
+ documentId,
546
+ ...isLocalizedContentType ? { locale: { $in: locales } } : {},
547
+ ...contentTypes$1.hasDraftAndPublish(strapi2.contentTypes[uid2]) ? { publishedAt: null } : {}
548
+ },
549
+ populate: serviceUtils.getDeepPopulate(
550
+ uid2,
551
+ true
552
+ /* use database syntax */
553
+ )
511
554
  });
512
- const status = await serviceUtils.getVersionStatus(contentTypeUid, document);
513
- const attributesSchema = strapi2.getModel(contentTypeUid).attributes;
514
- const componentsSchemas = Object.keys(
515
- attributesSchema
516
- ).reduce((currentComponentSchemas, key) => {
517
- const fieldSchema = attributesSchema[key];
518
- if (fieldSchema.type === "component") {
519
- const componentSchema = strapi2.getModel(fieldSchema.component).attributes;
520
- return {
521
- ...currentComponentSchemas,
522
- [fieldSchema.component]: componentSchema
523
- };
524
- }
525
- return currentComponentSchemas;
526
- }, {});
527
555
  await strapi2.db.transaction(async ({ onCommit }) => {
528
- onCommit(() => {
529
- historyService.createVersion({
530
- contentType: contentTypeUid,
531
- data: omit(FIELDS_TO_IGNORE, document),
532
- schema: omit(FIELDS_TO_IGNORE, attributesSchema),
533
- componentsSchemas,
534
- relatedDocumentId: documentContext.documentId,
535
- locale,
536
- status
537
- });
556
+ onCommit(async () => {
557
+ for (const entry of localeEntries) {
558
+ const status = await serviceUtils.getVersionStatus(uid2, entry);
559
+ await getService(strapi2, "history").createVersion({
560
+ contentType: uid2,
561
+ data: omit(FIELDS_TO_IGNORE, entry),
562
+ relatedDocumentId: documentId,
563
+ locale: entry.locale,
564
+ status,
565
+ ...schemas
566
+ });
567
+ }
538
568
  });
539
569
  });
540
570
  return result;
@@ -542,7 +572,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
542
572
  state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
543
573
  const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
544
574
  const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
545
- query.deleteMany({
575
+ strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
546
576
  where: {
547
577
  created_at: {
548
578
  $lt: expirationDate.toISOString()
@@ -1174,6 +1204,11 @@ const { createPolicy } = policy;
1174
1204
  const hasPermissions = createPolicy({
1175
1205
  name: "plugin::content-manager.hasPermissions",
1176
1206
  validator: validateHasPermissionsInput,
1207
+ /**
1208
+ * NOTE: Action aliases are currently not checked at this level (policy).
1209
+ * This is currently the intended behavior to avoid changing the behavior of API related permissions.
1210
+ * If you want to add support for it, please create a dedicated RFC with a list of potential side effect this could have.
1211
+ */
1177
1212
  handler(ctx, config = {}) {
1178
1213
  const { actions = [], hasAtLeastOne = false } = config;
1179
1214
  const { userAbility } = ctx.state;
@@ -1567,9 +1602,11 @@ const multipleLocaleSchema = yup$1.lazy(
1567
1602
  (value) => Array.isArray(value) ? yup$1.array().of(singleLocaleSchema.required()) : singleLocaleSchema
1568
1603
  );
1569
1604
  const statusSchema = yup$1.mixed().oneOf(["draft", "published"], "Invalid status");
1570
- const getDocumentLocaleAndStatus = async (request, opts = { allowMultipleLocales: false }) => {
1605
+ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultipleLocales: false }) => {
1571
1606
  const { allowMultipleLocales } = opts;
1572
- const { locale, status, ...rest } = request || {};
1607
+ const { locale, status: providedStatus, ...rest } = request || {};
1608
+ const defaultStatus = contentTypes$1.hasDraftAndPublish(strapi.getModel(model)) ? void 0 : "published";
1609
+ const status = providedStatus !== void 0 ? providedStatus : defaultStatus;
1573
1610
  const schema = yup$1.object().shape({
1574
1611
  locale: allowMultipleLocales ? multipleLocaleSchema : singleLocaleSchema,
1575
1612
  status: statusSchema
@@ -1617,7 +1654,7 @@ const createDocument = async (ctx, opts) => {
1617
1654
  const setCreator = setCreatorFields({ user });
1618
1655
  const sanitizeFn = async.pipe(pickPermittedFields, setCreator);
1619
1656
  const sanitizedBody = await sanitizeFn(body);
1620
- const { locale, status = "draft" } = await getDocumentLocaleAndStatus(body);
1657
+ const { locale, status } = await getDocumentLocaleAndStatus(body, model);
1621
1658
  return documentManager2.create(model, {
1622
1659
  data: sanitizedBody,
1623
1660
  locale,
@@ -1636,7 +1673,7 @@ const updateDocument = async (ctx, opts) => {
1636
1673
  }
1637
1674
  const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
1638
1675
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
1639
- const { locale } = await getDocumentLocaleAndStatus(body);
1676
+ const { locale } = await getDocumentLocaleAndStatus(body, model);
1640
1677
  const [documentVersion, documentExists] = await Promise.all([
1641
1678
  documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
1642
1679
  documentManager2.exists(model, id)
@@ -1674,7 +1711,7 @@ const collectionTypes = {
1674
1711
  }
1675
1712
  const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
1676
1713
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
1677
- const { locale, status } = await getDocumentLocaleAndStatus(query);
1714
+ const { locale, status } = await getDocumentLocaleAndStatus(query, model);
1678
1715
  const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
1679
1716
  { ...permissionQuery, populate, locale, status },
1680
1717
  model
@@ -1709,7 +1746,7 @@ const collectionTypes = {
1709
1746
  }
1710
1747
  const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
1711
1748
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
1712
- const { locale, status = "draft" } = await getDocumentLocaleAndStatus(ctx.query);
1749
+ const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
1713
1750
  const version = await documentManager2.findOne(id, model, {
1714
1751
  populate,
1715
1752
  locale,
@@ -1724,7 +1761,7 @@ const collectionTypes = {
1724
1761
  permissionChecker2,
1725
1762
  model,
1726
1763
  // @ts-expect-error TODO: fix
1727
- { id, locale, publishedAt: null },
1764
+ { documentId: id, locale, publishedAt: null },
1728
1765
  { availableLocales: true, availableStatus: false }
1729
1766
  );
1730
1767
  ctx.body = { data: {}, meta };
@@ -1776,7 +1813,7 @@ const collectionTypes = {
1776
1813
  }
1777
1814
  const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
1778
1815
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
1779
- const { locale } = await getDocumentLocaleAndStatus(body);
1816
+ const { locale } = await getDocumentLocaleAndStatus(body, model);
1780
1817
  const document = await documentManager2.findOne(id, model, {
1781
1818
  populate,
1782
1819
  locale,
@@ -1821,7 +1858,7 @@ const collectionTypes = {
1821
1858
  }
1822
1859
  const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
1823
1860
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
1824
- const { locale } = await getDocumentLocaleAndStatus(ctx.query);
1861
+ const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
1825
1862
  const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
1826
1863
  if (documentLocales.length === 0) {
1827
1864
  return ctx.notFound();
@@ -1850,11 +1887,28 @@ const collectionTypes = {
1850
1887
  const publishedDocument = await strapi.db.transaction(async () => {
1851
1888
  const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
1852
1889
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
1853
- const document = id ? await updateDocument(ctx, { populate }) : await createDocument(ctx, { populate });
1890
+ let document;
1891
+ const { locale } = await getDocumentLocaleAndStatus(body, model);
1892
+ const isCreate = isNil$1(id);
1893
+ if (isCreate) {
1894
+ if (permissionChecker2.cannot.create()) {
1895
+ throw new errors.ForbiddenError();
1896
+ }
1897
+ document = await createDocument(ctx, { populate });
1898
+ }
1899
+ const isUpdate = !isCreate;
1900
+ if (isUpdate) {
1901
+ document = await documentManager2.findOne(id, model, { populate, locale });
1902
+ if (!document) {
1903
+ throw new errors.NotFoundError("Document not found");
1904
+ }
1905
+ if (permissionChecker2.can.update(document)) {
1906
+ await updateDocument(ctx);
1907
+ }
1908
+ }
1854
1909
  if (permissionChecker2.cannot.publish(document)) {
1855
1910
  throw new errors.ForbiddenError();
1856
1911
  }
1857
- const { locale } = await getDocumentLocaleAndStatus(body);
1858
1912
  const publishResult = await documentManager2.publish(document.documentId, model, {
1859
1913
  locale
1860
1914
  // TODO: Allow setting creator fields on publish
@@ -1881,7 +1935,9 @@ const collectionTypes = {
1881
1935
  }
1882
1936
  const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
1883
1937
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
1884
- const { locale } = await getDocumentLocaleAndStatus(body, { allowMultipleLocales: true });
1938
+ const { locale } = await getDocumentLocaleAndStatus(body, model, {
1939
+ allowMultipleLocales: true
1940
+ });
1885
1941
  const entityPromises = documentIds.map(
1886
1942
  (documentId) => documentManager2.findLocales(documentId, model, { populate, locale, isPublished: false })
1887
1943
  );
@@ -1908,7 +1964,9 @@ const collectionTypes = {
1908
1964
  if (permissionChecker2.cannot.unpublish()) {
1909
1965
  return ctx.forbidden();
1910
1966
  }
1911
- const { locale } = await getDocumentLocaleAndStatus(body);
1967
+ const { locale } = await getDocumentLocaleAndStatus(body, model, {
1968
+ allowMultipleLocales: true
1969
+ });
1912
1970
  const entityPromises = documentIds.map(
1913
1971
  (documentId) => documentManager2.findLocales(documentId, model, { locale, isPublished: true })
1914
1972
  );
@@ -1941,7 +1999,7 @@ const collectionTypes = {
1941
1999
  }
1942
2000
  const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
1943
2001
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
1944
- const { locale } = await getDocumentLocaleAndStatus(body);
2002
+ const { locale } = await getDocumentLocaleAndStatus(body, model);
1945
2003
  const document = await documentManager2.findOne(id, model, {
1946
2004
  populate,
1947
2005
  locale,
@@ -1978,7 +2036,7 @@ const collectionTypes = {
1978
2036
  }
1979
2037
  const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
1980
2038
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
1981
- const { locale } = await getDocumentLocaleAndStatus(body);
2039
+ const { locale } = await getDocumentLocaleAndStatus(body, model);
1982
2040
  const document = await documentManager2.findOne(id, model, {
1983
2041
  populate,
1984
2042
  locale,
@@ -2009,7 +2067,7 @@ const collectionTypes = {
2009
2067
  }
2010
2068
  const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
2011
2069
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
2012
- const { locale } = await getDocumentLocaleAndStatus(body);
2070
+ const { locale } = await getDocumentLocaleAndStatus(body, model);
2013
2071
  const documentLocales = await documentManager2.findLocales(documentIds, model, {
2014
2072
  populate,
2015
2073
  locale
@@ -2036,7 +2094,7 @@ const collectionTypes = {
2036
2094
  }
2037
2095
  const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
2038
2096
  const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
2039
- const { locale, status = "draft" } = await getDocumentLocaleAndStatus(ctx.query);
2097
+ const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
2040
2098
  const entity = await documentManager2.findOne(id, model, { populate, locale, status });
2041
2099
  if (!entity) {
2042
2100
  return ctx.notFound();
@@ -2059,7 +2117,7 @@ const collectionTypes = {
2059
2117
  if (permissionChecker2.cannot.read()) {
2060
2118
  return ctx.forbidden();
2061
2119
  }
2062
- const entities = await documentManager2.findMany(
2120
+ const documents = await documentManager2.findMany(
2063
2121
  {
2064
2122
  filters: {
2065
2123
  documentId: ids
@@ -2068,7 +2126,7 @@ const collectionTypes = {
2068
2126
  },
2069
2127
  model
2070
2128
  );
2071
- if (!entities) {
2129
+ if (!documents) {
2072
2130
  return ctx.notFound();
2073
2131
  }
2074
2132
  const number = await documentManager2.countManyEntriesDraftRelations(ids, model, locale);
@@ -2259,20 +2317,13 @@ const sanitizeMainField = (model, mainField, userAbility) => {
2259
2317
  userAbility,
2260
2318
  model: model.uid
2261
2319
  });
2262
- if (!isListable(model, mainField)) {
2320
+ const isMainFieldListable = isListable(model, mainField);
2321
+ const canReadMainField = permissionChecker2.can.read(null, mainField);
2322
+ if (!isMainFieldListable || !canReadMainField) {
2263
2323
  return "id";
2264
2324
  }
2265
- if (permissionChecker2.cannot.read(null, mainField)) {
2266
- if (model.uid === "plugin::users-permissions.role") {
2267
- const userPermissionChecker = getService$1("permission-checker").create({
2268
- userAbility,
2269
- model: "plugin::users-permissions.user"
2270
- });
2271
- if (userPermissionChecker.can.read()) {
2272
- return "name";
2273
- }
2274
- }
2275
- return "id";
2325
+ if (model.uid === "plugin::users-permissions.role") {
2326
+ return "name";
2276
2327
  }
2277
2328
  return mainField;
2278
2329
  };
@@ -2530,9 +2581,7 @@ const relations = {
2530
2581
  addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
2531
2582
  const sanitizedRes = await loadRelations({ id: entryId }, targetField, {
2532
2583
  ...strapi.get("query-params").transform(targetUid, permissionQuery),
2533
- ordering: "desc",
2534
- page: ctx.request.query.page,
2535
- pageSize: ctx.request.query.pageSize
2584
+ ordering: "desc"
2536
2585
  });
2537
2586
  const relationsUnion = uniqBy("id", concat(sanitizedRes.results, res.results));
2538
2587
  ctx.body = {
@@ -2564,7 +2613,7 @@ const createOrUpdateDocument = async (ctx, opts) => {
2564
2613
  throw new errors.ForbiddenError();
2565
2614
  }
2566
2615
  const sanitizedQuery = await permissionChecker2.sanitizedQuery.update(query);
2567
- const { locale } = await getDocumentLocaleAndStatus(body);
2616
+ const { locale } = await getDocumentLocaleAndStatus(body, model);
2568
2617
  const [documentVersion, otherDocumentVersion] = await Promise.all([
2569
2618
  findDocument(sanitizedQuery, model, { locale, status: "draft" }),
2570
2619
  // Find the first document to check if it exists
@@ -2605,7 +2654,7 @@ const singleTypes = {
2605
2654
  return ctx.forbidden();
2606
2655
  }
2607
2656
  const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
2608
- const { locale, status } = await getDocumentLocaleAndStatus(query);
2657
+ const { locale, status } = await getDocumentLocaleAndStatus(query, model);
2609
2658
  const version = await findDocument(permissionQuery, model, { locale, status });
2610
2659
  if (!version) {
2611
2660
  if (permissionChecker2.cannot.create()) {
@@ -2650,7 +2699,7 @@ const singleTypes = {
2650
2699
  }
2651
2700
  const sanitizedQuery = await permissionChecker2.sanitizedQuery.delete(query);
2652
2701
  const populate = await buildPopulateFromQuery(sanitizedQuery, model);
2653
- const { locale } = await getDocumentLocaleAndStatus(query);
2702
+ const { locale } = await getDocumentLocaleAndStatus(query, model);
2654
2703
  const documentLocales = await documentManager2.findLocales(void 0, model, {
2655
2704
  populate,
2656
2705
  locale
@@ -2687,7 +2736,7 @@ const singleTypes = {
2687
2736
  if (permissionChecker2.cannot.publish(document)) {
2688
2737
  throw new errors.ForbiddenError();
2689
2738
  }
2690
- const { locale } = await getDocumentLocaleAndStatus(document);
2739
+ const { locale } = await getDocumentLocaleAndStatus(document, model);
2691
2740
  const publishResult = await documentManager2.publish(document.documentId, model, { locale });
2692
2741
  return publishResult.at(0);
2693
2742
  });
@@ -2710,7 +2759,7 @@ const singleTypes = {
2710
2759
  return ctx.forbidden();
2711
2760
  }
2712
2761
  const sanitizedQuery = await permissionChecker2.sanitizedQuery.unpublish(query);
2713
- const { locale } = await getDocumentLocaleAndStatus(body);
2762
+ const { locale } = await getDocumentLocaleAndStatus(body, model);
2714
2763
  const document = await findDocument(sanitizedQuery, model, { locale });
2715
2764
  if (!document) {
2716
2765
  return ctx.notFound();
@@ -2742,7 +2791,7 @@ const singleTypes = {
2742
2791
  return ctx.forbidden();
2743
2792
  }
2744
2793
  const sanitizedQuery = await permissionChecker2.sanitizedQuery.discard(query);
2745
- const { locale } = await getDocumentLocaleAndStatus(body);
2794
+ const { locale } = await getDocumentLocaleAndStatus(body, model);
2746
2795
  const document = await findDocument(sanitizedQuery, model, { locale, status: "published" });
2747
2796
  if (!document) {
2748
2797
  return ctx.notFound();
@@ -2762,7 +2811,7 @@ const singleTypes = {
2762
2811
  const { query } = ctx.request;
2763
2812
  const documentManager2 = getService$1("document-manager");
2764
2813
  const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
2765
- const { locale } = await getDocumentLocaleAndStatus(query);
2814
+ const { locale } = await getDocumentLocaleAndStatus(query, model);
2766
2815
  if (permissionChecker2.cannot.read()) {
2767
2816
  return ctx.forbidden();
2768
2817
  }
@@ -2783,7 +2832,7 @@ const uid$1 = {
2783
2832
  async generateUID(ctx) {
2784
2833
  const { contentTypeUID, field, data } = await validateGenerateUIDInput(ctx.request.body);
2785
2834
  const { query = {} } = ctx.request;
2786
- const { locale } = await getDocumentLocaleAndStatus(query);
2835
+ const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
2787
2836
  await validateUIDField(contentTypeUID, field);
2788
2837
  const uidService = getService$1("uid");
2789
2838
  ctx.body = {
@@ -2795,7 +2844,7 @@ const uid$1 = {
2795
2844
  ctx.request.body
2796
2845
  );
2797
2846
  const { query = {} } = ctx.request;
2798
- const { locale } = await getDocumentLocaleAndStatus(query);
2847
+ const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
2799
2848
  await validateUIDField(contentTypeUID, field);
2800
2849
  const uidService = getService$1("uid");
2801
2850
  const isAvailable = await uidService.checkUIDAvailability({
@@ -3438,12 +3487,27 @@ const createPermissionChecker = (strapi2) => ({ userAbility, model }) => {
3438
3487
  ability: userAbility,
3439
3488
  model
3440
3489
  });
3441
- const toSubject = (entity) => entity ? permissionsManager.toSubject(entity, model) : model;
3490
+ const { actionProvider } = strapi2.service("admin::permission");
3491
+ const toSubject = (entity) => {
3492
+ return entity ? permissionsManager.toSubject(entity, model) : model;
3493
+ };
3442
3494
  const can = (action, entity, field) => {
3443
- return userAbility.can(action, toSubject(entity), field);
3495
+ const subject = toSubject(entity);
3496
+ const aliases = actionProvider.unstable_aliases(action, model);
3497
+ return (
3498
+ // Test the original action to see if it passes
3499
+ userAbility.can(action, subject, field) || // Else try every known alias if at least one of them succeed, then the user "can"
3500
+ aliases.some((alias) => userAbility.can(alias, subject, field))
3501
+ );
3444
3502
  };
3445
3503
  const cannot = (action, entity, field) => {
3446
- return userAbility.cannot(action, toSubject(entity), field);
3504
+ const subject = toSubject(entity);
3505
+ const aliases = actionProvider.unstable_aliases(action, model);
3506
+ return (
3507
+ // Test both the original action
3508
+ userAbility.cannot(action, subject, field) && // and every known alias, if all of them fail (cannot), then the user truly "cannot"
3509
+ aliases.every((alias) => userAbility.cannot(alias, subject, field))
3510
+ );
3447
3511
  };
3448
3512
  const sanitizeOutput = (data, { action = ACTIONS.read } = {}) => {
3449
3513
  return permissionsManager.sanitizeOutput(data, { subject: toSubject(data), action });
@@ -3720,6 +3784,10 @@ const getDeepPopulateDraftCount = (uid2) => {
3720
3784
  const attribute = model.attributes[attributeName];
3721
3785
  switch (attribute.type) {
3722
3786
  case "relation": {
3787
+ const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
3788
+ if (isMorphRelation) {
3789
+ break;
3790
+ }
3723
3791
  if (isVisibleAttribute$1(model, attributeName)) {
3724
3792
  populateAcc[attributeName] = {
3725
3793
  count: true,
@@ -4097,7 +4165,13 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
4097
4165
  */
4098
4166
  async formatDocumentWithMetadata(uid2, document, opts = {}) {
4099
4167
  if (!document) {
4100
- return document;
4168
+ return {
4169
+ data: document,
4170
+ meta: {
4171
+ availableLocales: [],
4172
+ availableStatus: []
4173
+ }
4174
+ };
4101
4175
  }
4102
4176
  const hasDraftAndPublish = contentTypes$1.hasDraftAndPublish(strapi2.getModel(uid2));
4103
4177
  if (!hasDraftAndPublish) {
@@ -4205,10 +4279,7 @@ const documentManager = ({ strapi: strapi2 }) => {
4205
4279
  async clone(id, body, uid2) {
4206
4280
  const populate = await buildDeepPopulate(uid2);
4207
4281
  const params = {
4208
- data: {
4209
- ...omitIdField(body),
4210
- [PUBLISHED_AT_ATTRIBUTE]: null
4211
- },
4282
+ data: omitIdField(body),
4212
4283
  populate
4213
4284
  };
4214
4285
  return strapi2.documents(uid2).clone({ ...params, documentId: id }).then((result) => result?.entries.at(0));