@strapi/content-manager 0.0.0-experimental.826f263c58b6886b849d3f03b81f7a530bc51c91 → 0.0.0-experimental.86fea32ae4240d73f76516d7238e302b6b927e88
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-CR5XdR33.mjs → ComponentConfigurationPage-B2g3icXu.mjs} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-CR5XdR33.mjs.map → ComponentConfigurationPage-B2g3icXu.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-DJcn1DrO.js → ComponentConfigurationPage-CzDn8Uxh.js} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-DJcn1DrO.js.map → ComponentConfigurationPage-CzDn8Uxh.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-tDtWj7R2.js → EditConfigurationPage-Bcbi6r5y.js} +3 -3
- package/dist/_chunks/{EditConfigurationPage-tDtWj7R2.js.map → EditConfigurationPage-Bcbi6r5y.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-DmCIb4kD.mjs → EditConfigurationPage-DSA1zONV.mjs} +3 -3
- package/dist/_chunks/{EditConfigurationPage-DmCIb4kD.mjs.map → EditConfigurationPage-DSA1zONV.mjs.map} +1 -1
- package/dist/_chunks/{EditViewPage-CoQEnFlC.js → EditViewPage-BvcMXaP2.js} +68 -47
- package/dist/_chunks/EditViewPage-BvcMXaP2.js.map +1 -0
- package/dist/_chunks/{EditViewPage-DvaV7U9b.mjs → EditViewPage-Ca2EmJpb.mjs} +69 -48
- package/dist/_chunks/EditViewPage-Ca2EmJpb.mjs.map +1 -0
- package/dist/_chunks/{Field-Cz_J9551.mjs → Field-BEYkgCZ0.mjs} +579 -227
- package/dist/_chunks/Field-BEYkgCZ0.mjs.map +1 -0
- package/dist/_chunks/{Field-ZdrmmQ4Y.js → Field-CmaWxdpf.js} +581 -229
- package/dist/_chunks/Field-CmaWxdpf.js.map +1 -0
- package/dist/_chunks/{Form-Dxmihyw8.mjs → Form-BJVbU6w4.mjs} +54 -36
- package/dist/_chunks/Form-BJVbU6w4.mjs.map +1 -0
- package/dist/_chunks/{Form-Bpig5rch.js → Form-DAUpPBVM.js} +52 -34
- package/dist/_chunks/Form-DAUpPBVM.js.map +1 -0
- package/dist/_chunks/{History-BfX6XmZK.js → History-Bw9vfT1k.js} +157 -40
- package/dist/_chunks/History-Bw9vfT1k.js.map +1 -0
- package/dist/_chunks/{History-BZP8n7KT.mjs → History-M6Pk9CoY.mjs} +158 -41
- package/dist/_chunks/History-M6Pk9CoY.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DxKuVkKz.mjs → ListConfigurationPage-D7ior2zq.mjs} +58 -48
- package/dist/_chunks/ListConfigurationPage-D7ior2zq.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-B3CXj8PY.js → ListConfigurationPage-DBVqF5fc.js} +57 -46
- package/dist/_chunks/ListConfigurationPage-DBVqF5fc.js.map +1 -0
- package/dist/_chunks/{ListViewPage-D5D3tVPq.mjs → ListViewPage-BH37wONY.mjs} +103 -102
- package/dist/_chunks/ListViewPage-BH37wONY.mjs.map +1 -0
- package/dist/_chunks/{ListViewPage-Bk9VO__I.js → ListViewPage-MZu-8OKX.js} +105 -104
- package/dist/_chunks/ListViewPage-MZu-8OKX.js.map +1 -0
- package/dist/_chunks/{NoContentTypePage-DsB2F7Z1.js → NoContentTypePage-C9lRMTCa.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-DsB2F7Z1.js.map → NoContentTypePage-C9lRMTCa.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-DnMeuQCj.mjs → NoContentTypePage-DRp7Aem_.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-DnMeuQCj.mjs.map → NoContentTypePage-DRp7Aem_.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-BQDM64_b.js → NoPermissionsPage-COs61PpB.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-BQDM64_b.js.map → NoPermissionsPage-COs61PpB.js.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-OyoME_Tf.mjs → NoPermissionsPage-CzhRt5CA.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-OyoME_Tf.mjs.map → NoPermissionsPage-CzhRt5CA.mjs.map} +1 -1
- package/dist/_chunks/{Relations-BOYZmuWy.mjs → Relations-68XxIzPI.mjs} +50 -29
- package/dist/_chunks/Relations-68XxIzPI.mjs.map +1 -0
- package/dist/_chunks/{Relations-B6B3A3mb.js → Relations-CsGlulU_.js} +50 -29
- package/dist/_chunks/Relations-CsGlulU_.js.map +1 -0
- package/dist/_chunks/{en-BN1bvFK7.js → en-Bm0D0IWz.js} +20 -15
- package/dist/_chunks/{en-BN1bvFK7.js.map → en-Bm0D0IWz.js.map} +1 -1
- package/dist/_chunks/{en-Dzv55oQw.mjs → en-DKV44jRb.mjs} +20 -15
- package/dist/_chunks/{en-Dzv55oQw.mjs.map → en-DKV44jRb.mjs.map} +1 -1
- package/dist/_chunks/{index-VHviNMeW.mjs → index-CsfwpRfc.mjs} +1078 -895
- package/dist/_chunks/index-CsfwpRfc.mjs.map +1 -0
- package/dist/_chunks/{index-DzN3kBgx.js → index-oDq3VO9j.js} +1047 -863
- package/dist/_chunks/index-oDq3VO9j.js.map +1 -0
- package/dist/_chunks/{layout-CPn1PM6x.mjs → layout-C5uSVTqi.mjs} +41 -23
- package/dist/_chunks/layout-C5uSVTqi.mjs.map +1 -0
- package/dist/_chunks/{layout-b91XRlD2.js → layout-Euka-kfv.js} +39 -21
- package/dist/_chunks/layout-Euka-kfv.js.map +1 -0
- package/dist/_chunks/{relations-BsqxS6tR.mjs → relations-BpHVgFuV.mjs} +2 -2
- package/dist/_chunks/{relations-BsqxS6tR.mjs.map → relations-BpHVgFuV.mjs.map} +1 -1
- package/dist/_chunks/{relations-CA7IYmcP.js → relations-DG7kmxa0.js} +2 -2
- package/dist/_chunks/{relations-CA7IYmcP.js.map → relations-DG7kmxa0.js.map} +1 -1
- package/dist/_chunks/{usePrev-B9w_-eYc.js → useDebounce-CtcjDB3L.js} +14 -1
- package/dist/_chunks/useDebounce-CtcjDB3L.js.map +1 -0
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs +29 -0
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs.map +1 -0
- package/dist/admin/index.js +2 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +7 -6
- package/dist/admin/src/exports.d.ts +1 -1
- package/dist/admin/src/history/components/VersionInputRenderer.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 +8 -3
- package/dist/admin/src/pages/EditView/components/FormInputs/BlocksInput/utils/constants.d.ts +4 -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 +6 -58
- package/dist/admin/src/pages/EditView/components/Header.d.ts +11 -11
- package/dist/admin/src/pages/ListView/components/BulkActions/Actions.d.ts +3 -30
- package/dist/admin/src/pages/ListView/components/BulkActions/ConfirmBulkActionDialog.d.ts +2 -2
- 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 +214 -121
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +215 -122
- 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-CoQEnFlC.js.map +0 -1
- package/dist/_chunks/EditViewPage-DvaV7U9b.mjs.map +0 -1
- package/dist/_chunks/Field-Cz_J9551.mjs.map +0 -1
- package/dist/_chunks/Field-ZdrmmQ4Y.js.map +0 -1
- package/dist/_chunks/Form-Bpig5rch.js.map +0 -1
- package/dist/_chunks/Form-Dxmihyw8.mjs.map +0 -1
- package/dist/_chunks/History-BZP8n7KT.mjs.map +0 -1
- package/dist/_chunks/History-BfX6XmZK.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-B3CXj8PY.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-DxKuVkKz.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-Bk9VO__I.js.map +0 -1
- package/dist/_chunks/ListViewPage-D5D3tVPq.mjs.map +0 -1
- package/dist/_chunks/Relations-B6B3A3mb.js.map +0 -1
- package/dist/_chunks/Relations-BOYZmuWy.mjs.map +0 -1
- package/dist/_chunks/index-DzN3kBgx.js.map +0 -1
- package/dist/_chunks/index-VHviNMeW.mjs.map +0 -1
- package/dist/_chunks/layout-CPn1PM6x.mjs.map +0 -1
- package/dist/_chunks/layout-b91XRlD2.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,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] = {
|
218
|
+
acc[attributeName] = { [fieldSelector]: ["documentId", "locale", "publishedAt"] };
|
212
219
|
}
|
213
220
|
break;
|
214
221
|
}
|
215
222
|
case "media": {
|
216
|
-
acc[attributeName] = {
|
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
|
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,
|
@@ -353,7 +367,12 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
353
367
|
if (userToPopulate == null) {
|
354
368
|
return null;
|
355
369
|
}
|
356
|
-
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
|
+
});
|
357
376
|
})
|
358
377
|
);
|
359
378
|
return {
|
@@ -464,13 +483,47 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
464
483
|
}
|
465
484
|
};
|
466
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
|
+
};
|
467
522
|
const createLifecyclesService = ({ strapi: strapi2 }) => {
|
468
523
|
const state = {
|
469
524
|
deleteExpiredJob: null,
|
470
525
|
isInitialized: false
|
471
526
|
};
|
472
|
-
const query = strapi2.db.query(HISTORY_VERSION_UID);
|
473
|
-
const historyService = getService(strapi2, "history");
|
474
527
|
const serviceUtils = createServiceUtils({ strapi: strapi2 });
|
475
528
|
return {
|
476
529
|
async bootstrap() {
|
@@ -478,60 +531,45 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
478
531
|
return;
|
479
532
|
}
|
480
533
|
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
|
-
const contentTypeUid = context.contentType.uid;
|
488
|
-
if (!contentTypeUid.startsWith("api::")) {
|
489
|
-
return next();
|
490
|
-
}
|
491
534
|
const result = await next();
|
492
|
-
|
493
|
-
|
494
|
-
|
495
|
-
|
535
|
+
if (!shouldCreateHistoryVersion(context)) {
|
536
|
+
return result;
|
537
|
+
}
|
538
|
+
const documentId = context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId;
|
496
539
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
497
|
-
const
|
498
|
-
if (
|
499
|
-
|
500
|
-
"[Content manager history middleware]: An array of locales was provided, but only a single locale is supported for the findOne operation."
|
501
|
-
);
|
502
|
-
return next();
|
540
|
+
const locales = castArray(context.params?.locale || defaultLocale);
|
541
|
+
if (!locales.length) {
|
542
|
+
return result;
|
503
543
|
}
|
504
|
-
const
|
505
|
-
|
506
|
-
|
507
|
-
|
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
|
+
)
|
508
559
|
});
|
509
|
-
const status = await serviceUtils.getVersionStatus(contentTypeUid, document);
|
510
|
-
const attributesSchema = strapi2.getModel(contentTypeUid).attributes;
|
511
|
-
const componentsSchemas = Object.keys(
|
512
|
-
attributesSchema
|
513
|
-
).reduce((currentComponentSchemas, key) => {
|
514
|
-
const fieldSchema = attributesSchema[key];
|
515
|
-
if (fieldSchema.type === "component") {
|
516
|
-
const componentSchema = strapi2.getModel(fieldSchema.component).attributes;
|
517
|
-
return {
|
518
|
-
...currentComponentSchemas,
|
519
|
-
[fieldSchema.component]: componentSchema
|
520
|
-
};
|
521
|
-
}
|
522
|
-
return currentComponentSchemas;
|
523
|
-
}, {});
|
524
560
|
await strapi2.db.transaction(async ({ onCommit }) => {
|
525
|
-
onCommit(() => {
|
526
|
-
|
527
|
-
|
528
|
-
|
529
|
-
|
530
|
-
|
531
|
-
|
532
|
-
|
533
|
-
|
534
|
-
|
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
|
+
}
|
535
573
|
});
|
536
574
|
});
|
537
575
|
return result;
|
@@ -539,7 +577,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
539
577
|
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
540
578
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
541
579
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
542
|
-
query.deleteMany({
|
580
|
+
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
543
581
|
where: {
|
544
582
|
created_at: {
|
545
583
|
$lt: expirationDate.toISOString()
|
@@ -1171,6 +1209,11 @@ const { createPolicy } = policy;
|
|
1171
1209
|
const hasPermissions = createPolicy({
|
1172
1210
|
name: "plugin::content-manager.hasPermissions",
|
1173
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
|
+
*/
|
1174
1217
|
handler(ctx, config = {}) {
|
1175
1218
|
const { actions = [], hasAtLeastOne = false } = config;
|
1176
1219
|
const { userAbility } = ctx.state;
|
@@ -1564,9 +1607,11 @@ const multipleLocaleSchema = yup$1.lazy(
|
|
1564
1607
|
(value) => Array.isArray(value) ? yup$1.array().of(singleLocaleSchema.required()) : singleLocaleSchema
|
1565
1608
|
);
|
1566
1609
|
const statusSchema = yup$1.mixed().oneOf(["draft", "published"], "Invalid status");
|
1567
|
-
const getDocumentLocaleAndStatus = async (request, opts = { allowMultipleLocales: false }) => {
|
1610
|
+
const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultipleLocales: false }) => {
|
1568
1611
|
const { allowMultipleLocales } = opts;
|
1569
|
-
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;
|
1570
1615
|
const schema = yup$1.object().shape({
|
1571
1616
|
locale: allowMultipleLocales ? multipleLocaleSchema : singleLocaleSchema,
|
1572
1617
|
status: statusSchema
|
@@ -1614,7 +1659,7 @@ const createDocument = async (ctx, opts) => {
|
|
1614
1659
|
const setCreator = setCreatorFields({ user });
|
1615
1660
|
const sanitizeFn = async.pipe(pickPermittedFields, setCreator);
|
1616
1661
|
const sanitizedBody = await sanitizeFn(body);
|
1617
|
-
const { locale, status
|
1662
|
+
const { locale, status } = await getDocumentLocaleAndStatus(body, model);
|
1618
1663
|
return documentManager2.create(model, {
|
1619
1664
|
data: sanitizedBody,
|
1620
1665
|
locale,
|
@@ -1633,7 +1678,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1633
1678
|
}
|
1634
1679
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1635
1680
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1636
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1681
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1637
1682
|
const [documentVersion, documentExists] = await Promise.all([
|
1638
1683
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
1639
1684
|
documentManager2.exists(model, id)
|
@@ -1649,7 +1694,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1649
1694
|
throw new errors.ForbiddenError();
|
1650
1695
|
}
|
1651
1696
|
const pickPermittedFields = documentVersion ? permissionChecker2.sanitizeUpdateInput(documentVersion) : permissionChecker2.sanitizeCreateInput;
|
1652
|
-
const setCreator = setCreatorFields({ user, isEdition: true });
|
1697
|
+
const setCreator = documentVersion ? setCreatorFields({ user, isEdition: true }) : setCreatorFields({ user });
|
1653
1698
|
const sanitizeFn = async.pipe(pickPermittedFields, setCreator);
|
1654
1699
|
const sanitizedBody = await sanitizeFn(body);
|
1655
1700
|
return documentManager2.update(documentVersion?.documentId || id, model, {
|
@@ -1671,7 +1716,7 @@ const collectionTypes = {
|
|
1671
1716
|
}
|
1672
1717
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1673
1718
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1674
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
1719
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1675
1720
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1676
1721
|
{ ...permissionQuery, populate, locale, status },
|
1677
1722
|
model
|
@@ -1706,7 +1751,7 @@ const collectionTypes = {
|
|
1706
1751
|
}
|
1707
1752
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1708
1753
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1709
|
-
const { locale, status
|
1754
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1710
1755
|
const version = await documentManager2.findOne(id, model, {
|
1711
1756
|
populate,
|
1712
1757
|
locale,
|
@@ -1721,7 +1766,7 @@ const collectionTypes = {
|
|
1721
1766
|
permissionChecker2,
|
1722
1767
|
model,
|
1723
1768
|
// @ts-expect-error TODO: fix
|
1724
|
-
{ id, locale, publishedAt: null },
|
1769
|
+
{ documentId: id, locale, publishedAt: null },
|
1725
1770
|
{ availableLocales: true, availableStatus: false }
|
1726
1771
|
);
|
1727
1772
|
ctx.body = { data: {}, meta };
|
@@ -1773,7 +1818,7 @@ const collectionTypes = {
|
|
1773
1818
|
}
|
1774
1819
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1775
1820
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1776
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1821
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1777
1822
|
const document = await documentManager2.findOne(id, model, {
|
1778
1823
|
populate,
|
1779
1824
|
locale,
|
@@ -1818,7 +1863,7 @@ const collectionTypes = {
|
|
1818
1863
|
}
|
1819
1864
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1820
1865
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1821
|
-
const { locale } = await getDocumentLocaleAndStatus(ctx.query);
|
1866
|
+
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1822
1867
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1823
1868
|
if (documentLocales.length === 0) {
|
1824
1869
|
return ctx.notFound();
|
@@ -1847,11 +1892,34 @@ const collectionTypes = {
|
|
1847
1892
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1848
1893
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1849
1894
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1850
|
-
|
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
|
+
}
|
1851
1920
|
if (permissionChecker2.cannot.publish(document)) {
|
1852
1921
|
throw new errors.ForbiddenError();
|
1853
1922
|
}
|
1854
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1855
1923
|
const publishResult = await documentManager2.publish(document.documentId, model, {
|
1856
1924
|
locale
|
1857
1925
|
// TODO: Allow setting creator fields on publish
|
@@ -1878,7 +1946,9 @@ const collectionTypes = {
|
|
1878
1946
|
}
|
1879
1947
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1880
1948
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1881
|
-
const { locale } = await getDocumentLocaleAndStatus(body, {
|
1949
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1950
|
+
allowMultipleLocales: true
|
1951
|
+
});
|
1882
1952
|
const entityPromises = documentIds.map(
|
1883
1953
|
(documentId) => documentManager2.findLocales(documentId, model, { populate, locale, isPublished: false })
|
1884
1954
|
);
|
@@ -1905,7 +1975,9 @@ const collectionTypes = {
|
|
1905
1975
|
if (permissionChecker2.cannot.unpublish()) {
|
1906
1976
|
return ctx.forbidden();
|
1907
1977
|
}
|
1908
|
-
const { locale } = await getDocumentLocaleAndStatus(body
|
1978
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1979
|
+
allowMultipleLocales: true
|
1980
|
+
});
|
1909
1981
|
const entityPromises = documentIds.map(
|
1910
1982
|
(documentId) => documentManager2.findLocales(documentId, model, { locale, isPublished: true })
|
1911
1983
|
);
|
@@ -1938,7 +2010,7 @@ const collectionTypes = {
|
|
1938
2010
|
}
|
1939
2011
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
1940
2012
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1941
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2013
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1942
2014
|
const document = await documentManager2.findOne(id, model, {
|
1943
2015
|
populate,
|
1944
2016
|
locale,
|
@@ -1975,7 +2047,7 @@ const collectionTypes = {
|
|
1975
2047
|
}
|
1976
2048
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
1977
2049
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1978
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2050
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1979
2051
|
const document = await documentManager2.findOne(id, model, {
|
1980
2052
|
populate,
|
1981
2053
|
locale,
|
@@ -2006,7 +2078,7 @@ const collectionTypes = {
|
|
2006
2078
|
}
|
2007
2079
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2008
2080
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2009
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2081
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2010
2082
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2011
2083
|
populate,
|
2012
2084
|
locale
|
@@ -2033,7 +2105,7 @@ const collectionTypes = {
|
|
2033
2105
|
}
|
2034
2106
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2035
2107
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2036
|
-
const { locale, status
|
2108
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2037
2109
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2038
2110
|
if (!entity) {
|
2039
2111
|
return ctx.notFound();
|
@@ -2056,7 +2128,7 @@ const collectionTypes = {
|
|
2056
2128
|
if (permissionChecker2.cannot.read()) {
|
2057
2129
|
return ctx.forbidden();
|
2058
2130
|
}
|
2059
|
-
const
|
2131
|
+
const documents = await documentManager2.findMany(
|
2060
2132
|
{
|
2061
2133
|
filters: {
|
2062
2134
|
documentId: ids
|
@@ -2065,7 +2137,7 @@ const collectionTypes = {
|
|
2065
2137
|
},
|
2066
2138
|
model
|
2067
2139
|
);
|
2068
|
-
if (!
|
2140
|
+
if (!documents) {
|
2069
2141
|
return ctx.notFound();
|
2070
2142
|
}
|
2071
2143
|
const number = await documentManager2.countManyEntriesDraftRelations(ids, model, locale);
|
@@ -2256,20 +2328,13 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2256
2328
|
userAbility,
|
2257
2329
|
model: model.uid
|
2258
2330
|
});
|
2259
|
-
|
2331
|
+
const isMainFieldListable = isListable(model, mainField);
|
2332
|
+
const canReadMainField = permissionChecker2.can.read(null, mainField);
|
2333
|
+
if (!isMainFieldListable || !canReadMainField) {
|
2260
2334
|
return "id";
|
2261
2335
|
}
|
2262
|
-
if (
|
2263
|
-
|
2264
|
-
const userPermissionChecker = getService$1("permission-checker").create({
|
2265
|
-
userAbility,
|
2266
|
-
model: "plugin::users-permissions.user"
|
2267
|
-
});
|
2268
|
-
if (userPermissionChecker.can.read()) {
|
2269
|
-
return "name";
|
2270
|
-
}
|
2271
|
-
}
|
2272
|
-
return "id";
|
2336
|
+
if (model.uid === "plugin::users-permissions.role") {
|
2337
|
+
return "name";
|
2273
2338
|
}
|
2274
2339
|
return mainField;
|
2275
2340
|
};
|
@@ -2302,11 +2367,8 @@ const validateLocale = (sourceUid, targetUid, locale) => {
|
|
2302
2367
|
const isLocalized = strapi.plugin("i18n").service("content-types").isLocalizedContentType;
|
2303
2368
|
const isSourceLocalized = isLocalized(sourceModel);
|
2304
2369
|
const isTargetLocalized = isLocalized(targetModel);
|
2305
|
-
let validatedLocale = locale;
|
2306
|
-
if (!targetModel || !isTargetLocalized)
|
2307
|
-
validatedLocale = void 0;
|
2308
2370
|
return {
|
2309
|
-
locale
|
2371
|
+
locale,
|
2310
2372
|
isSourceLocalized,
|
2311
2373
|
isTargetLocalized
|
2312
2374
|
};
|
@@ -2409,7 +2471,7 @@ const relations = {
|
|
2409
2471
|
attribute,
|
2410
2472
|
fieldsToSelect,
|
2411
2473
|
mainField,
|
2412
|
-
source: { schema: sourceSchema },
|
2474
|
+
source: { schema: sourceSchema, isLocalized: isSourceLocalized },
|
2413
2475
|
target: { schema: targetSchema, isLocalized: isTargetLocalized },
|
2414
2476
|
sourceSchema,
|
2415
2477
|
targetSchema,
|
@@ -2431,7 +2493,8 @@ const relations = {
|
|
2431
2493
|
fieldsToSelect,
|
2432
2494
|
mainField,
|
2433
2495
|
source: {
|
2434
|
-
schema: { uid: sourceUid, modelType: sourceModelType }
|
2496
|
+
schema: { uid: sourceUid, modelType: sourceModelType },
|
2497
|
+
isLocalized: isSourceLocalized
|
2435
2498
|
},
|
2436
2499
|
target: {
|
2437
2500
|
schema: { uid: targetUid },
|
@@ -2469,12 +2532,16 @@ const relations = {
|
|
2469
2532
|
} else {
|
2470
2533
|
where.id = id;
|
2471
2534
|
}
|
2472
|
-
|
2473
|
-
|
2535
|
+
const publishedAt = getPublishedAtClause(status, targetUid);
|
2536
|
+
if (!isEmpty(publishedAt)) {
|
2537
|
+
where[`${alias}.published_at`] = publishedAt;
|
2474
2538
|
}
|
2475
|
-
if (
|
2539
|
+
if (isTargetLocalized && locale) {
|
2476
2540
|
where[`${alias}.locale`] = locale;
|
2477
2541
|
}
|
2542
|
+
if (isSourceLocalized && locale) {
|
2543
|
+
where.locale = locale;
|
2544
|
+
}
|
2478
2545
|
if ((idsToInclude?.length ?? 0) !== 0) {
|
2479
2546
|
where[`${alias}.id`].$notIn = idsToInclude;
|
2480
2547
|
}
|
@@ -2492,7 +2559,8 @@ const relations = {
|
|
2492
2559
|
id: { $notIn: uniq(idsToOmit) }
|
2493
2560
|
});
|
2494
2561
|
}
|
2495
|
-
const
|
2562
|
+
const dbQuery = strapi.get("query-params").transform(targetUid, queryParams);
|
2563
|
+
const res = await strapi.db.query(targetUid).findPage(dbQuery);
|
2496
2564
|
ctx.body = {
|
2497
2565
|
...res,
|
2498
2566
|
results: await addStatusToRelations(targetUid, res.results)
|
@@ -2527,11 +2595,14 @@ const relations = {
|
|
2527
2595
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
2528
2596
|
const sanitizedRes = await loadRelations({ id: entryId }, targetField, {
|
2529
2597
|
...strapi.get("query-params").transform(targetUid, permissionQuery),
|
2530
|
-
ordering: "desc"
|
2531
|
-
page: ctx.request.query.page,
|
2532
|
-
pageSize: ctx.request.query.pageSize
|
2598
|
+
ordering: "desc"
|
2533
2599
|
});
|
2534
|
-
const relationsUnion = uniqBy(
|
2600
|
+
const relationsUnion = uniqBy(
|
2601
|
+
(res2) => {
|
2602
|
+
return res2.locale ? `${res2.documentId}-${res2.locale}` : `${res2.documentId}-`;
|
2603
|
+
},
|
2604
|
+
concat(sanitizedRes.results, res.results)
|
2605
|
+
);
|
2535
2606
|
ctx.body = {
|
2536
2607
|
pagination: res.pagination || {
|
2537
2608
|
page: 1,
|
@@ -2561,7 +2632,7 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2561
2632
|
throw new errors.ForbiddenError();
|
2562
2633
|
}
|
2563
2634
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.update(query);
|
2564
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2635
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2565
2636
|
const [documentVersion, otherDocumentVersion] = await Promise.all([
|
2566
2637
|
findDocument(sanitizedQuery, model, { locale, status: "draft" }),
|
2567
2638
|
// Find the first document to check if it exists
|
@@ -2602,7 +2673,7 @@ const singleTypes = {
|
|
2602
2673
|
return ctx.forbidden();
|
2603
2674
|
}
|
2604
2675
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
2605
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
2676
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
2606
2677
|
const version = await findDocument(permissionQuery, model, { locale, status });
|
2607
2678
|
if (!version) {
|
2608
2679
|
if (permissionChecker2.cannot.create()) {
|
@@ -2616,7 +2687,7 @@ const singleTypes = {
|
|
2616
2687
|
permissionChecker2,
|
2617
2688
|
model,
|
2618
2689
|
// @ts-expect-error - fix types
|
2619
|
-
{
|
2690
|
+
{ documentId: document.documentId, locale, publishedAt: null },
|
2620
2691
|
{ availableLocales: true, availableStatus: false }
|
2621
2692
|
);
|
2622
2693
|
ctx.body = { data: {}, meta };
|
@@ -2647,7 +2718,7 @@ const singleTypes = {
|
|
2647
2718
|
}
|
2648
2719
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2649
2720
|
const populate = await buildPopulateFromQuery(sanitizedQuery, model);
|
2650
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2721
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2651
2722
|
const documentLocales = await documentManager2.findLocales(void 0, model, {
|
2652
2723
|
populate,
|
2653
2724
|
locale
|
@@ -2684,7 +2755,7 @@ const singleTypes = {
|
|
2684
2755
|
if (permissionChecker2.cannot.publish(document)) {
|
2685
2756
|
throw new errors.ForbiddenError();
|
2686
2757
|
}
|
2687
|
-
const { locale } = await getDocumentLocaleAndStatus(document);
|
2758
|
+
const { locale } = await getDocumentLocaleAndStatus(document, model);
|
2688
2759
|
const publishResult = await documentManager2.publish(document.documentId, model, { locale });
|
2689
2760
|
return publishResult.at(0);
|
2690
2761
|
});
|
@@ -2707,7 +2778,7 @@ const singleTypes = {
|
|
2707
2778
|
return ctx.forbidden();
|
2708
2779
|
}
|
2709
2780
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.unpublish(query);
|
2710
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2781
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2711
2782
|
const document = await findDocument(sanitizedQuery, model, { locale });
|
2712
2783
|
if (!document) {
|
2713
2784
|
return ctx.notFound();
|
@@ -2739,7 +2810,7 @@ const singleTypes = {
|
|
2739
2810
|
return ctx.forbidden();
|
2740
2811
|
}
|
2741
2812
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.discard(query);
|
2742
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2813
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2743
2814
|
const document = await findDocument(sanitizedQuery, model, { locale, status: "published" });
|
2744
2815
|
if (!document) {
|
2745
2816
|
return ctx.notFound();
|
@@ -2759,7 +2830,7 @@ const singleTypes = {
|
|
2759
2830
|
const { query } = ctx.request;
|
2760
2831
|
const documentManager2 = getService$1("document-manager");
|
2761
2832
|
const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
|
2762
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2833
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2763
2834
|
if (permissionChecker2.cannot.read()) {
|
2764
2835
|
return ctx.forbidden();
|
2765
2836
|
}
|
@@ -2780,7 +2851,7 @@ const uid$1 = {
|
|
2780
2851
|
async generateUID(ctx) {
|
2781
2852
|
const { contentTypeUID, field, data } = await validateGenerateUIDInput(ctx.request.body);
|
2782
2853
|
const { query = {} } = ctx.request;
|
2783
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2854
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2784
2855
|
await validateUIDField(contentTypeUID, field);
|
2785
2856
|
const uidService = getService$1("uid");
|
2786
2857
|
ctx.body = {
|
@@ -2792,7 +2863,7 @@ const uid$1 = {
|
|
2792
2863
|
ctx.request.body
|
2793
2864
|
);
|
2794
2865
|
const { query = {} } = ctx.request;
|
2795
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2866
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2796
2867
|
await validateUIDField(contentTypeUID, field);
|
2797
2868
|
const uidService = getService$1("uid");
|
2798
2869
|
const isAvailable = await uidService.checkUIDAvailability({
|
@@ -3435,12 +3506,27 @@ const createPermissionChecker = (strapi2) => ({ userAbility, model }) => {
|
|
3435
3506
|
ability: userAbility,
|
3436
3507
|
model
|
3437
3508
|
});
|
3438
|
-
const
|
3509
|
+
const { actionProvider } = strapi2.service("admin::permission");
|
3510
|
+
const toSubject = (entity) => {
|
3511
|
+
return entity ? permissionsManager.toSubject(entity, model) : model;
|
3512
|
+
};
|
3439
3513
|
const can = (action, entity, field) => {
|
3440
|
-
|
3514
|
+
const subject = toSubject(entity);
|
3515
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3516
|
+
return (
|
3517
|
+
// Test the original action to see if it passes
|
3518
|
+
userAbility.can(action, subject, field) || // Else try every known alias if at least one of them succeed, then the user "can"
|
3519
|
+
aliases.some((alias) => userAbility.can(alias, subject, field))
|
3520
|
+
);
|
3441
3521
|
};
|
3442
3522
|
const cannot = (action, entity, field) => {
|
3443
|
-
|
3523
|
+
const subject = toSubject(entity);
|
3524
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3525
|
+
return (
|
3526
|
+
// Test both the original action
|
3527
|
+
userAbility.cannot(action, subject, field) && // and every known alias, if all of them fail (cannot), then the user truly "cannot"
|
3528
|
+
aliases.every((alias) => userAbility.cannot(alias, subject, field))
|
3529
|
+
);
|
3444
3530
|
};
|
3445
3531
|
const sanitizeOutput = (data, { action = ACTIONS.read } = {}) => {
|
3446
3532
|
return permissionsManager.sanitizeOutput(data, { subject: toSubject(data), action });
|
@@ -3717,6 +3803,10 @@ const getDeepPopulateDraftCount = (uid2) => {
|
|
3717
3803
|
const attribute = model.attributes[attributeName];
|
3718
3804
|
switch (attribute.type) {
|
3719
3805
|
case "relation": {
|
3806
|
+
const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
|
3807
|
+
if (isMorphRelation) {
|
3808
|
+
break;
|
3809
|
+
}
|
3720
3810
|
if (isVisibleAttribute$1(model, attributeName)) {
|
3721
3811
|
populateAcc[attributeName] = {
|
3722
3812
|
count: true,
|
@@ -4094,7 +4184,13 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4094
4184
|
*/
|
4095
4185
|
async formatDocumentWithMetadata(uid2, document, opts = {}) {
|
4096
4186
|
if (!document) {
|
4097
|
-
return
|
4187
|
+
return {
|
4188
|
+
data: document,
|
4189
|
+
meta: {
|
4190
|
+
availableLocales: [],
|
4191
|
+
availableStatus: []
|
4192
|
+
}
|
4193
|
+
};
|
4098
4194
|
}
|
4099
4195
|
const hasDraftAndPublish = contentTypes$1.hasDraftAndPublish(strapi2.getModel(uid2));
|
4100
4196
|
if (!hasDraftAndPublish) {
|
@@ -4202,10 +4298,7 @@ const documentManager = ({ strapi: strapi2 }) => {
|
|
4202
4298
|
async clone(id, body, uid2) {
|
4203
4299
|
const populate = await buildDeepPopulate(uid2);
|
4204
4300
|
const params = {
|
4205
|
-
data:
|
4206
|
-
...omitIdField(body),
|
4207
|
-
[PUBLISHED_AT_ATTRIBUTE]: null
|
4208
|
-
},
|
4301
|
+
data: omitIdField(body),
|
4209
4302
|
populate
|
4210
4303
|
};
|
4211
4304
|
return strapi2.documents(uid2).clone({ ...params, documentId: id }).then((result) => result?.entries.at(0));
|