@strapi/content-manager 5.0.3 → 5.0.4
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/server/index.js +290 -129
- package/dist/server/index.js.map +1 -1
- package/dist/server/index.mjs +290 -129
- package/dist/server/index.mjs.map +1 -1
- package/dist/server/src/controllers/index.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/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.map +1 -1
- 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/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 +7 -7
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
|
});
|
@@ -385,7 +402,7 @@ const createHistoryService = ({ strapi: strapi2 }) => {
|
|
385
402
|
[attributeKey]: adminUsers
|
386
403
|
};
|
387
404
|
}
|
388
|
-
const permissionChecker2 = getService$
|
405
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
389
406
|
userAbility: params.state.userAbility,
|
390
407
|
model: attributeSchema.target
|
391
408
|
});
|
@@ -561,7 +578,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
561
578
|
onCommit(async () => {
|
562
579
|
for (const entry of localeEntries) {
|
563
580
|
const status = await serviceUtils.getVersionStatus(uid2, entry);
|
564
|
-
await getService(strapi2, "history").createVersion({
|
581
|
+
await getService$1(strapi2, "history").createVersion({
|
565
582
|
contentType: uid2,
|
566
583
|
data: omit(FIELDS_TO_IGNORE, entry),
|
567
584
|
relatedDocumentId: documentId,
|
@@ -574,15 +591,19 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
574
591
|
});
|
575
592
|
return result;
|
576
593
|
});
|
577
|
-
state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
|
594
|
+
state.deleteExpiredJob = scheduleJob("historyDaily", "0 0 * * *", () => {
|
578
595
|
const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
|
579
596
|
const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
|
580
597
|
strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
|
581
598
|
where: {
|
582
599
|
created_at: {
|
583
|
-
$lt: expirationDate
|
600
|
+
$lt: expirationDate
|
584
601
|
}
|
585
602
|
}
|
603
|
+
}).catch((error) => {
|
604
|
+
if (error instanceof Error) {
|
605
|
+
strapi2.log.error("Error deleting expired history versions", error.message);
|
606
|
+
}
|
586
607
|
});
|
587
608
|
});
|
588
609
|
state.isInitialized = true;
|
@@ -594,17 +615,17 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
|
|
594
615
|
}
|
595
616
|
};
|
596
617
|
};
|
597
|
-
const services$
|
618
|
+
const services$2 = {
|
598
619
|
history: createHistoryService,
|
599
620
|
lifecycles: createLifecyclesService
|
600
621
|
};
|
601
|
-
const info = { pluginName: "content-manager", type: "admin" };
|
622
|
+
const info$1 = { pluginName: "content-manager", type: "admin" };
|
602
623
|
const historyVersionRouter = {
|
603
624
|
type: "admin",
|
604
625
|
routes: [
|
605
626
|
{
|
606
627
|
method: "GET",
|
607
|
-
info,
|
628
|
+
info: info$1,
|
608
629
|
path: "/history-versions",
|
609
630
|
handler: "history-version.findMany",
|
610
631
|
config: {
|
@@ -613,7 +634,7 @@ const historyVersionRouter = {
|
|
613
634
|
},
|
614
635
|
{
|
615
636
|
method: "PUT",
|
616
|
-
info,
|
637
|
+
info: info$1,
|
617
638
|
path: "/history-versions/:versionId/restore",
|
618
639
|
handler: "history-version.restoreVersion",
|
619
640
|
config: {
|
@@ -622,7 +643,7 @@ const historyVersionRouter = {
|
|
622
643
|
}
|
623
644
|
]
|
624
645
|
};
|
625
|
-
const routes$
|
646
|
+
const routes$2 = {
|
626
647
|
"history-version": historyVersionRouter
|
627
648
|
};
|
628
649
|
const historyVersion = {
|
@@ -676,14 +697,14 @@ const getFeature$1 = () => {
|
|
676
697
|
strapi2.get("models").add(historyVersion);
|
677
698
|
},
|
678
699
|
bootstrap({ strapi: strapi2 }) {
|
679
|
-
getService(strapi2, "lifecycles").bootstrap();
|
700
|
+
getService$1(strapi2, "lifecycles").bootstrap();
|
680
701
|
},
|
681
702
|
destroy({ strapi: strapi2 }) {
|
682
|
-
getService(strapi2, "lifecycles").destroy();
|
703
|
+
getService$1(strapi2, "lifecycles").destroy();
|
683
704
|
},
|
684
|
-
controllers: controllers$
|
685
|
-
services: services$
|
686
|
-
routes: routes$
|
705
|
+
controllers: controllers$2,
|
706
|
+
services: services$2,
|
707
|
+
routes: routes$2
|
687
708
|
};
|
688
709
|
}
|
689
710
|
return {
|
@@ -701,6 +722,138 @@ const ALLOWED_WEBHOOK_EVENTS = {
|
|
701
722
|
ENTRY_UNPUBLISH: "entry.unpublish"
|
702
723
|
};
|
703
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
|
+
};
|
704
857
|
const getFeature = () => {
|
705
858
|
if (!strapi.features.future.isEnabled(FEATURE_ID)) {
|
706
859
|
return {};
|
@@ -708,7 +861,12 @@ const getFeature = () => {
|
|
708
861
|
return {
|
709
862
|
bootstrap() {
|
710
863
|
console.log("Bootstrapping preview server");
|
711
|
-
|
864
|
+
const config = getService(strapi, "preview-config");
|
865
|
+
config.validate();
|
866
|
+
},
|
867
|
+
routes: routes$1,
|
868
|
+
controllers: controllers$1,
|
869
|
+
services: services$1
|
712
870
|
};
|
713
871
|
};
|
714
872
|
const preview = getFeature();
|
@@ -716,10 +874,10 @@ const bootstrap = async () => {
|
|
716
874
|
Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
|
717
875
|
strapi.get("webhookStore").addAllowedEvent(key, value);
|
718
876
|
});
|
719
|
-
getService$
|
720
|
-
await getService$
|
721
|
-
await getService$
|
722
|
-
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();
|
723
881
|
await history.bootstrap?.({ strapi });
|
724
882
|
await preview.bootstrap?.({ strapi });
|
725
883
|
};
|
@@ -1211,7 +1369,8 @@ const admin = {
|
|
1211
1369
|
};
|
1212
1370
|
const routes = {
|
1213
1371
|
admin,
|
1214
|
-
...history.routes ? history.routes : {}
|
1372
|
+
...history.routes ? history.routes : {},
|
1373
|
+
...preview.routes ? preview.routes : {}
|
1215
1374
|
};
|
1216
1375
|
const hasPermissionsSchema = yup$1.object({
|
1217
1376
|
actions: yup$1.array().of(yup$1.string()),
|
@@ -1468,7 +1627,7 @@ const createMetadasSchema = (schema) => {
|
|
1468
1627
|
if (!value) {
|
1469
1628
|
return yup$1.string();
|
1470
1629
|
}
|
1471
|
-
const targetSchema = getService$
|
1630
|
+
const targetSchema = getService$2("content-types").findContentType(
|
1472
1631
|
schema.attributes[key].targetModel
|
1473
1632
|
);
|
1474
1633
|
if (!targetSchema) {
|
@@ -1637,7 +1796,7 @@ const getDocumentLocaleAndStatus = async (request, model, opts = { allowMultiple
|
|
1637
1796
|
}
|
1638
1797
|
};
|
1639
1798
|
const formatDocumentWithMetadata = async (permissionChecker2, uid2, document, opts = {}) => {
|
1640
|
-
const documentMetadata2 = getService$
|
1799
|
+
const documentMetadata2 = getService$2("document-metadata");
|
1641
1800
|
const serviceOutput = await documentMetadata2.formatDocumentWithMetadata(uid2, document, opts);
|
1642
1801
|
let {
|
1643
1802
|
meta: { availableLocales, availableStatus }
|
@@ -1663,8 +1822,8 @@ const createDocument = async (ctx, opts) => {
|
|
1663
1822
|
const { userAbility, user } = ctx.state;
|
1664
1823
|
const { model } = ctx.params;
|
1665
1824
|
const { body } = ctx.request;
|
1666
|
-
const documentManager2 = getService$
|
1667
|
-
const permissionChecker2 = getService$
|
1825
|
+
const documentManager2 = getService$2("document-manager");
|
1826
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1668
1827
|
if (permissionChecker2.cannot.create()) {
|
1669
1828
|
throw new errors.ForbiddenError();
|
1670
1829
|
}
|
@@ -1684,13 +1843,13 @@ const updateDocument = async (ctx, opts) => {
|
|
1684
1843
|
const { userAbility, user } = ctx.state;
|
1685
1844
|
const { id, model } = ctx.params;
|
1686
1845
|
const { body } = ctx.request;
|
1687
|
-
const documentManager2 = getService$
|
1688
|
-
const permissionChecker2 = getService$
|
1846
|
+
const documentManager2 = getService$2("document-manager");
|
1847
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1689
1848
|
if (permissionChecker2.cannot.update()) {
|
1690
1849
|
throw new errors.ForbiddenError();
|
1691
1850
|
}
|
1692
1851
|
const permissionQuery = await permissionChecker2.sanitizedQuery.update(ctx.query);
|
1693
|
-
const populate = await getService$
|
1852
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1694
1853
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1695
1854
|
const [documentVersion, documentExists] = await Promise.all([
|
1696
1855
|
documentManager2.findOne(id, model, { populate, locale, status: "draft" }),
|
@@ -1721,14 +1880,14 @@ const collectionTypes = {
|
|
1721
1880
|
const { userAbility } = ctx.state;
|
1722
1881
|
const { model } = ctx.params;
|
1723
1882
|
const { query } = ctx.request;
|
1724
|
-
const documentMetadata2 = getService$
|
1725
|
-
const documentManager2 = getService$
|
1726
|
-
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 });
|
1727
1886
|
if (permissionChecker2.cannot.read()) {
|
1728
1887
|
return ctx.forbidden();
|
1729
1888
|
}
|
1730
1889
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(query);
|
1731
|
-
const populate = await getService$
|
1890
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(1).countRelations({ toOne: false, toMany: true }).build();
|
1732
1891
|
const { locale, status } = await getDocumentLocaleAndStatus(query, model);
|
1733
1892
|
const { results: documents, pagination: pagination2 } = await documentManager2.findPage(
|
1734
1893
|
{ ...permissionQuery, populate, locale, status },
|
@@ -1757,13 +1916,13 @@ const collectionTypes = {
|
|
1757
1916
|
async findOne(ctx) {
|
1758
1917
|
const { userAbility } = ctx.state;
|
1759
1918
|
const { model, id } = ctx.params;
|
1760
|
-
const documentManager2 = getService$
|
1761
|
-
const permissionChecker2 = getService$
|
1919
|
+
const documentManager2 = getService$2("document-manager");
|
1920
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1762
1921
|
if (permissionChecker2.cannot.read()) {
|
1763
1922
|
return ctx.forbidden();
|
1764
1923
|
}
|
1765
1924
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
1766
|
-
const populate = await getService$
|
1925
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1767
1926
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1768
1927
|
const version = await documentManager2.findOne(id, model, {
|
1769
1928
|
populate,
|
@@ -1794,7 +1953,7 @@ const collectionTypes = {
|
|
1794
1953
|
async create(ctx) {
|
1795
1954
|
const { userAbility } = ctx.state;
|
1796
1955
|
const { model } = ctx.params;
|
1797
|
-
const permissionChecker2 = getService$
|
1956
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1798
1957
|
const [totalEntries, document] = await Promise.all([
|
1799
1958
|
strapi.db.query(model).count(),
|
1800
1959
|
createDocument(ctx)
|
@@ -1815,7 +1974,7 @@ const collectionTypes = {
|
|
1815
1974
|
async update(ctx) {
|
1816
1975
|
const { userAbility } = ctx.state;
|
1817
1976
|
const { model } = ctx.params;
|
1818
|
-
const permissionChecker2 = getService$
|
1977
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1819
1978
|
const updatedVersion = await updateDocument(ctx);
|
1820
1979
|
const sanitizedVersion = await permissionChecker2.sanitizeOutput(updatedVersion);
|
1821
1980
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedVersion);
|
@@ -1824,13 +1983,13 @@ const collectionTypes = {
|
|
1824
1983
|
const { userAbility, user } = ctx.state;
|
1825
1984
|
const { model, sourceId: id } = ctx.params;
|
1826
1985
|
const { body } = ctx.request;
|
1827
|
-
const documentManager2 = getService$
|
1828
|
-
const permissionChecker2 = getService$
|
1986
|
+
const documentManager2 = getService$2("document-manager");
|
1987
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1829
1988
|
if (permissionChecker2.cannot.create()) {
|
1830
1989
|
return ctx.forbidden();
|
1831
1990
|
}
|
1832
1991
|
const permissionQuery = await permissionChecker2.sanitizedQuery.create(ctx.query);
|
1833
|
-
const populate = await getService$
|
1992
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1834
1993
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1835
1994
|
const document = await documentManager2.findOne(id, model, {
|
1836
1995
|
populate,
|
@@ -1869,13 +2028,13 @@ const collectionTypes = {
|
|
1869
2028
|
async delete(ctx) {
|
1870
2029
|
const { userAbility } = ctx.state;
|
1871
2030
|
const { id, model } = ctx.params;
|
1872
|
-
const documentManager2 = getService$
|
1873
|
-
const permissionChecker2 = getService$
|
2031
|
+
const documentManager2 = getService$2("document-manager");
|
2032
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1874
2033
|
if (permissionChecker2.cannot.delete()) {
|
1875
2034
|
return ctx.forbidden();
|
1876
2035
|
}
|
1877
2036
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(ctx.query);
|
1878
|
-
const populate = await getService$
|
2037
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
1879
2038
|
const { locale } = await getDocumentLocaleAndStatus(ctx.query, model);
|
1880
2039
|
const documentLocales = await documentManager2.findLocales(id, model, { populate, locale });
|
1881
2040
|
if (documentLocales.length === 0) {
|
@@ -1897,14 +2056,14 @@ const collectionTypes = {
|
|
1897
2056
|
const { userAbility } = ctx.state;
|
1898
2057
|
const { id, model } = ctx.params;
|
1899
2058
|
const { body } = ctx.request;
|
1900
|
-
const documentManager2 = getService$
|
1901
|
-
const permissionChecker2 = getService$
|
2059
|
+
const documentManager2 = getService$2("document-manager");
|
2060
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1902
2061
|
if (permissionChecker2.cannot.publish()) {
|
1903
2062
|
return ctx.forbidden();
|
1904
2063
|
}
|
1905
2064
|
const publishedDocument = await strapi.db.transaction(async () => {
|
1906
2065
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1907
|
-
const populate = await getService$
|
2066
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1908
2067
|
let document;
|
1909
2068
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
1910
2069
|
const isCreate = isNil$1(id);
|
@@ -1952,13 +2111,13 @@ const collectionTypes = {
|
|
1952
2111
|
const { body } = ctx.request;
|
1953
2112
|
const { documentIds } = body;
|
1954
2113
|
await validateBulkActionInput(body);
|
1955
|
-
const documentManager2 = getService$
|
1956
|
-
const permissionChecker2 = getService$
|
2114
|
+
const documentManager2 = getService$2("document-manager");
|
2115
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1957
2116
|
if (permissionChecker2.cannot.publish()) {
|
1958
2117
|
return ctx.forbidden();
|
1959
2118
|
}
|
1960
2119
|
const permissionQuery = await permissionChecker2.sanitizedQuery.publish(ctx.query);
|
1961
|
-
const populate = await getService$
|
2120
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).populateDeep(Infinity).countRelations().build();
|
1962
2121
|
const { locale } = await getDocumentLocaleAndStatus(body, model, {
|
1963
2122
|
allowMultipleLocales: true
|
1964
2123
|
});
|
@@ -1983,8 +2142,8 @@ const collectionTypes = {
|
|
1983
2142
|
const { body } = ctx.request;
|
1984
2143
|
const { documentIds } = body;
|
1985
2144
|
await validateBulkActionInput(body);
|
1986
|
-
const documentManager2 = getService$
|
1987
|
-
const permissionChecker2 = getService$
|
2145
|
+
const documentManager2 = getService$2("document-manager");
|
2146
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
1988
2147
|
if (permissionChecker2.cannot.unpublish()) {
|
1989
2148
|
return ctx.forbidden();
|
1990
2149
|
}
|
@@ -2013,8 +2172,8 @@ const collectionTypes = {
|
|
2013
2172
|
const {
|
2014
2173
|
body: { discardDraft, ...body }
|
2015
2174
|
} = ctx.request;
|
2016
|
-
const documentManager2 = getService$
|
2017
|
-
const permissionChecker2 = getService$
|
2175
|
+
const documentManager2 = getService$2("document-manager");
|
2176
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2018
2177
|
if (permissionChecker2.cannot.unpublish()) {
|
2019
2178
|
return ctx.forbidden();
|
2020
2179
|
}
|
@@ -2022,7 +2181,7 @@ const collectionTypes = {
|
|
2022
2181
|
return ctx.forbidden();
|
2023
2182
|
}
|
2024
2183
|
const permissionQuery = await permissionChecker2.sanitizedQuery.unpublish(ctx.query);
|
2025
|
-
const populate = await getService$
|
2184
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2026
2185
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2027
2186
|
const document = await documentManager2.findOne(id, model, {
|
2028
2187
|
populate,
|
@@ -2053,13 +2212,13 @@ const collectionTypes = {
|
|
2053
2212
|
const { userAbility } = ctx.state;
|
2054
2213
|
const { id, model } = ctx.params;
|
2055
2214
|
const { body } = ctx.request;
|
2056
|
-
const documentManager2 = getService$
|
2057
|
-
const permissionChecker2 = getService$
|
2215
|
+
const documentManager2 = getService$2("document-manager");
|
2216
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2058
2217
|
if (permissionChecker2.cannot.discard()) {
|
2059
2218
|
return ctx.forbidden();
|
2060
2219
|
}
|
2061
2220
|
const permissionQuery = await permissionChecker2.sanitizedQuery.discard(ctx.query);
|
2062
|
-
const populate = await getService$
|
2221
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2063
2222
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2064
2223
|
const document = await documentManager2.findOne(id, model, {
|
2065
2224
|
populate,
|
@@ -2084,13 +2243,13 @@ const collectionTypes = {
|
|
2084
2243
|
const { query, body } = ctx.request;
|
2085
2244
|
const { documentIds } = body;
|
2086
2245
|
await validateBulkActionInput(body);
|
2087
|
-
const documentManager2 = getService$
|
2088
|
-
const permissionChecker2 = getService$
|
2246
|
+
const documentManager2 = getService$2("document-manager");
|
2247
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2089
2248
|
if (permissionChecker2.cannot.delete()) {
|
2090
2249
|
return ctx.forbidden();
|
2091
2250
|
}
|
2092
2251
|
const permissionQuery = await permissionChecker2.sanitizedQuery.delete(query);
|
2093
|
-
const populate = await getService$
|
2252
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2094
2253
|
const { locale } = await getDocumentLocaleAndStatus(body, model);
|
2095
2254
|
const documentLocales = await documentManager2.findLocales(documentIds, model, {
|
2096
2255
|
populate,
|
@@ -2111,13 +2270,13 @@ const collectionTypes = {
|
|
2111
2270
|
async countDraftRelations(ctx) {
|
2112
2271
|
const { userAbility } = ctx.state;
|
2113
2272
|
const { model, id } = ctx.params;
|
2114
|
-
const documentManager2 = getService$
|
2115
|
-
const permissionChecker2 = getService$
|
2273
|
+
const documentManager2 = getService$2("document-manager");
|
2274
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2116
2275
|
if (permissionChecker2.cannot.read()) {
|
2117
2276
|
return ctx.forbidden();
|
2118
2277
|
}
|
2119
2278
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2120
|
-
const populate = await getService$
|
2279
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2121
2280
|
const { locale, status } = await getDocumentLocaleAndStatus(ctx.query, model);
|
2122
2281
|
const entity = await documentManager2.findOne(id, model, { populate, locale, status });
|
2123
2282
|
if (!entity) {
|
@@ -2136,8 +2295,8 @@ const collectionTypes = {
|
|
2136
2295
|
const ids = ctx.request.query.documentIds;
|
2137
2296
|
const locale = ctx.request.query.locale;
|
2138
2297
|
const { model } = ctx.params;
|
2139
|
-
const documentManager2 = getService$
|
2140
|
-
const permissionChecker2 = getService$
|
2298
|
+
const documentManager2 = getService$2("document-manager");
|
2299
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2141
2300
|
if (permissionChecker2.cannot.read()) {
|
2142
2301
|
return ctx.forbidden();
|
2143
2302
|
}
|
@@ -2161,13 +2320,13 @@ const collectionTypes = {
|
|
2161
2320
|
};
|
2162
2321
|
const components$1 = {
|
2163
2322
|
findComponents(ctx) {
|
2164
|
-
const components2 = getService$
|
2165
|
-
const { toDto } = getService$
|
2323
|
+
const components2 = getService$2("components").findAllComponents();
|
2324
|
+
const { toDto } = getService$2("data-mapper");
|
2166
2325
|
ctx.body = { data: components2.map(toDto) };
|
2167
2326
|
},
|
2168
2327
|
async findComponentConfiguration(ctx) {
|
2169
2328
|
const { uid: uid2 } = ctx.params;
|
2170
|
-
const componentService = getService$
|
2329
|
+
const componentService = getService$2("components");
|
2171
2330
|
const component = componentService.findComponent(uid2);
|
2172
2331
|
if (!component) {
|
2173
2332
|
return ctx.notFound("component.notFound");
|
@@ -2184,7 +2343,7 @@ const components$1 = {
|
|
2184
2343
|
async updateComponentConfiguration(ctx) {
|
2185
2344
|
const { uid: uid2 } = ctx.params;
|
2186
2345
|
const { body } = ctx.request;
|
2187
|
-
const componentService = getService$
|
2346
|
+
const componentService = getService$2("components");
|
2188
2347
|
const component = componentService.findComponent(uid2);
|
2189
2348
|
if (!component) {
|
2190
2349
|
return ctx.notFound("component.notFound");
|
@@ -2218,12 +2377,12 @@ const contentTypes = {
|
|
2218
2377
|
} catch (error) {
|
2219
2378
|
return ctx.send({ error }, 400);
|
2220
2379
|
}
|
2221
|
-
const contentTypes2 = getService$
|
2222
|
-
const { toDto } = getService$
|
2380
|
+
const contentTypes2 = getService$2("content-types").findContentTypesByKind(kind);
|
2381
|
+
const { toDto } = getService$2("data-mapper");
|
2223
2382
|
ctx.body = { data: contentTypes2.map(toDto) };
|
2224
2383
|
},
|
2225
2384
|
async findContentTypesSettings(ctx) {
|
2226
|
-
const { findAllContentTypes, findConfiguration } = getService$
|
2385
|
+
const { findAllContentTypes, findConfiguration } = getService$2("content-types");
|
2227
2386
|
const contentTypes2 = await findAllContentTypes();
|
2228
2387
|
const configurations = await Promise.all(
|
2229
2388
|
contentTypes2.map(async (contentType) => {
|
@@ -2237,7 +2396,7 @@ const contentTypes = {
|
|
2237
2396
|
},
|
2238
2397
|
async findContentTypeConfiguration(ctx) {
|
2239
2398
|
const { uid: uid2 } = ctx.params;
|
2240
|
-
const contentTypeService = getService$
|
2399
|
+
const contentTypeService = getService$2("content-types");
|
2241
2400
|
const contentType = await contentTypeService.findContentType(uid2);
|
2242
2401
|
if (!contentType) {
|
2243
2402
|
return ctx.notFound("contentType.notFound");
|
@@ -2259,13 +2418,13 @@ const contentTypes = {
|
|
2259
2418
|
const { userAbility } = ctx.state;
|
2260
2419
|
const { uid: uid2 } = ctx.params;
|
2261
2420
|
const { body } = ctx.request;
|
2262
|
-
const contentTypeService = getService$
|
2263
|
-
const metricsService = getService$
|
2421
|
+
const contentTypeService = getService$2("content-types");
|
2422
|
+
const metricsService = getService$2("metrics");
|
2264
2423
|
const contentType = await contentTypeService.findContentType(uid2);
|
2265
2424
|
if (!contentType) {
|
2266
2425
|
return ctx.notFound("contentType.notFound");
|
2267
2426
|
}
|
2268
|
-
if (!getService$
|
2427
|
+
if (!getService$2("permission").canConfigureContentType({ userAbility, contentType })) {
|
2269
2428
|
return ctx.forbidden();
|
2270
2429
|
}
|
2271
2430
|
let input;
|
@@ -2298,10 +2457,10 @@ const contentTypes = {
|
|
2298
2457
|
};
|
2299
2458
|
const init = {
|
2300
2459
|
getInitData(ctx) {
|
2301
|
-
const { toDto } = getService$
|
2302
|
-
const { findAllComponents } = getService$
|
2303
|
-
const { getAllFieldSizes } = getService$
|
2304
|
-
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");
|
2305
2464
|
ctx.body = {
|
2306
2465
|
data: {
|
2307
2466
|
fieldSizes: getAllFieldSizes(),
|
@@ -2337,7 +2496,7 @@ const addFiltersClause = (params, filtersClause) => {
|
|
2337
2496
|
params.filters.$and.push(filtersClause);
|
2338
2497
|
};
|
2339
2498
|
const sanitizeMainField = (model, mainField, userAbility) => {
|
2340
|
-
const permissionChecker2 = getService$
|
2499
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2341
2500
|
userAbility,
|
2342
2501
|
model: model.uid
|
2343
2502
|
});
|
@@ -2355,7 +2514,7 @@ const addStatusToRelations = async (targetUid, relations2) => {
|
|
2355
2514
|
if (!contentTypes$1.hasDraftAndPublish(strapi.getModel(targetUid))) {
|
2356
2515
|
return relations2;
|
2357
2516
|
}
|
2358
|
-
const documentMetadata2 = getService$
|
2517
|
+
const documentMetadata2 = getService$2("document-metadata");
|
2359
2518
|
if (!relations2.length) {
|
2360
2519
|
return relations2;
|
2361
2520
|
}
|
@@ -2433,7 +2592,7 @@ const relations = {
|
|
2433
2592
|
ctx.request?.query?.locale
|
2434
2593
|
);
|
2435
2594
|
const { status } = validateStatus(sourceUid, ctx.request?.query?.status);
|
2436
|
-
const permissionChecker2 = getService$
|
2595
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2437
2596
|
userAbility,
|
2438
2597
|
model
|
2439
2598
|
});
|
@@ -2458,7 +2617,7 @@ const relations = {
|
|
2458
2617
|
where.id = id;
|
2459
2618
|
}
|
2460
2619
|
const permissionQuery = await permissionChecker2.sanitizedQuery.read(ctx.query);
|
2461
|
-
const populate = await getService$
|
2620
|
+
const populate = await getService$2("populate-builder")(model).populateFromQuery(permissionQuery).build();
|
2462
2621
|
const currentEntity = await strapi.db.query(model).findOne({
|
2463
2622
|
where,
|
2464
2623
|
populate
|
@@ -2473,7 +2632,7 @@ const relations = {
|
|
2473
2632
|
}
|
2474
2633
|
entryId = currentEntity.id;
|
2475
2634
|
}
|
2476
|
-
const modelConfig = isComponent2 ? await getService$
|
2635
|
+
const modelConfig = isComponent2 ? await getService$2("components").findConfiguration(sourceSchema) : await getService$2("content-types").findConfiguration(sourceSchema);
|
2477
2636
|
const targetSchema = strapi.getModel(targetUid);
|
2478
2637
|
const mainField = flow(
|
2479
2638
|
prop(`metadatas.${targetField}.edit.mainField`),
|
@@ -2527,7 +2686,7 @@ const relations = {
|
|
2527
2686
|
}
|
2528
2687
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2529
2688
|
const { idsToOmit, idsToInclude, _q, ...query } = ctx.request.query;
|
2530
|
-
const permissionChecker2 = getService$
|
2689
|
+
const permissionChecker2 = getService$2("permission-checker").create({
|
2531
2690
|
userAbility: ctx.state.userAbility,
|
2532
2691
|
model: targetUid
|
2533
2692
|
});
|
@@ -2606,7 +2765,7 @@ const relations = {
|
|
2606
2765
|
} = await this.extractAndValidateRequestInfo(ctx, id);
|
2607
2766
|
const { uid: sourceUid } = sourceSchema;
|
2608
2767
|
const { uid: targetUid } = targetSchema;
|
2609
|
-
const permissionQuery = await getService$
|
2768
|
+
const permissionQuery = await getService$2("permission-checker").create({ userAbility, model: targetUid }).sanitizedQuery.read({ fields: fieldsToSelect });
|
2610
2769
|
const dbQuery = strapi.db.query(sourceUid);
|
2611
2770
|
const loadRelations = relations$1.isAnyToMany(attribute) ? (...args) => dbQuery.loadPages(...args) : (...args) => dbQuery.load(...args).then((res2) => ({ results: res2 ? [res2] : [] }));
|
2612
2771
|
const filters = {};
|
@@ -2647,10 +2806,10 @@ const relations = {
|
|
2647
2806
|
}
|
2648
2807
|
};
|
2649
2808
|
const buildPopulateFromQuery = async (query, model) => {
|
2650
|
-
return getService$
|
2809
|
+
return getService$2("populate-builder")(model).populateFromQuery(query).populateDeep(Infinity).countRelations().build();
|
2651
2810
|
};
|
2652
2811
|
const findDocument = async (query, uid2, opts = {}) => {
|
2653
|
-
const documentManager2 = getService$
|
2812
|
+
const documentManager2 = getService$2("document-manager");
|
2654
2813
|
const populate = await buildPopulateFromQuery(query, uid2);
|
2655
2814
|
return documentManager2.findMany({ ...opts, populate }, uid2).then((documents) => documents[0]);
|
2656
2815
|
};
|
@@ -2658,8 +2817,8 @@ const createOrUpdateDocument = async (ctx, opts) => {
|
|
2658
2817
|
const { user, userAbility } = ctx.state;
|
2659
2818
|
const { model } = ctx.params;
|
2660
2819
|
const { body, query } = ctx.request;
|
2661
|
-
const documentManager2 = getService$
|
2662
|
-
const permissionChecker2 = getService$
|
2820
|
+
const documentManager2 = getService$2("document-manager");
|
2821
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2663
2822
|
if (permissionChecker2.cannot.create() && permissionChecker2.cannot.update()) {
|
2664
2823
|
throw new errors.ForbiddenError();
|
2665
2824
|
}
|
@@ -2700,7 +2859,7 @@ const singleTypes = {
|
|
2700
2859
|
const { userAbility } = ctx.state;
|
2701
2860
|
const { model } = ctx.params;
|
2702
2861
|
const { query = {} } = ctx.request;
|
2703
|
-
const permissionChecker2 = getService$
|
2862
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2704
2863
|
if (permissionChecker2.cannot.read()) {
|
2705
2864
|
return ctx.forbidden();
|
2706
2865
|
}
|
@@ -2734,7 +2893,7 @@ const singleTypes = {
|
|
2734
2893
|
async createOrUpdate(ctx) {
|
2735
2894
|
const { userAbility } = ctx.state;
|
2736
2895
|
const { model } = ctx.params;
|
2737
|
-
const permissionChecker2 = getService$
|
2896
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2738
2897
|
const document = await createOrUpdateDocument(ctx);
|
2739
2898
|
const sanitizedDocument = await permissionChecker2.sanitizeOutput(document);
|
2740
2899
|
ctx.body = await formatDocumentWithMetadata(permissionChecker2, model, sanitizedDocument);
|
@@ -2743,8 +2902,8 @@ const singleTypes = {
|
|
2743
2902
|
const { userAbility } = ctx.state;
|
2744
2903
|
const { model } = ctx.params;
|
2745
2904
|
const { query = {} } = ctx.request;
|
2746
|
-
const documentManager2 = getService$
|
2747
|
-
const permissionChecker2 = getService$
|
2905
|
+
const documentManager2 = getService$2("document-manager");
|
2906
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2748
2907
|
if (permissionChecker2.cannot.delete()) {
|
2749
2908
|
return ctx.forbidden();
|
2750
2909
|
}
|
@@ -2772,8 +2931,8 @@ const singleTypes = {
|
|
2772
2931
|
const { userAbility } = ctx.state;
|
2773
2932
|
const { model } = ctx.params;
|
2774
2933
|
const { query = {} } = ctx.request;
|
2775
|
-
const documentManager2 = getService$
|
2776
|
-
const permissionChecker2 = getService$
|
2934
|
+
const documentManager2 = getService$2("document-manager");
|
2935
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2777
2936
|
if (permissionChecker2.cannot.publish()) {
|
2778
2937
|
return ctx.forbidden();
|
2779
2938
|
}
|
@@ -2801,8 +2960,8 @@ const singleTypes = {
|
|
2801
2960
|
body: { discardDraft, ...body },
|
2802
2961
|
query = {}
|
2803
2962
|
} = ctx.request;
|
2804
|
-
const documentManager2 = getService$
|
2805
|
-
const permissionChecker2 = getService$
|
2963
|
+
const documentManager2 = getService$2("document-manager");
|
2964
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2806
2965
|
if (permissionChecker2.cannot.unpublish()) {
|
2807
2966
|
return ctx.forbidden();
|
2808
2967
|
}
|
@@ -2836,8 +2995,8 @@ const singleTypes = {
|
|
2836
2995
|
const { userAbility } = ctx.state;
|
2837
2996
|
const { model } = ctx.params;
|
2838
2997
|
const { body, query = {} } = ctx.request;
|
2839
|
-
const documentManager2 = getService$
|
2840
|
-
const permissionChecker2 = getService$
|
2998
|
+
const documentManager2 = getService$2("document-manager");
|
2999
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2841
3000
|
if (permissionChecker2.cannot.discard()) {
|
2842
3001
|
return ctx.forbidden();
|
2843
3002
|
}
|
@@ -2860,8 +3019,8 @@ const singleTypes = {
|
|
2860
3019
|
const { userAbility } = ctx.state;
|
2861
3020
|
const { model } = ctx.params;
|
2862
3021
|
const { query } = ctx.request;
|
2863
|
-
const documentManager2 = getService$
|
2864
|
-
const permissionChecker2 = getService$
|
3022
|
+
const documentManager2 = getService$2("document-manager");
|
3023
|
+
const permissionChecker2 = getService$2("permission-checker").create({ userAbility, model });
|
2865
3024
|
const { locale } = await getDocumentLocaleAndStatus(query, model);
|
2866
3025
|
if (permissionChecker2.cannot.read()) {
|
2867
3026
|
return ctx.forbidden();
|
@@ -2885,7 +3044,7 @@ const uid$1 = {
|
|
2885
3044
|
const { query = {} } = ctx.request;
|
2886
3045
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2887
3046
|
await validateUIDField(contentTypeUID, field);
|
2888
|
-
const uidService = getService$
|
3047
|
+
const uidService = getService$2("uid");
|
2889
3048
|
ctx.body = {
|
2890
3049
|
data: await uidService.generateUIDField({ contentTypeUID, field, data, locale })
|
2891
3050
|
};
|
@@ -2897,7 +3056,7 @@ const uid$1 = {
|
|
2897
3056
|
const { query = {} } = ctx.request;
|
2898
3057
|
const { locale } = await getDocumentLocaleAndStatus(query, contentTypeUID);
|
2899
3058
|
await validateUIDField(contentTypeUID, field);
|
2900
|
-
const uidService = getService$
|
3059
|
+
const uidService = getService$2("uid");
|
2901
3060
|
const isAvailable = await uidService.checkUIDAvailability({
|
2902
3061
|
contentTypeUID,
|
2903
3062
|
field,
|
@@ -2918,7 +3077,8 @@ const controllers = {
|
|
2918
3077
|
relations,
|
2919
3078
|
"single-types": singleTypes,
|
2920
3079
|
uid: uid$1,
|
2921
|
-
...history.controllers ? history.controllers : {}
|
3080
|
+
...history.controllers ? history.controllers : {},
|
3081
|
+
...preview.controllers ? preview.controllers : {}
|
2922
3082
|
};
|
2923
3083
|
const keys = {
|
2924
3084
|
CONFIGURATION: "configuration"
|
@@ -3069,12 +3229,12 @@ async function syncMetadatas(configuration, schema) {
|
|
3069
3229
|
return _.assign(metasWithDefaults, updatedMetas);
|
3070
3230
|
}
|
3071
3231
|
const getTargetSchema = (targetModel) => {
|
3072
|
-
return getService$
|
3232
|
+
return getService$2("content-types").findContentType(targetModel);
|
3073
3233
|
};
|
3074
3234
|
const DEFAULT_LIST_LENGTH = 4;
|
3075
3235
|
const MAX_ROW_SIZE = 12;
|
3076
3236
|
const isAllowedFieldSize = (type, size) => {
|
3077
|
-
const { getFieldSize } = getService$
|
3237
|
+
const { getFieldSize } = getService$2("field-sizes");
|
3078
3238
|
const fieldSize = getFieldSize(type);
|
3079
3239
|
if (!fieldSize.isResizable && size !== fieldSize.default) {
|
3080
3240
|
return false;
|
@@ -3082,7 +3242,7 @@ const isAllowedFieldSize = (type, size) => {
|
|
3082
3242
|
return size <= MAX_ROW_SIZE;
|
3083
3243
|
};
|
3084
3244
|
const getDefaultFieldSize = (attribute) => {
|
3085
|
-
const { hasFieldSize, getFieldSize } = getService$
|
3245
|
+
const { hasFieldSize, getFieldSize } = getService$2("field-sizes");
|
3086
3246
|
return getFieldSize(hasFieldSize(attribute.customField) ? attribute.customField : attribute.type).default;
|
3087
3247
|
};
|
3088
3248
|
async function createDefaultLayouts(schema) {
|
@@ -3117,7 +3277,7 @@ function syncLayouts(configuration, schema) {
|
|
3117
3277
|
for (const el of row) {
|
3118
3278
|
if (!hasEditableAttribute(schema, el.name))
|
3119
3279
|
continue;
|
3120
|
-
const { hasFieldSize } = getService$
|
3280
|
+
const { hasFieldSize } = getService$2("field-sizes");
|
3121
3281
|
const fieldType = hasFieldSize(schema.attributes[el.name].customField) ? schema.attributes[el.name].customField : schema.attributes[el.name].type;
|
3122
3282
|
if (!isAllowedFieldSize(fieldType, el.size)) {
|
3123
3283
|
elementsToReAppend.push(el.name);
|
@@ -3257,17 +3417,17 @@ const configurationService$1 = createConfigurationService({
|
|
3257
3417
|
isComponent: true,
|
3258
3418
|
prefix: STORE_KEY_PREFIX,
|
3259
3419
|
getModels() {
|
3260
|
-
const { toContentManagerModel } = getService$
|
3420
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3261
3421
|
return mapValues(toContentManagerModel, strapi.components);
|
3262
3422
|
}
|
3263
3423
|
});
|
3264
3424
|
const components = ({ strapi: strapi2 }) => ({
|
3265
3425
|
findAllComponents() {
|
3266
|
-
const { toContentManagerModel } = getService$
|
3426
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3267
3427
|
return Object.values(strapi2.components).map(toContentManagerModel);
|
3268
3428
|
},
|
3269
3429
|
findComponent(uid2) {
|
3270
|
-
const { toContentManagerModel } = getService$
|
3430
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3271
3431
|
const component = strapi2.components[uid2];
|
3272
3432
|
return isNil$1(component) ? component : toContentManagerModel(component);
|
3273
3433
|
},
|
@@ -3318,17 +3478,17 @@ const configurationService = createConfigurationService({
|
|
3318
3478
|
storeUtils,
|
3319
3479
|
prefix: "content_types",
|
3320
3480
|
getModels() {
|
3321
|
-
const { toContentManagerModel } = getService$
|
3481
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3322
3482
|
return mapValues(toContentManagerModel, strapi.contentTypes);
|
3323
3483
|
}
|
3324
3484
|
});
|
3325
3485
|
const service = ({ strapi: strapi2 }) => ({
|
3326
3486
|
findAllContentTypes() {
|
3327
|
-
const { toContentManagerModel } = getService$
|
3487
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3328
3488
|
return Object.values(strapi2.contentTypes).map(toContentManagerModel);
|
3329
3489
|
},
|
3330
3490
|
findContentType(uid2) {
|
3331
|
-
const { toContentManagerModel } = getService$
|
3491
|
+
const { toContentManagerModel } = getService$2("data-mapper");
|
3332
3492
|
const contentType = strapi2.contentTypes[uid2];
|
3333
3493
|
return isNil$1(contentType) ? contentType : toContentManagerModel(contentType);
|
3334
3494
|
},
|
@@ -3357,7 +3517,7 @@ const service = ({ strapi: strapi2 }) => ({
|
|
3357
3517
|
return this.findConfiguration(contentType);
|
3358
3518
|
},
|
3359
3519
|
findComponentsConfigurations(contentType) {
|
3360
|
-
return getService$
|
3520
|
+
return getService$2("components").findComponentsConfigurations(contentType);
|
3361
3521
|
},
|
3362
3522
|
syncConfigurations() {
|
3363
3523
|
return configurationService.syncConfigurations();
|
@@ -3629,7 +3789,7 @@ const permission = ({ strapi: strapi2 }) => ({
|
|
3629
3789
|
return userAbility.can(action);
|
3630
3790
|
},
|
3631
3791
|
async registerPermissions() {
|
3632
|
-
const displayedContentTypes = getService$
|
3792
|
+
const displayedContentTypes = getService$2("content-types").findDisplayedContentTypes();
|
3633
3793
|
const contentTypesUids = displayedContentTypes.map(prop("uid"));
|
3634
3794
|
const actions = [
|
3635
3795
|
{
|
@@ -3905,7 +4065,7 @@ const getQueryPopulate = async (uid2, query) => {
|
|
3905
4065
|
return populateQuery;
|
3906
4066
|
};
|
3907
4067
|
const buildDeepPopulate = (uid2) => {
|
3908
|
-
return getService$
|
4068
|
+
return getService$2("populate-builder")(uid2).populateDeep(Infinity).countRelations().build();
|
3909
4069
|
};
|
3910
4070
|
const populateBuilder = (uid2) => {
|
3911
4071
|
let getInitialPopulate = async () => {
|
@@ -4448,7 +4608,8 @@ const services = {
|
|
4448
4608
|
permission,
|
4449
4609
|
"populate-builder": populateBuilder$1,
|
4450
4610
|
uid,
|
4451
|
-
...history.services ? history.services : {}
|
4611
|
+
...history.services ? history.services : {},
|
4612
|
+
...preview.services ? preview.services : {}
|
4452
4613
|
};
|
4453
4614
|
const index = () => {
|
4454
4615
|
return {
|