@strapi/content-manager 5.0.0-beta.8 → 5.0.0-rc.0

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() {
@@ -481,7 +483,10 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
         if (!strapi2.requestContext.get()?.request.url.startsWith("/content-manager")) {
           return next();
         }
-        if (context.action !== "create" && context.action !== "update" && context.action !== "publish" && context.action !== "unpublish" && context.action !== "discardDraft") {
+        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;
@@ -489,7 +494,10 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
           return next();
         }
         const result = await next();
-        const documentContext = context.action === "create" ? { documentId: result.documentId, locale: context.params?.locale } : { documentId: context.params.documentId, locale: context.params?.locale };
+        const documentContext = {
+          documentId: context.action === "create" || context.action === "clone" ? result.documentId : context.params.documentId,
+          locale: context.params?.locale
+        };
         const defaultLocale = await serviceUtils.getDefaultLocale();
         const locale = documentContext.locale || defaultLocale;
         if (Array.isArray(locale)) {
@@ -520,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),
@@ -533,11 +541,10 @@ const createLifecyclesService = ({ strapi: strapi2 }) => {
         });
         return result;
       });
-      const retentionDays = serviceUtils.getRetentionDays();
       state.deleteExpiredJob = scheduleJob("0 0 * * *", () => {
-        const retentionDaysInMilliseconds = retentionDays * 24 * 60 * 60 * 1e3;
+        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()
@@ -2054,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
@@ -2063,7 +2070,7 @@ const collectionTypes = {
       },
       model
     );
-    if (!entities) {
+    if (!documents) {
       return ctx.notFound();
     }
     const number = await documentManager2.countManyEntriesDraftRelations(ids, model, locale);
@@ -3729,22 +3736,24 @@ const getDeepPopulateDraftCount = (uid2) => {
           attribute.component
         );
         if (childHasRelations) {
-          populateAcc[attributeName] = { populate: populate2 };
+          populateAcc[attributeName] = {
+            populate: populate2
+          };
           hasRelations = true;
         }
         break;
       }
       case "dynamiczone": {
-        const dzPopulate = (attribute.components || []).reduce((acc, componentUID) => {
-          const { populate: populate2, hasRelations: childHasRelations } = getDeepPopulateDraftCount(componentUID);
-          if (childHasRelations) {
+        const dzPopulateFragment = attribute.components?.reduce((acc, componentUID) => {
+          const { populate: componentPopulate, hasRelations: componentHasRelations } = getDeepPopulateDraftCount(componentUID);
+          if (componentHasRelations) {
             hasRelations = true;
-            return merge(acc, populate2);
+            return { ...acc, [componentUID]: { populate: componentPopulate } };
           }
           return acc;
         }, {});
-        if (!isEmpty(dzPopulate)) {
-          populateAcc[attributeName] = { populate: dzPopulate };
+        if (!isEmpty(dzPopulateFragment)) {
+          populateAcc[attributeName] = { on: dzPopulateFragment };
         }
         break;
       }