@strapi/content-manager 0.0.0-experimental.71ed910bd859c7e558bd1c1042eaadb7d26fd22a → 0.0.0-experimental.7273fc63f5c2c8aa9e100655b1776f3e0621e61a
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/_chunks/{ComponentConfigurationPage-DP7AC0UU.js → ComponentConfigurationPage-D2_cVxXK.js} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-DP7AC0UU.js.map → ComponentConfigurationPage-D2_cVxXK.js.map} +1 -1
- package/dist/_chunks/{ComponentConfigurationPage-7-qB29e7.mjs → ComponentConfigurationPage-suSMW3KC.mjs} +4 -4
- package/dist/_chunks/{ComponentConfigurationPage-7-qB29e7.mjs.map → ComponentConfigurationPage-suSMW3KC.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-CI4XoymK.mjs → EditConfigurationPage-CBscKbxt.mjs} +4 -4
- package/dist/_chunks/{EditConfigurationPage-CI4XoymK.mjs.map → EditConfigurationPage-CBscKbxt.mjs.map} +1 -1
- package/dist/_chunks/{EditConfigurationPage-DITVliEI.js → EditConfigurationPage-Z_VzHVH4.js} +4 -4
- package/dist/_chunks/{EditConfigurationPage-DITVliEI.js.map → EditConfigurationPage-Z_VzHVH4.js.map} +1 -1
- package/dist/_chunks/{EditViewPage-Dzpno8xI.mjs → EditViewPage-D5Zhyw_q.mjs} +10 -4
- package/dist/_chunks/EditViewPage-D5Zhyw_q.mjs.map +1 -0
- package/dist/_chunks/{EditViewPage-CUS2EAhB.js → EditViewPage-DzDDKiF5.js} +10 -4
- package/dist/_chunks/EditViewPage-DzDDKiF5.js.map +1 -0
- package/dist/_chunks/{Field-CtUU1Fg8.js → Field-CZHNLm_m.js} +42 -10
- package/dist/_chunks/Field-CZHNLm_m.js.map +1 -0
- package/dist/_chunks/{Field-B_jG_EV9.mjs → Field-FNlyAbcI.mjs} +42 -10
- package/dist/_chunks/Field-FNlyAbcI.mjs.map +1 -0
- package/dist/_chunks/{Form-DTqO0ymI.js → Form-DqPHDLuK.js} +3 -3
- package/dist/_chunks/Form-DqPHDLuK.js.map +1 -0
- package/dist/_chunks/{Form-BXHao2mZ.mjs → Form-Sq_OVNv-.mjs} +3 -3
- package/dist/_chunks/Form-Sq_OVNv-.mjs.map +1 -0
- package/dist/_chunks/{History-C_uSGzO5.js → History-B-ZiOAEg.js} +37 -40
- package/dist/_chunks/History-B-ZiOAEg.js.map +1 -0
- package/dist/_chunks/{History-2Ah2CQ4T.mjs → History-DlL3k_OW.mjs} +38 -41
- package/dist/_chunks/History-DlL3k_OW.mjs.map +1 -0
- package/dist/_chunks/{ListConfigurationPage-nyuP7OSy.js → ListConfigurationPage-Cc0hLAoS.js} +3 -3
- package/dist/_chunks/{ListConfigurationPage-nyuP7OSy.js.map → ListConfigurationPage-Cc0hLAoS.js.map} +1 -1
- package/dist/_chunks/{ListConfigurationPage-BjSJlaoC.mjs → ListConfigurationPage-xj3cSF5M.mjs} +3 -3
- package/dist/_chunks/{ListConfigurationPage-BjSJlaoC.mjs.map → ListConfigurationPage-xj3cSF5M.mjs.map} +1 -1
- package/dist/_chunks/{ListViewPage-B75x3nz2.mjs → ListViewPage-C9STpcYd.mjs} +15 -4
- package/dist/_chunks/{ListViewPage-B75x3nz2.mjs.map → ListViewPage-C9STpcYd.mjs.map} +1 -1
- package/dist/_chunks/{ListViewPage-DHgHD8Xg.js → ListViewPage-D48T84aT.js} +15 -4
- package/dist/_chunks/ListViewPage-D48T84aT.js.map +1 -0
- package/dist/_chunks/{NoContentTypePage-CDUKdZ7d.js → NoContentTypePage-BnUmUnXQ.js} +2 -2
- package/dist/_chunks/{NoContentTypePage-CDUKdZ7d.js.map → NoContentTypePage-BnUmUnXQ.js.map} +1 -1
- package/dist/_chunks/{NoContentTypePage-DUacQSyF.mjs → NoContentTypePage-DpV_ouD6.mjs} +2 -2
- package/dist/_chunks/{NoContentTypePage-DUacQSyF.mjs.map → NoContentTypePage-DpV_ouD6.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-SFllMekk.mjs → NoPermissionsPage-BeDixsE9.mjs} +2 -2
- package/dist/_chunks/{NoPermissionsPage-SFllMekk.mjs.map → NoPermissionsPage-BeDixsE9.mjs.map} +1 -1
- package/dist/_chunks/{NoPermissionsPage-zwIZydDI.js → NoPermissionsPage-z-CpOFfh.js} +2 -2
- package/dist/_chunks/{NoPermissionsPage-zwIZydDI.js.map → NoPermissionsPage-z-CpOFfh.js.map} +1 -1
- package/dist/_chunks/{Relations-D2NRW8fC.mjs → Relations-CTiimSAg.mjs} +65 -33
- package/dist/_chunks/Relations-CTiimSAg.mjs.map +1 -0
- package/dist/_chunks/{Relations-NFLaRNPr.js → Relations-Cs5vJLAp.js} +64 -32
- package/dist/_chunks/Relations-Cs5vJLAp.js.map +1 -0
- package/dist/_chunks/{en-BlhnxQfj.js → en-Bm0D0IWz.js} +7 -7
- package/dist/_chunks/{en-BlhnxQfj.js.map → en-Bm0D0IWz.js.map} +1 -1
- package/dist/_chunks/{en-C8YBvRrK.mjs → en-DKV44jRb.mjs} +7 -7
- package/dist/_chunks/{en-C8YBvRrK.mjs.map → en-DKV44jRb.mjs.map} +1 -1
- package/dist/_chunks/{fr-B7kGGg3E.js → fr-C6t7ywEg.js} +12 -2
- package/dist/_chunks/{fr-B7kGGg3E.js.map → fr-C6t7ywEg.js.map} +1 -1
- package/dist/_chunks/{fr-CD9VFbPM.mjs → fr-DxrTDLl6.mjs} +12 -2
- package/dist/_chunks/{fr-CD9VFbPM.mjs.map → fr-DxrTDLl6.mjs.map} +1 -1
- package/dist/_chunks/{index-C9HxCo5R.mjs → index-DUZzV11o.mjs} +119 -84
- package/dist/_chunks/index-DUZzV11o.mjs.map +1 -0
- package/dist/_chunks/{index-ovJRE1FM.js → index-dFQ_8EM3.js} +119 -83
- package/dist/_chunks/index-dFQ_8EM3.js.map +1 -0
- package/dist/_chunks/{layout-UNWstw_s.js → layout-Bu-ET7w6.js} +3 -3
- package/dist/_chunks/{layout-UNWstw_s.js.map → layout-Bu-ET7w6.js.map} +1 -1
- package/dist/_chunks/{layout-DaUjDiWQ.mjs → layout-C-eg7m9Y.mjs} +3 -3
- package/dist/_chunks/{layout-DaUjDiWQ.mjs.map → layout-C-eg7m9Y.mjs.map} +1 -1
- package/dist/_chunks/{objects-gigeqt7s.js → objects-BcXOv6_9.js} +2 -4
- package/dist/_chunks/{objects-gigeqt7s.js.map → objects-BcXOv6_9.js.map} +1 -1
- package/dist/_chunks/{objects-mKMAmfec.mjs → objects-D6yBsdmx.mjs} +2 -4
- package/dist/_chunks/{objects-mKMAmfec.mjs.map → objects-D6yBsdmx.mjs.map} +1 -1
- package/dist/_chunks/{relations-D8iFAeRu.mjs → relations-Cj61Oyt2.mjs} +3 -7
- package/dist/_chunks/relations-Cj61Oyt2.mjs.map +1 -0
- package/dist/_chunks/{relations-NN3coOG5.js → relations-isLeDaA0.js} +3 -7
- package/dist/_chunks/relations-isLeDaA0.js.map +1 -0
- package/dist/admin/index.js +1 -1
- package/dist/admin/index.mjs +1 -1
- package/dist/admin/src/preview/constants.d.ts +1 -0
- package/dist/admin/src/preview/index.d.ts +4 -0
- package/dist/server/index.js +351 -146
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +351 -146
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/bootstrap.d.ts.map +1 -1
- package/dist/server/src/controllers/collection-types.d.ts.map +1 -1
- package/dist/server/src/controllers/index.d.ts.map +1 -1
- package/dist/server/src/controllers/relations.d.ts.map +1 -1
- package/dist/server/src/controllers/utils/metadata.d.ts +15 -1
- package/dist/server/src/controllers/utils/metadata.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 -3
- package/dist/server/src/history/services/utils.d.ts.map +1 -1
- package/dist/server/src/index.d.ts +4 -4
- package/dist/server/src/preview/constants.d.ts +2 -0
- package/dist/server/src/preview/constants.d.ts.map +1 -0
- package/dist/server/src/preview/controllers/index.d.ts +2 -0
- package/dist/server/src/preview/controllers/index.d.ts.map +1 -0
- package/dist/server/src/preview/controllers/preview.d.ts +13 -0
- package/dist/server/src/preview/controllers/preview.d.ts.map +1 -0
- package/dist/server/src/preview/controllers/validation/preview.d.ts +6 -0
- package/dist/server/src/preview/controllers/validation/preview.d.ts.map +1 -0
- package/dist/server/src/preview/index.d.ts +4 -0
- package/dist/server/src/preview/index.d.ts.map +1 -0
- package/dist/server/src/preview/routes/index.d.ts +8 -0
- package/dist/server/src/preview/routes/index.d.ts.map +1 -0
- package/dist/server/src/preview/routes/preview.d.ts +4 -0
- package/dist/server/src/preview/routes/preview.d.ts.map +1 -0
- package/dist/server/src/preview/services/index.d.ts +15 -0
- package/dist/server/src/preview/services/index.d.ts.map +1 -0
- package/dist/server/src/preview/services/preview-config.d.ts +30 -0
- package/dist/server/src/preview/services/preview-config.d.ts.map +1 -0
- package/dist/server/src/preview/services/preview.d.ts +12 -0
- package/dist/server/src/preview/services/preview.d.ts.map +1 -0
- package/dist/server/src/preview/utils.d.ts +18 -0
- package/dist/server/src/preview/utils.d.ts.map +1 -0
- package/dist/server/src/routes/index.d.ts.map +1 -1
- package/dist/server/src/services/document-metadata.d.ts +8 -8
- package/dist/server/src/services/document-metadata.d.ts.map +1 -1
- package/dist/server/src/services/index.d.ts +4 -4
- package/dist/server/src/services/index.d.ts.map +1 -1
- package/dist/server/src/services/utils/configuration/index.d.ts +2 -2
- package/dist/server/src/services/utils/configuration/layouts.d.ts +2 -2
- package/dist/server/src/utils/index.d.ts +2 -0
- package/dist/server/src/utils/index.d.ts.map +1 -1
- package/dist/shared/contracts/index.d.ts +1 -0
- package/dist/shared/contracts/index.d.ts.map +1 -1
- package/dist/shared/contracts/preview.d.ts +27 -0
- package/dist/shared/contracts/preview.d.ts.map +1 -0
- package/dist/shared/index.js +4 -0
- package/dist/shared/index.js.map +1 -1
- package/dist/shared/index.mjs +4 -0
- package/dist/shared/index.mjs.map +1 -1
- package/package.json +8 -8
- package/dist/_chunks/EditViewPage-CUS2EAhB.js.map +0 -1
- package/dist/_chunks/EditViewPage-Dzpno8xI.mjs.map +0 -1
- package/dist/_chunks/Field-B_jG_EV9.mjs.map +0 -1
- package/dist/_chunks/Field-CtUU1Fg8.js.map +0 -1
- package/dist/_chunks/Form-BXHao2mZ.mjs.map +0 -1
- package/dist/_chunks/Form-DTqO0ymI.js.map +0 -1
- package/dist/_chunks/History-2Ah2CQ4T.mjs.map +0 -1
- package/dist/_chunks/History-C_uSGzO5.js.map +0 -1
- package/dist/_chunks/ListViewPage-DHgHD8Xg.js.map +0 -1
- package/dist/_chunks/Relations-D2NRW8fC.mjs.map +0 -1
- package/dist/_chunks/Relations-NFLaRNPr.js.map +0 -1
- package/dist/_chunks/index-C9HxCo5R.mjs.map +0 -1
- package/dist/_chunks/index-ovJRE1FM.js.map +0 -1
- package/dist/_chunks/relations-D8iFAeRu.mjs.map +0 -1
- package/dist/_chunks/relations-NN3coOG5.js.map +0 -1
package/dist/server/index.mjs
CHANGED
@@ -7,10 +7,10 @@ import isNil from "lodash/isNil";
|
|
7
7
|
import _, { intersection as intersection$1, difference as difference$1 } from "lodash";
|
8
8
|
import qs from "qs";
|
9
9
|
import slugify from "@sindresorhus/slugify";
|
10
|
-
const getService$
|
10
|
+
const getService$2 = (name) => {
|
11
11
|
return strapi.plugin("content-manager").service(name);
|
12
12
|
};
|
13
|
-
function getService(strapi2, name) {
|
13
|
+
function getService$1(strapi2, name) {
|
14
14
|
return strapi2.service(`plugin::content-manager.${name}`);
|
15
15
|
}
|
16
16
|
const historyRestoreVersionSchema = yup.object().shape({
|
@@ -46,7 +46,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
46
46
|
if (!isSingleType && (!contentTypeUid || !ctx.query.documentId)) {
|
47
47
|
throw new errors.ForbiddenError("contentType and documentId are required");
|
48
48
|
}
|
49
|
-
const permissionChecker2 = getService$
|
49
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
50
50
|
userAbility: ctx.state.userAbility,
|
51
51
|
model: ctx.query.contentType
|
52
52
|
});
|
@@ -54,7 +54,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
54
54
|
return ctx.forbidden();
|
55
55
|
}
|
56
56
|
const query = await permissionChecker2.sanitizeQuery(ctx.query);
|
57
|
-
const { results, pagination: pagination2 } = await getService(strapi2, "history").findVersionsPage({
|
57
|
+
const { results, pagination: pagination2 } = await getService$1(strapi2, "history").findVersionsPage({
|
58
58
|
query: {
|
59
59
|
...query,
|
60
60
|
...getValidPagination({ page: query.page, pageSize: query.pageSize })
|
@@ -79,14 +79,14 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
79
79
|
async restoreVersion(ctx) {
|
80
80
|
const request = ctx.request;
|
81
81
|
await validateRestoreVersion(request.body, "contentType is required");
|
82
|
-
const permissionChecker2 = getService$
|
82
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
83
83
|
userAbility: ctx.state.userAbility,
|
84
84
|
model: request.body.contentType
|
85
85
|
});
|
86
86
|
if (permissionChecker2.cannot.update()) {
|
87
87
|
throw new errors.ForbiddenError();
|
88
88
|
}
|
89
|
-
const restoredDocument = await getService(strapi2, "history").restoreVersion(
|
89
|
+
const restoredDocument = await getService$1(strapi2, "history").restoreVersion(
|
90
90
|
request.params.versionId
|
91
91
|
);
|
92
92
|
return {
|
@@ -95,7 +95,7 @@ const createHistoryVersionController = ({ strapi: strapi2 }) => {
|
|
95
95
|
}
|
96
96
|
};
|
97
97
|
};
|
98
|
-
const controllers$
|
98
|
+
const controllers$2 = {
|
99
99
|
"history-version": createHistoryVersionController
|
100
100
|
/**
|
101
101
|
* Casting is needed because the types aren't aware that Strapi supports
|
@@ -202,6 +202,17 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
202
202
|
const meta = await documentMetadataService.getMetadata(contentTypeUid, document);
|
203
203
|
return documentMetadataService.getStatus(document, meta.availableStatus);
|
204
204
|
};
|
205
|
+
const getComponentFields = (componentUID) => {
|
206
|
+
return Object.entries(strapi2.getModel(componentUID).attributes).reduce(
|
207
|
+
(fieldsAcc, [key, attribute]) => {
|
208
|
+
if (!["relation", "media", "component", "dynamiczone"].includes(attribute.type)) {
|
209
|
+
fieldsAcc.push(key);
|
210
|
+
}
|
211
|
+
return fieldsAcc;
|
212
|
+
},
|
213
|
+
[]
|
214
|
+
);
|
215
|
+
};
|
205
216
|
const getDeepPopulate2 = (uid2, useDatabaseSyntax = false) => {
|
206
217
|
const model = strapi2.getModel(uid2);
|
207
218
|
const attributes = Object.entries(model.attributes);
|
@@ -225,13 +236,19 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
|
|
225
236
|
}
|
226
237
|
case "component": {
|
227
238
|
const populate = getDeepPopulate2(attribute.component);
|
228
|
-
acc[attributeName] = {
|
239
|
+
acc[attributeName] = {
|
240
|
+
populate,
|
241
|
+
[fieldSelector]: getComponentFields(attribute.component)
|
242
|
+
};
|
229
243
|
break;
|
230
244
|
}
|
231
245
|
case "dynamiczone": {
|
232
246
|
const populatedComponents = (attribute.components || []).reduce(
|
233
247
|
(acc2, componentUID) => {
|
234
|
-
acc2[componentUID] = {
|
248
|
+
acc2[componentUID] = {
|
249
|
+
populate: getDeepPopulate2(componentUID),
|
250
|
+
[fieldSelector]: getComponentFields(componentUID)
|
251
|
+
};
|
235
252
|
return acc2;
|
236
253
|
},
|
237
254
|
{}
|
@@ -344,7 +361,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
344
361
|
const attributeValue = entry.data[attributeKey];
|
345
362
|
const attributeValues = Array.isArray(attributeValue) ? attributeValue : [attributeValue];
|
346
363
|
if (attributeSchema.type === "media") {
|
347
|
-
const permissionChecker2 = getService$
|
364
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
348
365
|
userAbility: params.state.userAbility,
|
349
366
|
model: "plugin::upload.file"
|
350
367
|
});
|
@@ -367,7 +384,12 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
367
384
|
if (userToPopulate == null) {
|
368
385
|
return null;
|
369
386
|
}
|
370
|
-
return strapi2.query("admin::user").findOne({
|
387
|
+
return strapi2.query("admin::user").findOne({
|
388
|
+
where: {
|
389
|
+
...userToPopulate.id ? { id: userToPopulate.id } : {},
|
390
|
+
...userToPopulate.documentId ? { documentId: userToPopulate.documentId } : {}
|
391
|
+
}
|
392
|
+
});
|
371
393
|
})
|
372
394
|
);
|
373
395
|
return {
|
@@ -380,7 +402,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
380
402
|
[attributeKey]: adminUsers
|
381
403
|
};
|
382
404
|
}
|
383
|
-
const permissionChecker2 = getService$
|
405
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
384
406
|
userAbility: params.state.userAbility,
|
385
407
|
model: attributeSchema.target
|
386
408
|
});
|
@@ -556,7 +578,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
556
578
|
onCommit(async () => {
|
557
579
|
for (const entry of localeEntries) {
|
558
580
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
559
|
-
await getService(strapi2, "history").createVersion({
|
581
|
+
await getService$1(strapi2, "history").createVersion({
|
560
582
|
contentType: uid2,
|
561
583
|
data: omit(FIELDS_TO_IGNORE, entry),
|
562
584
|
relatedDocumentId: documentId,
|
@@ -569,15 +591,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
569
591
|
});
|
570
592
|
return result;
|
571
593
|
});
|
572
|
-
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
594
|
+
state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
|
573
595
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
574
596
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
575
597
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
576
598
|
where: {
|
577
599
|
created_at: {
|
578
|
-
$lt: expirationDate
|
600
|
+
$lt: expirationDate
|
579
601
|
}
|
580
602
|
}
|
603
|
+
}).catch((error) => {
|
604
|
+
if (error instanceof Error) {
|
605
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
606
|
+
}
|
581
607
|
});
|
582
608
|
});
|
583
609
|
state.isInitialized = true;
|
@@ -589,17 +615,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
589
615
|
}
|
590
616
|
};
|
591
617
|
};
|
592
|
-
const services$
|
618
|
+
const services$2 = {
|
593
619
|
history: createHistoryService,
|
594
620
|
lifecycles: createLifecyclesService
|
595
621
|
};
|
596
|
-
const info = { pluginName: "content-manager", type: "admin" };
|
622
|
+
const info$1 = { pluginName: "content-manager", type: "admin" };
|
597
623
|
const historyVersionRouter = {
|
598
624
|
type: "admin",
|
599
625
|
routes: [
|
600
626
|
{
|
601
627
|
method: "GET",
|
602
|
-
info,
|
628
|
+
info: info$1,
|
603
629
|
path: "/history-versions",
|
604
630
|
handler: "history-version.findMany",
|
605
631
|
config: {
|
@@ -608,7 +634,7 @@ const historyVersionRouter = {
|
|
608
634
|
},
|
609
635
|
{
|
610
636
|
method: "PUT",
|
611
|
-
info,
|
637
|
+
info: info$1,
|
612
638
|
path: "/history-versions/:versionId/restore",
|
613
639
|
handler: "history-version.restoreVersion",
|
614
640
|
config: {
|
@@ -617,7 +643,7 @@ const historyVersionRouter = {
|
|
617
643
|
}
|
618
644
|
]
|
619
645
|
};
|
620
|
-
const routes$
|
646
|
+
const routes$2 = {
|
621
647
|
"history-version": historyVersionRouter
|
622
648
|
};
|
623
649
|
const historyVersion = {
|
@@ -664,21 +690,21 @@ const historyVersion = {
|
|
664
690
|
}
|
665
691
|
}
|
666
692
|
};
|
667
|
-
const getFeature = () => {
|
693
|
+
const getFeature$1 = () => {
|
668
694
|
if (strapi.ee.features.isEnabled("cms-content-history")) {
|
669
695
|
return {
|
670
696
|
register({ strapi: strapi2 }) {
|
671
697
|
strapi2.get("models").add(historyVersion);
|
672
698
|
},
|
673
699
|
bootstrap({ strapi: strapi2 }) {
|
674
|
-
getService(strapi2, "lifecycles").bootstrap();
|
700
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
675
701
|
},
|
676
702
|
destroy({ strapi: strapi2 }) {
|
677
|
-
getService(strapi2, "lifecycles").destroy();
|
703
|
+
getService$1(strapi2, "lifecycles").destroy();
|
678
704
|
},
|
679
|
-
controllers: controllers$
|
680
|
-
services: services$
|
681
|
-
routes: routes$
|
705
|
+
controllers: controllers$2,
|
706
|
+
services: services$2,
|
707
|
+
routes: routes$2
|
682
708
|
};
|
683
709
|
}
|
684
710
|
return {
|
@@ -687,7 +713,7 @@ const getFeature = () => {
|
|
687
713
|
}
|
688
714
|
};
|
689
715
|
};
|
690
|
-
const history = getFeature();
|
716
|
+
const history = getFeature$1();
|
691
717
|
const register = async ({ strapi: strapi2 }) => {
|
692
718
|
await history.register?.({ strapi: strapi2 });
|
693
719
|
};
|
@@ -695,15 +721,165 @@ const ALLOWED_WEBHOOK_EVENTS = {
|
|
695
721
|
ENTRY_PUBLISH: "entry.publish",
|
696
722
|
ENTRY_UNPUBLISH: "entry.unpublish"
|
697
723
|
};
|
724
|
+
const FEATURE_ID = "preview";
|
725
|
+
const info = { pluginName: "content-manager", type: "admin" };
|
726
|
+
const previewRouter = {
|
727
|
+
type: "admin",
|
728
|
+
routes: [
|
729
|
+
{
|
730
|
+
method: "GET",
|
731
|
+
info,
|
732
|
+
path: "/preview/url/:contentType",
|
733
|
+
handler: "preview.getPreviewUrl",
|
734
|
+
config: {
|
735
|
+
policies: ["admin::isAuthenticatedAdmin"]
|
736
|
+
}
|
737
|
+
}
|
738
|
+
]
|
739
|
+
};
|
740
|
+
const routes$1 = {
|
741
|
+
preview: previewRouter
|
742
|
+
};
|
743
|
+
function getService(strapi2, name) {
|
744
|
+
return strapi2.service(`plugin::content-manager.${name}`);
|
745
|
+
}
|
746
|
+
const getPreviewUrlSchema = yup.object().shape({
|
747
|
+
// Will be undefined for single types
|
748
|
+
documentId: yup.string(),
|
749
|
+
locale: yup.string().nullable(),
|
750
|
+
status: yup.string()
|
751
|
+
}).required();
|
752
|
+
const validatePreviewUrl = async (strapi2, uid2, params) => {
|
753
|
+
await validateYupSchema(getPreviewUrlSchema)(params);
|
754
|
+
const newParams = pick(["documentId", "locale", "status"], params);
|
755
|
+
const model = strapi2.getModel(uid2);
|
756
|
+
if (!model || model.modelType !== "contentType") {
|
757
|
+
throw new errors.ValidationError("Invalid content type");
|
758
|
+
}
|
759
|
+
const isSingleType = model?.kind === "singleType";
|
760
|
+
if (!isSingleType && !params.documentId) {
|
761
|
+
throw new errors.ValidationError("documentId is required for Collection Types");
|
762
|
+
}
|
763
|
+
if (isSingleType) {
|
764
|
+
const doc = await strapi2.documents(uid2).findFirst();
|
765
|
+
if (!doc) {
|
766
|
+
throw new errors.NotFoundError("Document not found");
|
767
|
+
}
|
768
|
+
newParams.documentId = doc?.documentId;
|
769
|
+
}
|
770
|
+
return newParams;
|
771
|
+
};
|
772
|
+
const createPreviewController = () => {
|
773
|
+
return {
|
774
|
+
/**
|
775
|
+
* Transforms an entry into a preview URL, so that it can be previewed
|
776
|
+
* in the Content Manager.
|
777
|
+
*/
|
778
|
+
async getPreviewUrl(ctx) {
|
779
|
+
const uid2 = ctx.params.contentType;
|
780
|
+
const query = ctx.request.query;
|
781
|
+
const params = await validatePreviewUrl(strapi, uid2, query);
|
782
|
+
const previewService = getService(strapi, "preview");
|
783
|
+
const url = await previewService.getPreviewUrl(uid2, params);
|
784
|
+
if (!url) {
|
785
|
+
ctx.status = 204;
|
786
|
+
}
|
787
|
+
return {
|
788
|
+
data: { url }
|
789
|
+
};
|
790
|
+
}
|
791
|
+
};
|
792
|
+
};
|
793
|
+
const controllers$1 = {
|
794
|
+
preview: createPreviewController
|
795
|
+
/**
|
796
|
+
* Casting is needed because the types aren't aware that Strapi supports
|
797
|
+
* passing a controller factory as the value, instead of a controller object directly
|
798
|
+
*/
|
799
|
+
};
|
800
|
+
const createPreviewService = ({ strapi: strapi2 }) => {
|
801
|
+
const config = getService(strapi2, "preview-config");
|
802
|
+
return {
|
803
|
+
async getPreviewUrl(uid2, params) {
|
804
|
+
const handler = config.getPreviewHandler();
|
805
|
+
try {
|
806
|
+
return handler(uid2, params);
|
807
|
+
} catch (error) {
|
808
|
+
strapi2.log.error(`Failed to get preview URL: ${error}`);
|
809
|
+
throw new errors.ApplicationError("Failed to get preview URL");
|
810
|
+
}
|
811
|
+
return;
|
812
|
+
}
|
813
|
+
};
|
814
|
+
};
|
815
|
+
const createPreviewConfigService = ({ strapi: strapi2 }) => {
|
816
|
+
return {
|
817
|
+
isEnabled() {
|
818
|
+
const config = strapi2.config.get("admin.preview");
|
819
|
+
if (!config) {
|
820
|
+
return false;
|
821
|
+
}
|
822
|
+
return config?.enabled ?? true;
|
823
|
+
},
|
824
|
+
/**
|
825
|
+
* Validate if the configuration is valid
|
826
|
+
*/
|
827
|
+
validate() {
|
828
|
+
if (!this.isEnabled()) {
|
829
|
+
return;
|
830
|
+
}
|
831
|
+
const handler = this.getPreviewHandler();
|
832
|
+
if (typeof handler !== "function") {
|
833
|
+
throw new errors.ValidationError(
|
834
|
+
"Preview configuration is invalid. Handler must be a function"
|
835
|
+
);
|
836
|
+
}
|
837
|
+
},
|
838
|
+
/**
|
839
|
+
* Utility to get the preview handler from the configuration
|
840
|
+
*/
|
841
|
+
getPreviewHandler() {
|
842
|
+
const config = strapi2.config.get("admin.preview");
|
843
|
+
const emptyHandler = () => {
|
844
|
+
return void 0;
|
845
|
+
};
|
846
|
+
if (!this.isEnabled()) {
|
847
|
+
return emptyHandler;
|
848
|
+
}
|
849
|
+
return config?.config?.handler || emptyHandler;
|
850
|
+
}
|
851
|
+
};
|
852
|
+
};
|
853
|
+
const services$1 = {
|
854
|
+
preview: createPreviewService,
|
855
|
+
"preview-config": createPreviewConfigService
|
856
|
+
};
|
857
|
+
const getFeature = () => {
|
858
|
+
if (!strapi.features.future.isEnabled(FEATURE_ID)) {
|
859
|
+
return {};
|
860
|
+
}
|
861
|
+
return {
|
862
|
+
bootstrap() {
|
863
|
+
console.log("Bootstrapping preview server");
|
864
|
+
const config = getService(strapi, "preview-config");
|
865
|
+
config.validate();
|
866
|
+
},
|
867
|
+
routes: routes$1,
|
868
|
+
controllers: controllers$1,
|
869
|
+
services: services$1
|
870
|
+
};
|
871
|
+
};
|
872
|
+
const preview = getFeature();
|
698
873
|
const bootstrap = async () => {
|
699
874
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
700
875
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
701
876
|
});
|
702
|
-
getService$
|
703
|
-
await getService$
|
704
|
-
await getService$
|
705
|
-
await getService$
|
877
|
+
getService$2("field-sizes").setCustomFieldInputSizes();
|
878
|
+
await getService$2("components").syncConfigurations();
|
879
|
+
await getService$2("content-types").syncConfigurations();
|
880
|
+
await getService$2("permission").registerPermissions();
|
706
881
|
await history.bootstrap?.({ strapi });
|
882
|
+
await preview.bootstrap?.({ strapi });
|
707
883
|
};
|
708
884
|
const destroy = async ({ strapi: strapi2 }) => {
|
709
885
|
await history.destroy?.({ strapi: strapi2 });
|
@@ -1193,7 +1369,8 @@ const admin = {
|
|
1193
1369
|
};
|
1194
1370
|
const routes = {
|
1195
1371
|
admin,
|
1196
|
-
...history.routes ? history.routes : {}
|
1372
|
+
...history.routes ? history.routes : {},
|
1373
|
+
...preview.routes ? preview.routes : {}
|
1197
1374
|
};
|
1198
1375
|
const hasPermissionsSchema = yup$1.object({
|
1199
1376
|
actions: yup$1.array().of(yup$1.string()),
|
@@ -1450,7 +1627,7 @@ const createMetadasSchema = (schema) => {
|
|
1450
1627
|
if (!value) {
|
1451
1628
|
return yup$1.string();
|
1452
1629
|
}
|
1453
|
-
const targetSchema = getService$
|
1630
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1454
1631
|
schema.attributes[key].targetModel
|
1455
1632
|
);
|
1456
1633
|
if (!targetSchema) {
|
@@ -1619,7 +1796,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1619
1796
|
}
|
1620
1797
|
};
|
1621
1798
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1622
|
-
const documentMetadata2 = getService$
|
1799
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1623
1800
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1624
1801
|
let {
|
1625
1802
|
meta: { availableLocales, availableStatus }
|
@@ -1645,8 +1822,8 @@ const createDocument = async (ctx, opts) => {
|
|
1645
1822
|
const { userAbility, user } = ctx.state;
|
1646
1823
|
const { model } = ctx.params;
|
1647
1824
|
const { body } = ctx.request;
|
1648
|
-
const documentManager2 = getService$
|
1649
|
-
const permissionChecker2 = getService$
|
1825
|
+
const documentManager2 = getService$2("document-manager");
|
1826
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1650
1827
|
if (permissionChecker2.cannot.create()) {
|
1651
1828
|
throw new errors.ForbiddenError();
|
1652
1829
|
}
|
@@ -1666,13 +1843,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1666
1843
|
const { userAbility, user } = ctx.state;
|
1667
1844
|
const { id, model } = ctx.params;
|
1668
1845
|
const { body } = ctx.request;
|
1669
|
-
const documentManager2 = getService$
|
1670
|
-
const permissionChecker2 = getService$
|
1846
|
+
const documentManager2 = getService$2("document-manager");
|
1847
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1671
1848
|
if (permissionChecker2.cannot.update()) {
|
1672
1849
|
throw new errors.ForbiddenError();
|
1673
1850
|
}
|
1674
1851
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1675
|
-
const populate = await getService$
|
1852
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1676
1853
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1677
1854
|
const [documentVersion, documentExists] = await Promise.all([
|
1678
1855
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1689,7 +1866,7 @@ const updateDocument = async (ctx, opts) => {
|
|
1689
1866
|
throw new errors.ForbiddenError();
|
1690
1867
|
}
|
1691
1868
|
const pickPermittedFields = documentVersion ? permissionChecker2.sanitizeUpdateInput(documentVersion) : permissionChecker2.sanitizeCreateInput;
|
1692
|
-
const setCreator = setCreatorFields({ user, isEdition: true });
|
1869
|
+
const setCreator = documentVersion ? setCreatorFields({ user, isEdition: true }) : setCreatorFields({ user });
|
1693
1870
|
const sanitizeFn = async.pipe(pickPermittedFields, setCreator);
|
1694
1871
|
const sanitizedBody = await sanitizeFn(body);
|
1695
1872
|
return documentManager2.update(documentVersion?.documentId || id, model, {
|
@@ -1703,14 +1880,14 @@ const collectionTypes = {
|
|
1703
1880
|
const { userAbility } = ctx.state;
|
1704
1881
|
const { model } = ctx.params;
|
1705
1882
|
const { query } = ctx.request;
|
1706
|
-
const documentMetadata2 = getService$
|
1707
|
-
const documentManager2 = getService$
|
1708
|
-
const permissionChecker2 = getService$
|
1883
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1884
|
+
const documentManager2 = getService$2("document-manager");
|
1885
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1709
1886
|
if (permissionChecker2.cannot.read()) {
|
1710
1887
|
return ctx.forbidden();
|
1711
1888
|
}
|
1712
1889
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1713
|
-
const populate = await getService$
|
1890
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1714
1891
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1715
1892
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1716
1893
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1739,13 +1916,13 @@ const collectionTypes = {
|
|
1739
1916
|
async findOne(ctx) {
|
1740
1917
|
const { userAbility } = ctx.state;
|
1741
1918
|
const { model, id } = ctx.params;
|
1742
|
-
const documentManager2 = getService$
|
1743
|
-
const permissionChecker2 = getService$
|
1919
|
+
const documentManager2 = getService$2("document-manager");
|
1920
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1744
1921
|
if (permissionChecker2.cannot.read()) {
|
1745
1922
|
return ctx.forbidden();
|
1746
1923
|
}
|
1747
1924
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1748
|
-
const populate = await getService$
|
1925
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1749
1926
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1750
1927
|
const version = await documentManager2.findOne(id, model, {
|
1751
1928
|
populate,
|
@@ -1776,7 +1953,7 @@ const collectionTypes = {
|
|
1776
1953
|
async create(ctx) {
|
1777
1954
|
const { userAbility } = ctx.state;
|
1778
1955
|
const { model } = ctx.params;
|
1779
|
-
const permissionChecker2 = getService$
|
1956
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1780
1957
|
const [totalEntries, document] = await Promise.all([
|
1781
1958
|
strapi.db.query(model).count(),
|
1782
1959
|
createDocument(ctx)
|
@@ -1797,7 +1974,7 @@ const collectionTypes = {
|
|
1797
1974
|
async update(ctx) {
|
1798
1975
|
const { userAbility } = ctx.state;
|
1799
1976
|
const { model } = ctx.params;
|
1800
|
-
const permissionChecker2 = getService$
|
1977
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1801
1978
|
const updatedVersion = await updateDocument(ctx);
|
1802
1979
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1803
1980
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1806,13 +1983,13 @@ const collectionTypes = {
|
|
1806
1983
|
const { userAbility, user } = ctx.state;
|
1807
1984
|
const { model, sourceId: id } = ctx.params;
|
1808
1985
|
const { body } = ctx.request;
|
1809
|
-
const documentManager2 = getService$
|
1810
|
-
const permissionChecker2 = getService$
|
1986
|
+
const documentManager2 = getService$2("document-manager");
|
1987
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1811
1988
|
if (permissionChecker2.cannot.create()) {
|
1812
1989
|
return ctx.forbidden();
|
1813
1990
|
}
|
1814
1991
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1815
|
-
const populate = await getService$
|
1992
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1816
1993
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1817
1994
|
const document = await documentManager2.findOne(id, model, {
|
1818
1995
|
populate,
|
@@ -1851,13 +2028,13 @@ const collectionTypes = {
|
|
1851
2028
|
async delete(ctx) {
|
1852
2029
|
const { userAbility } = ctx.state;
|
1853
2030
|
const { id, model } = ctx.params;
|
1854
|
-
const documentManager2 = getService$
|
1855
|
-
const permissionChecker2 = getService$
|
2031
|
+
const documentManager2 = getService$2("document-manager");
|
2032
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1856
2033
|
if (permissionChecker2.cannot.delete()) {
|
1857
2034
|
return ctx.forbidden();
|
1858
2035
|
}
|
1859
2036
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1860
|
-
const populate = await getService$
|
2037
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1861
2038
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1862
2039
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1863
2040
|
if (documentLocales.length === 0) {
|
@@ -1879,14 +2056,14 @@ const collectionTypes = {
|
|
1879
2056
|
const { userAbility } = ctx.state;
|
1880
2057
|
const { id, model } = ctx.params;
|
1881
2058
|
const { body } = ctx.request;
|
1882
|
-
const documentManager2 = getService$
|
1883
|
-
const permissionChecker2 = getService$
|
2059
|
+
const documentManager2 = getService$2("document-manager");
|
2060
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1884
2061
|
if (permissionChecker2.cannot.publish()) {
|
1885
2062
|
return ctx.forbidden();
|
1886
2063
|
}
|
1887
2064
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1888
2065
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1889
|
-
const populate = await getService$
|
2066
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1890
2067
|
let document;
|
1891
2068
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1892
2069
|
const isCreate = isNil$1(id);
|
@@ -1934,13 +2111,13 @@ const collectionTypes = {
|
|
1934
2111
|
const { body } = ctx.request;
|
1935
2112
|
const { documentIds } = body;
|
1936
2113
|
await validateBulkActionInput(body);
|
1937
|
-
const documentManager2 = getService$
|
1938
|
-
const permissionChecker2 = getService$
|
2114
|
+
const documentManager2 = getService$2("document-manager");
|
2115
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1939
2116
|
if (permissionChecker2.cannot.publish()) {
|
1940
2117
|
return ctx.forbidden();
|
1941
2118
|
}
|
1942
2119
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1943
|
-
const populate = await getService$
|
2120
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1944
2121
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1945
2122
|
allowMultipleLocales: true
|
1946
2123
|
});
|
@@ -1965,8 +2142,8 @@ const collectionTypes = {
|
|
1965
2142
|
const { body } = ctx.request;
|
1966
2143
|
const { documentIds } = body;
|
1967
2144
|
await validateBulkActionInput(body);
|
1968
|
-
const documentManager2 = getService$
|
1969
|
-
const permissionChecker2 = getService$
|
2145
|
+
const documentManager2 = getService$2("document-manager");
|
2146
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1970
2147
|
if (permissionChecker2.cannot.unpublish()) {
|
1971
2148
|
return ctx.forbidden();
|
1972
2149
|
}
|
@@ -1995,8 +2172,8 @@ const collectionTypes = {
|
|
1995
2172
|
const {
|
1996
2173
|
body: { discardDraft, ...body }
|
1997
2174
|
} = ctx.request;
|
1998
|
-
const documentManager2 = getService$
|
1999
|
-
const permissionChecker2 = getService$
|
2175
|
+
const documentManager2 = getService$2("document-manager");
|
2176
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2000
2177
|
if (permissionChecker2.cannot.unpublish()) {
|
2001
2178
|
return ctx.forbidden();
|
2002
2179
|
}
|
@@ -2004,7 +2181,7 @@ const collectionTypes = {
|
|
2004
2181
|
return ctx.forbidden();
|
2005
2182
|
}
|
2006
2183
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2007
|
-
const populate = await getService$
|
2184
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2008
2185
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2009
2186
|
const document = await documentManager2.findOne(id, model, {
|
2010
2187
|
populate,
|
@@ -2035,13 +2212,13 @@ const collectionTypes = {
|
|
2035
2212
|
const { userAbility } = ctx.state;
|
2036
2213
|
const { id, model } = ctx.params;
|
2037
2214
|
const { body } = ctx.request;
|
2038
|
-
const documentManager2 = getService$
|
2039
|
-
const permissionChecker2 = getService$
|
2215
|
+
const documentManager2 = getService$2("document-manager");
|
2216
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2040
2217
|
if (permissionChecker2.cannot.discard()) {
|
2041
2218
|
return ctx.forbidden();
|
2042
2219
|
}
|
2043
2220
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2044
|
-
const populate = await getService$
|
2221
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2045
2222
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2046
2223
|
const document = await documentManager2.findOne(id, model, {
|
2047
2224
|
populate,
|
@@ -2066,13 +2243,13 @@ const collectionTypes = {
|
|
2066
2243
|
const { query, body } = ctx.request;
|
2067
2244
|
const { documentIds } = body;
|
2068
2245
|
await validateBulkActionInput(body);
|
2069
|
-
const documentManager2 = getService$
|
2070
|
-
const permissionChecker2 = getService$
|
2246
|
+
const documentManager2 = getService$2("document-manager");
|
2247
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2071
2248
|
if (permissionChecker2.cannot.delete()) {
|
2072
2249
|
return ctx.forbidden();
|
2073
2250
|
}
|
2074
2251
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2075
|
-
const populate = await getService$
|
2252
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2076
2253
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2077
2254
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2078
2255
|
populate,
|
@@ -2093,13 +2270,13 @@ const collectionTypes = {
|
|
2093
2270
|
async countDraftRelations(ctx) {
|
2094
2271
|
const { userAbility } = ctx.state;
|
2095
2272
|
const { model, id } = ctx.params;
|
2096
|
-
const documentManager2 = getService$
|
2097
|
-
const permissionChecker2 = getService$
|
2273
|
+
const documentManager2 = getService$2("document-manager");
|
2274
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2098
2275
|
if (permissionChecker2.cannot.read()) {
|
2099
2276
|
return ctx.forbidden();
|
2100
2277
|
}
|
2101
2278
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2102
|
-
const populate = await getService$
|
2279
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2103
2280
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2104
2281
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2105
2282
|
if (!entity) {
|
@@ -2118,8 +2295,8 @@ const collectionTypes = {
|
|
2118
2295
|
const ids = ctx.request.query.documentIds;
|
2119
2296
|
const locale = ctx.request.query.locale;
|
2120
2297
|
const { model } = ctx.params;
|
2121
|
-
const documentManager2 = getService$
|
2122
|
-
const permissionChecker2 = getService$
|
2298
|
+
const documentManager2 = getService$2("document-manager");
|
2299
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2123
2300
|
if (permissionChecker2.cannot.read()) {
|
2124
2301
|
return ctx.forbidden();
|
2125
2302
|
}
|
@@ -2143,13 +2320,13 @@ const collectionTypes = {
|
|
2143
2320
|
};
|
2144
2321
|
const components$1 = {
|
2145
2322
|
findComponents(ctx) {
|
2146
|
-
const components2 = getService$
|
2147
|
-
const { toDto } = getService$
|
2323
|
+
const components2 = getService$2("components").findAllComponents();
|
2324
|
+
const { toDto } = getService$2("data-mapper");
|
2148
2325
|
ctx.body = { data: components2.map(toDto) };
|
2149
2326
|
},
|
2150
2327
|
async findComponentConfiguration(ctx) {
|
2151
2328
|
const { uid: uid2 } = ctx.params;
|
2152
|
-
const componentService = getService$
|
2329
|
+
const componentService = getService$2("components");
|
2153
2330
|
const component = componentService.findComponent(uid2);
|
2154
2331
|
if (!component) {
|
2155
2332
|
return ctx.notFound("component.notFound");
|
@@ -2166,7 +2343,7 @@ const components$1 = {
|
|
2166
2343
|
async updateComponentConfiguration(ctx) {
|
2167
2344
|
const { uid: uid2 } = ctx.params;
|
2168
2345
|
const { body } = ctx.request;
|
2169
|
-
const componentService = getService$
|
2346
|
+
const componentService = getService$2("components");
|
2170
2347
|
const component = componentService.findComponent(uid2);
|
2171
2348
|
if (!component) {
|
2172
2349
|
return ctx.notFound("component.notFound");
|
@@ -2200,12 +2377,12 @@ const contentTypes = {
|
|
2200
2377
|
} catch (error) {
|
2201
2378
|
return ctx.send({ error }, 400);
|
2202
2379
|
}
|
2203
|
-
const contentTypes2 = getService$
|
2204
|
-
const { toDto } = getService$
|
2380
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2381
|
+
const { toDto } = getService$2("data-mapper");
|
2205
2382
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2206
2383
|
},
|
2207
2384
|
async findContentTypesSettings(ctx) {
|
2208
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2385
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2209
2386
|
const contentTypes2 = await findAllContentTypes();
|
2210
2387
|
const configurations = await Promise.all(
|
2211
2388
|
contentTypes2.map(async (contentType) => {
|
@@ -2219,7 +2396,7 @@ const contentTypes = {
|
|
2219
2396
|
},
|
2220
2397
|
async findContentTypeConfiguration(ctx) {
|
2221
2398
|
const { uid: uid2 } = ctx.params;
|
2222
|
-
const contentTypeService = getService$
|
2399
|
+
const contentTypeService = getService$2("content-types");
|
2223
2400
|
const contentType = await contentTypeService.findContentType(uid2);
|
2224
2401
|
if (!contentType) {
|
2225
2402
|
return ctx.notFound("contentType.notFound");
|
@@ -2241,13 +2418,13 @@ const contentTypes = {
|
|
2241
2418
|
const { userAbility } = ctx.state;
|
2242
2419
|
const { uid: uid2 } = ctx.params;
|
2243
2420
|
const { body } = ctx.request;
|
2244
|
-
const contentTypeService = getService$
|
2245
|
-
const metricsService = getService$
|
2421
|
+
const contentTypeService = getService$2("content-types");
|
2422
|
+
const metricsService = getService$2("metrics");
|
2246
2423
|
const contentType = await contentTypeService.findContentType(uid2);
|
2247
2424
|
if (!contentType) {
|
2248
2425
|
return ctx.notFound("contentType.notFound");
|
2249
2426
|
}
|
2250
|
-
if (!getService$
|
2427
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2251
2428
|
return ctx.forbidden();
|
2252
2429
|
}
|
2253
2430
|
let input;
|
@@ -2280,10 +2457,10 @@ const contentTypes = {
|
|
2280
2457
|
};
|
2281
2458
|
const init = {
|
2282
2459
|
getInitData(ctx) {
|
2283
|
-
const { toDto } = getService$
|
2284
|
-
const { findAllComponents } = getService$
|
2285
|
-
const { getAllFieldSizes } = getService$
|
2286
|
-
const { findAllContentTypes } = getService$
|
2460
|
+
const { toDto } = getService$2("data-mapper");
|
2461
|
+
const { findAllComponents } = getService$2("components");
|
2462
|
+
const { getAllFieldSizes } = getService$2("field-sizes");
|
2463
|
+
const { findAllContentTypes } = getService$2("content-types");
|
2287
2464
|
ctx.body = {
|
2288
2465
|
data: {
|
2289
2466
|
fieldSizes: getAllFieldSizes(),
|
@@ -2319,7 +2496,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2319
2496
|
params.filters.$and.push(filtersClause);
|
2320
2497
|
};
|
2321
2498
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2322
|
-
const permissionChecker2 = getService$
|
2499
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2323
2500
|
userAbility,
|
2324
2501
|
model: model.uid
|
2325
2502
|
});
|
@@ -2333,15 +2510,27 @@ const sanitizeMainField = (model, mainField, userAbility) => {
|
|
2333
2510
|
}
|
2334
2511
|
return mainField;
|
2335
2512
|
};
|
2336
|
-
const addStatusToRelations = async (
|
2337
|
-
if (!contentTypes$1.hasDraftAndPublish(strapi.
|
2513
|
+
const addStatusToRelations = async (targetUid, relations2) => {
|
2514
|
+
if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2515
|
+
return relations2;
|
2516
|
+
}
|
2517
|
+
const documentMetadata2 = getService$2("document-metadata");
|
2518
|
+
if (!relations2.length) {
|
2338
2519
|
return relations2;
|
2339
2520
|
}
|
2340
|
-
const
|
2341
|
-
const
|
2521
|
+
const firstRelation = relations2[0];
|
2522
|
+
const filters = {
|
2523
|
+
documentId: { $in: relations2.map((r) => r.documentId) },
|
2524
|
+
// NOTE: find the "opposite" status
|
2525
|
+
publishedAt: firstRelation.publishedAt !== null ? { $null: true } : { $notNull: true }
|
2526
|
+
};
|
2527
|
+
const availableStatus = await strapi.query(targetUid).findMany({
|
2528
|
+
select: ["id", "documentId", "locale", "updatedAt", "createdAt", "publishedAt"],
|
2529
|
+
filters
|
2530
|
+
});
|
2342
2531
|
return relations2.map((relation) => {
|
2343
|
-
const availableStatuses =
|
2344
|
-
(availableDocument) => availableDocument.documentId === relation.documentId
|
2532
|
+
const availableStatuses = availableStatus.filter(
|
2533
|
+
(availableDocument) => availableDocument.documentId === relation.documentId && (relation.locale ? availableDocument.locale === relation.locale : true)
|
2345
2534
|
);
|
2346
2535
|
return {
|
2347
2536
|
...relation,
|
@@ -2403,7 +2592,7 @@ const relations = {
|
|
2403
2592
|
ctx.request?.query?.locale
|
2404
2593
|
);
|
2405
2594
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2406
|
-
const permissionChecker2 = getService$
|
2595
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2407
2596
|
userAbility,
|
2408
2597
|
model
|
2409
2598
|
});
|
@@ -2428,7 +2617,7 @@ const relations = {
|
|
2428
2617
|
where.id = id;
|
2429
2618
|
}
|
2430
2619
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2431
|
-
const populate = await getService$
|
2620
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2432
2621
|
const currentEntity = await strapi.db.query(model).findOne({
|
2433
2622
|
where,
|
2434
2623
|
populate
|
@@ -2443,7 +2632,7 @@ const relations = {
|
|
2443
2632
|
}
|
2444
2633
|
entryId = currentEntity.id;
|
2445
2634
|
}
|
2446
|
-
const modelConfig = isComponent2 ? await getService$
|
2635
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2447
2636
|
const targetSchema = strapi.getModel(targetUid);
|
2448
2637
|
const mainField = flow(
|
2449
2638
|
prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2497,7 +2686,7 @@ const relations = {
|
|
2497
2686
|
}
|
2498
2687
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2499
2688
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2500
|
-
const permissionChecker2 = getService$
|
2689
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2501
2690
|
userAbility: ctx.state.userAbility,
|
2502
2691
|
model: targetUid
|
2503
2692
|
});
|
@@ -2570,21 +2759,33 @@ const relations = {
|
|
2570
2759
|
attribute,
|
2571
2760
|
targetField,
|
2572
2761
|
fieldsToSelect,
|
2573
|
-
|
2574
|
-
|
2575
|
-
}
|
2576
|
-
target: {
|
2577
|
-
schema: { uid: targetUid }
|
2578
|
-
}
|
2762
|
+
status,
|
2763
|
+
source: { schema: sourceSchema },
|
2764
|
+
target: { schema: targetSchema }
|
2579
2765
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2580
|
-
const
|
2766
|
+
const { uid: sourceUid } = sourceSchema;
|
2767
|
+
const { uid: targetUid } = targetSchema;
|
2768
|
+
const permissionQuery = await getService$2("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
|
2581
2769
|
const dbQuery = strapi.db.query(sourceUid);
|
2582
2770
|
const loadRelations = relations$1.isAnyToMany(attribute) ? (...args) => dbQuery.loadPages(...args) : (...args) => dbQuery.load(...args).then((res2) => ({ results: res2 ? [res2] : [] }));
|
2771
|
+
const filters = {};
|
2772
|
+
if (sourceSchema?.options?.draftAndPublish) {
|
2773
|
+
if (targetSchema?.options?.draftAndPublish) {
|
2774
|
+
if (status === "published") {
|
2775
|
+
filters.publishedAt = { $notNull: true };
|
2776
|
+
} else {
|
2777
|
+
filters.publishedAt = { $null: true };
|
2778
|
+
}
|
2779
|
+
}
|
2780
|
+
} else if (targetSchema?.options?.draftAndPublish) {
|
2781
|
+
filters.publishedAt = { $null: true };
|
2782
|
+
}
|
2583
2783
|
const res = await loadRelations({ id: entryId }, targetField, {
|
2584
|
-
select: ["id", "documentId", "locale", "publishedAt"],
|
2784
|
+
select: ["id", "documentId", "locale", "publishedAt", "updatedAt"],
|
2585
2785
|
ordering: "desc",
|
2586
2786
|
page: ctx.request.query.page,
|
2587
|
-
pageSize: ctx.request.query.pageSize
|
2787
|
+
pageSize: ctx.request.query.pageSize,
|
2788
|
+
filters
|
2588
2789
|
});
|
2589
2790
|
const loadedIds = res.results.map((item) => item.id);
|
2590
2791
|
addFiltersClause(permissionQuery, { id: { $in: loadedIds } });
|
@@ -2605,10 +2806,10 @@ const relations = {
|
|
2605
2806
|
}
|
2606
2807
|
};
|
2607
2808
|
const buildPopulateFromQuery = async (query, model) => {
|
2608
|
-
return getService$
|
2809
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2609
2810
|
};
|
2610
2811
|
const findDocument = async (query, uid2, opts = {}) => {
|
2611
|
-
const documentManager2 = getService$
|
2812
|
+
const documentManager2 = getService$2("document-manager");
|
2612
2813
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2613
2814
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2614
2815
|
};
|
@@ -2616,8 +2817,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2616
2817
|
const { user, userAbility } = ctx.state;
|
2617
2818
|
const { model } = ctx.params;
|
2618
2819
|
const { body, query } = ctx.request;
|
2619
|
-
const documentManager2 = getService$
|
2620
|
-
const permissionChecker2 = getService$
|
2820
|
+
const documentManager2 = getService$2("document-manager");
|
2821
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2621
2822
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2622
2823
|
throw new errors.ForbiddenError();
|
2623
2824
|
}
|
@@ -2658,7 +2859,7 @@ const singleTypes = {
|
|
2658
2859
|
const { userAbility } = ctx.state;
|
2659
2860
|
const { model } = ctx.params;
|
2660
2861
|
const { query = {} } = ctx.request;
|
2661
|
-
const permissionChecker2 = getService$
|
2862
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2662
2863
|
if (permissionChecker2.cannot.read()) {
|
2663
2864
|
return ctx.forbidden();
|
2664
2865
|
}
|
@@ -2692,7 +2893,7 @@ const singleTypes = {
|
|
2692
2893
|
async createOrUpdate(ctx) {
|
2693
2894
|
const { userAbility } = ctx.state;
|
2694
2895
|
const { model } = ctx.params;
|
2695
|
-
const permissionChecker2 = getService$
|
2896
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2696
2897
|
const document = await createOrUpdateDocument(ctx);
|
2697
2898
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2698
2899
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2701,8 +2902,8 @@ const singleTypes = {
|
|
2701
2902
|
const { userAbility } = ctx.state;
|
2702
2903
|
const { model } = ctx.params;
|
2703
2904
|
const { query = {} } = ctx.request;
|
2704
|
-
const documentManager2 = getService$
|
2705
|
-
const permissionChecker2 = getService$
|
2905
|
+
const documentManager2 = getService$2("document-manager");
|
2906
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2706
2907
|
if (permissionChecker2.cannot.delete()) {
|
2707
2908
|
return ctx.forbidden();
|
2708
2909
|
}
|
@@ -2730,8 +2931,8 @@ const singleTypes = {
|
|
2730
2931
|
const { userAbility } = ctx.state;
|
2731
2932
|
const { model } = ctx.params;
|
2732
2933
|
const { query = {} } = ctx.request;
|
2733
|
-
const documentManager2 = getService$
|
2734
|
-
const permissionChecker2 = getService$
|
2934
|
+
const documentManager2 = getService$2("document-manager");
|
2935
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2735
2936
|
if (permissionChecker2.cannot.publish()) {
|
2736
2937
|
return ctx.forbidden();
|
2737
2938
|
}
|
@@ -2759,8 +2960,8 @@ const singleTypes = {
|
|
2759
2960
|
body: { discardDraft, ...body },
|
2760
2961
|
query = {}
|
2761
2962
|
} = ctx.request;
|
2762
|
-
const documentManager2 = getService$
|
2763
|
-
const permissionChecker2 = getService$
|
2963
|
+
const documentManager2 = getService$2("document-manager");
|
2964
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2764
2965
|
if (permissionChecker2.cannot.unpublish()) {
|
2765
2966
|
return ctx.forbidden();
|
2766
2967
|
}
|
@@ -2794,8 +2995,8 @@ const singleTypes = {
|
|
2794
2995
|
const { userAbility } = ctx.state;
|
2795
2996
|
const { model } = ctx.params;
|
2796
2997
|
const { body, query = {} } = ctx.request;
|
2797
|
-
const documentManager2 = getService$
|
2798
|
-
const permissionChecker2 = getService$
|
2998
|
+
const documentManager2 = getService$2("document-manager");
|
2999
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2799
3000
|
if (permissionChecker2.cannot.discard()) {
|
2800
3001
|
return ctx.forbidden();
|
2801
3002
|
}
|
@@ -2818,8 +3019,8 @@ const singleTypes = {
|
|
2818
3019
|
const { userAbility } = ctx.state;
|
2819
3020
|
const { model } = ctx.params;
|
2820
3021
|
const { query } = ctx.request;
|
2821
|
-
const documentManager2 = getService$
|
2822
|
-
const permissionChecker2 = getService$
|
3022
|
+
const documentManager2 = getService$2("document-manager");
|
3023
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2823
3024
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2824
3025
|
if (permissionChecker2.cannot.read()) {
|
2825
3026
|
return ctx.forbidden();
|
@@ -2843,7 +3044,7 @@ const uid$1 = {
|
|
2843
3044
|
const { query = {} } = ctx.request;
|
2844
3045
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2845
3046
|
await validateUIDField(contentTypeUID, field);
|
2846
|
-
const uidService = getService$
|
3047
|
+
const uidService = getService$2("uid");
|
2847
3048
|
ctx.body = {
|
2848
3049
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2849
3050
|
};
|
@@ -2855,7 +3056,7 @@ const uid$1 = {
|
|
2855
3056
|
const { query = {} } = ctx.request;
|
2856
3057
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2857
3058
|
await validateUIDField(contentTypeUID, field);
|
2858
|
-
const uidService = getService$
|
3059
|
+
const uidService = getService$2("uid");
|
2859
3060
|
const isAvailable = await uidService.checkUIDAvailability({
|
2860
3061
|
contentTypeUID,
|
2861
3062
|
field,
|
@@ -2876,7 +3077,8 @@ const controllers = {
|
|
2876
3077
|
relations,
|
2877
3078
|
"single-types": singleTypes,
|
2878
3079
|
uid: uid$1,
|
2879
|
-
...history.controllers ? history.controllers : {}
|
3080
|
+
...history.controllers ? history.controllers : {},
|
3081
|
+
...preview.controllers ? preview.controllers : {}
|
2880
3082
|
};
|
2881
3083
|
const keys = {
|
2882
3084
|
CONFIGURATION: "configuration"
|
@@ -3027,12 +3229,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3027
3229
|
return _.assign(metasWithDefaults, updatedMetas);
|
3028
3230
|
}
|
3029
3231
|
const getTargetSchema = (targetModel) => {
|
3030
|
-
return getService$
|
3232
|
+
return getService$2("content-types").findContentType(targetModel);
|
3031
3233
|
};
|
3032
3234
|
const DEFAULT_LIST_LENGTH = 4;
|
3033
3235
|
const MAX_ROW_SIZE = 12;
|
3034
3236
|
const isAllowedFieldSize = (type, size) => {
|
3035
|
-
const { getFieldSize } = getService$
|
3237
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3036
3238
|
const fieldSize = getFieldSize(type);
|
3037
3239
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3038
3240
|
return false;
|
@@ -3040,7 +3242,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3040
3242
|
return size <= MAX_ROW_SIZE;
|
3041
3243
|
};
|
3042
3244
|
const getDefaultFieldSize = (attribute) => {
|
3043
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3245
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3044
3246
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3045
3247
|
};
|
3046
3248
|
async function createDefaultLayouts(schema) {
|
@@ -3075,7 +3277,7 @@ function syncLayouts(configuration, schema) {
|
|
3075
3277
|
for (const el of row) {
|
3076
3278
|
if (!hasEditableAttribute(schema, el.name))
|
3077
3279
|
continue;
|
3078
|
-
const { hasFieldSize } = getService$
|
3280
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3079
3281
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3080
3282
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3081
3283
|
elementsToReAppend.push(el.name);
|
@@ -3215,17 +3417,17 @@ const configurationService$1 = createConfigurationService({
|
|
3215
3417
|
isComponent: true,
|
3216
3418
|
prefix: STORE_KEY_PREFIX,
|
3217
3419
|
getModels() {
|
3218
|
-
const { toContentManagerModel } = getService$
|
3420
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3219
3421
|
return mapValues(toContentManagerModel, strapi.components);
|
3220
3422
|
}
|
3221
3423
|
});
|
3222
3424
|
const components = ({ strapi: strapi2 }) => ({
|
3223
3425
|
findAllComponents() {
|
3224
|
-
const { toContentManagerModel } = getService$
|
3426
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3225
3427
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3226
3428
|
},
|
3227
3429
|
findComponent(uid2) {
|
3228
|
-
const { toContentManagerModel } = getService$
|
3430
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3229
3431
|
const component = strapi2.components[uid2];
|
3230
3432
|
return isNil$1(component) ? component : toContentManagerModel(component);
|
3231
3433
|
},
|
@@ -3276,17 +3478,17 @@ const configurationService = createConfigurationService({
|
|
3276
3478
|
storeUtils,
|
3277
3479
|
prefix: "content_types",
|
3278
3480
|
getModels() {
|
3279
|
-
const { toContentManagerModel } = getService$
|
3481
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3280
3482
|
return mapValues(toContentManagerModel, strapi.contentTypes);
|
3281
3483
|
}
|
3282
3484
|
});
|
3283
3485
|
const service = ({ strapi: strapi2 }) => ({
|
3284
3486
|
findAllContentTypes() {
|
3285
|
-
const { toContentManagerModel } = getService$
|
3487
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3286
3488
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3287
3489
|
},
|
3288
3490
|
findContentType(uid2) {
|
3289
|
-
const { toContentManagerModel } = getService$
|
3491
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3290
3492
|
const contentType = strapi2.contentTypes[uid2];
|
3291
3493
|
return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
|
3292
3494
|
},
|
@@ -3315,7 +3517,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3315
3517
|
return this.findConfiguration(contentType);
|
3316
3518
|
},
|
3317
3519
|
findComponentsConfigurations(contentType) {
|
3318
|
-
return getService$
|
3520
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3319
3521
|
},
|
3320
3522
|
syncConfigurations() {
|
3321
3523
|
return configurationService.syncConfigurations();
|
@@ -3587,7 +3789,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3587
3789
|
return userAbility.can(action);
|
3588
3790
|
},
|
3589
3791
|
async registerPermissions() {
|
3590
|
-
const displayedContentTypes = getService$
|
3792
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3591
3793
|
const contentTypesUids = displayedContentTypes.map(prop("uid"));
|
3592
3794
|
const actions = [
|
3593
3795
|
{
|
@@ -3863,7 +4065,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3863
4065
|
return populateQuery;
|
3864
4066
|
};
|
3865
4067
|
const buildDeepPopulate = (uid2) => {
|
3866
|
-
return getService$
|
4068
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3867
4069
|
};
|
3868
4070
|
const populateBuilder = (uid2) => {
|
3869
4071
|
let getInitialPopulate = async () => {
|
@@ -4048,7 +4250,9 @@ const documentMetadata = ({ strapi: strapi2 }) => ({
|
|
4048
4250
|
*/
|
4049
4251
|
async getAvailableLocales(uid2, version, allVersions, validatableFields = []) {
|
4050
4252
|
const versionsByLocale = groupBy("locale", allVersions);
|
4051
|
-
|
4253
|
+
if (version.locale) {
|
4254
|
+
delete versionsByLocale[version.locale];
|
4255
|
+
}
|
4052
4256
|
const model = strapi2.getModel(uid2);
|
4053
4257
|
const keysToKeep = [...AVAILABLE_LOCALES_FIELDS, ...validatableFields];
|
4054
4258
|
const traversalFunction = async (localeVersion) => traverseEntity(
|
@@ -4404,7 +4608,8 @@ const services = {
|
|
4404
4608
|
permission,
|
4405
4609
|
"populate-builder": populateBuilder$1,
|
4406
4610
|
uid,
|
4407
|
-
...history.services ? history.services : {}
|
4611
|
+
...history.services ? history.services : {},
|
4612
|
+
...preview.services ? preview.services : {}
|
4408
4613
|
};
|
4409
4614
|
const index = () => {
|
4410
4615
|
return {
|