@strapi/content-manager 5.0.0-beta.9 → 5.0.0-rc.1

package/dist/server/index.mjs

@@ -206,6 +206,10 @@ const createServiceUtils = ({ strapi: strapi2 }) => {
     return attributes.reduce((acc, [attributeName, attribute]) => {
       switch (attribute.type) {
         case "relation": {
+          const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
+          if (isMorphRelation) {
+            break;
+          }
           const isVisible2 = contentTypes$1.isVisibleAttribute(model, attributeName);
           if (isVisible2) {
             acc[attributeName] = { fields: ["documentId", "locale", "publishedAt"] };
@@ -469,8 +473,6 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
     deleteExpiredJob: null,
     isInitialized: false
   };
-  const query = strapi2.db.query(HISTORY_VERSION_UID);
-  const historyService = getService(strapi2, "history");
   const serviceUtils = createServiceUtils({ strapi: strapi2 });
   return {
     async bootstrap() {
@@ -484,6 +486,9 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
         if (context.action !== "create" && context.action !== "update" && context.action !== "clone" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
           return next();
         }
+        if (context.action === "update" && strapi2.requestContext.get()?.request.url.endsWith("/actions/publish")) {
+          return next();
+        }
         const contentTypeUid = context.contentType.uid;
         if (!contentTypeUid.startsWith("api::")) {
           return next();
@@ -523,7 +528,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
         }, {});
         await strapi2.db.transaction(async ({ onCommit }) => {
           onCommit(() => {
-            historyService.createVersion({
+            getService(strapi2, "history").createVersion({
               contentType: contentTypeUid,
               data: omit(FIELDS_TO_IGNORE, document),
               schema: omit(FIELDS_TO_IGNORE, attributesSchema),
@@ -539,7 +544,7 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
       state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
         const retentionDaysInMilliseconds = serviceUtils.getRetentionDays() * 24 * 60 * 60 * 1e3;
         const expirationDate = new Date(Date.now() - retentionDaysInMilliseconds);
-        query.deleteMany({
+        strapi2.db.query(HISTORY_VERSION_UID).deleteMany({
           where: {
             created_at: {
               $lt: expirationDate.toISOString()
@@ -2056,7 +2061,7 @@ const collectionTypes = {
     if (permissionChecker2.cannot.read()) {
       return ctx.forbidden();
     }
-    const entities = await documentManager2.findMany(
+    const documents = await documentManager2.findMany(
       {
         filters: {
           documentId: ids
@@ -2065,7 +2070,7 @@ const collectionTypes = {
       },
       model
     );
-    if (!entities) {
+    if (!documents) {
       return ctx.notFound();
     }
     const number = await documentManager2.countManyEntriesDraftRelations(ids, model, locale);
@@ -3717,6 +3722,10 @@ const getDeepPopulateDraftCount = (uid2) => {
     const attribute = model.attributes[attributeName];
     switch (attribute.type) {
       case "relation": {
+        const isMorphRelation = attribute.relation.toLowerCase().startsWith("morph");
+        if (isMorphRelation) {
+          break;
+        }
         if (isVisibleAttribute$1(model, attributeName)) {
           populateAcc[attributeName] = {
             count: true,