@strapi/content-manager 0.0.0-experimental.545ccead2ee1717bbc7ab950455dbb0ddb9924a3 → 0.0.0-experimental.55dabf6295dfb7987fcab8a6b40212555f0e684c
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-B1bIXVuX.mjs → ComponentConfigurationPage-DfFSZQxe.mjs} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-B1bIXVuX.mjs.map → ComponentConfigurationPage-DfFSZQxe.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-Bqgx7Mes.js → ComponentConfigurationPage-FqfsxQ1j.js} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-Bqgx7Mes.js.map → ComponentConfigurationPage-FqfsxQ1j.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-BFEwvdMW.js → EditConfigurationPage-Cn0e8t3I.js} +3 -3
- package/dist/_chunks/{EditConfigurationPage-BFEwvdMW.js.map → EditConfigurationPage-Cn0e8t3I.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-ZO0vOO8q.mjs → EditConfigurationPage-DdPNAbl3.mjs} +3 -3
- package/dist/_chunks/{EditConfigurationPage-ZO0vOO8q.mjs.map → EditConfigurationPage-DdPNAbl3.mjs.map} +1 -1
- package/dist/_chunks/{EditViewPage-DlLEyUL6.mjs → EditViewPage-B82x_x1b.mjs} +30 -9
- package/dist/_chunks/EditViewPage-B82x_x1b.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-DA95Ha6J.js → EditViewPage-DlxEHhUt.js} +30 -9
- package/dist/_chunks/EditViewPage-DlxEHhUt.js.map +1 -0
- package/dist/_chunks/{Field-CnK8dO8N.js → Field-COL25JiC.js} +179 -107
- package/dist/_chunks/Field-COL25JiC.js.map +1 -0
- package/dist/_chunks/{Field-Dq7bDnuh.mjs → Field-DufHXW17.mjs} +177 -105
- package/dist/_chunks/Field-DufHXW17.mjs.map +1 -0
- package/dist/_chunks/{Form-BpiR4piS.js → Form-BssUwrTO.js} +36 -17
- package/dist/_chunks/Form-BssUwrTO.js.map +1 -0
- package/dist/_chunks/{Form-B_JE0dbz.mjs → Form-u_kAOhwB.mjs} +36 -17
- package/dist/_chunks/Form-u_kAOhwB.mjs.map +1 -0
- package/dist/_chunks/{History-DdIstl8b.js → History-C9t9UqpO.js} +40 -17
- package/dist/_chunks/History-C9t9UqpO.js.map +1 -0
- package/dist/_chunks/{History-CBNGU7a-.mjs → History-DRwA3oMM.mjs} +41 -18
- package/dist/_chunks/History-DRwA3oMM.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DkKRparB.js → ListConfigurationPage-BXYPohh-.js} +14 -4
- package/dist/_chunks/ListConfigurationPage-BXYPohh-.js.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-5dr4qpue.mjs → ListConfigurationPage-BxfQJzPk.mjs} +14 -4
- package/dist/_chunks/ListConfigurationPage-BxfQJzPk.mjs.map +1 -0
- package/dist/_chunks/{ListViewPage-DecLrYV6.mjs → ListViewPage-CELx2ysp.mjs} +47 -38
- package/dist/_chunks/ListViewPage-CELx2ysp.mjs.map +1 -0
- package/dist/_chunks/{ListViewPage-wE0lXqoD.js → ListViewPage-D2VD8Szg.js} +49 -40
- package/dist/_chunks/ListViewPage-D2VD8Szg.js.map +1 -0
- package/dist/_chunks/{NoContentTypePage-DEKR6tf9.js → NoContentTypePage-BV9IjJSM.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-DEKR6tf9.js.map → NoContentTypePage-BV9IjJSM.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-CiIcfYsd.mjs → NoContentTypePage-DtJ9jcfk.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-CiIcfYsd.mjs.map → NoContentTypePage-DtJ9jcfk.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-CM5UD8ee.mjs → NoPermissionsPage-DWleVYK7.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-CM5UD8ee.mjs.map → NoPermissionsPage-DWleVYK7.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DmNfF2Bb.js → NoPermissionsPage-Dp8NpF9I.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DmNfF2Bb.js.map → NoPermissionsPage-Dp8NpF9I.js.map} +1 -1
- package/dist/_chunks/{Relations-Dqz0C1fz.mjs → Relations-BTcf5xaw.mjs} +33 -24
- package/dist/_chunks/Relations-BTcf5xaw.mjs.map +1 -0
- package/dist/_chunks/{Relations-L0xYRoSQ.js → Relations-DR7EUgyC.js} +33 -24
- package/dist/_chunks/Relations-DR7EUgyC.js.map +1 -0
- package/dist/_chunks/{en-uOUIxfcQ.js → en-Bm0D0IWz.js} +13 -12
- package/dist/_chunks/{en-uOUIxfcQ.js.map → en-Bm0D0IWz.js.map} +1 -1
- package/dist/_chunks/{en-BrCTWlZv.mjs → en-DKV44jRb.mjs} +13 -12
- package/dist/_chunks/{en-BrCTWlZv.mjs.map → en-DKV44jRb.mjs.map} +1 -1
- package/dist/_chunks/{index-DyvUPg1a.js → index-BdMf2lfT.js} +708 -526
- package/dist/_chunks/index-BdMf2lfT.js.map +1 -0
- package/dist/_chunks/{index-BSn97i8U.mjs → index-wnqzm4Q8.mjs} +728 -546
- package/dist/_chunks/index-wnqzm4Q8.mjs.map +1 -0
- package/dist/_chunks/{layout-DPaHUusj.mjs → layout-2CfjL0T9.mjs} +22 -9
- package/dist/_chunks/layout-2CfjL0T9.mjs.map +1 -0
- package/dist/_chunks/{layout-TPqF2oJ5.js → layout-B2MyZU-_.js} +21 -8
- package/dist/_chunks/layout-B2MyZU-_.js.map +1 -0
- package/dist/_chunks/{relations-BWYS9gkn.js → relations-BH7JJGGe.js} +2 -2
- package/dist/_chunks/{relations-BWYS9gkn.js.map → relations-BH7JJGGe.js.map} +1 -1
- package/dist/_chunks/{relations-Ck7-ecDT.mjs → relations-C0w0GcXi.mjs} +2 -2
- package/dist/_chunks/{relations-Ck7-ecDT.mjs.map → relations-C0w0GcXi.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/services/historyVersion.d.ts +1 -1
- package/dist/admin/src/hooks/useDocument.d.ts +32 -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 +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 +201 -118
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +202 -119
- 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-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/Relations-Dqz0C1fz.mjs.map +0 -1
- package/dist/_chunks/Relations-L0xYRoSQ.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.mjs
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1, traverseEntity, pagination } from "@strapi/utils";
|
2
|
-
import { pick, omit, difference, intersection, pipe, propOr, isEqual, isEmpty, set, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat,
|
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,9 +202,10 @@ 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,12 +215,12 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
212
215
|
}
|
213
216
|
const isVisible2 = contentTypes$1.isVisibleAttribute(model, attributeName);
|
214
217
|
if (isVisible2) {
|
215
|
-
acc[attributeName] = {
|
218
|
+
acc[attributeName] = { [fieldSelector]: ["documentId", "locale", "publishedAt"] };
|
216
219
|
}
|
217
220
|
break;
|
218
221
|
}
|
219
222
|
case "media": {
|
220
|
-
acc[attributeName] = {
|
223
|
+
acc[attributeName] = { [fieldSelector]: ["id"] };
|
221
224
|
break;
|
222
225
|
}
|
223
226
|
case "component": {
|
@@ -290,6 +293,7 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
290
293
|
getRelationRestoreValue,
|
291
294
|
getMediaRestoreValue,
|
292
295
|
getDefaultLocale,
|
296
|
+
isLocalizedContentType,
|
293
297
|
getLocaleDictionary,
|
294
298
|
getRetentionDays,
|
295
299
|
getVersionStatus,
|
@@ -312,7 +316,13 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
312
316
|
});
|
313
317
|
},
|
314
318
|
async findVersionsPage(params) {
|
315
|
-
const
|
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
|
+
}
|
316
326
|
const [{ results, pagination: pagination2 }, localeDictionary] = await Promise.all([
|
317
327
|
query.findPage({
|
318
328
|
...params.query,
|
@@ -357,7 +367,12 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
357
367
|
if (userToPopulate == null) {
|
358
368
|
return null;
|
359
369
|
}
|
360
|
-
return strapi2.query("admin::user").findOne({
|
370
|
+
return strapi2.query("admin::user").findOne({
|
371
|
+
where: {
|
372
|
+
...userToPopulate.id ? { id: userToPopulate.id } : {},
|
373
|
+
...userToPopulate.documentId ? { documentId: userToPopulate.documentId } : {}
|
374
|
+
}
|
375
|
+
});
|
361
376
|
})
|
362
377
|
);
|
363
378
|
return {
|
@@ -468,6 +483,42 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
468
483
|
}
|
469
484
|
};
|
470
485
|
};
|
486
|
+
const shouldCreateHistoryVersion = (context) => {
|
487
|
+
if (!strapi.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
488
|
+
return false;
|
489
|
+
}
|
490
|
+
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
491
|
+
return false;
|
492
|
+
}
|
493
|
+
if (context.action === "update" && strapi.requestContext.get()?.request.url.endsWith("/actions/publish")) {
|
494
|
+
return false;
|
495
|
+
}
|
496
|
+
if (!context.contentType.uid.startsWith("api::")) {
|
497
|
+
return false;
|
498
|
+
}
|
499
|
+
return true;
|
500
|
+
};
|
501
|
+
const getSchemas = (uid2) => {
|
502
|
+
const attributesSchema = strapi.getModel(uid2).attributes;
|
503
|
+
const componentsSchemas = Object.keys(attributesSchema).reduce(
|
504
|
+
(currentComponentSchemas, key) => {
|
505
|
+
const fieldSchema = attributesSchema[key];
|
506
|
+
if (fieldSchema.type === "component") {
|
507
|
+
const componentSchema = strapi.getModel(fieldSchema.component).attributes;
|
508
|
+
return {
|
509
|
+
...currentComponentSchemas,
|
510
|
+
[fieldSchema.component]: componentSchema
|
511
|
+
};
|
512
|
+
}
|
513
|
+
return currentComponentSchemas;
|
514
|
+
},
|
515
|
+
{}
|
516
|
+
);
|
517
|
+
return {
|
518
|
+
schema: omit(FIELDS_TO_IGNORE, attributesSchema),
|
519
|
+
componentsSchemas
|
520
|
+
};
|
521
|
+
};
|
471
522
|
const createLifecyclesService = ({ strapi: strapi2 }) => {
|
472
523
|
const state = {
|
473
524
|
deleteExpiredJob: null,
|
@@ -480,63 +531,45 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
480
531
|
return;
|
481
532
|
}
|
482
533
|
strapi2.documents.use(async (context, next) => {
|
483
|
-
if (!strapi2.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
484
|
-
return next();
|
485
|
-
}
|
486
|
-
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
487
|
-
return next();
|
488
|
-
}
|
489
|
-
if (context.action === "update" && strapi2.requestContext.get()?.request.url.endsWith("/actions/publish")) {
|
490
|
-
return next();
|
491
|
-
}
|
492
|
-
const contentTypeUid = context.contentType.uid;
|
493
|
-
if (!contentTypeUid.startsWith("api::")) {
|
494
|
-
return next();
|
495
|
-
}
|
496
534
|
const result = await next();
|
497
|
-
|
498
|
-
|
499
|
-
|
500
|
-
|
535
|
+
if (!shouldCreateHistoryVersion(context)) {
|
536
|
+
return result;
|
537
|
+
}
|
538
|
+
const documentId = context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId;
|
501
539
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
502
|
-
const
|
503
|
-
if (
|
504
|
-
|
505
|
-
"[Content manager history middleware]: An array of locales was provided, but only a single locale is supported for the findOne operation."
|
506
|
-
);
|
507
|
-
return next();
|
540
|
+
const locales = castArray(context.params?.locale || defaultLocale);
|
541
|
+
if (!locales.length) {
|
542
|
+
return result;
|
508
543
|
}
|
509
|
-
const
|
510
|
-
|
511
|
-
|
512
|
-
|
544
|
+
const uid2 = context.contentType.uid;
|
545
|
+
const schemas = getSchemas(uid2);
|
546
|
+
const model = strapi2.getModel(uid2);
|
547
|
+
const isLocalizedContentType = serviceUtils.isLocalizedContentType(model);
|
548
|
+
const localeEntries = await strapi2.db.query(uid2).findMany({
|
549
|
+
where: {
|
550
|
+
documentId,
|
551
|
+
...isLocalizedContentType ? { locale: { $in: locales } } : {},
|
552
|
+
...contentTypes$1.hasDraftAndPublish(strapi2.contentTypes[uid2]) ? { publishedAt: null } : {}
|
553
|
+
},
|
554
|
+
populate: serviceUtils.getDeepPopulate(
|
555
|
+
uid2,
|
556
|
+
true
|
557
|
+
/* use database syntax */
|
558
|
+
)
|
513
559
|
});
|
514
|
-
const status = await serviceUtils.getVersionStatus(contentTypeUid, document);
|
515
|
-
const attributesSchema = strapi2.getModel(contentTypeUid).attributes;
|
516
|
-
const componentsSchemas = Object.keys(
|
517
|
-
attributesSchema
|
518
|
-
).reduce((currentComponentSchemas, key) => {
|
519
|
-
const fieldSchema = attributesSchema[key];
|
520
|
-
if (fieldSchema.type === "component") {
|
521
|
-
const componentSchema = strapi2.getModel(fieldSchema.component).attributes;
|
522
|
-
return {
|
523
|
-
...currentComponentSchemas,
|
524
|
-
[fieldSchema.component]: componentSchema
|
525
|
-
};
|
526
|
-
}
|
527
|
-
return currentComponentSchemas;
|
528
|
-
}, {});
|
529
560
|
await strapi2.db.transaction(async ({ onCommit }) => {
|
530
|
-
onCommit(() => {
|
531
|
-
|
532
|
-
|
533
|
-
|
534
|
-
|
535
|
-
|
536
|
-
|
537
|
-
|
538
|
-
|
539
|
-
|
561
|
+
onCommit(async () => {
|
562
|
+
for (const entry of localeEntries) {
|
563
|
+
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
564
|
+
await getService(strapi2, "history").createVersion({
|
565
|
+
contentType: uid2,
|
566
|
+
data: omit(FIELDS_TO_IGNORE, entry),
|
567
|
+
relatedDocumentId: documentId,
|
568
|
+
locale: entry.locale,
|
569
|
+
status,
|
570
|
+
...schemas
|
571
|
+
});
|
572
|
+
}
|
540
573
|
});
|
541
574
|
});
|
542
575
|
return result;
|
@@ -1176,6 +1209,11 @@ const { createPolicy } = policy;
|
|
1176
1209
|
const hasPermissions = createPolicy({
|
1177
1210
|
name: "plugin::content-manager.hasPermissions",
|
1178
1211
|
validator: validateHasPermissionsInput,
|
1212
|
+
/**
|
1213
|
+
* NOTE: Action aliases are currently not checked at this level (policy).
|
1214
|
+
* This is currently the intended behavior to avoid changing the behavior of API related permissions.
|
1215
|
+
* If you want to add support for it, please create a dedicated RFC with a list of potential side effect this could have.
|
1216
|
+
*/
|
1179
1217
|
handler(ctx, config = {}) {
|
1180
1218
|
const { actions = [], hasAtLeastOne = false } = config;
|
1181
1219
|
const { userAbility } = ctx.state;
|
@@ -1569,9 +1607,11 @@ const multipleLocaleSchema = yup$1.lazy(
|
|
1569
1607
|
(value) => Array.isArray(value) ? yup$1.array().of(singleLocaleSchema.required()) : singleLocaleSchema
|
1570
1608
|
);
|
1571
1609
|
const statusSchema = yup$1.mixed().oneOf(["draft", "published"], "Invalid status");
|
1572
|
-
const getDocumentLocaleAndStatus = async (request, opts = { allowMultipleLocales: false }) => {
|
1610
|
+
const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultipleLocales: false }) => {
|
1573
1611
|
const { allowMultipleLocales } = opts;
|
1574
|
-
const { locale, status, ...rest } = request || {};
|
1612
|
+
const { locale, status: providedStatus, ...rest } = request || {};
|
1613
|
+
const defaultStatus = contentTypes$1.hasDraftAndPublish(strapi.getModel(model)) ? void 0 : "published";
|
1614
|
+
const status = providedStatus !== void 0 ? providedStatus : defaultStatus;
|
1575
1615
|
const schema = yup$1.object().shape({
|
1576
1616
|
locale: allowMultipleLocales ? multipleLocaleSchema : singleLocaleSchema,
|
1577
1617
|
status: statusSchema
|
@@ -1619,7 +1659,7 @@ const createDocument = async (ctx, opts) => {
|
|
1619
1659
|
const setCreator = setCreatorFields({ user });
|
1620
1660
|
const sanitizeFn = async.pipe(pickPermittedFields, setCreator);
|
1621
1661
|
const sanitizedBody = await sanitizeFn(body);
|
1622
|
-
const { locale, status
|
1662
|
+
const { locale, status } = await getDocumentLocaleAndStatus(body, model);
|
1623
1663
|
return documentManager2.create(model, {
|
1624
1664
|
data: sanitizedBody,
|
1625
1665
|
locale,
|
@@ -1638,7 +1678,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1638
1678
|
}
|
1639
1679
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1640
1680
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1641
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1681
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1642
1682
|
const [documentVersion, documentExists] = await Promise.all([
|
1643
1683
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
1644
1684
|
documentManager2.exists(model, id)
|
@@ -1654,7 +1694,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1654
1694
|
throw new errors.ForbiddenError();
|
1655
1695
|
}
|
1656
1696
|
const pickPermittedFields = documentVersion ? permissionChecker2.sanitizeUpdateInput(documentVersion) : permissionChecker2.sanitizeCreateInput;
|
1657
|
-
const setCreator = setCreatorFields({ user, isEdition: true });
|
1697
|
+
const setCreator = documentVersion ? setCreatorFields({ user, isEdition: true }) : setCreatorFields({ user });
|
1658
1698
|
const sanitizeFn = async.pipe(pickPermittedFields, setCreator);
|
1659
1699
|
const sanitizedBody = await sanitizeFn(body);
|
1660
1700
|
return documentManager2.update(documentVersion?.documentId || id, model, {
|
@@ -1676,7 +1716,7 @@ const collectionTypes = {
|
|
1676
1716
|
}
|
1677
1717
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1678
1718
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1679
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
1719
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1680
1720
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1681
1721
|
{ ...permissionQuery, populate, locale, status },
|
1682
1722
|
model
|
@@ -1711,7 +1751,7 @@ const collectionTypes = {
|
|
1711
1751
|
}
|
1712
1752
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1713
1753
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1714
|
-
const { locale, status
|
1754
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1715
1755
|
const version = await documentManager2.findOne(id, model, {
|
1716
1756
|
populate,
|
1717
1757
|
locale,
|
@@ -1726,7 +1766,7 @@ const collectionTypes = {
|
|
1726
1766
|
permissionChecker2,
|
1727
1767
|
model,
|
1728
1768
|
// @ts-expect-error TODO: fix
|
1729
|
-
{ id, locale, publishedAt: null },
|
1769
|
+
{ documentId: id, locale, publishedAt: null },
|
1730
1770
|
{ availableLocales: true, availableStatus: false }
|
1731
1771
|
);
|
1732
1772
|
ctx.body = { data: {}, meta };
|
@@ -1778,7 +1818,7 @@ const collectionTypes = {
|
|
1778
1818
|
}
|
1779
1819
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1780
1820
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1781
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1821
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1782
1822
|
const document = await documentManager2.findOne(id, model, {
|
1783
1823
|
populate,
|
1784
1824
|
locale,
|
@@ -1823,7 +1863,7 @@ const collectionTypes = {
|
|
1823
1863
|
}
|
1824
1864
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1825
1865
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1826
|
-
const { locale } = await getDocumentLocaleAndStatus(ctx.query);
|
1866
|
+
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1827
1867
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1828
1868
|
if (documentLocales.length === 0) {
|
1829
1869
|
return ctx.notFound();
|
@@ -1852,11 +1892,34 @@ const collectionTypes = {
|
|
1852
1892
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1853
1893
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1854
1894
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1855
|
-
|
1895
|
+
let document;
|
1896
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1897
|
+
const isCreate = isNil$1(id);
|
1898
|
+
if (isCreate) {
|
1899
|
+
if (permissionChecker2.cannot.create()) {
|
1900
|
+
throw new errors.ForbiddenError();
|
1901
|
+
}
|
1902
|
+
document = await createDocument(ctx, { populate });
|
1903
|
+
}
|
1904
|
+
const isUpdate = !isCreate;
|
1905
|
+
if (isUpdate) {
|
1906
|
+
const documentExists = documentManager2.exists(model, id);
|
1907
|
+
if (!documentExists) {
|
1908
|
+
throw new errors.NotFoundError("Document not found");
|
1909
|
+
}
|
1910
|
+
document = await documentManager2.findOne(id, model, { populate, locale });
|
1911
|
+
if (!document) {
|
1912
|
+
if (permissionChecker2.cannot.create({ locale }) || permissionChecker2.cannot.publish({ locale })) {
|
1913
|
+
throw new errors.ForbiddenError();
|
1914
|
+
}
|
1915
|
+
document = await updateDocument(ctx);
|
1916
|
+
} else if (permissionChecker2.can.update(document)) {
|
1917
|
+
await updateDocument(ctx);
|
1918
|
+
}
|
1919
|
+
}
|
1856
1920
|
if (permissionChecker2.cannot.publish(document)) {
|
1857
1921
|
throw new errors.ForbiddenError();
|
1858
1922
|
}
|
1859
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1860
1923
|
const publishResult = await documentManager2.publish(document.documentId, model, {
|
1861
1924
|
locale
|
1862
1925
|
// TODO: Allow setting creator fields on publish
|
@@ -1883,7 +1946,9 @@ const collectionTypes = {
|
|
1883
1946
|
}
|
1884
1947
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1885
1948
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1886
|
-
const { locale } = await getDocumentLocaleAndStatus(body, {
|
1949
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1950
|
+
allowMultipleLocales: true
|
1951
|
+
});
|
1887
1952
|
const entityPromises = documentIds.map(
|
1888
1953
|
(documentId) => documentManager2.findLocales(documentId, model, { populate, locale, isPublished: false })
|
1889
1954
|
);
|
@@ -1910,7 +1975,9 @@ const collectionTypes = {
|
|
1910
1975
|
if (permissionChecker2.cannot.unpublish()) {
|
1911
1976
|
return ctx.forbidden();
|
1912
1977
|
}
|
1913
|
-
const { locale } = await getDocumentLocaleAndStatus(body
|
1978
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1979
|
+
allowMultipleLocales: true
|
1980
|
+
});
|
1914
1981
|
const entityPromises = documentIds.map(
|
1915
1982
|
(documentId) => documentManager2.findLocales(documentId, model, { locale, isPublished: true })
|
1916
1983
|
);
|
@@ -1943,7 +2010,7 @@ const collectionTypes = {
|
|
1943
2010
|
}
|
1944
2011
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
1945
2012
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1946
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2013
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1947
2014
|
const document = await documentManager2.findOne(id, model, {
|
1948
2015
|
populate,
|
1949
2016
|
locale,
|
@@ -1980,7 +2047,7 @@ const collectionTypes = {
|
|
1980
2047
|
}
|
1981
2048
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
1982
2049
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1983
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2050
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1984
2051
|
const document = await documentManager2.findOne(id, model, {
|
1985
2052
|
populate,
|
1986
2053
|
locale,
|
@@ -2011,7 +2078,7 @@ const collectionTypes = {
|
|
2011
2078
|
}
|
2012
2079
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2013
2080
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2014
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2081
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2015
2082
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2016
2083
|
populate,
|
2017
2084
|
locale
|
@@ -2038,7 +2105,7 @@ const collectionTypes = {
|
|
2038
2105
|
}
|
2039
2106
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2040
2107
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2041
|
-
const { locale, status
|
2108
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2042
2109
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2043
2110
|
if (!entity) {
|
2044
2111
|
return ctx.notFound();
|
@@ -2261,20 +2328,13 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2261
2328
|
userAbility,
|
2262
2329
|
model: model.uid
|
2263
2330
|
});
|
2264
|
-
|
2331
|
+
const isMainFieldListable = isListable(model, mainField);
|
2332
|
+
const canReadMainField = permissionChecker2.can.read(null, mainField);
|
2333
|
+
if (!isMainFieldListable || !canReadMainField) {
|
2265
2334
|
return "id";
|
2266
2335
|
}
|
2267
|
-
if (
|
2268
|
-
|
2269
|
-
const userPermissionChecker = getService$1("permission-checker").create({
|
2270
|
-
userAbility,
|
2271
|
-
model: "plugin::users-permissions.user"
|
2272
|
-
});
|
2273
|
-
if (userPermissionChecker.can.read()) {
|
2274
|
-
return "name";
|
2275
|
-
}
|
2276
|
-
}
|
2277
|
-
return "id";
|
2336
|
+
if (model.uid === "plugin::users-permissions.role") {
|
2337
|
+
return "name";
|
2278
2338
|
}
|
2279
2339
|
return mainField;
|
2280
2340
|
};
|
@@ -2307,11 +2367,8 @@ const validateLocale = (sourceUid, targetUid, locale) => {
|
|
2307
2367
|
const isLocalized = strapi.plugin("i18n").service("content-types").isLocalizedContentType;
|
2308
2368
|
const isSourceLocalized = isLocalized(sourceModel);
|
2309
2369
|
const isTargetLocalized = isLocalized(targetModel);
|
2310
|
-
let validatedLocale = locale;
|
2311
|
-
if (!targetModel || !isTargetLocalized)
|
2312
|
-
validatedLocale = void 0;
|
2313
2370
|
return {
|
2314
|
-
locale
|
2371
|
+
locale,
|
2315
2372
|
isSourceLocalized,
|
2316
2373
|
isTargetLocalized
|
2317
2374
|
};
|
@@ -2414,7 +2471,7 @@ const relations = {
|
|
2414
2471
|
attribute,
|
2415
2472
|
fieldsToSelect,
|
2416
2473
|
mainField,
|
2417
|
-
source: { schema: sourceSchema },
|
2474
|
+
source: { schema: sourceSchema, isLocalized: isSourceLocalized },
|
2418
2475
|
target: { schema: targetSchema, isLocalized: isTargetLocalized },
|
2419
2476
|
sourceSchema,
|
2420
2477
|
targetSchema,
|
@@ -2436,7 +2493,8 @@ const relations = {
|
|
2436
2493
|
fieldsToSelect,
|
2437
2494
|
mainField,
|
2438
2495
|
source: {
|
2439
|
-
schema: { uid: sourceUid, modelType: sourceModelType }
|
2496
|
+
schema: { uid: sourceUid, modelType: sourceModelType },
|
2497
|
+
isLocalized: isSourceLocalized
|
2440
2498
|
},
|
2441
2499
|
target: {
|
2442
2500
|
schema: { uid: targetUid },
|
@@ -2474,12 +2532,16 @@ const relations = {
|
|
2474
2532
|
} else {
|
2475
2533
|
where.id = id;
|
2476
2534
|
}
|
2477
|
-
|
2478
|
-
|
2535
|
+
const publishedAt = getPublishedAtClause(status, targetUid);
|
2536
|
+
if (!isEmpty(publishedAt)) {
|
2537
|
+
where[`${alias}.published_at`] = publishedAt;
|
2479
2538
|
}
|
2480
|
-
if (
|
2539
|
+
if (isTargetLocalized && locale) {
|
2481
2540
|
where[`${alias}.locale`] = locale;
|
2482
2541
|
}
|
2542
|
+
if (isSourceLocalized && locale) {
|
2543
|
+
where.locale = locale;
|
2544
|
+
}
|
2483
2545
|
if ((idsToInclude?.length ?? 0) !== 0) {
|
2484
2546
|
where[`${alias}.id`].$notIn = idsToInclude;
|
2485
2547
|
}
|
@@ -2497,7 +2559,8 @@ const relations = {
|
|
2497
2559
|
id: { $notIn: uniq(idsToOmit) }
|
2498
2560
|
});
|
2499
2561
|
}
|
2500
|
-
const
|
2562
|
+
const dbQuery = strapi.get("query-params").transform(targetUid, queryParams);
|
2563
|
+
const res = await strapi.db.query(targetUid).findPage(dbQuery);
|
2501
2564
|
ctx.body = {
|
2502
2565
|
...res,
|
2503
2566
|
results: await addStatusToRelations(targetUid, res.results)
|
@@ -2532,9 +2595,7 @@ const relations = {
|
|
2532
2595
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
2533
2596
|
const sanitizedRes = await loadRelations({ id: entryId }, targetField, {
|
2534
2597
|
...strapi.get("query-params").transform(targetUid, permissionQuery),
|
2535
|
-
ordering: "desc"
|
2536
|
-
page: ctx.request.query.page,
|
2537
|
-
pageSize: ctx.request.query.pageSize
|
2598
|
+
ordering: "desc"
|
2538
2599
|
});
|
2539
2600
|
const relationsUnion = uniqBy("id", concat(sanitizedRes.results, res.results));
|
2540
2601
|
ctx.body = {
|
@@ -2566,7 +2627,7 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2566
2627
|
throw new errors.ForbiddenError();
|
2567
2628
|
}
|
2568
2629
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.update(query);
|
2569
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2630
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2570
2631
|
const [documentVersion, otherDocumentVersion] = await Promise.all([
|
2571
2632
|
findDocument(sanitizedQuery, model, { locale, status: "draft" }),
|
2572
2633
|
// Find the first document to check if it exists
|
@@ -2607,7 +2668,7 @@ const singleTypes = {
|
|
2607
2668
|
return ctx.forbidden();
|
2608
2669
|
}
|
2609
2670
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
2610
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
2671
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
2611
2672
|
const version = await findDocument(permissionQuery, model, { locale, status });
|
2612
2673
|
if (!version) {
|
2613
2674
|
if (permissionChecker2.cannot.create()) {
|
@@ -2621,7 +2682,7 @@ const singleTypes = {
|
|
2621
2682
|
permissionChecker2,
|
2622
2683
|
model,
|
2623
2684
|
// @ts-expect-error - fix types
|
2624
|
-
{
|
2685
|
+
{ documentId: document.documentId, locale, publishedAt: null },
|
2625
2686
|
{ availableLocales: true, availableStatus: false }
|
2626
2687
|
);
|
2627
2688
|
ctx.body = { data: {}, meta };
|
@@ -2652,7 +2713,7 @@ const singleTypes = {
|
|
2652
2713
|
}
|
2653
2714
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2654
2715
|
const populate = await buildPopulateFromQuery(sanitizedQuery, model);
|
2655
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2716
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2656
2717
|
const documentLocales = await documentManager2.findLocales(void 0, model, {
|
2657
2718
|
populate,
|
2658
2719
|
locale
|
@@ -2689,7 +2750,7 @@ const singleTypes = {
|
|
2689
2750
|
if (permissionChecker2.cannot.publish(document)) {
|
2690
2751
|
throw new errors.ForbiddenError();
|
2691
2752
|
}
|
2692
|
-
const { locale } = await getDocumentLocaleAndStatus(document);
|
2753
|
+
const { locale } = await getDocumentLocaleAndStatus(document, model);
|
2693
2754
|
const publishResult = await documentManager2.publish(document.documentId, model, { locale });
|
2694
2755
|
return publishResult.at(0);
|
2695
2756
|
});
|
@@ -2712,7 +2773,7 @@ const singleTypes = {
|
|
2712
2773
|
return ctx.forbidden();
|
2713
2774
|
}
|
2714
2775
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.unpublish(query);
|
2715
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2776
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2716
2777
|
const document = await findDocument(sanitizedQuery, model, { locale });
|
2717
2778
|
if (!document) {
|
2718
2779
|
return ctx.notFound();
|
@@ -2744,7 +2805,7 @@ const singleTypes = {
|
|
2744
2805
|
return ctx.forbidden();
|
2745
2806
|
}
|
2746
2807
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.discard(query);
|
2747
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2808
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2748
2809
|
const document = await findDocument(sanitizedQuery, model, { locale, status: "published" });
|
2749
2810
|
if (!document) {
|
2750
2811
|
return ctx.notFound();
|
@@ -2764,7 +2825,7 @@ const singleTypes = {
|
|
2764
2825
|
const { query } = ctx.request;
|
2765
2826
|
const documentManager2 = getService$1("document-manager");
|
2766
2827
|
const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
|
2767
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2828
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2768
2829
|
if (permissionChecker2.cannot.read()) {
|
2769
2830
|
return ctx.forbidden();
|
2770
2831
|
}
|
@@ -2785,7 +2846,7 @@ const uid$1 = {
|
|
2785
2846
|
async generateUID(ctx) {
|
2786
2847
|
const { contentTypeUID, field, data } = await validateGenerateUIDInput(ctx.request.body);
|
2787
2848
|
const { query = {} } = ctx.request;
|
2788
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2849
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2789
2850
|
await validateUIDField(contentTypeUID, field);
|
2790
2851
|
const uidService = getService$1("uid");
|
2791
2852
|
ctx.body = {
|
@@ -2797,7 +2858,7 @@ const uid$1 = {
|
|
2797
2858
|
ctx.request.body
|
2798
2859
|
);
|
2799
2860
|
const { query = {} } = ctx.request;
|
2800
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2861
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2801
2862
|
await validateUIDField(contentTypeUID, field);
|
2802
2863
|
const uidService = getService$1("uid");
|
2803
2864
|
const isAvailable = await uidService.checkUIDAvailability({
|
@@ -3440,12 +3501,27 @@ const createPermissionChecker = (strapi2) => ({ userAbility, model }) => {
|
|
3440
3501
|
ability: userAbility,
|
3441
3502
|
model
|
3442
3503
|
});
|
3443
|
-
const
|
3504
|
+
const { actionProvider } = strapi2.service("admin::permission");
|
3505
|
+
const toSubject = (entity) => {
|
3506
|
+
return entity ? permissionsManager.toSubject(entity, model) : model;
|
3507
|
+
};
|
3444
3508
|
const can = (action, entity, field) => {
|
3445
|
-
|
3509
|
+
const subject = toSubject(entity);
|
3510
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3511
|
+
return (
|
3512
|
+
// Test the original action to see if it passes
|
3513
|
+
userAbility.can(action, subject, field) || // Else try every known alias if at least one of them succeed, then the user "can"
|
3514
|
+
aliases.some((alias) => userAbility.can(alias, subject, field))
|
3515
|
+
);
|
3446
3516
|
};
|
3447
3517
|
const cannot = (action, entity, field) => {
|
3448
|
-
|
3518
|
+
const subject = toSubject(entity);
|
3519
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3520
|
+
return (
|
3521
|
+
// Test both the original action
|
3522
|
+
userAbility.cannot(action, subject, field) && // and every known alias, if all of them fail (cannot), then the user truly "cannot"
|
3523
|
+
aliases.every((alias) => userAbility.cannot(alias, subject, field))
|
3524
|
+
);
|
3449
3525
|
};
|
3450
3526
|
const sanitizeOutput = (data, { action = ACTIONS.read } = {}) => {
|
3451
3527
|
return permissionsManager.sanitizeOutput(data, { subject: toSubject(data), action });
|
@@ -3722,6 +3798,10 @@ const getDeepPopulateDraftCount = (uid2) => {
|
|
3722
3798
|
const attribute = model.attributes[attributeName];
|
3723
3799
|
switch (attribute.type) {
|
3724
3800
|
case "relation": {
|
3801
|
+
const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
|
3802
|
+
if (isMorphRelation) {
|
3803
|
+
break;
|
3804
|
+
}
|
3725
3805
|
if (isVisibleAttribute$1(model, attributeName)) {
|
3726
3806
|
populateAcc[attributeName] = {
|
3727
3807
|
count: true,
|
@@ -4099,7 +4179,13 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4099
4179
|
*/
|
4100
4180
|
async formatDocumentWithMetadata(uid2, document, opts = {}) {
|
4101
4181
|
if (!document) {
|
4102
|
-
return
|
4182
|
+
return {
|
4183
|
+
data: document,
|
4184
|
+
meta: {
|
4185
|
+
availableLocales: [],
|
4186
|
+
availableStatus: []
|
4187
|
+
}
|
4188
|
+
};
|
4103
4189
|
}
|
4104
4190
|
const hasDraftAndPublish = contentTypes$1.hasDraftAndPublish(strapi2.getModel(uid2));
|
4105
4191
|
if (!hasDraftAndPublish) {
|
@@ -4207,10 +4293,7 @@ const documentManager = ({ strapi: strapi2 }) => {
|
|
4207
4293
|
async clone(id, body, uid2) {
|
4208
4294
|
const populate = await buildDeepPopulate(uid2);
|
4209
4295
|
const params = {
|
4210
|
-
data:
|
4211
|
-
...omitIdField(body),
|
4212
|
-
[PUBLISHED_AT_ATTRIBUTE]: null
|
4213
|
-
},
|
4296
|
+
data: omitIdField(body),
|
4214
4297
|
populate
|
4215
4298
|
};
|
4216
4299
|
return strapi2.documents(uid2).clone({ ...params, documentId: id }).then((result) => result?.entries.at(0));
|