@strapi/content-manager 0.0.0-experimental.c3e9d4b26f9fd3d9eb530b5c11f9baa1d09b13ad → 0.0.0-experimental.c592deb623aed3f74ef7fdacfad9757ed59d34f7
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-BMajAl1u.mjs → ComponentConfigurationPage-7-qB29e7.mjs} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-BMajAl1u.mjs.map → ComponentConfigurationPage-7-qB29e7.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-y_7iLdmB.js → ComponentConfigurationPage-DP7AC0UU.js} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-y_7iLdmB.js.map → ComponentConfigurationPage-DP7AC0UU.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-CcOoD26O.mjs → EditConfigurationPage-CI4XoymK.mjs} +3 -3
- package/dist/_chunks/{EditConfigurationPage-CcOoD26O.mjs.map → EditConfigurationPage-CI4XoymK.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-CPVB8Uqc.js → EditConfigurationPage-DITVliEI.js} +3 -3
- package/dist/_chunks/{EditConfigurationPage-CPVB8Uqc.js.map → EditConfigurationPage-DITVliEI.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-CTTDHKkQ.js → EditViewPage-CUS2EAhB.js} +62 -47
- package/dist/_chunks/EditViewPage-CUS2EAhB.js.map +1 -0
- package/dist/_chunks/{EditViewPage-DWb0DE7R.mjs → EditViewPage-Dzpno8xI.mjs} +63 -48
- package/dist/_chunks/EditViewPage-Dzpno8xI.mjs.map +1 -0
- package/dist/_chunks/{Field-DnStdvQw.mjs → Field-B_jG_EV9.mjs} +541 -221
- package/dist/_chunks/Field-B_jG_EV9.mjs.map +1 -0
- package/dist/_chunks/{Field-C5Z1Ivdv.js → Field-CtUU1Fg8.js} +543 -223
- package/dist/_chunks/Field-CtUU1Fg8.js.map +1 -0
- package/dist/_chunks/{Form-DqGgE55Q.mjs → Form-BXHao2mZ.mjs} +53 -35
- package/dist/_chunks/Form-BXHao2mZ.mjs.map +1 -0
- package/dist/_chunks/{Form-B81OtW-k.js → Form-DTqO0ymI.js} +51 -33
- package/dist/_chunks/Form-DTqO0ymI.js.map +1 -0
- package/dist/_chunks/{History-DS6-HCYX.mjs → History-2Ah2CQ4T.mjs} +52 -29
- package/dist/_chunks/History-2Ah2CQ4T.mjs.map +1 -0
- package/dist/_chunks/{History-4NbOq2dX.js → History-C_uSGzO5.js} +51 -28
- package/dist/_chunks/History-C_uSGzO5.js.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DQJJltko.mjs → ListConfigurationPage-BjSJlaoC.mjs} +58 -48
- package/dist/_chunks/ListConfigurationPage-BjSJlaoC.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-CpfstlYY.js → ListConfigurationPage-nyuP7OSy.js} +57 -46
- package/dist/_chunks/ListConfigurationPage-nyuP7OSy.js.map +1 -0
- package/dist/_chunks/{ListViewPage-nQrOQuVo.mjs → ListViewPage-B75x3nz2.mjs} +103 -102
- package/dist/_chunks/ListViewPage-B75x3nz2.mjs.map +1 -0
- package/dist/_chunks/{ListViewPage-CA3I75m5.js → ListViewPage-DHgHD8Xg.js} +105 -104
- package/dist/_chunks/ListViewPage-DHgHD8Xg.js.map +1 -0
- package/dist/_chunks/{NoContentTypePage-Dldu-_Mx.js → NoContentTypePage-CDUKdZ7d.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-Dldu-_Mx.js.map → NoContentTypePage-CDUKdZ7d.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-DbnHE22g.mjs → NoContentTypePage-DUacQSyF.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-DbnHE22g.mjs.map → NoContentTypePage-DUacQSyF.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-fOIkQM0v.mjs → NoPermissionsPage-SFllMekk.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-fOIkQM0v.mjs.map → NoPermissionsPage-SFllMekk.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-CO2MK200.js → NoPermissionsPage-zwIZydDI.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-CO2MK200.js.map → NoPermissionsPage-zwIZydDI.js.map} +1 -1
- package/dist/_chunks/{Relations-BDRl99Ux.mjs → Relations-D2NRW8fC.mjs} +14 -10
- package/dist/_chunks/Relations-D2NRW8fC.mjs.map +1 -0
- package/dist/_chunks/{Relations-DG2jnOcr.js → Relations-NFLaRNPr.js} +14 -10
- package/dist/_chunks/Relations-NFLaRNPr.js.map +1 -0
- package/dist/_chunks/{en-fbKQxLGn.js → en-BlhnxQfj.js} +11 -9
- package/dist/_chunks/{en-fbKQxLGn.js.map → en-BlhnxQfj.js.map} +1 -1
- package/dist/_chunks/{en-Ux26r5pl.mjs → en-C8YBvRrK.mjs} +11 -9
- package/dist/_chunks/{en-Ux26r5pl.mjs.map → en-C8YBvRrK.mjs.map} +1 -1
- package/dist/_chunks/{index-Drt2DN7v.mjs → index-C9HxCo5R.mjs} +1008 -867
- package/dist/_chunks/index-C9HxCo5R.mjs.map +1 -0
- package/dist/_chunks/{index-BZoNZMXL.js → index-ovJRE1FM.js} +998 -857
- package/dist/_chunks/index-ovJRE1FM.js.map +1 -0
- package/dist/_chunks/{layout-BzAbmoO6.mjs → layout-DaUjDiWQ.mjs} +27 -14
- package/dist/_chunks/layout-DaUjDiWQ.mjs.map +1 -0
- package/dist/_chunks/{layout-DEYBqgF1.js → layout-UNWstw_s.js} +25 -12
- package/dist/_chunks/layout-UNWstw_s.js.map +1 -0
- package/dist/_chunks/{relations-D26zVRdi.mjs → relations-D8iFAeRu.mjs} +2 -2
- package/dist/_chunks/{relations-D26zVRdi.mjs.map → relations-D8iFAeRu.mjs.map} +1 -1
- package/dist/_chunks/{relations-D0eZ4VWw.js → relations-NN3coOG5.js} +2 -2
- package/dist/_chunks/{relations-D0eZ4VWw.js.map → relations-NN3coOG5.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 +3 -2
- 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 +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 +191 -110
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +192 -111
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/controllers/collection-types.d.ts.map +1 -1
- package/dist/server/src/controllers/relations.d.ts.map +1 -1
- package/dist/server/src/controllers/uid.d.ts.map +1 -1
- package/dist/server/src/controllers/validation/dimensions.d.ts +4 -2
- package/dist/server/src/controllers/validation/dimensions.d.ts.map +1 -1
- package/dist/server/src/history/services/history.d.ts.map +1 -1
- package/dist/server/src/history/services/lifecycles.d.ts.map +1 -1
- package/dist/server/src/history/services/utils.d.ts +2 -1
- package/dist/server/src/history/services/utils.d.ts.map +1 -1
- package/dist/server/src/policies/hasPermissions.d.ts.map +1 -1
- package/dist/server/src/services/document-manager.d.ts.map +1 -1
- package/dist/server/src/services/document-metadata.d.ts.map +1 -1
- package/dist/server/src/services/permission-checker.d.ts.map +1 -1
- package/dist/server/src/services/utils/populate.d.ts.map +1 -1
- package/dist/shared/contracts/collection-types.d.ts +3 -1
- package/dist/shared/contracts/collection-types.d.ts.map +1 -1
- package/package.json +11 -11
- package/dist/_chunks/EditViewPage-CTTDHKkQ.js.map +0 -1
- package/dist/_chunks/EditViewPage-DWb0DE7R.mjs.map +0 -1
- package/dist/_chunks/Field-C5Z1Ivdv.js.map +0 -1
- package/dist/_chunks/Field-DnStdvQw.mjs.map +0 -1
- package/dist/_chunks/Form-B81OtW-k.js.map +0 -1
- package/dist/_chunks/Form-DqGgE55Q.mjs.map +0 -1
- package/dist/_chunks/History-4NbOq2dX.js.map +0 -1
- package/dist/_chunks/History-DS6-HCYX.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-CpfstlYY.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-DQJJltko.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-CA3I75m5.js.map +0 -1
- package/dist/_chunks/ListViewPage-nQrOQuVo.mjs.map +0 -1
- package/dist/_chunks/Relations-BDRl99Ux.mjs.map +0 -1
- package/dist/_chunks/Relations-DG2jnOcr.js.map +0 -1
- package/dist/_chunks/index-BZoNZMXL.js.map +0 -1
- package/dist/_chunks/index-Drt2DN7v.mjs.map +0 -1
- package/dist/_chunks/layout-BzAbmoO6.mjs.map +0 -1
- package/dist/_chunks/layout-DEYBqgF1.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,
|
@@ -490,13 +504,47 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
490
504
|
}
|
491
505
|
};
|
492
506
|
};
|
507
|
+
const shouldCreateHistoryVersion = (context) => {
|
508
|
+
if (!strapi.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
509
|
+
return false;
|
510
|
+
}
|
511
|
+
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
512
|
+
return false;
|
513
|
+
}
|
514
|
+
if (context.action === "update" && strapi.requestContext.get()?.request.url.endsWith("/actions/publish")) {
|
515
|
+
return false;
|
516
|
+
}
|
517
|
+
if (!context.contentType.uid.startsWith("api::")) {
|
518
|
+
return false;
|
519
|
+
}
|
520
|
+
return true;
|
521
|
+
};
|
522
|
+
const getSchemas = (uid2) => {
|
523
|
+
const attributesSchema = strapi.getModel(uid2).attributes;
|
524
|
+
const componentsSchemas = Object.keys(attributesSchema).reduce(
|
525
|
+
(currentComponentSchemas, key) => {
|
526
|
+
const fieldSchema = attributesSchema[key];
|
527
|
+
if (fieldSchema.type === "component") {
|
528
|
+
const componentSchema = strapi.getModel(fieldSchema.component).attributes;
|
529
|
+
return {
|
530
|
+
...currentComponentSchemas,
|
531
|
+
[fieldSchema.component]: componentSchema
|
532
|
+
};
|
533
|
+
}
|
534
|
+
return currentComponentSchemas;
|
535
|
+
},
|
536
|
+
{}
|
537
|
+
);
|
538
|
+
return {
|
539
|
+
schema: fp.omit(FIELDS_TO_IGNORE, attributesSchema),
|
540
|
+
componentsSchemas
|
541
|
+
};
|
542
|
+
};
|
493
543
|
const createLifecyclesService = ({ strapi: strapi2 }) => {
|
494
544
|
const state = {
|
495
545
|
deleteExpiredJob: null,
|
496
546
|
isInitialized: false
|
497
547
|
};
|
498
|
-
const query = strapi2.db.query(HISTORY_VERSION_UID);
|
499
|
-
const historyService = getService(strapi2, "history");
|
500
548
|
const serviceUtils = createServiceUtils({ strapi: strapi2 });
|
501
549
|
return {
|
502
550
|
async bootstrap() {
|
@@ -504,60 +552,45 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
504
552
|
return;
|
505
553
|
}
|
506
554
|
strapi2.documents.use(async (context, next) => {
|
507
|
-
if (!strapi2.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
508
|
-
return next();
|
509
|
-
}
|
510
|
-
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
511
|
-
return next();
|
512
|
-
}
|
513
|
-
const contentTypeUid = context.contentType.uid;
|
514
|
-
if (!contentTypeUid.startsWith("api::")) {
|
515
|
-
return next();
|
516
|
-
}
|
517
555
|
const result = await next();
|
518
|
-
|
519
|
-
|
520
|
-
|
521
|
-
|
556
|
+
if (!shouldCreateHistoryVersion(context)) {
|
557
|
+
return result;
|
558
|
+
}
|
559
|
+
const documentId = context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId;
|
522
560
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
523
|
-
const
|
524
|
-
if (
|
525
|
-
|
526
|
-
"[Content manager history middleware]: An array of locales was provided, but only a single locale is supported for the findOne operation."
|
527
|
-
);
|
528
|
-
return next();
|
561
|
+
const locales = fp.castArray(context.params?.locale || defaultLocale);
|
562
|
+
if (!locales.length) {
|
563
|
+
return result;
|
529
564
|
}
|
530
|
-
const
|
531
|
-
|
532
|
-
|
533
|
-
|
565
|
+
const uid2 = context.contentType.uid;
|
566
|
+
const schemas = getSchemas(uid2);
|
567
|
+
const model = strapi2.getModel(uid2);
|
568
|
+
const isLocalizedContentType = serviceUtils.isLocalizedContentType(model);
|
569
|
+
const localeEntries = await strapi2.db.query(uid2).findMany({
|
570
|
+
where: {
|
571
|
+
documentId,
|
572
|
+
...isLocalizedContentType ? { locale: { $in: locales } } : {},
|
573
|
+
...strapiUtils.contentTypes.hasDraftAndPublish(strapi2.contentTypes[uid2]) ? { publishedAt: null } : {}
|
574
|
+
},
|
575
|
+
populate: serviceUtils.getDeepPopulate(
|
576
|
+
uid2,
|
577
|
+
true
|
578
|
+
/* use database syntax */
|
579
|
+
)
|
534
580
|
});
|
535
|
-
const status = await serviceUtils.getVersionStatus(contentTypeUid, document);
|
536
|
-
const attributesSchema = strapi2.getModel(contentTypeUid).attributes;
|
537
|
-
const componentsSchemas = Object.keys(
|
538
|
-
attributesSchema
|
539
|
-
).reduce((currentComponentSchemas, key) => {
|
540
|
-
const fieldSchema = attributesSchema[key];
|
541
|
-
if (fieldSchema.type === "component") {
|
542
|
-
const componentSchema = strapi2.getModel(fieldSchema.component).attributes;
|
543
|
-
return {
|
544
|
-
...currentComponentSchemas,
|
545
|
-
[fieldSchema.component]: componentSchema
|
546
|
-
};
|
547
|
-
}
|
548
|
-
return currentComponentSchemas;
|
549
|
-
}, {});
|
550
581
|
await strapi2.db.transaction(async ({ onCommit }) => {
|
551
|
-
onCommit(() => {
|
552
|
-
|
553
|
-
|
554
|
-
|
555
|
-
|
556
|
-
|
557
|
-
|
558
|
-
|
559
|
-
|
560
|
-
|
582
|
+
onCommit(async () => {
|
583
|
+
for (const entry of localeEntries) {
|
584
|
+
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
585
|
+
await getService(strapi2, "history").createVersion({
|
586
|
+
contentType: uid2,
|
587
|
+
data: fp.omit(FIELDS_TO_IGNORE, entry),
|
588
|
+
relatedDocumentId: documentId,
|
589
|
+
locale: entry.locale,
|
590
|
+
status,
|
591
|
+
...schemas
|
592
|
+
});
|
593
|
+
}
|
561
594
|
});
|
562
595
|
});
|
563
596
|
return result;
|
@@ -565,7 +598,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
565
598
|
state.deleteExpiredJob = nodeSchedule.scheduleJob("0 0 * * *", () => {
|
566
599
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
567
600
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
568
|
-
query.deleteMany({
|
601
|
+
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
569
602
|
where: {
|
570
603
|
created_at: {
|
571
604
|
$lt: expirationDate.toISOString()
|
@@ -1197,6 +1230,11 @@ const { createPolicy } = strapiUtils.policy;
|
|
1197
1230
|
const hasPermissions = createPolicy({
|
1198
1231
|
name: "plugin::content-manager.hasPermissions",
|
1199
1232
|
validator: validateHasPermissionsInput,
|
1233
|
+
/**
|
1234
|
+
* NOTE: Action aliases are currently not checked at this level (policy).
|
1235
|
+
* This is currently the intended behavior to avoid changing the behavior of API related permissions.
|
1236
|
+
* If you want to add support for it, please create a dedicated RFC with a list of potential side effect this could have.
|
1237
|
+
*/
|
1200
1238
|
handler(ctx, config = {}) {
|
1201
1239
|
const { actions = [], hasAtLeastOne = false } = config;
|
1202
1240
|
const { userAbility } = ctx.state;
|
@@ -1590,9 +1628,11 @@ const multipleLocaleSchema = strapiUtils.yup.lazy(
|
|
1590
1628
|
(value) => Array.isArray(value) ? strapiUtils.yup.array().of(singleLocaleSchema.required()) : singleLocaleSchema
|
1591
1629
|
);
|
1592
1630
|
const statusSchema = strapiUtils.yup.mixed().oneOf(["draft", "published"], "Invalid status");
|
1593
|
-
const getDocumentLocaleAndStatus = async (request, opts = { allowMultipleLocales: false }) => {
|
1631
|
+
const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultipleLocales: false }) => {
|
1594
1632
|
const { allowMultipleLocales } = opts;
|
1595
|
-
const { locale, status, ...rest } = request || {};
|
1633
|
+
const { locale, status: providedStatus, ...rest } = request || {};
|
1634
|
+
const defaultStatus = strapiUtils.contentTypes.hasDraftAndPublish(strapi.getModel(model)) ? void 0 : "published";
|
1635
|
+
const status = providedStatus !== void 0 ? providedStatus : defaultStatus;
|
1596
1636
|
const schema = strapiUtils.yup.object().shape({
|
1597
1637
|
locale: allowMultipleLocales ? multipleLocaleSchema : singleLocaleSchema,
|
1598
1638
|
status: statusSchema
|
@@ -1640,7 +1680,7 @@ const createDocument = async (ctx, opts) => {
|
|
1640
1680
|
const setCreator = strapiUtils.setCreatorFields({ user });
|
1641
1681
|
const sanitizeFn = strapiUtils.async.pipe(pickPermittedFields, setCreator);
|
1642
1682
|
const sanitizedBody = await sanitizeFn(body);
|
1643
|
-
const { locale, status
|
1683
|
+
const { locale, status } = await getDocumentLocaleAndStatus(body, model);
|
1644
1684
|
return documentManager2.create(model, {
|
1645
1685
|
data: sanitizedBody,
|
1646
1686
|
locale,
|
@@ -1659,7 +1699,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1659
1699
|
}
|
1660
1700
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1661
1701
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1662
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1702
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1663
1703
|
const [documentVersion, documentExists] = await Promise.all([
|
1664
1704
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
1665
1705
|
documentManager2.exists(model, id)
|
@@ -1697,7 +1737,7 @@ const collectionTypes = {
|
|
1697
1737
|
}
|
1698
1738
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1699
1739
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1700
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
1740
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1701
1741
|
const { results: documents, pagination } = await documentManager2.findPage(
|
1702
1742
|
{ ...permissionQuery, populate, locale, status },
|
1703
1743
|
model
|
@@ -1732,7 +1772,7 @@ const collectionTypes = {
|
|
1732
1772
|
}
|
1733
1773
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1734
1774
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1735
|
-
const { locale, status
|
1775
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1736
1776
|
const version = await documentManager2.findOne(id, model, {
|
1737
1777
|
populate,
|
1738
1778
|
locale,
|
@@ -1747,7 +1787,7 @@ const collectionTypes = {
|
|
1747
1787
|
permissionChecker2,
|
1748
1788
|
model,
|
1749
1789
|
// @ts-expect-error TODO: fix
|
1750
|
-
{ id, locale, publishedAt: null },
|
1790
|
+
{ documentId: id, locale, publishedAt: null },
|
1751
1791
|
{ availableLocales: true, availableStatus: false }
|
1752
1792
|
);
|
1753
1793
|
ctx.body = { data: {}, meta };
|
@@ -1799,7 +1839,7 @@ const collectionTypes = {
|
|
1799
1839
|
}
|
1800
1840
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1801
1841
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1802
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1842
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1803
1843
|
const document = await documentManager2.findOne(id, model, {
|
1804
1844
|
populate,
|
1805
1845
|
locale,
|
@@ -1844,7 +1884,7 @@ const collectionTypes = {
|
|
1844
1884
|
}
|
1845
1885
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1846
1886
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1847
|
-
const { locale } = await getDocumentLocaleAndStatus(ctx.query);
|
1887
|
+
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1848
1888
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1849
1889
|
if (documentLocales.length === 0) {
|
1850
1890
|
return ctx.notFound();
|
@@ -1873,11 +1913,34 @@ const collectionTypes = {
|
|
1873
1913
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1874
1914
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1875
1915
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1876
|
-
|
1916
|
+
let document;
|
1917
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1918
|
+
const isCreate = fp.isNil(id);
|
1919
|
+
if (isCreate) {
|
1920
|
+
if (permissionChecker2.cannot.create()) {
|
1921
|
+
throw new strapiUtils.errors.ForbiddenError();
|
1922
|
+
}
|
1923
|
+
document = await createDocument(ctx, { populate });
|
1924
|
+
}
|
1925
|
+
const isUpdate = !isCreate;
|
1926
|
+
if (isUpdate) {
|
1927
|
+
const documentExists = documentManager2.exists(model, id);
|
1928
|
+
if (!documentExists) {
|
1929
|
+
throw new strapiUtils.errors.NotFoundError("Document not found");
|
1930
|
+
}
|
1931
|
+
document = await documentManager2.findOne(id, model, { populate, locale });
|
1932
|
+
if (!document) {
|
1933
|
+
if (permissionChecker2.cannot.create({ locale }) || permissionChecker2.cannot.publish({ locale })) {
|
1934
|
+
throw new strapiUtils.errors.ForbiddenError();
|
1935
|
+
}
|
1936
|
+
document = await updateDocument(ctx);
|
1937
|
+
} else if (permissionChecker2.can.update(document)) {
|
1938
|
+
await updateDocument(ctx);
|
1939
|
+
}
|
1940
|
+
}
|
1877
1941
|
if (permissionChecker2.cannot.publish(document)) {
|
1878
1942
|
throw new strapiUtils.errors.ForbiddenError();
|
1879
1943
|
}
|
1880
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1881
1944
|
const publishResult = await documentManager2.publish(document.documentId, model, {
|
1882
1945
|
locale
|
1883
1946
|
// TODO: Allow setting creator fields on publish
|
@@ -1904,7 +1967,9 @@ const collectionTypes = {
|
|
1904
1967
|
}
|
1905
1968
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1906
1969
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1907
|
-
const { locale } = await getDocumentLocaleAndStatus(body, {
|
1970
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1971
|
+
allowMultipleLocales: true
|
1972
|
+
});
|
1908
1973
|
const entityPromises = documentIds.map(
|
1909
1974
|
(documentId) => documentManager2.findLocales(documentId, model, { populate, locale, isPublished: false })
|
1910
1975
|
);
|
@@ -1931,7 +1996,9 @@ const collectionTypes = {
|
|
1931
1996
|
if (permissionChecker2.cannot.unpublish()) {
|
1932
1997
|
return ctx.forbidden();
|
1933
1998
|
}
|
1934
|
-
const { locale } = await getDocumentLocaleAndStatus(body
|
1999
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
2000
|
+
allowMultipleLocales: true
|
2001
|
+
});
|
1935
2002
|
const entityPromises = documentIds.map(
|
1936
2003
|
(documentId) => documentManager2.findLocales(documentId, model, { locale, isPublished: true })
|
1937
2004
|
);
|
@@ -1964,7 +2031,7 @@ const collectionTypes = {
|
|
1964
2031
|
}
|
1965
2032
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
1966
2033
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1967
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2034
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1968
2035
|
const document = await documentManager2.findOne(id, model, {
|
1969
2036
|
populate,
|
1970
2037
|
locale,
|
@@ -2001,7 +2068,7 @@ const collectionTypes = {
|
|
2001
2068
|
}
|
2002
2069
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2003
2070
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2004
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2071
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2005
2072
|
const document = await documentManager2.findOne(id, model, {
|
2006
2073
|
populate,
|
2007
2074
|
locale,
|
@@ -2032,7 +2099,7 @@ const collectionTypes = {
|
|
2032
2099
|
}
|
2033
2100
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2034
2101
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2035
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2102
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2036
2103
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2037
2104
|
populate,
|
2038
2105
|
locale
|
@@ -2059,7 +2126,7 @@ const collectionTypes = {
|
|
2059
2126
|
}
|
2060
2127
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2061
2128
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2062
|
-
const { locale, status
|
2129
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2063
2130
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2064
2131
|
if (!entity) {
|
2065
2132
|
return ctx.notFound();
|
@@ -2082,7 +2149,7 @@ const collectionTypes = {
|
|
2082
2149
|
if (permissionChecker2.cannot.read()) {
|
2083
2150
|
return ctx.forbidden();
|
2084
2151
|
}
|
2085
|
-
const
|
2152
|
+
const documents = await documentManager2.findMany(
|
2086
2153
|
{
|
2087
2154
|
filters: {
|
2088
2155
|
documentId: ids
|
@@ -2091,7 +2158,7 @@ const collectionTypes = {
|
|
2091
2158
|
},
|
2092
2159
|
model
|
2093
2160
|
);
|
2094
|
-
if (!
|
2161
|
+
if (!documents) {
|
2095
2162
|
return ctx.notFound();
|
2096
2163
|
}
|
2097
2164
|
const number = await documentManager2.countManyEntriesDraftRelations(ids, model, locale);
|
@@ -2282,20 +2349,13 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2282
2349
|
userAbility,
|
2283
2350
|
model: model.uid
|
2284
2351
|
});
|
2285
|
-
|
2352
|
+
const isMainFieldListable = isListable(model, mainField);
|
2353
|
+
const canReadMainField = permissionChecker2.can.read(null, mainField);
|
2354
|
+
if (!isMainFieldListable || !canReadMainField) {
|
2286
2355
|
return "id";
|
2287
2356
|
}
|
2288
|
-
if (
|
2289
|
-
|
2290
|
-
const userPermissionChecker = getService$1("permission-checker").create({
|
2291
|
-
userAbility,
|
2292
|
-
model: "plugin::users-permissions.user"
|
2293
|
-
});
|
2294
|
-
if (userPermissionChecker.can.read()) {
|
2295
|
-
return "name";
|
2296
|
-
}
|
2297
|
-
}
|
2298
|
-
return "id";
|
2357
|
+
if (model.uid === "plugin::users-permissions.role") {
|
2358
|
+
return "name";
|
2299
2359
|
}
|
2300
2360
|
return mainField;
|
2301
2361
|
};
|
@@ -2495,8 +2555,9 @@ const relations = {
|
|
2495
2555
|
} else {
|
2496
2556
|
where.id = id;
|
2497
2557
|
}
|
2498
|
-
|
2499
|
-
|
2558
|
+
const publishedAt = getPublishedAtClause(status, targetUid);
|
2559
|
+
if (!fp.isEmpty(publishedAt)) {
|
2560
|
+
where[`${alias}.published_at`] = publishedAt;
|
2500
2561
|
}
|
2501
2562
|
if (filterByLocale) {
|
2502
2563
|
where[`${alias}.locale`] = locale;
|
@@ -2553,9 +2614,7 @@ const relations = {
|
|
2553
2614
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
2554
2615
|
const sanitizedRes = await loadRelations({ id: entryId }, targetField, {
|
2555
2616
|
...strapi.get("query-params").transform(targetUid, permissionQuery),
|
2556
|
-
ordering: "desc"
|
2557
|
-
page: ctx.request.query.page,
|
2558
|
-
pageSize: ctx.request.query.pageSize
|
2617
|
+
ordering: "desc"
|
2559
2618
|
});
|
2560
2619
|
const relationsUnion = fp.uniqBy("id", fp.concat(sanitizedRes.results, res.results));
|
2561
2620
|
ctx.body = {
|
@@ -2587,7 +2646,7 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2587
2646
|
throw new strapiUtils.errors.ForbiddenError();
|
2588
2647
|
}
|
2589
2648
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.update(query);
|
2590
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2649
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2591
2650
|
const [documentVersion, otherDocumentVersion] = await Promise.all([
|
2592
2651
|
findDocument(sanitizedQuery, model, { locale, status: "draft" }),
|
2593
2652
|
// Find the first document to check if it exists
|
@@ -2628,7 +2687,7 @@ const singleTypes = {
|
|
2628
2687
|
return ctx.forbidden();
|
2629
2688
|
}
|
2630
2689
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
2631
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
2690
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
2632
2691
|
const version = await findDocument(permissionQuery, model, { locale, status });
|
2633
2692
|
if (!version) {
|
2634
2693
|
if (permissionChecker2.cannot.create()) {
|
@@ -2642,7 +2701,7 @@ const singleTypes = {
|
|
2642
2701
|
permissionChecker2,
|
2643
2702
|
model,
|
2644
2703
|
// @ts-expect-error - fix types
|
2645
|
-
{
|
2704
|
+
{ documentId: document.documentId, locale, publishedAt: null },
|
2646
2705
|
{ availableLocales: true, availableStatus: false }
|
2647
2706
|
);
|
2648
2707
|
ctx.body = { data: {}, meta };
|
@@ -2673,7 +2732,7 @@ const singleTypes = {
|
|
2673
2732
|
}
|
2674
2733
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2675
2734
|
const populate = await buildPopulateFromQuery(sanitizedQuery, model);
|
2676
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2735
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2677
2736
|
const documentLocales = await documentManager2.findLocales(void 0, model, {
|
2678
2737
|
populate,
|
2679
2738
|
locale
|
@@ -2710,7 +2769,7 @@ const singleTypes = {
|
|
2710
2769
|
if (permissionChecker2.cannot.publish(document)) {
|
2711
2770
|
throw new strapiUtils.errors.ForbiddenError();
|
2712
2771
|
}
|
2713
|
-
const { locale } = await getDocumentLocaleAndStatus(document);
|
2772
|
+
const { locale } = await getDocumentLocaleAndStatus(document, model);
|
2714
2773
|
const publishResult = await documentManager2.publish(document.documentId, model, { locale });
|
2715
2774
|
return publishResult.at(0);
|
2716
2775
|
});
|
@@ -2733,7 +2792,7 @@ const singleTypes = {
|
|
2733
2792
|
return ctx.forbidden();
|
2734
2793
|
}
|
2735
2794
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.unpublish(query);
|
2736
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2795
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2737
2796
|
const document = await findDocument(sanitizedQuery, model, { locale });
|
2738
2797
|
if (!document) {
|
2739
2798
|
return ctx.notFound();
|
@@ -2765,7 +2824,7 @@ const singleTypes = {
|
|
2765
2824
|
return ctx.forbidden();
|
2766
2825
|
}
|
2767
2826
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.discard(query);
|
2768
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2827
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2769
2828
|
const document = await findDocument(sanitizedQuery, model, { locale, status: "published" });
|
2770
2829
|
if (!document) {
|
2771
2830
|
return ctx.notFound();
|
@@ -2785,7 +2844,7 @@ const singleTypes = {
|
|
2785
2844
|
const { query } = ctx.request;
|
2786
2845
|
const documentManager2 = getService$1("document-manager");
|
2787
2846
|
const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
|
2788
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2847
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2789
2848
|
if (permissionChecker2.cannot.read()) {
|
2790
2849
|
return ctx.forbidden();
|
2791
2850
|
}
|
@@ -2806,7 +2865,7 @@ const uid$1 = {
|
|
2806
2865
|
async generateUID(ctx) {
|
2807
2866
|
const { contentTypeUID, field, data } = await validateGenerateUIDInput(ctx.request.body);
|
2808
2867
|
const { query = {} } = ctx.request;
|
2809
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2868
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2810
2869
|
await validateUIDField(contentTypeUID, field);
|
2811
2870
|
const uidService = getService$1("uid");
|
2812
2871
|
ctx.body = {
|
@@ -2818,7 +2877,7 @@ const uid$1 = {
|
|
2818
2877
|
ctx.request.body
|
2819
2878
|
);
|
2820
2879
|
const { query = {} } = ctx.request;
|
2821
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2880
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2822
2881
|
await validateUIDField(contentTypeUID, field);
|
2823
2882
|
const uidService = getService$1("uid");
|
2824
2883
|
const isAvailable = await uidService.checkUIDAvailability({
|
@@ -3461,12 +3520,27 @@ const createPermissionChecker = (strapi2) => ({ userAbility, model }) => {
|
|
3461
3520
|
ability: userAbility,
|
3462
3521
|
model
|
3463
3522
|
});
|
3464
|
-
const
|
3523
|
+
const { actionProvider } = strapi2.service("admin::permission");
|
3524
|
+
const toSubject = (entity) => {
|
3525
|
+
return entity ? permissionsManager.toSubject(entity, model) : model;
|
3526
|
+
};
|
3465
3527
|
const can = (action, entity, field) => {
|
3466
|
-
|
3528
|
+
const subject = toSubject(entity);
|
3529
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3530
|
+
return (
|
3531
|
+
// Test the original action to see if it passes
|
3532
|
+
userAbility.can(action, subject, field) || // Else try every known alias if at least one of them succeed, then the user "can"
|
3533
|
+
aliases.some((alias) => userAbility.can(alias, subject, field))
|
3534
|
+
);
|
3467
3535
|
};
|
3468
3536
|
const cannot = (action, entity, field) => {
|
3469
|
-
|
3537
|
+
const subject = toSubject(entity);
|
3538
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3539
|
+
return (
|
3540
|
+
// Test both the original action
|
3541
|
+
userAbility.cannot(action, subject, field) && // and every known alias, if all of them fail (cannot), then the user truly "cannot"
|
3542
|
+
aliases.every((alias) => userAbility.cannot(alias, subject, field))
|
3543
|
+
);
|
3470
3544
|
};
|
3471
3545
|
const sanitizeOutput = (data, { action = ACTIONS.read } = {}) => {
|
3472
3546
|
return permissionsManager.sanitizeOutput(data, { subject: toSubject(data), action });
|
@@ -3743,6 +3817,10 @@ const getDeepPopulateDraftCount = (uid2) => {
|
|
3743
3817
|
const attribute = model.attributes[attributeName];
|
3744
3818
|
switch (attribute.type) {
|
3745
3819
|
case "relation": {
|
3820
|
+
const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
|
3821
|
+
if (isMorphRelation) {
|
3822
|
+
break;
|
3823
|
+
}
|
3746
3824
|
if (isVisibleAttribute$1(model, attributeName)) {
|
3747
3825
|
populateAcc[attributeName] = {
|
3748
3826
|
count: true,
|
@@ -4120,7 +4198,13 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4120
4198
|
*/
|
4121
4199
|
async formatDocumentWithMetadata(uid2, document, opts = {}) {
|
4122
4200
|
if (!document) {
|
4123
|
-
return
|
4201
|
+
return {
|
4202
|
+
data: document,
|
4203
|
+
meta: {
|
4204
|
+
availableLocales: [],
|
4205
|
+
availableStatus: []
|
4206
|
+
}
|
4207
|
+
};
|
4124
4208
|
}
|
4125
4209
|
const hasDraftAndPublish = strapiUtils.contentTypes.hasDraftAndPublish(strapi2.getModel(uid2));
|
4126
4210
|
if (!hasDraftAndPublish) {
|
@@ -4228,10 +4312,7 @@ const documentManager = ({ strapi: strapi2 }) => {
|
|
4228
4312
|
async clone(id, body, uid2) {
|
4229
4313
|
const populate = await buildDeepPopulate(uid2);
|
4230
4314
|
const params = {
|
4231
|
-
data:
|
4232
|
-
...omitIdField(body),
|
4233
|
-
[PUBLISHED_AT_ATTRIBUTE]: null
|
4234
|
-
},
|
4315
|
+
data: omitIdField(body),
|
4235
4316
|
populate
|
4236
4317
|
};
|
4237
4318
|
return strapi2.documents(uid2).clone({ ...params, documentId: id }).then((result) => result?.entries.at(0));
|