@strapi/content-manager 0.0.0-experimental.a53a4b1c8f7981a689823cdd719105671e1c6392 → 0.0.0-experimental.a6728ad43ac70ae19dabb624dbfca1f2d9610a86
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-DmwmiFQy.mjs → ComponentConfigurationPage-DJ5voqEK.mjs} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-DmwmiFQy.mjs.map → ComponentConfigurationPage-DJ5voqEK.mjs.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-C-49MccQ.js → ComponentConfigurationPage-_6osrv39.js} +3 -3
- package/dist/_chunks/{ComponentConfigurationPage-C-49MccQ.js.map → ComponentConfigurationPage-_6osrv39.js.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-JT3E7NZy.mjs → EditConfigurationPage-CZofxSLy.mjs} +3 -3
- package/dist/_chunks/{EditConfigurationPage-JT3E7NZy.mjs.map → EditConfigurationPage-CZofxSLy.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-DjFJw56M.js → EditConfigurationPage-ZN3s568V.js} +3 -3
- package/dist/_chunks/{EditConfigurationPage-DjFJw56M.js.map → EditConfigurationPage-ZN3s568V.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-zT3fBr4Y.js → EditViewPage-Co2IKQZH.js} +19 -8
- package/dist/_chunks/EditViewPage-Co2IKQZH.js.map +1 -0
- package/dist/_chunks/{EditViewPage-CPj61RMh.mjs → EditViewPage-HYljoEY7.mjs} +19 -8
- package/dist/_chunks/EditViewPage-HYljoEY7.mjs.map +1 -0
- package/dist/_chunks/{Field-dha5VnIQ.mjs → Field-BOPUMZ1u.mjs} +194 -141
- package/dist/_chunks/Field-BOPUMZ1u.mjs.map +1 -0
- package/dist/_chunks/{Field-Boxf9Ajp.js → Field-G9CkFUtP.js} +196 -143
- package/dist/_chunks/Field-G9CkFUtP.js.map +1 -0
- package/dist/_chunks/{Form-DHrru2AV.mjs → Form-CDwNp7pU.mjs} +35 -16
- package/dist/_chunks/Form-CDwNp7pU.mjs.map +1 -0
- package/dist/_chunks/{Form-y5g1SRsh.js → Form-crsbkGxI.js} +35 -16
- package/dist/_chunks/Form-crsbkGxI.js.map +1 -0
- package/dist/_chunks/{History-Bru_KoeP.mjs → History-BDZrgfZ3.mjs} +44 -19
- package/dist/_chunks/History-BDZrgfZ3.mjs.map +1 -0
- package/dist/_chunks/{History-CqN6K7SX.js → History-CWcM9HnW.js} +44 -19
- package/dist/_chunks/History-CWcM9HnW.js.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-D8wGABj0.mjs → ListConfigurationPage-BZ3ScUna.mjs} +20 -8
- package/dist/_chunks/ListConfigurationPage-BZ3ScUna.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-R_p-SbHZ.js → ListConfigurationPage-DGzoQD_I.js} +20 -8
- package/dist/_chunks/ListConfigurationPage-DGzoQD_I.js.map +1 -0
- package/dist/_chunks/{ListViewPage-pEw_zug9.js → ListViewPage-BBAC9aPu.js} +60 -42
- package/dist/_chunks/ListViewPage-BBAC9aPu.js.map +1 -0
- package/dist/_chunks/{ListViewPage-SID6TRb9.mjs → ListViewPage-CsX7tWx-.mjs} +58 -40
- package/dist/_chunks/ListViewPage-CsX7tWx-.mjs.map +1 -0
- package/dist/_chunks/{NoContentTypePage-C5dcQojD.js → NoContentTypePage-CwVDx_YC.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-C5dcQojD.js.map → NoContentTypePage-CwVDx_YC.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-CJ7UXwrQ.mjs → NoContentTypePage-LClTUPWs.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-CJ7UXwrQ.mjs.map → NoContentTypePage-LClTUPWs.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-BtPrImPP.js → NoPermissionsPage-D2iWw-sn.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-BtPrImPP.js.map → NoPermissionsPage-D2iWw-sn.js.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-B7syEq5E.mjs → NoPermissionsPage-S4Re3FwO.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-B7syEq5E.mjs.map → NoPermissionsPage-S4Re3FwO.mjs.map} +1 -1
- package/dist/_chunks/{Relations-B9Crnhnn.mjs → Relations-Dmv0Tpe5.mjs} +4 -4
- package/dist/_chunks/Relations-Dmv0Tpe5.mjs.map +1 -0
- package/dist/_chunks/{Relations-DjTQ5kGB.js → Relations-jwuTFGOV.js} +4 -4
- package/dist/_chunks/Relations-jwuTFGOV.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-DJXJw9V5.mjs → index-BmUAydCA.mjs} +977 -680
- package/dist/_chunks/index-BmUAydCA.mjs.map +1 -0
- package/dist/_chunks/{index-DVPWZkbS.js → index-CBX6KyXv.js} +958 -661
- package/dist/_chunks/index-CBX6KyXv.js.map +1 -0
- package/dist/_chunks/{layout-Bau7ZfLV.mjs → layout-ClP-DC72.mjs} +25 -12
- package/dist/_chunks/layout-ClP-DC72.mjs.map +1 -0
- package/dist/_chunks/{layout-Dm6fbiQj.js → layout-CxxkX9jY.js} +24 -11
- package/dist/_chunks/layout-CxxkX9jY.js.map +1 -0
- package/dist/_chunks/{relations-CKnpRgrN.js → relations-DIjTADIu.js} +2 -2
- package/dist/_chunks/{relations-CKnpRgrN.js.map → relations-DIjTADIu.js.map} +1 -1
- package/dist/_chunks/{relations-BH_kBSJ0.mjs → relations-op89RClB.mjs} +2 -2
- package/dist/_chunks/{relations-BH_kBSJ0.mjs.map → relations-op89RClB.mjs.map} +1 -1
- package/dist/_chunks/{usePrev-B9w_-eYc.js → useDebounce-CtcjDB3L.js} +14 -1
- package/dist/_chunks/useDebounce-CtcjDB3L.js.map +1 -0
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs +29 -0
- package/dist/_chunks/useDebounce-DmuSJIF3.mjs.map +1 -0
- package/dist/admin/index.js +2 -1
- package/dist/admin/index.js.map +1 -1
- package/dist/admin/index.mjs +5 -4
- package/dist/admin/src/exports.d.ts +1 -1
- package/dist/admin/src/history/index.d.ts +3 -0
- package/dist/admin/src/history/services/historyVersion.d.ts +1 -1
- package/dist/admin/src/hooks/useDocument.d.ts +30 -1
- package/dist/admin/src/index.d.ts +1 -0
- package/dist/admin/src/pages/EditView/components/DocumentActions.d.ts +1 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/Relations.d.ts +20 -0
- package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/EditorLayout.d.ts +2 -2
- package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/WysiwygFooter.d.ts +2 -2
- package/dist/admin/src/pages/EditView/components/FormInputs/Wysiwyg/WysiwygStyles.d.ts +4 -48
- package/dist/admin/src/pages/EditView/components/Header.d.ts +10 -11
- package/dist/admin/src/services/api.d.ts +1 -1
- package/dist/admin/src/services/components.d.ts +2 -2
- package/dist/admin/src/services/contentTypes.d.ts +3 -3
- package/dist/admin/src/services/documents.d.ts +19 -17
- package/dist/admin/src/services/init.d.ts +1 -1
- package/dist/admin/src/services/relations.d.ts +2 -2
- package/dist/admin/src/services/uid.d.ts +3 -3
- package/dist/admin/src/utils/validation.d.ts +4 -1
- package/dist/server/index.js +181 -107
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +182 -108
- 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-CPj61RMh.mjs.map +0 -1
- package/dist/_chunks/EditViewPage-zT3fBr4Y.js.map +0 -1
- package/dist/_chunks/Field-Boxf9Ajp.js.map +0 -1
- package/dist/_chunks/Field-dha5VnIQ.mjs.map +0 -1
- package/dist/_chunks/Form-DHrru2AV.mjs.map +0 -1
- package/dist/_chunks/Form-y5g1SRsh.js.map +0 -1
- package/dist/_chunks/History-Bru_KoeP.mjs.map +0 -1
- package/dist/_chunks/History-CqN6K7SX.js.map +0 -1
- package/dist/_chunks/ListConfigurationPage-D8wGABj0.mjs.map +0 -1
- package/dist/_chunks/ListConfigurationPage-R_p-SbHZ.js.map +0 -1
- package/dist/_chunks/ListViewPage-SID6TRb9.mjs.map +0 -1
- package/dist/_chunks/ListViewPage-pEw_zug9.js.map +0 -1
- package/dist/_chunks/Relations-B9Crnhnn.mjs.map +0 -1
- package/dist/_chunks/Relations-DjTQ5kGB.js.map +0 -1
- package/dist/_chunks/index-DJXJw9V5.mjs.map +0 -1
- package/dist/_chunks/index-DVPWZkbS.js.map +0 -1
- package/dist/_chunks/layout-Bau7ZfLV.mjs.map +0 -1
- package/dist/_chunks/layout-Dm6fbiQj.js.map +0 -1
- package/dist/_chunks/usePrev-B9w_-eYc.js.map +0 -1
- package/dist/_chunks/usePrev-DH6iah0A.mjs +0 -16
- package/dist/_chunks/usePrev-DH6iah0A.mjs.map +0 -1
- package/strapi-server.js +0 -3
package/dist/server/index.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,6 +478,42 @@ 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,
|
@@ -476,63 +526,45 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
476
526
|
return;
|
477
527
|
}
|
478
528
|
strapi2.documents.use(async (context, next) => {
|
479
|
-
if (!strapi2.requestContext.get()?.request.url.startsWith("/content-manager")) {
|
480
|
-
return next();
|
481
|
-
}
|
482
|
-
if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
|
483
|
-
return next();
|
484
|
-
}
|
485
|
-
if (context.action === "update" && strapi2.requestContext.get()?.request.url.endsWith("/actions/publish")) {
|
486
|
-
return next();
|
487
|
-
}
|
488
|
-
const contentTypeUid = context.contentType.uid;
|
489
|
-
if (!contentTypeUid.startsWith("api::")) {
|
490
|
-
return next();
|
491
|
-
}
|
492
529
|
const result = await next();
|
493
|
-
|
494
|
-
|
495
|
-
|
496
|
-
|
530
|
+
if (!shouldCreateHistoryVersion(context)) {
|
531
|
+
return result;
|
532
|
+
}
|
533
|
+
const documentId = context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId;
|
497
534
|
const defaultLocale = await serviceUtils.getDefaultLocale();
|
498
|
-
const
|
499
|
-
if (
|
500
|
-
|
501
|
-
"[Content manager history middleware]: An array of locales was provided, but only a single locale is supported for the findOne operation."
|
502
|
-
);
|
503
|
-
return next();
|
535
|
+
const locales = castArray(context.params?.locale || defaultLocale);
|
536
|
+
if (!locales.length) {
|
537
|
+
return result;
|
504
538
|
}
|
505
|
-
const
|
506
|
-
|
507
|
-
|
508
|
-
|
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
|
+
)
|
509
554
|
});
|
510
|
-
const status = await serviceUtils.getVersionStatus(contentTypeUid, document);
|
511
|
-
const attributesSchema = strapi2.getModel(contentTypeUid).attributes;
|
512
|
-
const componentsSchemas = Object.keys(
|
513
|
-
attributesSchema
|
514
|
-
).reduce((currentComponentSchemas, key) => {
|
515
|
-
const fieldSchema = attributesSchema[key];
|
516
|
-
if (fieldSchema.type === "component") {
|
517
|
-
const componentSchema = strapi2.getModel(fieldSchema.component).attributes;
|
518
|
-
return {
|
519
|
-
...currentComponentSchemas,
|
520
|
-
[fieldSchema.component]: componentSchema
|
521
|
-
};
|
522
|
-
}
|
523
|
-
return currentComponentSchemas;
|
524
|
-
}, {});
|
525
555
|
await strapi2.db.transaction(async ({ onCommit }) => {
|
526
|
-
onCommit(() => {
|
527
|
-
|
528
|
-
|
529
|
-
|
530
|
-
|
531
|
-
|
532
|
-
|
533
|
-
|
534
|
-
|
535
|
-
|
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
|
+
}
|
536
568
|
});
|
537
569
|
});
|
538
570
|
return result;
|
@@ -1172,6 +1204,11 @@ const { createPolicy } = policy;
|
|
1172
1204
|
const hasPermissions = createPolicy({
|
1173
1205
|
name: "plugin::content-manager.hasPermissions",
|
1174
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
|
+
*/
|
1175
1212
|
handler(ctx, config = {}) {
|
1176
1213
|
const { actions = [], hasAtLeastOne = false } = config;
|
1177
1214
|
const { userAbility } = ctx.state;
|
@@ -1565,9 +1602,11 @@ const multipleLocaleSchema = yup$1.lazy(
|
|
1565
1602
|
(value) => Array.isArray(value) ? yup$1.array().of(singleLocaleSchema.required()) : singleLocaleSchema
|
1566
1603
|
);
|
1567
1604
|
const statusSchema = yup$1.mixed().oneOf(["draft", "published"], "Invalid status");
|
1568
|
-
const getDocumentLocaleAndStatus = async (request, opts = { allowMultipleLocales: false }) => {
|
1605
|
+
const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultipleLocales: false }) => {
|
1569
1606
|
const { allowMultipleLocales } = opts;
|
1570
|
-
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;
|
1571
1610
|
const schema = yup$1.object().shape({
|
1572
1611
|
locale: allowMultipleLocales ? multipleLocaleSchema : singleLocaleSchema,
|
1573
1612
|
status: statusSchema
|
@@ -1615,7 +1654,7 @@ const createDocument = async (ctx, opts) => {
|
|
1615
1654
|
const setCreator = setCreatorFields({ user });
|
1616
1655
|
const sanitizeFn = async.pipe(pickPermittedFields, setCreator);
|
1617
1656
|
const sanitizedBody = await sanitizeFn(body);
|
1618
|
-
const { locale, status
|
1657
|
+
const { locale, status } = await getDocumentLocaleAndStatus(body, model);
|
1619
1658
|
return documentManager2.create(model, {
|
1620
1659
|
data: sanitizedBody,
|
1621
1660
|
locale,
|
@@ -1634,7 +1673,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1634
1673
|
}
|
1635
1674
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1636
1675
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1637
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1676
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1638
1677
|
const [documentVersion, documentExists] = await Promise.all([
|
1639
1678
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
1640
1679
|
documentManager2.exists(model, id)
|
@@ -1672,7 +1711,7 @@ const collectionTypes = {
|
|
1672
1711
|
}
|
1673
1712
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1674
1713
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1675
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
1714
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1676
1715
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1677
1716
|
{ ...permissionQuery, populate, locale, status },
|
1678
1717
|
model
|
@@ -1707,7 +1746,7 @@ const collectionTypes = {
|
|
1707
1746
|
}
|
1708
1747
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1709
1748
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1710
|
-
const { locale, status
|
1749
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1711
1750
|
const version = await documentManager2.findOne(id, model, {
|
1712
1751
|
populate,
|
1713
1752
|
locale,
|
@@ -1722,7 +1761,7 @@ const collectionTypes = {
|
|
1722
1761
|
permissionChecker2,
|
1723
1762
|
model,
|
1724
1763
|
// @ts-expect-error TODO: fix
|
1725
|
-
{ id, locale, publishedAt: null },
|
1764
|
+
{ documentId: id, locale, publishedAt: null },
|
1726
1765
|
{ availableLocales: true, availableStatus: false }
|
1727
1766
|
);
|
1728
1767
|
ctx.body = { data: {}, meta };
|
@@ -1774,7 +1813,7 @@ const collectionTypes = {
|
|
1774
1813
|
}
|
1775
1814
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1776
1815
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1777
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1816
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1778
1817
|
const document = await documentManager2.findOne(id, model, {
|
1779
1818
|
populate,
|
1780
1819
|
locale,
|
@@ -1819,7 +1858,7 @@ const collectionTypes = {
|
|
1819
1858
|
}
|
1820
1859
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1821
1860
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1822
|
-
const { locale } = await getDocumentLocaleAndStatus(ctx.query);
|
1861
|
+
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1823
1862
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1824
1863
|
if (documentLocales.length === 0) {
|
1825
1864
|
return ctx.notFound();
|
@@ -1848,11 +1887,28 @@ const collectionTypes = {
|
|
1848
1887
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1849
1888
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1850
1889
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1851
|
-
|
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
|
+
}
|
1852
1909
|
if (permissionChecker2.cannot.publish(document)) {
|
1853
1910
|
throw new errors.ForbiddenError();
|
1854
1911
|
}
|
1855
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
1856
1912
|
const publishResult = await documentManager2.publish(document.documentId, model, {
|
1857
1913
|
locale
|
1858
1914
|
// TODO: Allow setting creator fields on publish
|
@@ -1879,7 +1935,9 @@ const collectionTypes = {
|
|
1879
1935
|
}
|
1880
1936
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1881
1937
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1882
|
-
const { locale } = await getDocumentLocaleAndStatus(body, {
|
1938
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1939
|
+
allowMultipleLocales: true
|
1940
|
+
});
|
1883
1941
|
const entityPromises = documentIds.map(
|
1884
1942
|
(documentId) => documentManager2.findLocales(documentId, model, { populate, locale, isPublished: false })
|
1885
1943
|
);
|
@@ -1906,7 +1964,9 @@ const collectionTypes = {
|
|
1906
1964
|
if (permissionChecker2.cannot.unpublish()) {
|
1907
1965
|
return ctx.forbidden();
|
1908
1966
|
}
|
1909
|
-
const { locale } = await getDocumentLocaleAndStatus(body
|
1967
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1968
|
+
allowMultipleLocales: true
|
1969
|
+
});
|
1910
1970
|
const entityPromises = documentIds.map(
|
1911
1971
|
(documentId) => documentManager2.findLocales(documentId, model, { locale, isPublished: true })
|
1912
1972
|
);
|
@@ -1939,7 +1999,7 @@ const collectionTypes = {
|
|
1939
1999
|
}
|
1940
2000
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
1941
2001
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1942
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2002
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1943
2003
|
const document = await documentManager2.findOne(id, model, {
|
1944
2004
|
populate,
|
1945
2005
|
locale,
|
@@ -1976,7 +2036,7 @@ const collectionTypes = {
|
|
1976
2036
|
}
|
1977
2037
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
1978
2038
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1979
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2039
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1980
2040
|
const document = await documentManager2.findOne(id, model, {
|
1981
2041
|
populate,
|
1982
2042
|
locale,
|
@@ -2007,7 +2067,7 @@ const collectionTypes = {
|
|
2007
2067
|
}
|
2008
2068
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2009
2069
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2010
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2070
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2011
2071
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2012
2072
|
populate,
|
2013
2073
|
locale
|
@@ -2034,7 +2094,7 @@ const collectionTypes = {
|
|
2034
2094
|
}
|
2035
2095
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2036
2096
|
const populate = await getService$1("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2037
|
-
const { locale, status
|
2097
|
+
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2038
2098
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2039
2099
|
if (!entity) {
|
2040
2100
|
return ctx.notFound();
|
@@ -2257,20 +2317,13 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2257
2317
|
userAbility,
|
2258
2318
|
model: model.uid
|
2259
2319
|
});
|
2260
|
-
|
2320
|
+
const isMainFieldListable = isListable(model, mainField);
|
2321
|
+
const canReadMainField = permissionChecker2.can.read(null, mainField);
|
2322
|
+
if (!isMainFieldListable || !canReadMainField) {
|
2261
2323
|
return "id";
|
2262
2324
|
}
|
2263
|
-
if (
|
2264
|
-
|
2265
|
-
const userPermissionChecker = getService$1("permission-checker").create({
|
2266
|
-
userAbility,
|
2267
|
-
model: "plugin::users-permissions.user"
|
2268
|
-
});
|
2269
|
-
if (userPermissionChecker.can.read()) {
|
2270
|
-
return "name";
|
2271
|
-
}
|
2272
|
-
}
|
2273
|
-
return "id";
|
2325
|
+
if (model.uid === "plugin::users-permissions.role") {
|
2326
|
+
return "name";
|
2274
2327
|
}
|
2275
2328
|
return mainField;
|
2276
2329
|
};
|
@@ -2470,8 +2523,9 @@ const relations = {
|
|
2470
2523
|
} else {
|
2471
2524
|
where.id = id;
|
2472
2525
|
}
|
2473
|
-
|
2474
|
-
|
2526
|
+
const publishedAt = getPublishedAtClause(status, targetUid);
|
2527
|
+
if (!isEmpty(publishedAt)) {
|
2528
|
+
where[`${alias}.published_at`] = publishedAt;
|
2475
2529
|
}
|
2476
2530
|
if (filterByLocale) {
|
2477
2531
|
where[`${alias}.locale`] = locale;
|
@@ -2528,9 +2582,7 @@ const relations = {
|
|
2528
2582
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
2529
2583
|
const sanitizedRes = await loadRelations({ id: entryId }, targetField, {
|
2530
2584
|
...strapi.get("query-params").transform(targetUid, permissionQuery),
|
2531
|
-
ordering: "desc"
|
2532
|
-
page: ctx.request.query.page,
|
2533
|
-
pageSize: ctx.request.query.pageSize
|
2585
|
+
ordering: "desc"
|
2534
2586
|
});
|
2535
2587
|
const relationsUnion = uniqBy("id", concat(sanitizedRes.results, res.results));
|
2536
2588
|
ctx.body = {
|
@@ -2562,7 +2614,7 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2562
2614
|
throw new errors.ForbiddenError();
|
2563
2615
|
}
|
2564
2616
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.update(query);
|
2565
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2617
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2566
2618
|
const [documentVersion, otherDocumentVersion] = await Promise.all([
|
2567
2619
|
findDocument(sanitizedQuery, model, { locale, status: "draft" }),
|
2568
2620
|
// Find the first document to check if it exists
|
@@ -2603,7 +2655,7 @@ const singleTypes = {
|
|
2603
2655
|
return ctx.forbidden();
|
2604
2656
|
}
|
2605
2657
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
2606
|
-
const { locale, status } = await getDocumentLocaleAndStatus(query);
|
2658
|
+
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
2607
2659
|
const version = await findDocument(permissionQuery, model, { locale, status });
|
2608
2660
|
if (!version) {
|
2609
2661
|
if (permissionChecker2.cannot.create()) {
|
@@ -2648,7 +2700,7 @@ const singleTypes = {
|
|
2648
2700
|
}
|
2649
2701
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2650
2702
|
const populate = await buildPopulateFromQuery(sanitizedQuery, model);
|
2651
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2703
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2652
2704
|
const documentLocales = await documentManager2.findLocales(void 0, model, {
|
2653
2705
|
populate,
|
2654
2706
|
locale
|
@@ -2685,7 +2737,7 @@ const singleTypes = {
|
|
2685
2737
|
if (permissionChecker2.cannot.publish(document)) {
|
2686
2738
|
throw new errors.ForbiddenError();
|
2687
2739
|
}
|
2688
|
-
const { locale } = await getDocumentLocaleAndStatus(document);
|
2740
|
+
const { locale } = await getDocumentLocaleAndStatus(document, model);
|
2689
2741
|
const publishResult = await documentManager2.publish(document.documentId, model, { locale });
|
2690
2742
|
return publishResult.at(0);
|
2691
2743
|
});
|
@@ -2708,7 +2760,7 @@ const singleTypes = {
|
|
2708
2760
|
return ctx.forbidden();
|
2709
2761
|
}
|
2710
2762
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.unpublish(query);
|
2711
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2763
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2712
2764
|
const document = await findDocument(sanitizedQuery, model, { locale });
|
2713
2765
|
if (!document) {
|
2714
2766
|
return ctx.notFound();
|
@@ -2740,7 +2792,7 @@ const singleTypes = {
|
|
2740
2792
|
return ctx.forbidden();
|
2741
2793
|
}
|
2742
2794
|
const sanitizedQuery = await permissionChecker2.sanitizedQuery.discard(query);
|
2743
|
-
const { locale } = await getDocumentLocaleAndStatus(body);
|
2795
|
+
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2744
2796
|
const document = await findDocument(sanitizedQuery, model, { locale, status: "published" });
|
2745
2797
|
if (!document) {
|
2746
2798
|
return ctx.notFound();
|
@@ -2760,7 +2812,7 @@ const singleTypes = {
|
|
2760
2812
|
const { query } = ctx.request;
|
2761
2813
|
const documentManager2 = getService$1("document-manager");
|
2762
2814
|
const permissionChecker2 = getService$1("permission-checker").create({ userAbility, model });
|
2763
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2815
|
+
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2764
2816
|
if (permissionChecker2.cannot.read()) {
|
2765
2817
|
return ctx.forbidden();
|
2766
2818
|
}
|
@@ -2781,7 +2833,7 @@ const uid$1 = {
|
|
2781
2833
|
async generateUID(ctx) {
|
2782
2834
|
const { contentTypeUID, field, data } = await validateGenerateUIDInput(ctx.request.body);
|
2783
2835
|
const { query = {} } = ctx.request;
|
2784
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2836
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2785
2837
|
await validateUIDField(contentTypeUID, field);
|
2786
2838
|
const uidService = getService$1("uid");
|
2787
2839
|
ctx.body = {
|
@@ -2793,7 +2845,7 @@ const uid$1 = {
|
|
2793
2845
|
ctx.request.body
|
2794
2846
|
);
|
2795
2847
|
const { query = {} } = ctx.request;
|
2796
|
-
const { locale } = await getDocumentLocaleAndStatus(query);
|
2848
|
+
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2797
2849
|
await validateUIDField(contentTypeUID, field);
|
2798
2850
|
const uidService = getService$1("uid");
|
2799
2851
|
const isAvailable = await uidService.checkUIDAvailability({
|
@@ -3436,12 +3488,27 @@ const createPermissionChecker = (strapi2) => ({ userAbility, model }) => {
|
|
3436
3488
|
ability: userAbility,
|
3437
3489
|
model
|
3438
3490
|
});
|
3439
|
-
const
|
3491
|
+
const { actionProvider } = strapi2.service("admin::permission");
|
3492
|
+
const toSubject = (entity) => {
|
3493
|
+
return entity ? permissionsManager.toSubject(entity, model) : model;
|
3494
|
+
};
|
3440
3495
|
const can = (action, entity, field) => {
|
3441
|
-
|
3496
|
+
const subject = toSubject(entity);
|
3497
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3498
|
+
return (
|
3499
|
+
// Test the original action to see if it passes
|
3500
|
+
userAbility.can(action, subject, field) || // Else try every known alias if at least one of them succeed, then the user "can"
|
3501
|
+
aliases.some((alias) => userAbility.can(alias, subject, field))
|
3502
|
+
);
|
3442
3503
|
};
|
3443
3504
|
const cannot = (action, entity, field) => {
|
3444
|
-
|
3505
|
+
const subject = toSubject(entity);
|
3506
|
+
const aliases = actionProvider.unstable_aliases(action, model);
|
3507
|
+
return (
|
3508
|
+
// Test both the original action
|
3509
|
+
userAbility.cannot(action, subject, field) && // and every known alias, if all of them fail (cannot), then the user truly "cannot"
|
3510
|
+
aliases.every((alias) => userAbility.cannot(alias, subject, field))
|
3511
|
+
);
|
3445
3512
|
};
|
3446
3513
|
const sanitizeOutput = (data, { action = ACTIONS.read } = {}) => {
|
3447
3514
|
return permissionsManager.sanitizeOutput(data, { subject: toSubject(data), action });
|
@@ -3718,6 +3785,10 @@ const getDeepPopulateDraftCount = (uid2) => {
|
|
3718
3785
|
const attribute = model.attributes[attributeName];
|
3719
3786
|
switch (attribute.type) {
|
3720
3787
|
case "relation": {
|
3788
|
+
const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
|
3789
|
+
if (isMorphRelation) {
|
3790
|
+
break;
|
3791
|
+
}
|
3721
3792
|
if (isVisibleAttribute$1(model, attributeName)) {
|
3722
3793
|
populateAcc[attributeName] = {
|
3723
3794
|
count: true,
|
@@ -4095,7 +4166,13 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4095
4166
|
*/
|
4096
4167
|
async formatDocumentWithMetadata(uid2, document, opts = {}) {
|
4097
4168
|
if (!document) {
|
4098
|
-
return
|
4169
|
+
return {
|
4170
|
+
data: document,
|
4171
|
+
meta: {
|
4172
|
+
availableLocales: [],
|
4173
|
+
availableStatus: []
|
4174
|
+
}
|
4175
|
+
};
|
4099
4176
|
}
|
4100
4177
|
const hasDraftAndPublish = contentTypes$1.hasDraftAndPublish(strapi2.getModel(uid2));
|
4101
4178
|
if (!hasDraftAndPublish) {
|
@@ -4203,10 +4280,7 @@ const documentManager = ({ strapi: strapi2 }) => {
|
|
4203
4280
|
async clone(id, body, uid2) {
|
4204
4281
|
const populate = await buildDeepPopulate(uid2);
|
4205
4282
|
const params = {
|
4206
|
-
data:
|
4207
|
-
...omitIdField(body),
|
4208
|
-
[PUBLISHED_AT_ATTRIBUTE]: null
|
4209
|
-
},
|
4283
|
+
data: omitIdField(body),
|
4210
4284
|
populate
|
4211
4285
|
};
|
4212
4286
|
return strapi2.documents(uid2).clone({ ...params, documentId: id }).then((result) => result?.entries.at(0));
|