@strapi/content-manager 0.0.0-experimental.d53e940834bf72ddc725f1d2fd36dac9abec30cb → 0.0.0-experimental.d65615a2b9130dd742d3c396674457d7971da928
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/LICENSE +18 -3
- package/dist/_chunks/{ComponentConfigurationPage-C-49MccQ.js → ComponentConfigurationPage-CO977CPh.js} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-C-49MccQ.js.map → ComponentConfigurationPage-CO977CPh.js.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-DmwmiFQy.mjs → ComponentConfigurationPage-CQroR9Qk.mjs} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-DmwmiFQy.mjs.map → ComponentConfigurationPage-CQroR9Qk.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-DjFJw56M.js → EditConfigurationPage-BPgoE-kf.js} +4 -4
- package/dist/_chunks/{EditConfigurationPage-DjFJw56M.js.map → EditConfigurationPage-BPgoE-kf.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-JT3E7NZy.mjs → EditConfigurationPage-tVCJ5vWC.mjs} +4 -4
- package/dist/_chunks/{EditConfigurationPage-JT3E7NZy.mjs.map → EditConfigurationPage-tVCJ5vWC.mjs.map} +1 -1
- package/dist/_chunks/{EditViewPage-CPj61RMh.mjs → EditViewPage-8mOu02ji.mjs} +30 -9
- package/dist/_chunks/EditViewPage-8mOu02ji.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-zT3fBr4Y.js → EditViewPage-BMVgUNOX.js} +30 -9
- package/dist/_chunks/EditViewPage-BMVgUNOX.js.map +1 -0
- package/dist/_chunks/{Field-dha5VnIQ.mjs → Field-CJPYzwD7.mjs} +249 -152
- package/dist/_chunks/Field-CJPYzwD7.mjs.map +1 -0
- package/dist/_chunks/{Field-Boxf9Ajp.js → Field-CdSLKFQk.js} +251 -154
- package/dist/_chunks/Field-CdSLKFQk.js.map +1 -0
- package/dist/_chunks/{Form-DHrru2AV.mjs → Form-DJOJ-GF1.mjs} +36 -17
- package/dist/_chunks/Form-DJOJ-GF1.mjs.map +1 -0
- package/dist/_chunks/{Form-y5g1SRsh.js → Form-eP5bZwap.js} +36 -17
- package/dist/_chunks/Form-eP5bZwap.js.map +1 -0
- package/dist/_chunks/{History-CqN6K7SX.js → History-B-Mrquzu.js} +63 -25
- package/dist/_chunks/History-B-Mrquzu.js.map +1 -0
- package/dist/_chunks/{History-Bru_KoeP.mjs → History-MnQLtk1g.mjs} +64 -26
- package/dist/_chunks/History-MnQLtk1g.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-D8wGABj0.mjs → ListConfigurationPage-BcycI8Lw.mjs} +21 -9
- package/dist/_chunks/ListConfigurationPage-BcycI8Lw.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-R_p-SbHZ.js → ListConfigurationPage-C0n4rUzH.js} +21 -9
- package/dist/_chunks/ListConfigurationPage-C0n4rUzH.js.map +1 -0
- package/dist/_chunks/{ListViewPage-SID6TRb9.mjs → ListViewPage-CRXONXwZ.mjs} +59 -41
- package/dist/_chunks/ListViewPage-CRXONXwZ.mjs.map +1 -0
- package/dist/_chunks/{ListViewPage-pEw_zug9.js → ListViewPage-q0SHVPUS.js} +61 -43
- package/dist/_chunks/ListViewPage-q0SHVPUS.js.map +1 -0
- package/dist/_chunks/{NoContentTypePage-C5dcQojD.js → NoContentTypePage-Bh3komDV.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-C5dcQojD.js.map → NoContentTypePage-Bh3komDV.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-CJ7UXwrQ.mjs → NoContentTypePage-ukzFRF3z.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-CJ7UXwrQ.mjs.map → NoContentTypePage-ukzFRF3z.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-B7syEq5E.mjs → NoPermissionsPage-B4sD7Ble.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-B7syEq5E.mjs.map → NoPermissionsPage-B4sD7Ble.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-BtPrImPP.js → NoPermissionsPage-BGBpj_Y1.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-BtPrImPP.js.map → NoPermissionsPage-BGBpj_Y1.js.map} +1 -1
- package/dist/_chunks/{Relations-DjTQ5kGB.js → Relations-B53wYe8g.js} +33 -24
- package/dist/_chunks/Relations-B53wYe8g.js.map +1 -0
- package/dist/_chunks/{Relations-B9Crnhnn.mjs → Relations-CIexb8gr.mjs} +33 -24
- package/dist/_chunks/Relations-CIexb8gr.mjs.map +1 -0
- package/dist/_chunks/{en-fbKQxLGn.js → en-Bm0D0IWz.js} +17 -15
- package/dist/_chunks/{en-fbKQxLGn.js.map → en-Bm0D0IWz.js.map} +1 -1
- package/dist/_chunks/{en-Ux26r5pl.mjs → en-DKV44jRb.mjs} +17 -15
- package/dist/_chunks/{en-Ux26r5pl.mjs.map → en-DKV44jRb.mjs.map} +1 -1
- package/dist/_chunks/{index-DJXJw9V5.mjs → index-CJ2vYwuT.mjs} +997 -690
- package/dist/_chunks/index-CJ2vYwuT.mjs.map +1 -0
- package/dist/_chunks/{index-DVPWZkbS.js → index-DbT2sx-Q.js} +978 -671
- package/dist/_chunks/index-DbT2sx-Q.js.map +1 -0
- package/dist/_chunks/{layout-Dm6fbiQj.js → layout-CeBSIkmP.js} +24 -11
- package/dist/_chunks/layout-CeBSIkmP.js.map +1 -0
- package/dist/_chunks/{layout-Bau7ZfLV.mjs → layout-vzKSrr7p.mjs} +25 -12
- package/dist/_chunks/layout-vzKSrr7p.mjs.map +1 -0
- 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-CKnpRgrN.js → relations-Cl-6t9iz.js} +2 -2
- package/dist/_chunks/{relations-CKnpRgrN.js.map → relations-Cl-6t9iz.js.map} +1 -1
- package/dist/_chunks/{relations-BH_kBSJ0.mjs → relations-DI0lguF0.mjs} +2 -2
- package/dist/_chunks/{relations-BH_kBSJ0.mjs.map → relations-DI0lguF0.mjs.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/index.d.ts +3 -0
- package/dist/admin/src/history/services/historyVersion.d.ts +1 -1
- package/dist/admin/src/hooks/useDocument.d.ts +32 -1
- package/dist/admin/src/index.d.ts +1 -0
- package/dist/admin/src/pages/EditView/components/DocumentActions.d.ts +1 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/Relations.d.ts +20 -0
- 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 +11 -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 +207 -120
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +208 -121
- 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 +12 -12
- package/dist/_chunks/EditViewPage-CPj61RMh.mjs.map +0 -1
- package/dist/_chunks/EditViewPage-zT3fBr4Y.js.map +0 -1
- package/dist/_chunks/Field-Boxf9Ajp.js.map +0 -1
- package/dist/_chunks/Field-dha5VnIQ.mjs.map +0 -1
- package/dist/_chunks/Form-DHrru2AV.mjs.map +0 -1
- package/dist/_chunks/Form-y5g1SRsh.js.map +0 -1
- package/dist/_chunks/History-Bru_KoeP.mjs.map +0 -1
- package/dist/_chunks/History-CqN6K7SX.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-D8wGABj0.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-R_p-SbHZ.js.map +0 -1
- package/dist/_chunks/ListViewPage-SID6TRb9.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-pEw_zug9.js.map +0 -1
- package/dist/_chunks/Relations-B9Crnhnn.mjs.map +0 -1
- package/dist/_chunks/Relations-DjTQ5kGB.js.map +0 -1
- package/dist/_chunks/index-DJXJw9V5.mjs.map +0 -1
- package/dist/_chunks/index-DVPWZkbS.js.map +0 -1
- package/dist/_chunks/layout-Bau7ZfLV.mjs.map +0 -1
- package/dist/_chunks/layout-Dm6fbiQj.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,20 +228,25 @@ 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
|
+
const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
|
239
|
+
if (isMorphRelation) {
|
240
|
+
break;
|
241
|
+
}
|
235
242
|
const isVisible2 = strapiUtils.contentTypes.isVisibleAttribute(model, attributeName);
|
236
243
|
if (isVisible2) {
|
237
|
-
acc[attributeName] = {
|
244
|
+
acc[attributeName] = { [fieldSelector]: ["documentId", "locale", "publishedAt"] };
|
238
245
|
}
|
239
246
|
break;
|
240
247
|
}
|
241
248
|
case "media": {
|
242
|
-
acc[attributeName] = {
|
249
|
+
acc[attributeName] = { [fieldSelector]: ["id"] };
|
243
250
|
break;
|
244
251
|
}
|
245
252
|
case "component": {
|
@@ -312,6 +319,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
312
319
|
getRelationRestoreValue,
|
313
320
|
getMediaRestoreValue,
|
314
321
|
getDefaultLocale,
|
322
|
+
isLocalizedContentType,
|
315
323
|
getLocaleDictionary,
|
316
324
|
getRetentionDays,
|
317
325
|
getVersionStatus,
|
@@ -334,7 +342,13 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
334
342
|
});
|
335
343
|
},
|
336
344
|
async findVersionsPage(params) {
|
337
|
-
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
|
+
}
|
338
352
|
const [{ results, pagination }, localeDictionary] = await Promise.all([
|
339
353
|
query.findPage({
|
340
354
|
...params.query,
|
@@ -379,7 +393,12 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
379
393
|
if (userToPopulate == null) {
|
380
394
|
return null;
|
381
395
|
}
|
382
|
-
return strapi2.query("admin::user").findOne({
|
396
|
+
return strapi2.query("admin::user").findOne({
|
397
|
+
where: {
|
398
|
+
...userToPopulate.id ? { id: userToPopulate.id } : {},
|
399
|
+
...userToPopulate.documentId ? { documentId: userToPopulate.documentId } : {}
|
400
|
+
}
|
401
|
+
});
|
383
402
|
})
|
384
403
|
);
|
385
404
|
return {
|
@@ -490,6 +509,42 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
490
509
|
}
|
491
510
|
};
|
492
511
|
};
|
512
|
+
const shouldCreateHistoryVersion = (context) => {
|
513
|
+
if (!strapi.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
514
|
+
return false;
|
515
|
+
}
|
516
|
+
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
517
|
+
return false;
|
518
|
+
}
|
519
|
+
if (context.action === "update" && strapi.requestContext.get()?.request.url.endsWith("/actions/publish")) {
|
520
|
+
return false;
|
521
|
+
}
|
522
|
+
if (!context.contentType.uid.startsWith("api::")) {
|
523
|
+
return false;
|
524
|
+
}
|
525
|
+
return true;
|
526
|
+
};
|
527
|
+
const getSchemas = (uid2) => {
|
528
|
+
const attributesSchema = strapi.getModel(uid2).attributes;
|
529
|
+
const componentsSchemas = Object.keys(attributesSchema).reduce(
|
530
|
+
(currentComponentSchemas, key) => {
|
531
|
+
const fieldSchema = attributesSchema[key];
|
532
|
+
if (fieldSchema.type === "component") {
|
533
|
+
const componentSchema = strapi.getModel(fieldSchema.component).attributes;
|
534
|
+
return {
|
535
|
+
...currentComponentSchemas,
|
536
|
+
[fieldSchema.component]: componentSchema
|
537
|
+
};
|
538
|
+
}
|
539
|
+
return currentComponentSchemas;
|
540
|
+
},
|
541
|
+
{}
|
542
|
+
);
|
543
|
+
return {
|
544
|
+
schema: fp.omit(FIELDS_TO_IGNORE, attributesSchema),
|
545
|
+
componentsSchemas
|
546
|
+
};
|
547
|
+
};
|
493
548
|
const createLifecyclesService = ({ strapi: strapi2 }) => {
|
494
549
|
const state = {
|
495
550
|
deleteExpiredJob: null,
|
@@ -502,63 +557,45 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
502
557
|
return;
|
503
558
|
}
|
504
559
|
strapi2.documents.use(async (context, next) => {
|
505
|
-
if (!strapi2.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
506
|
-
return next();
|
507
|
-
}
|
508
|
-
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
509
|
-
return next();
|
510
|
-
}
|
511
|
-
if (context.action === "update" && strapi2.requestContext.get()?.request.url.endsWith("/actions/publish")) {
|
512
|
-
return next();
|
513
|
-
}
|
514
|
-
const contentTypeUid = context.contentType.uid;
|
515
|
-
if (!contentTypeUid.startsWith("api::")) {
|
516
|
-
return next();
|
517
|
-
}
|
518
560
|
const result = await next();
|
519
|
-
|
520
|
-
|
521
|
-
|
522
|
-
|
561
|
+
if (!shouldCreateHistoryVersion(context)) {
|
562
|
+
return result;
|
563
|
+
}
|
564
|
+
const documentId = context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId;
|
523
565
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
524
|
-
const
|
525
|
-
if (
|
526
|
-
|
527
|
-
"[Content manager history middleware]: An array of locales was provided, but only a single locale is supported for the findOne operation."
|
528
|
-
);
|
529
|
-
return next();
|
566
|
+
const locales = fp.castArray(context.params?.locale || defaultLocale);
|
567
|
+
if (!locales.length) {
|
568
|
+
return result;
|
530
569
|
}
|
531
|
-
const
|
532
|
-
|
533
|
-
|
534
|
-
|
570
|
+
const uid2 = context.contentType.uid;
|
571
|
+
const schemas = getSchemas(uid2);
|
572
|
+
const model = strapi2.getModel(uid2);
|
573
|
+
const isLocalizedContentType = serviceUtils.isLocalizedContentType(model);
|
574
|
+
const localeEntries = await strapi2.db.query(uid2).findMany({
|
575
|
+
where: {
|
576
|
+
documentId,
|
577
|
+
...isLocalizedContentType ? { locale: { $in: locales } } : {},
|
578
|
+
...strapiUtils.contentTypes.hasDraftAndPublish(strapi2.contentTypes[uid2]) ? { publishedAt: null } : {}
|
579
|
+
},
|
580
|
+
populate: serviceUtils.getDeepPopulate(
|
581
|
+
uid2,
|
582
|
+
true
|
583
|
+
/* use database syntax */
|
584
|
+
)
|
535
585
|
});
|
536
|
-
const status = await serviceUtils.getVersionStatus(contentTypeUid, document);
|
537
|
-
const attributesSchema = strapi2.getModel(contentTypeUid).attributes;
|
538
|
-
const componentsSchemas = Object.keys(
|
539
|
-
attributesSchema
|
540
|
-
).reduce((currentComponentSchemas, key) => {
|
541
|
-
const fieldSchema = attributesSchema[key];
|
542
|
-
if (fieldSchema.type === "component") {
|
543
|
-
const componentSchema = strapi2.getModel(fieldSchema.component).attributes;
|
544
|
-
return {
|
545
|
-
...currentComponentSchemas,
|
546
|
-
[fieldSchema.component]: componentSchema
|
547
|
-
};
|
548
|
-
}
|
549
|
-
return currentComponentSchemas;
|
550
|
-
}, {});
|
551
586
|
await strapi2.db.transaction(async ({ onCommit }) => {
|
552
|
-
onCommit(() => {
|
553
|
-
|
554
|
-
|
555
|
-
|
556
|
-
|
557
|
-
|
558
|
-
|
559
|
-
|
560
|
-
|
561
|
-
|
587
|
+
onCommit(async () => {
|
588
|
+
for (const entry of localeEntries) {
|
589
|
+
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
590
|
+
await getService(strapi2, "history").createVersion({
|
591
|
+
contentType: uid2,
|
592
|
+
data: fp.omit(FIELDS_TO_IGNORE, entry),
|
593
|
+
relatedDocumentId: documentId,
|
594
|
+
locale: entry.locale,
|
595
|
+
status,
|
596
|
+
...schemas
|
597
|
+
});
|
598
|
+
}
|
562
599
|
});
|
563
600
|
});
|
564
601
|
return result;
|
@@ -1198,6 +1235,11 @@ const { createPolicy } = strapiUtils.policy;
|
|
1198
1235
|
const hasPermissions = createPolicy({
|
1199
1236
|
name: "plugin::content-manager.hasPermissions",
|
1200
1237
|
validator: validateHasPermissionsInput,
|
1238
|
+
/**
|
1239
|
+
* NOTE: Action aliases are currently not checked at this level (policy).
|
1240
|
+
* This is currently the intended behavior to avoid changing the behavior of API related permissions.
|
1241
|
+
* If you want to add support for it, please create a dedicated RFC with a list of potential side effect this could have.
|
1242
|
+
*/
|
1201
1243
|
handler(ctx, config = {}) {
|
1202
1244
|
const { actions = [], hasAtLeastOne = false } = config;
|
1203
1245
|
const { userAbility } = ctx.state;
|
@@ -1591,9 +1633,11 @@ const multipleLocaleSchema = strapiUtils.yup.lazy(
|
|
1591
1633
|
(value) => Array.isArray(value) ? strapiUtils.yup.array().of(singleLocaleSchema.required()) : singleLocaleSchema
|
1592
1634
|
);
|
1593
1635
|
const statusSchema = strapiUtils.yup.mixed().oneOf(["draft", "published"], "Invalid status");
|
1594
|
-
const getDocumentLocaleAndStatus = async (request, opts = { allowMultipleLocales: false }) => {
|
1636
|
+
const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultipleLocales: false }) => {
|
1595
1637
|
const { allowMultipleLocales } = opts;
|
1596
|
-
const { locale, status, ...rest } = request || {};
|
1638
|
+
const { locale, status: providedStatus, ...rest } = request || {};
|
1639
|
+
const defaultStatus = strapiUtils.contentTypes.hasDraftAndPublish(strapi.getModel(model)) ? void 0 : "published";
|
1640
|
+
const status = providedStatus !== void 0 ? providedStatus : defaultStatus;
|
1597
1641
|
const schema = strapiUtils.yup.object().shape({
|
1598
1642
|
locale: allowMultipleLocales ? multipleLocaleSchema : singleLocaleSchema,
|
1599
1643
|
status: statusSchema
|
@@ -1641,7 +1685,7 @@ const createDocument = async (ctx, opts) => {
|
|
1641
1685
|
const setCreator = strapiUtils.setCreatorFields({ user });
|
1642
1686
|
const sanitizeFn = strapiUtils.async.pipe(pickPermittedFields, setCreator);
|
1643
1687
|
const sanitizedBody = await sanitizeFn(body);
|
1644
|
-
const { locale, status
|
1688
|
+
const { locale, status } = await getDocumentLocaleAndStatus(body, model);
|
1645
1689
|
return documentManager2.create(model, {
|
1646
1690
|
data: sanitizedBody,
|
1647
1691
|
locale,
|
@@ -1660,7 +1704,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1660
1704
|
}
|
1661
1705
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1662
1706
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1663
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1707
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1664
1708
|
const [documentVersion, documentExists] = await Promise.all([
|
1665
1709
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
1666
1710
|
documentManager2.exists(model, id)
|
@@ -1676,7 +1720,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1676
1720
|
throw new strapiUtils.errors.ForbiddenError();
|
1677
1721
|
}
|
1678
1722
|
const pickPermittedFields = documentVersion ? permissionChecker2.sanitizeUpdateInput(documentVersion) : permissionChecker2.sanitizeCreateInput;
|
1679
|
-
const setCreator = strapiUtils.setCreatorFields({ user, isEdition: true });
|
1723
|
+
const setCreator = documentVersion ? strapiUtils.setCreatorFields({ user, isEdition: true }) : strapiUtils.setCreatorFields({ user });
|
1680
1724
|
const sanitizeFn = strapiUtils.async.pipe(pickPermittedFields, setCreator);
|
1681
1725
|
const sanitizedBody = await sanitizeFn(body);
|
1682
1726
|
return documentManager2.update(documentVersion?.documentId || id, model, {
|
@@ -1698,7 +1742,7 @@ const collectionTypes = {
|
|
1698
1742
|
}
|
1699
1743
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1700
1744
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1701
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
1745
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1702
1746
|
const { results: documents, pagination } = await documentManager2.findPage(
|
1703
1747
|
{ ...permissionQuery, populate, locale, status },
|
1704
1748
|
model
|
@@ -1733,7 +1777,7 @@ const collectionTypes = {
|
|
1733
1777
|
}
|
1734
1778
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1735
1779
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1736
|
-
const { locale, status
|
1780
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1737
1781
|
const version = await documentManager2.findOne(id, model, {
|
1738
1782
|
populate,
|
1739
1783
|
locale,
|
@@ -1748,7 +1792,7 @@ const collectionTypes = {
|
|
1748
1792
|
permissionChecker2,
|
1749
1793
|
model,
|
1750
1794
|
// @ts-expect-error TODO: fix
|
1751
|
-
{ id, locale, publishedAt: null },
|
1795
|
+
{ documentId: id, locale, publishedAt: null },
|
1752
1796
|
{ availableLocales: true, availableStatus: false }
|
1753
1797
|
);
|
1754
1798
|
ctx.body = { data: {}, meta };
|
@@ -1800,7 +1844,7 @@ const collectionTypes = {
|
|
1800
1844
|
}
|
1801
1845
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1802
1846
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1803
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1847
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1804
1848
|
const document = await documentManager2.findOne(id, model, {
|
1805
1849
|
populate,
|
1806
1850
|
locale,
|
@@ -1845,7 +1889,7 @@ const collectionTypes = {
|
|
1845
1889
|
}
|
1846
1890
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1847
1891
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1848
|
-
const { locale } = await getDocumentLocaleAndStatus(ctx.query);
|
1892
|
+
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1849
1893
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1850
1894
|
if (documentLocales.length === 0) {
|
1851
1895
|
return ctx.notFound();
|
@@ -1874,11 +1918,34 @@ const collectionTypes = {
|
|
1874
1918
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1875
1919
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1876
1920
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1877
|
-
|
1921
|
+
let document;
|
1922
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1923
|
+
const isCreate = fp.isNil(id);
|
1924
|
+
if (isCreate) {
|
1925
|
+
if (permissionChecker2.cannot.create()) {
|
1926
|
+
throw new strapiUtils.errors.ForbiddenError();
|
1927
|
+
}
|
1928
|
+
document = await createDocument(ctx, { populate });
|
1929
|
+
}
|
1930
|
+
const isUpdate = !isCreate;
|
1931
|
+
if (isUpdate) {
|
1932
|
+
const documentExists = documentManager2.exists(model, id);
|
1933
|
+
if (!documentExists) {
|
1934
|
+
throw new strapiUtils.errors.NotFoundError("Document not found");
|
1935
|
+
}
|
1936
|
+
document = await documentManager2.findOne(id, model, { populate, locale });
|
1937
|
+
if (!document) {
|
1938
|
+
if (permissionChecker2.cannot.create({ locale }) || permissionChecker2.cannot.publish({ locale })) {
|
1939
|
+
throw new strapiUtils.errors.ForbiddenError();
|
1940
|
+
}
|
1941
|
+
document = await updateDocument(ctx);
|
1942
|
+
} else if (permissionChecker2.can.update(document)) {
|
1943
|
+
await updateDocument(ctx);
|
1944
|
+
}
|
1945
|
+
}
|
1878
1946
|
if (permissionChecker2.cannot.publish(document)) {
|
1879
1947
|
throw new strapiUtils.errors.ForbiddenError();
|
1880
1948
|
}
|
1881
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1882
1949
|
const publishResult = await documentManager2.publish(document.documentId, model, {
|
1883
1950
|
locale
|
1884
1951
|
// TODO: Allow setting creator fields on publish
|
@@ -1905,7 +1972,9 @@ const collectionTypes = {
|
|
1905
1972
|
}
|
1906
1973
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1907
1974
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1908
|
-
const { locale } = await getDocumentLocaleAndStatus(body, {
|
1975
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1976
|
+
allowMultipleLocales: true
|
1977
|
+
});
|
1909
1978
|
const entityPromises = documentIds.map(
|
1910
1979
|
(documentId) => documentManager2.findLocales(documentId, model, { populate, locale, isPublished: false })
|
1911
1980
|
);
|
@@ -1932,7 +2001,9 @@ const collectionTypes = {
|
|
1932
2001
|
if (permissionChecker2.cannot.unpublish()) {
|
1933
2002
|
return ctx.forbidden();
|
1934
2003
|
}
|
1935
|
-
const { locale } = await getDocumentLocaleAndStatus(body
|
2004
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
2005
|
+
allowMultipleLocales: true
|
2006
|
+
});
|
1936
2007
|
const entityPromises = documentIds.map(
|
1937
2008
|
(documentId) => documentManager2.findLocales(documentId, model, { locale, isPublished: true })
|
1938
2009
|
);
|
@@ -1965,7 +2036,7 @@ const collectionTypes = {
|
|
1965
2036
|
}
|
1966
2037
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
1967
2038
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1968
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2039
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1969
2040
|
const document = await documentManager2.findOne(id, model, {
|
1970
2041
|
populate,
|
1971
2042
|
locale,
|
@@ -2002,7 +2073,7 @@ const collectionTypes = {
|
|
2002
2073
|
}
|
2003
2074
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2004
2075
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2005
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2076
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2006
2077
|
const document = await documentManager2.findOne(id, model, {
|
2007
2078
|
populate,
|
2008
2079
|
locale,
|
@@ -2033,7 +2104,7 @@ const collectionTypes = {
|
|
2033
2104
|
}
|
2034
2105
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2035
2106
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2036
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2107
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2037
2108
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2038
2109
|
populate,
|
2039
2110
|
locale
|
@@ -2060,7 +2131,7 @@ const collectionTypes = {
|
|
2060
2131
|
}
|
2061
2132
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2062
2133
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2063
|
-
const { locale, status
|
2134
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2064
2135
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2065
2136
|
if (!entity) {
|
2066
2137
|
return ctx.notFound();
|
@@ -2083,7 +2154,7 @@ const collectionTypes = {
|
|
2083
2154
|
if (permissionChecker2.cannot.read()) {
|
2084
2155
|
return ctx.forbidden();
|
2085
2156
|
}
|
2086
|
-
const
|
2157
|
+
const documents = await documentManager2.findMany(
|
2087
2158
|
{
|
2088
2159
|
filters: {
|
2089
2160
|
documentId: ids
|
@@ -2092,7 +2163,7 @@ const collectionTypes = {
|
|
2092
2163
|
},
|
2093
2164
|
model
|
2094
2165
|
);
|
2095
|
-
if (!
|
2166
|
+
if (!documents) {
|
2096
2167
|
return ctx.notFound();
|
2097
2168
|
}
|
2098
2169
|
const number = await documentManager2.countManyEntriesDraftRelations(ids, model, locale);
|
@@ -2283,20 +2354,13 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2283
2354
|
userAbility,
|
2284
2355
|
model: model.uid
|
2285
2356
|
});
|
2286
|
-
|
2357
|
+
const isMainFieldListable = isListable(model, mainField);
|
2358
|
+
const canReadMainField = permissionChecker2.can.read(null, mainField);
|
2359
|
+
if (!isMainFieldListable || !canReadMainField) {
|
2287
2360
|
return "id";
|
2288
2361
|
}
|
2289
|
-
if (
|
2290
|
-
|
2291
|
-
const userPermissionChecker = getService$1("permission-checker").create({
|
2292
|
-
userAbility,
|
2293
|
-
model: "plugin::users-permissions.user"
|
2294
|
-
});
|
2295
|
-
if (userPermissionChecker.can.read()) {
|
2296
|
-
return "name";
|
2297
|
-
}
|
2298
|
-
}
|
2299
|
-
return "id";
|
2362
|
+
if (model.uid === "plugin::users-permissions.role") {
|
2363
|
+
return "name";
|
2300
2364
|
}
|
2301
2365
|
return mainField;
|
2302
2366
|
};
|
@@ -2329,11 +2393,8 @@ const validateLocale = (sourceUid, targetUid, locale) => {
|
|
2329
2393
|
const isLocalized = strapi.plugin("i18n").service("content-types").isLocalizedContentType;
|
2330
2394
|
const isSourceLocalized = isLocalized(sourceModel);
|
2331
2395
|
const isTargetLocalized = isLocalized(targetModel);
|
2332
|
-
let validatedLocale = locale;
|
2333
|
-
if (!targetModel || !isTargetLocalized)
|
2334
|
-
validatedLocale = void 0;
|
2335
2396
|
return {
|
2336
|
-
locale
|
2397
|
+
locale,
|
2337
2398
|
isSourceLocalized,
|
2338
2399
|
isTargetLocalized
|
2339
2400
|
};
|
@@ -2436,7 +2497,7 @@ const relations = {
|
|
2436
2497
|
attribute,
|
2437
2498
|
fieldsToSelect,
|
2438
2499
|
mainField,
|
2439
|
-
source: { schema: sourceSchema },
|
2500
|
+
source: { schema: sourceSchema, isLocalized: isSourceLocalized },
|
2440
2501
|
target: { schema: targetSchema, isLocalized: isTargetLocalized },
|
2441
2502
|
sourceSchema,
|
2442
2503
|
targetSchema,
|
@@ -2458,7 +2519,8 @@ const relations = {
|
|
2458
2519
|
fieldsToSelect,
|
2459
2520
|
mainField,
|
2460
2521
|
source: {
|
2461
|
-
schema: { uid: sourceUid, modelType: sourceModelType }
|
2522
|
+
schema: { uid: sourceUid, modelType: sourceModelType },
|
2523
|
+
isLocalized: isSourceLocalized
|
2462
2524
|
},
|
2463
2525
|
target: {
|
2464
2526
|
schema: { uid: targetUid },
|
@@ -2496,12 +2558,16 @@ const relations = {
|
|
2496
2558
|
} else {
|
2497
2559
|
where.id = id;
|
2498
2560
|
}
|
2499
|
-
|
2500
|
-
|
2561
|
+
const publishedAt = getPublishedAtClause(status, targetUid);
|
2562
|
+
if (!fp.isEmpty(publishedAt)) {
|
2563
|
+
where[`${alias}.published_at`] = publishedAt;
|
2501
2564
|
}
|
2502
|
-
if (
|
2565
|
+
if (isTargetLocalized && locale) {
|
2503
2566
|
where[`${alias}.locale`] = locale;
|
2504
2567
|
}
|
2568
|
+
if (isSourceLocalized && locale) {
|
2569
|
+
where.locale = locale;
|
2570
|
+
}
|
2505
2571
|
if ((idsToInclude?.length ?? 0) !== 0) {
|
2506
2572
|
where[`${alias}.id`].$notIn = idsToInclude;
|
2507
2573
|
}
|
@@ -2519,7 +2585,8 @@ const relations = {
|
|
2519
2585
|
id: { $notIn: fp.uniq(idsToOmit) }
|
2520
2586
|
});
|
2521
2587
|
}
|
2522
|
-
const
|
2588
|
+
const dbQuery = strapi.get("query-params").transform(targetUid, queryParams);
|
2589
|
+
const res = await strapi.db.query(targetUid).findPage(dbQuery);
|
2523
2590
|
ctx.body = {
|
2524
2591
|
...res,
|
2525
2592
|
results: await addStatusToRelations(targetUid, res.results)
|
@@ -2554,9 +2621,7 @@ const relations = {
|
|
2554
2621
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
2555
2622
|
const sanitizedRes = await loadRelations({ id: entryId }, targetField, {
|
2556
2623
|
...strapi.get("query-params").transform(targetUid, permissionQuery),
|
2557
|
-
ordering: "desc"
|
2558
|
-
page: ctx.request.query.page,
|
2559
|
-
pageSize: ctx.request.query.pageSize
|
2624
|
+
ordering: "desc"
|
2560
2625
|
});
|
2561
2626
|
const relationsUnion = fp.uniqBy("id", fp.concat(sanitizedRes.results, res.results));
|
2562
2627
|
ctx.body = {
|
@@ -2588,7 +2653,7 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2588
2653
|
throw new strapiUtils.errors.ForbiddenError();
|
2589
2654
|
}
|
2590
2655
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.update(query);
|
2591
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2656
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2592
2657
|
const [documentVersion, otherDocumentVersion] = await Promise.all([
|
2593
2658
|
findDocument(sanitizedQuery, model, { locale, status: "draft" }),
|
2594
2659
|
// Find the first document to check if it exists
|
@@ -2629,7 +2694,7 @@ const singleTypes = {
|
|
2629
2694
|
return ctx.forbidden();
|
2630
2695
|
}
|
2631
2696
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
2632
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
2697
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
2633
2698
|
const version = await findDocument(permissionQuery, model, { locale, status });
|
2634
2699
|
if (!version) {
|
2635
2700
|
if (permissionChecker2.cannot.create()) {
|
@@ -2643,7 +2708,7 @@ const singleTypes = {
|
|
2643
2708
|
permissionChecker2,
|
2644
2709
|
model,
|
2645
2710
|
// @ts-expect-error - fix types
|
2646
|
-
{
|
2711
|
+
{ documentId: document.documentId, locale, publishedAt: null },
|
2647
2712
|
{ availableLocales: true, availableStatus: false }
|
2648
2713
|
);
|
2649
2714
|
ctx.body = { data: {}, meta };
|
@@ -2674,7 +2739,7 @@ const singleTypes = {
|
|
2674
2739
|
}
|
2675
2740
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2676
2741
|
const populate = await buildPopulateFromQuery(sanitizedQuery, model);
|
2677
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2742
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2678
2743
|
const documentLocales = await documentManager2.findLocales(void 0, model, {
|
2679
2744
|
populate,
|
2680
2745
|
locale
|
@@ -2711,7 +2776,7 @@ const singleTypes = {
|
|
2711
2776
|
if (permissionChecker2.cannot.publish(document)) {
|
2712
2777
|
throw new strapiUtils.errors.ForbiddenError();
|
2713
2778
|
}
|
2714
|
-
const { locale } = await getDocumentLocaleAndStatus(document);
|
2779
|
+
const { locale } = await getDocumentLocaleAndStatus(document, model);
|
2715
2780
|
const publishResult = await documentManager2.publish(document.documentId, model, { locale });
|
2716
2781
|
return publishResult.at(0);
|
2717
2782
|
});
|
@@ -2734,7 +2799,7 @@ const singleTypes = {
|
|
2734
2799
|
return ctx.forbidden();
|
2735
2800
|
}
|
2736
2801
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.unpublish(query);
|
2737
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2802
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2738
2803
|
const document = await findDocument(sanitizedQuery, model, { locale });
|
2739
2804
|
if (!document) {
|
2740
2805
|
return ctx.notFound();
|
@@ -2766,7 +2831,7 @@ const singleTypes = {
|
|
2766
2831
|
return ctx.forbidden();
|
2767
2832
|
}
|
2768
2833
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.discard(query);
|
2769
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2834
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2770
2835
|
const document = await findDocument(sanitizedQuery, model, { locale, status: "published" });
|
2771
2836
|
if (!document) {
|
2772
2837
|
return ctx.notFound();
|
@@ -2786,7 +2851,7 @@ const singleTypes = {
|
|
2786
2851
|
const { query } = ctx.request;
|
2787
2852
|
const documentManager2 = getService$1("document-manager");
|
2788
2853
|
const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
|
2789
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2854
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2790
2855
|
if (permissionChecker2.cannot.read()) {
|
2791
2856
|
return ctx.forbidden();
|
2792
2857
|
}
|
@@ -2807,7 +2872,7 @@ const uid$1 = {
|
|
2807
2872
|
async generateUID(ctx) {
|
2808
2873
|
const { contentTypeUID, field, data } = await validateGenerateUIDInput(ctx.request.body);
|
2809
2874
|
const { query = {} } = ctx.request;
|
2810
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2875
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2811
2876
|
await validateUIDField(contentTypeUID, field);
|
2812
2877
|
const uidService = getService$1("uid");
|
2813
2878
|
ctx.body = {
|
@@ -2819,7 +2884,7 @@ const uid$1 = {
|
|
2819
2884
|
ctx.request.body
|
2820
2885
|
);
|
2821
2886
|
const { query = {} } = ctx.request;
|
2822
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2887
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2823
2888
|
await validateUIDField(contentTypeUID, field);
|
2824
2889
|
const uidService = getService$1("uid");
|
2825
2890
|
const isAvailable = await uidService.checkUIDAvailability({
|
@@ -3462,12 +3527,27 @@ const createPermissionChecker = (strapi2) => ({ userAbility, model }) => {
|
|
3462
3527
|
ability: userAbility,
|
3463
3528
|
model
|
3464
3529
|
});
|
3465
|
-
const
|
3530
|
+
const { actionProvider } = strapi2.service("admin::permission");
|
3531
|
+
const toSubject = (entity) => {
|
3532
|
+
return entity ? permissionsManager.toSubject(entity, model) : model;
|
3533
|
+
};
|
3466
3534
|
const can = (action, entity, field) => {
|
3467
|
-
|
3535
|
+
const subject = toSubject(entity);
|
3536
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3537
|
+
return (
|
3538
|
+
// Test the original action to see if it passes
|
3539
|
+
userAbility.can(action, subject, field) || // Else try every known alias if at least one of them succeed, then the user "can"
|
3540
|
+
aliases.some((alias) => userAbility.can(alias, subject, field))
|
3541
|
+
);
|
3468
3542
|
};
|
3469
3543
|
const cannot = (action, entity, field) => {
|
3470
|
-
|
3544
|
+
const subject = toSubject(entity);
|
3545
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3546
|
+
return (
|
3547
|
+
// Test both the original action
|
3548
|
+
userAbility.cannot(action, subject, field) && // and every known alias, if all of them fail (cannot), then the user truly "cannot"
|
3549
|
+
aliases.every((alias) => userAbility.cannot(alias, subject, field))
|
3550
|
+
);
|
3471
3551
|
};
|
3472
3552
|
const sanitizeOutput = (data, { action = ACTIONS.read } = {}) => {
|
3473
3553
|
return permissionsManager.sanitizeOutput(data, { subject: toSubject(data), action });
|
@@ -3744,6 +3824,10 @@ const getDeepPopulateDraftCount = (uid2) => {
|
|
3744
3824
|
const attribute = model.attributes[attributeName];
|
3745
3825
|
switch (attribute.type) {
|
3746
3826
|
case "relation": {
|
3827
|
+
const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
|
3828
|
+
if (isMorphRelation) {
|
3829
|
+
break;
|
3830
|
+
}
|
3747
3831
|
if (isVisibleAttribute$1(model, attributeName)) {
|
3748
3832
|
populateAcc[attributeName] = {
|
3749
3833
|
count: true,
|
@@ -4121,7 +4205,13 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4121
4205
|
*/
|
4122
4206
|
async formatDocumentWithMetadata(uid2, document, opts = {}) {
|
4123
4207
|
if (!document) {
|
4124
|
-
return
|
4208
|
+
return {
|
4209
|
+
data: document,
|
4210
|
+
meta: {
|
4211
|
+
availableLocales: [],
|
4212
|
+
availableStatus: []
|
4213
|
+
}
|
4214
|
+
};
|
4125
4215
|
}
|
4126
4216
|
const hasDraftAndPublish = strapiUtils.contentTypes.hasDraftAndPublish(strapi2.getModel(uid2));
|
4127
4217
|
if (!hasDraftAndPublish) {
|
@@ -4229,10 +4319,7 @@ const documentManager = ({ strapi: strapi2 }) => {
|
|
4229
4319
|
async clone(id, body, uid2) {
|
4230
4320
|
const populate = await buildDeepPopulate(uid2);
|
4231
4321
|
const params = {
|
4232
|
-
data:
|
4233
|
-
...omitIdField(body),
|
4234
|
-
[PUBLISHED_AT_ATTRIBUTE]: null
|
4235
|
-
},
|
4322
|
+
data: omitIdField(body),
|
4236
4323
|
populate
|
4237
4324
|
};
|
4238
4325
|
return strapi2.documents(uid2).clone({ ...params, documentId: id }).then((result) => result?.entries.at(0));
|