@strapi/content-manager 0.0.0-experimental.d954d57341a6623992a0d211daaec8e245c3517d → 0.0.0-experimental.da85533897155e719d784f0271223c866d2f69ab
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-gdUj_t-O.mjs → ComponentConfigurationPage-9lRmRdIr.mjs} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-gdUj_t-O.mjs.map → ComponentConfigurationPage-9lRmRdIr.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-WRPUXGd6.js → ComponentConfigurationPage-DyDkPajU.js} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-WRPUXGd6.js.map → ComponentConfigurationPage-DyDkPajU.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-BwuIPOJG.mjs → EditConfigurationPage-Bk893vVY.mjs} +3 -3
- package/dist/_chunks/{EditConfigurationPage-BwuIPOJG.mjs.map → EditConfigurationPage-Bk893vVY.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-C1vjMBgy.js → EditConfigurationPage-DValmA0m.js} +3 -3
- package/dist/_chunks/{EditConfigurationPage-C1vjMBgy.js.map → EditConfigurationPage-DValmA0m.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-0MiFkXa8.mjs → EditViewPage-DiNFdFqP.mjs} +19 -8
- package/dist/_chunks/EditViewPage-DiNFdFqP.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-DbcGfyqK.js → EditViewPage-Dk7Eaft4.js} +19 -8
- package/dist/_chunks/EditViewPage-Dk7Eaft4.js.map +1 -0
- package/dist/_chunks/{Field-BG1xu38N.js → Field-DH2OaqUP.js} +458 -128
- package/dist/_chunks/Field-DH2OaqUP.js.map +1 -0
- package/dist/_chunks/{Field-BDMSCcy5.mjs → Field-Dv_HTFTa.mjs} +460 -130
- package/dist/_chunks/Field-Dv_HTFTa.mjs.map +1 -0
- package/dist/_chunks/{Form-9BnFyUjy.js → Form-B_dUDizM.js} +26 -12
- package/dist/_chunks/Form-B_dUDizM.js.map +1 -0
- package/dist/_chunks/{Form-CPVWavB8.mjs → Form-Dy6P4HgH.mjs} +26 -12
- package/dist/_chunks/Form-Dy6P4HgH.mjs.map +1 -0
- package/dist/_chunks/{History-BWWxLt2Z.js → History-BT4w83Oa.js} +44 -19
- package/dist/_chunks/History-BT4w83Oa.js.map +1 -0
- package/dist/_chunks/{History-BVpd8LP3.mjs → History-DrwsD1Vc.mjs} +44 -19
- package/dist/_chunks/History-DrwsD1Vc.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-DozVMKcR.mjs → ListConfigurationPage-BxIP0jRy.mjs} +20 -8
- package/dist/_chunks/ListConfigurationPage-BxIP0jRy.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-6swzjdAZ.js → ListConfigurationPage-CuYrMcW3.js} +20 -8
- package/dist/_chunks/ListConfigurationPage-CuYrMcW3.js.map +1 -0
- package/dist/_chunks/{ListViewPage-Ds0ulgfG.mjs → ListViewPage-5a1vw-OK.mjs} +40 -34
- package/dist/_chunks/ListViewPage-5a1vw-OK.mjs.map +1 -0
- package/dist/_chunks/{ListViewPage-BlzfjS2Q.js → ListViewPage-BvpwNur7.js} +38 -32
- package/dist/_chunks/ListViewPage-BvpwNur7.js.map +1 -0
- package/dist/_chunks/{NoContentTypePage-BH11kaKt.mjs → NoContentTypePage-Bm6tRcd3.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-BH11kaKt.mjs.map → NoContentTypePage-Bm6tRcd3.mjs.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-D2nCCWEl.js → NoContentTypePage-UqEiWKkM.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-D2nCCWEl.js.map → NoContentTypePage-UqEiWKkM.js.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-BT2Tn0D_.mjs → NoPermissionsPage-BHPqn_tQ.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-BT2Tn0D_.mjs.map → NoPermissionsPage-BHPqn_tQ.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-DN_JlsU2.js → NoPermissionsPage-C_vGRo8Q.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-DN_JlsU2.js.map → NoPermissionsPage-C_vGRo8Q.js.map} +1 -1
- package/dist/_chunks/{Relations-Dnag3fhV.mjs → Relations-C7fPyh5P.mjs} +4 -4
- package/dist/_chunks/Relations-C7fPyh5P.mjs.map +1 -0
- package/dist/_chunks/{Relations-CcgFTcWo.js → Relations-CznVF6LS.js} +4 -4
- package/dist/_chunks/Relations-CznVF6LS.js.map +1 -0
- package/dist/_chunks/{en-Ux26r5pl.mjs → en-CbaIuYoB.mjs} +6 -5
- package/dist/_chunks/{en-Ux26r5pl.mjs.map → en-CbaIuYoB.mjs.map} +1 -1
- package/dist/_chunks/{en-fbKQxLGn.js → en-otD_UBJi.js} +6 -5
- package/dist/_chunks/{en-fbKQxLGn.js.map → en-otD_UBJi.js.map} +1 -1
- package/dist/_chunks/{index-JNNNKUHs.mjs → index-BJ6uTqLL.mjs} +395 -179
- package/dist/_chunks/index-BJ6uTqLL.mjs.map +1 -0
- package/dist/_chunks/{index-CWpLBSt0.js → index-D9UmmBcM.js} +388 -172
- package/dist/_chunks/index-D9UmmBcM.js.map +1 -0
- package/dist/_chunks/{layout--iHdZzRk.js → layout-kfu5Wtix.js} +23 -11
- package/dist/_chunks/layout-kfu5Wtix.js.map +1 -0
- package/dist/_chunks/{layout-DC503LnF.mjs → layout-uomiIGbG.mjs} +25 -13
- package/dist/_chunks/layout-uomiIGbG.mjs.map +1 -0
- package/dist/_chunks/{relations-BbHizA5K.js → relations-DKENrxko.js} +2 -2
- package/dist/_chunks/{relations-BbHizA5K.js.map → relations-DKENrxko.js.map} +1 -1
- package/dist/_chunks/{relations-CTje5t-a.mjs → relations-DiDufGSA.mjs} +2 -2
- package/dist/_chunks/{relations-CTje5t-a.mjs.map → relations-DiDufGSA.mjs.map} +1 -1
- package/dist/admin/index.js +1 -1
- package/dist/admin/index.mjs +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/index.d.ts +1 -0
- package/dist/admin/src/pages/EditView/components/DocumentActions.d.ts +1 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/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 +4 -48
- 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 +16 -16
- 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 +178 -109
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +179 -110
- 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/package.json +8 -8
- package/dist/_chunks/EditViewPage-0MiFkXa8.mjs.map +0 -1
- package/dist/_chunks/EditViewPage-DbcGfyqK.js.map +0 -1
- package/dist/_chunks/Field-BDMSCcy5.mjs.map +0 -1
- package/dist/_chunks/Field-BG1xu38N.js.map +0 -1
- package/dist/_chunks/Form-9BnFyUjy.js.map +0 -1
- package/dist/_chunks/Form-CPVWavB8.mjs.map +0 -1
- package/dist/_chunks/History-BVpd8LP3.mjs.map +0 -1
- package/dist/_chunks/History-BWWxLt2Z.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-6swzjdAZ.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-DozVMKcR.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-BlzfjS2Q.js.map +0 -1
- package/dist/_chunks/ListViewPage-Ds0ulgfG.mjs.map +0 -1
- package/dist/_chunks/Relations-CcgFTcWo.js.map +0 -1
- package/dist/_chunks/Relations-Dnag3fhV.mjs.map +0 -1
- package/dist/_chunks/index-CWpLBSt0.js.map +0 -1
- package/dist/_chunks/index-JNNNKUHs.mjs.map +0 -1
- package/dist/_chunks/layout--iHdZzRk.js.map +0 -1
- package/dist/_chunks/layout-DC503LnF.mjs.map +0 -1
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,
|
@@ -464,13 +478,47 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
464
478
|
}
|
465
479
|
};
|
466
480
|
};
|
481
|
+
const shouldCreateHistoryVersion = (context) => {
|
482
|
+
if (!strapi.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
483
|
+
return false;
|
484
|
+
}
|
485
|
+
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
486
|
+
return false;
|
487
|
+
}
|
488
|
+
if (context.action === "update" && strapi.requestContext.get()?.request.url.endsWith("/actions/publish")) {
|
489
|
+
return false;
|
490
|
+
}
|
491
|
+
if (!context.contentType.uid.startsWith("api::")) {
|
492
|
+
return false;
|
493
|
+
}
|
494
|
+
return true;
|
495
|
+
};
|
496
|
+
const getSchemas = (uid2) => {
|
497
|
+
const attributesSchema = strapi.getModel(uid2).attributes;
|
498
|
+
const componentsSchemas = Object.keys(attributesSchema).reduce(
|
499
|
+
(currentComponentSchemas, key) => {
|
500
|
+
const fieldSchema = attributesSchema[key];
|
501
|
+
if (fieldSchema.type === "component") {
|
502
|
+
const componentSchema = strapi.getModel(fieldSchema.component).attributes;
|
503
|
+
return {
|
504
|
+
...currentComponentSchemas,
|
505
|
+
[fieldSchema.component]: componentSchema
|
506
|
+
};
|
507
|
+
}
|
508
|
+
return currentComponentSchemas;
|
509
|
+
},
|
510
|
+
{}
|
511
|
+
);
|
512
|
+
return {
|
513
|
+
schema: omit(FIELDS_TO_IGNORE, attributesSchema),
|
514
|
+
componentsSchemas
|
515
|
+
};
|
516
|
+
};
|
467
517
|
const createLifecyclesService = ({ strapi: strapi2 }) => {
|
468
518
|
const state = {
|
469
519
|
deleteExpiredJob: null,
|
470
520
|
isInitialized: false
|
471
521
|
};
|
472
|
-
const query = strapi2.db.query(HISTORY_VERSION_UID);
|
473
|
-
const historyService = getService(strapi2, "history");
|
474
522
|
const serviceUtils = createServiceUtils({ strapi: strapi2 });
|
475
523
|
return {
|
476
524
|
async bootstrap() {
|
@@ -478,63 +526,45 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
478
526
|
return;
|
479
527
|
}
|
480
528
|
strapi2.documents.use(async (context, next) => {
|
481
|
-
if (!strapi2.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
482
|
-
return next();
|
483
|
-
}
|
484
|
-
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
485
|
-
return next();
|
486
|
-
}
|
487
|
-
if (context.action === "update" && strapi2.requestContext.get()?.request.url.endsWith("/actions/publish")) {
|
488
|
-
return next();
|
489
|
-
}
|
490
|
-
const contentTypeUid = context.contentType.uid;
|
491
|
-
if (!contentTypeUid.startsWith("api::")) {
|
492
|
-
return next();
|
493
|
-
}
|
494
529
|
const result = await next();
|
495
|
-
|
496
|
-
|
497
|
-
|
498
|
-
|
530
|
+
if (!shouldCreateHistoryVersion(context)) {
|
531
|
+
return result;
|
532
|
+
}
|
533
|
+
const documentId = context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId;
|
499
534
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
500
|
-
const
|
501
|
-
if (
|
502
|
-
|
503
|
-
"[Content manager history middleware]: An array of locales was provided, but only a single locale is supported for the findOne operation."
|
504
|
-
);
|
505
|
-
return next();
|
535
|
+
const locales = castArray(context.params?.locale || defaultLocale);
|
536
|
+
if (!locales.length) {
|
537
|
+
return result;
|
506
538
|
}
|
507
|
-
const
|
508
|
-
|
509
|
-
|
510
|
-
|
539
|
+
const uid2 = context.contentType.uid;
|
540
|
+
const schemas = getSchemas(uid2);
|
541
|
+
const model = strapi2.getModel(uid2);
|
542
|
+
const isLocalizedContentType = serviceUtils.isLocalizedContentType(model);
|
543
|
+
const localeEntries = await strapi2.db.query(uid2).findMany({
|
544
|
+
where: {
|
545
|
+
documentId,
|
546
|
+
...isLocalizedContentType ? { locale: { $in: locales } } : {},
|
547
|
+
...contentTypes$1.hasDraftAndPublish(strapi2.contentTypes[uid2]) ? { publishedAt: null } : {}
|
548
|
+
},
|
549
|
+
populate: serviceUtils.getDeepPopulate(
|
550
|
+
uid2,
|
551
|
+
true
|
552
|
+
/* use database syntax */
|
553
|
+
)
|
511
554
|
});
|
512
|
-
const status = await serviceUtils.getVersionStatus(contentTypeUid, document);
|
513
|
-
const attributesSchema = strapi2.getModel(contentTypeUid).attributes;
|
514
|
-
const componentsSchemas = Object.keys(
|
515
|
-
attributesSchema
|
516
|
-
).reduce((currentComponentSchemas, key) => {
|
517
|
-
const fieldSchema = attributesSchema[key];
|
518
|
-
if (fieldSchema.type === "component") {
|
519
|
-
const componentSchema = strapi2.getModel(fieldSchema.component).attributes;
|
520
|
-
return {
|
521
|
-
...currentComponentSchemas,
|
522
|
-
[fieldSchema.component]: componentSchema
|
523
|
-
};
|
524
|
-
}
|
525
|
-
return currentComponentSchemas;
|
526
|
-
}, {});
|
527
555
|
await strapi2.db.transaction(async ({ onCommit }) => {
|
528
|
-
onCommit(() => {
|
529
|
-
|
530
|
-
|
531
|
-
|
532
|
-
|
533
|
-
|
534
|
-
|
535
|
-
|
536
|
-
|
537
|
-
|
556
|
+
onCommit(async () => {
|
557
|
+
for (const entry of localeEntries) {
|
558
|
+
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
559
|
+
await getService(strapi2, "history").createVersion({
|
560
|
+
contentType: uid2,
|
561
|
+
data: omit(FIELDS_TO_IGNORE, entry),
|
562
|
+
relatedDocumentId: documentId,
|
563
|
+
locale: entry.locale,
|
564
|
+
status,
|
565
|
+
...schemas
|
566
|
+
});
|
567
|
+
}
|
538
568
|
});
|
539
569
|
});
|
540
570
|
return result;
|
@@ -542,7 +572,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
542
572
|
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
543
573
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
544
574
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
545
|
-
query.deleteMany({
|
575
|
+
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
546
576
|
where: {
|
547
577
|
created_at: {
|
548
578
|
$lt: expirationDate.toISOString()
|
@@ -1174,6 +1204,11 @@ const { createPolicy } = policy;
|
|
1174
1204
|
const hasPermissions = createPolicy({
|
1175
1205
|
name: "plugin::content-manager.hasPermissions",
|
1176
1206
|
validator: validateHasPermissionsInput,
|
1207
|
+
/**
|
1208
|
+
* NOTE: Action aliases are currently not checked at this level (policy).
|
1209
|
+
* This is currently the intended behavior to avoid changing the behavior of API related permissions.
|
1210
|
+
* If you want to add support for it, please create a dedicated RFC with a list of potential side effect this could have.
|
1211
|
+
*/
|
1177
1212
|
handler(ctx, config = {}) {
|
1178
1213
|
const { actions = [], hasAtLeastOne = false } = config;
|
1179
1214
|
const { userAbility } = ctx.state;
|
@@ -1567,9 +1602,11 @@ const multipleLocaleSchema = yup$1.lazy(
|
|
1567
1602
|
(value) => Array.isArray(value) ? yup$1.array().of(singleLocaleSchema.required()) : singleLocaleSchema
|
1568
1603
|
);
|
1569
1604
|
const statusSchema = yup$1.mixed().oneOf(["draft", "published"], "Invalid status");
|
1570
|
-
const getDocumentLocaleAndStatus = async (request, opts = { allowMultipleLocales: false }) => {
|
1605
|
+
const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultipleLocales: false }) => {
|
1571
1606
|
const { allowMultipleLocales } = opts;
|
1572
|
-
const { locale, status, ...rest } = request || {};
|
1607
|
+
const { locale, status: providedStatus, ...rest } = request || {};
|
1608
|
+
const defaultStatus = contentTypes$1.hasDraftAndPublish(strapi.getModel(model)) ? void 0 : "published";
|
1609
|
+
const status = providedStatus !== void 0 ? providedStatus : defaultStatus;
|
1573
1610
|
const schema = yup$1.object().shape({
|
1574
1611
|
locale: allowMultipleLocales ? multipleLocaleSchema : singleLocaleSchema,
|
1575
1612
|
status: statusSchema
|
@@ -1617,7 +1654,7 @@ const createDocument = async (ctx, opts) => {
|
|
1617
1654
|
const setCreator = setCreatorFields({ user });
|
1618
1655
|
const sanitizeFn = async.pipe(pickPermittedFields, setCreator);
|
1619
1656
|
const sanitizedBody = await sanitizeFn(body);
|
1620
|
-
const { locale, status
|
1657
|
+
const { locale, status } = await getDocumentLocaleAndStatus(body, model);
|
1621
1658
|
return documentManager2.create(model, {
|
1622
1659
|
data: sanitizedBody,
|
1623
1660
|
locale,
|
@@ -1636,7 +1673,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1636
1673
|
}
|
1637
1674
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1638
1675
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1639
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1676
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1640
1677
|
const [documentVersion, documentExists] = await Promise.all([
|
1641
1678
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
1642
1679
|
documentManager2.exists(model, id)
|
@@ -1674,7 +1711,7 @@ const collectionTypes = {
|
|
1674
1711
|
}
|
1675
1712
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1676
1713
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1677
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
1714
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1678
1715
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1679
1716
|
{ ...permissionQuery, populate, locale, status },
|
1680
1717
|
model
|
@@ -1709,7 +1746,7 @@ const collectionTypes = {
|
|
1709
1746
|
}
|
1710
1747
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1711
1748
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1712
|
-
const { locale, status
|
1749
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1713
1750
|
const version = await documentManager2.findOne(id, model, {
|
1714
1751
|
populate,
|
1715
1752
|
locale,
|
@@ -1776,7 +1813,7 @@ const collectionTypes = {
|
|
1776
1813
|
}
|
1777
1814
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1778
1815
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1779
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1816
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1780
1817
|
const document = await documentManager2.findOne(id, model, {
|
1781
1818
|
populate,
|
1782
1819
|
locale,
|
@@ -1821,7 +1858,7 @@ const collectionTypes = {
|
|
1821
1858
|
}
|
1822
1859
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1823
1860
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1824
|
-
const { locale } = await getDocumentLocaleAndStatus(ctx.query);
|
1861
|
+
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1825
1862
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1826
1863
|
if (documentLocales.length === 0) {
|
1827
1864
|
return ctx.notFound();
|
@@ -1850,11 +1887,28 @@ const collectionTypes = {
|
|
1850
1887
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1851
1888
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1852
1889
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1853
|
-
|
1890
|
+
let document;
|
1891
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1892
|
+
const isCreate = isNil$1(id);
|
1893
|
+
if (isCreate) {
|
1894
|
+
if (permissionChecker2.cannot.create()) {
|
1895
|
+
throw new errors.ForbiddenError();
|
1896
|
+
}
|
1897
|
+
document = await createDocument(ctx, { populate });
|
1898
|
+
}
|
1899
|
+
const isUpdate = !isCreate;
|
1900
|
+
if (isUpdate) {
|
1901
|
+
document = await documentManager2.findOne(id, model, { populate, locale });
|
1902
|
+
if (!document) {
|
1903
|
+
throw new errors.NotFoundError("Document not found");
|
1904
|
+
}
|
1905
|
+
if (permissionChecker2.can.update(document)) {
|
1906
|
+
await updateDocument(ctx);
|
1907
|
+
}
|
1908
|
+
}
|
1854
1909
|
if (permissionChecker2.cannot.publish(document)) {
|
1855
1910
|
throw new errors.ForbiddenError();
|
1856
1911
|
}
|
1857
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1858
1912
|
const publishResult = await documentManager2.publish(document.documentId, model, {
|
1859
1913
|
locale
|
1860
1914
|
// TODO: Allow setting creator fields on publish
|
@@ -1881,7 +1935,9 @@ const collectionTypes = {
|
|
1881
1935
|
}
|
1882
1936
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1883
1937
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1884
|
-
const { locale } = await getDocumentLocaleAndStatus(body, {
|
1938
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1939
|
+
allowMultipleLocales: true
|
1940
|
+
});
|
1885
1941
|
const entityPromises = documentIds.map(
|
1886
1942
|
(documentId) => documentManager2.findLocales(documentId, model, { populate, locale, isPublished: false })
|
1887
1943
|
);
|
@@ -1908,7 +1964,7 @@ const collectionTypes = {
|
|
1908
1964
|
if (permissionChecker2.cannot.unpublish()) {
|
1909
1965
|
return ctx.forbidden();
|
1910
1966
|
}
|
1911
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1967
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1912
1968
|
const entityPromises = documentIds.map(
|
1913
1969
|
(documentId) => documentManager2.findLocales(documentId, model, { locale, isPublished: true })
|
1914
1970
|
);
|
@@ -1941,7 +1997,7 @@ const collectionTypes = {
|
|
1941
1997
|
}
|
1942
1998
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
1943
1999
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1944
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2000
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1945
2001
|
const document = await documentManager2.findOne(id, model, {
|
1946
2002
|
populate,
|
1947
2003
|
locale,
|
@@ -1978,7 +2034,7 @@ const collectionTypes = {
|
|
1978
2034
|
}
|
1979
2035
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
1980
2036
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1981
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2037
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1982
2038
|
const document = await documentManager2.findOne(id, model, {
|
1983
2039
|
populate,
|
1984
2040
|
locale,
|
@@ -2009,7 +2065,7 @@ const collectionTypes = {
|
|
2009
2065
|
}
|
2010
2066
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2011
2067
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2012
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2068
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2013
2069
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2014
2070
|
populate,
|
2015
2071
|
locale
|
@@ -2036,7 +2092,7 @@ const collectionTypes = {
|
|
2036
2092
|
}
|
2037
2093
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2038
2094
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2039
|
-
const { locale, status
|
2095
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2040
2096
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2041
2097
|
if (!entity) {
|
2042
2098
|
return ctx.notFound();
|
@@ -2059,7 +2115,7 @@ const collectionTypes = {
|
|
2059
2115
|
if (permissionChecker2.cannot.read()) {
|
2060
2116
|
return ctx.forbidden();
|
2061
2117
|
}
|
2062
|
-
const
|
2118
|
+
const documents = await documentManager2.findMany(
|
2063
2119
|
{
|
2064
2120
|
filters: {
|
2065
2121
|
documentId: ids
|
@@ -2068,7 +2124,7 @@ const collectionTypes = {
|
|
2068
2124
|
},
|
2069
2125
|
model
|
2070
2126
|
);
|
2071
|
-
if (!
|
2127
|
+
if (!documents) {
|
2072
2128
|
return ctx.notFound();
|
2073
2129
|
}
|
2074
2130
|
const number = await documentManager2.countManyEntriesDraftRelations(ids, model, locale);
|
@@ -2259,20 +2315,13 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2259
2315
|
userAbility,
|
2260
2316
|
model: model.uid
|
2261
2317
|
});
|
2262
|
-
|
2318
|
+
const isMainFieldListable = isListable(model, mainField);
|
2319
|
+
const canReadMainField = permissionChecker2.can.read(null, mainField);
|
2320
|
+
if (!isMainFieldListable || !canReadMainField) {
|
2263
2321
|
return "id";
|
2264
2322
|
}
|
2265
|
-
if (
|
2266
|
-
|
2267
|
-
const userPermissionChecker = getService$1("permission-checker").create({
|
2268
|
-
userAbility,
|
2269
|
-
model: "plugin::users-permissions.user"
|
2270
|
-
});
|
2271
|
-
if (userPermissionChecker.can.read()) {
|
2272
|
-
return "name";
|
2273
|
-
}
|
2274
|
-
}
|
2275
|
-
return "id";
|
2323
|
+
if (model.uid === "plugin::users-permissions.role") {
|
2324
|
+
return "name";
|
2276
2325
|
}
|
2277
2326
|
return mainField;
|
2278
2327
|
};
|
@@ -2530,9 +2579,7 @@ const relations = {
|
|
2530
2579
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
2531
2580
|
const sanitizedRes = await loadRelations({ id: entryId }, targetField, {
|
2532
2581
|
...strapi.get("query-params").transform(targetUid, permissionQuery),
|
2533
|
-
ordering: "desc"
|
2534
|
-
page: ctx.request.query.page,
|
2535
|
-
pageSize: ctx.request.query.pageSize
|
2582
|
+
ordering: "desc"
|
2536
2583
|
});
|
2537
2584
|
const relationsUnion = uniqBy("id", concat(sanitizedRes.results, res.results));
|
2538
2585
|
ctx.body = {
|
@@ -2564,7 +2611,7 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2564
2611
|
throw new errors.ForbiddenError();
|
2565
2612
|
}
|
2566
2613
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.update(query);
|
2567
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2614
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2568
2615
|
const [documentVersion, otherDocumentVersion] = await Promise.all([
|
2569
2616
|
findDocument(sanitizedQuery, model, { locale, status: "draft" }),
|
2570
2617
|
// Find the first document to check if it exists
|
@@ -2605,7 +2652,7 @@ const singleTypes = {
|
|
2605
2652
|
return ctx.forbidden();
|
2606
2653
|
}
|
2607
2654
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
2608
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
2655
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
2609
2656
|
const version = await findDocument(permissionQuery, model, { locale, status });
|
2610
2657
|
if (!version) {
|
2611
2658
|
if (permissionChecker2.cannot.create()) {
|
@@ -2650,7 +2697,7 @@ const singleTypes = {
|
|
2650
2697
|
}
|
2651
2698
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2652
2699
|
const populate = await buildPopulateFromQuery(sanitizedQuery, model);
|
2653
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2700
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2654
2701
|
const documentLocales = await documentManager2.findLocales(void 0, model, {
|
2655
2702
|
populate,
|
2656
2703
|
locale
|
@@ -2687,7 +2734,7 @@ const singleTypes = {
|
|
2687
2734
|
if (permissionChecker2.cannot.publish(document)) {
|
2688
2735
|
throw new errors.ForbiddenError();
|
2689
2736
|
}
|
2690
|
-
const { locale } = await getDocumentLocaleAndStatus(document);
|
2737
|
+
const { locale } = await getDocumentLocaleAndStatus(document, model);
|
2691
2738
|
const publishResult = await documentManager2.publish(document.documentId, model, { locale });
|
2692
2739
|
return publishResult.at(0);
|
2693
2740
|
});
|
@@ -2710,7 +2757,7 @@ const singleTypes = {
|
|
2710
2757
|
return ctx.forbidden();
|
2711
2758
|
}
|
2712
2759
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.unpublish(query);
|
2713
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2760
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2714
2761
|
const document = await findDocument(sanitizedQuery, model, { locale });
|
2715
2762
|
if (!document) {
|
2716
2763
|
return ctx.notFound();
|
@@ -2742,7 +2789,7 @@ const singleTypes = {
|
|
2742
2789
|
return ctx.forbidden();
|
2743
2790
|
}
|
2744
2791
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.discard(query);
|
2745
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2792
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2746
2793
|
const document = await findDocument(sanitizedQuery, model, { locale, status: "published" });
|
2747
2794
|
if (!document) {
|
2748
2795
|
return ctx.notFound();
|
@@ -2762,7 +2809,7 @@ const singleTypes = {
|
|
2762
2809
|
const { query } = ctx.request;
|
2763
2810
|
const documentManager2 = getService$1("document-manager");
|
2764
2811
|
const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
|
2765
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2812
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2766
2813
|
if (permissionChecker2.cannot.read()) {
|
2767
2814
|
return ctx.forbidden();
|
2768
2815
|
}
|
@@ -2783,7 +2830,7 @@ const uid$1 = {
|
|
2783
2830
|
async generateUID(ctx) {
|
2784
2831
|
const { contentTypeUID, field, data } = await validateGenerateUIDInput(ctx.request.body);
|
2785
2832
|
const { query = {} } = ctx.request;
|
2786
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2833
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2787
2834
|
await validateUIDField(contentTypeUID, field);
|
2788
2835
|
const uidService = getService$1("uid");
|
2789
2836
|
ctx.body = {
|
@@ -2795,7 +2842,7 @@ const uid$1 = {
|
|
2795
2842
|
ctx.request.body
|
2796
2843
|
);
|
2797
2844
|
const { query = {} } = ctx.request;
|
2798
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2845
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2799
2846
|
await validateUIDField(contentTypeUID, field);
|
2800
2847
|
const uidService = getService$1("uid");
|
2801
2848
|
const isAvailable = await uidService.checkUIDAvailability({
|
@@ -3438,12 +3485,27 @@ const createPermissionChecker = (strapi2) => ({ userAbility, model }) => {
|
|
3438
3485
|
ability: userAbility,
|
3439
3486
|
model
|
3440
3487
|
});
|
3441
|
-
const
|
3488
|
+
const { actionProvider } = strapi2.service("admin::permission");
|
3489
|
+
const toSubject = (entity) => {
|
3490
|
+
return entity ? permissionsManager.toSubject(entity, model) : model;
|
3491
|
+
};
|
3442
3492
|
const can = (action, entity, field) => {
|
3443
|
-
|
3493
|
+
const subject = toSubject(entity);
|
3494
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3495
|
+
return (
|
3496
|
+
// Test the original action to see if it passes
|
3497
|
+
userAbility.can(action, subject, field) || // Else try every known alias if at least one of them succeed, then the user "can"
|
3498
|
+
aliases.some((alias) => userAbility.can(alias, subject, field))
|
3499
|
+
);
|
3444
3500
|
};
|
3445
3501
|
const cannot = (action, entity, field) => {
|
3446
|
-
|
3502
|
+
const subject = toSubject(entity);
|
3503
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3504
|
+
return (
|
3505
|
+
// Test both the original action
|
3506
|
+
userAbility.cannot(action, subject, field) && // and every known alias, if all of them fail (cannot), then the user truly "cannot"
|
3507
|
+
aliases.every((alias) => userAbility.cannot(alias, subject, field))
|
3508
|
+
);
|
3447
3509
|
};
|
3448
3510
|
const sanitizeOutput = (data, { action = ACTIONS.read } = {}) => {
|
3449
3511
|
return permissionsManager.sanitizeOutput(data, { subject: toSubject(data), action });
|
@@ -3720,6 +3782,10 @@ const getDeepPopulateDraftCount = (uid2) => {
|
|
3720
3782
|
const attribute = model.attributes[attributeName];
|
3721
3783
|
switch (attribute.type) {
|
3722
3784
|
case "relation": {
|
3785
|
+
const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
|
3786
|
+
if (isMorphRelation) {
|
3787
|
+
break;
|
3788
|
+
}
|
3723
3789
|
if (isVisibleAttribute$1(model, attributeName)) {
|
3724
3790
|
populateAcc[attributeName] = {
|
3725
3791
|
count: true,
|
@@ -4097,7 +4163,13 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4097
4163
|
*/
|
4098
4164
|
async formatDocumentWithMetadata(uid2, document, opts = {}) {
|
4099
4165
|
if (!document) {
|
4100
|
-
return
|
4166
|
+
return {
|
4167
|
+
data: document,
|
4168
|
+
meta: {
|
4169
|
+
availableLocales: [],
|
4170
|
+
availableStatus: []
|
4171
|
+
}
|
4172
|
+
};
|
4101
4173
|
}
|
4102
4174
|
const hasDraftAndPublish = contentTypes$1.hasDraftAndPublish(strapi2.getModel(uid2));
|
4103
4175
|
if (!hasDraftAndPublish) {
|
@@ -4205,10 +4277,7 @@ const documentManager = ({ strapi: strapi2 }) => {
|
|
4205
4277
|
async clone(id, body, uid2) {
|
4206
4278
|
const populate = await buildDeepPopulate(uid2);
|
4207
4279
|
const params = {
|
4208
|
-
data:
|
4209
|
-
...omitIdField(body),
|
4210
|
-
[PUBLISHED_AT_ATTRIBUTE]: null
|
4211
|
-
},
|
4280
|
+
data: omitIdField(body),
|
4212
4281
|
populate
|
4213
4282
|
};
|
4214
4283
|
return strapi2.documents(uid2).clone({ ...params, documentId: id }).then((result) => result?.entries.at(0));
|