@strapi/content-releases 5.0.0-rc.9 → 5.0.1

package/dist/server/index.mjs

@@ -906,7 +906,7 @@ const createReleaseActionService = ({ strapi: strapi2 }) => {
     return contentTypesData;
   };
   return {
-    async create(releaseId, action) {
+    async create(releaseId, action, { disableUpdateReleaseStatus = false } = {}) {
       const { validateEntryData, validateUniqueEntry } = getService("release-validation", {
         strapi: strapi2
       });
@@ -914,6 +914,14 @@ const createReleaseActionService = ({ strapi: strapi2 }) => {
         validateEntryData(action.contentType, action.entryDocumentId),
         validateUniqueEntry(releaseId, action)
       ]);
+      const model = strapi2.contentType(action.contentType);
+      if (model.kind === "singleType") {
+        const document = await strapi2.db.query(model.uid).findOne({ select: ["documentId"] });
+        if (!document) {
+          throw new errors.NotFoundError(`No entry found for contentType ${action.contentType}`);
+        }
+        action.entryDocumentId = document.documentId;
+      }
       const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({ where: { id: releaseId } });
       if (!release2) {
         throw new errors.NotFoundError(`No release found for id ${releaseId}`);
@@ -939,7 +947,9 @@ const createReleaseActionService = ({ strapi: strapi2 }) => {
         },
         populate: { release: { select: ["id"] } }
       });
-      getService("release", { strapi: strapi2 }).updateReleaseStatus(release2.id);
+      if (!disableUpdateReleaseStatus) {
+        getService("release", { strapi: strapi2 }).updateReleaseStatus(release2.id);
+      }
       return releaseAction2;
     },
     async findPage(releaseId, query) {
@@ -1042,7 +1052,7 @@ const createReleaseActionService = ({ strapi: strapi2 }) => {
           `Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
         );
       }
-      const actionStatus = update.type === "publish" ? getDraftEntryValidStatus(
+      const actionStatus = update.type === "publish" ? await getDraftEntryValidStatus(
         {
           contentType: action.contentType,
           documentId: action.entryDocumentId,
@@ -1283,7 +1293,15 @@ const releaseController = {
     const releaseService = getService("release", { strapi });
     const query = await permissionsManager.sanitizeQuery(ctx.query);
     await validatefindByDocumentAttachedParams(query);
-    const { contentType, entryDocumentId, hasEntryAttached, locale } = query;
+    const model = strapi.getModel(query.contentType);
+    if (model.kind && model.kind === "singleType") {
+      const document = await strapi.db.query(model.uid).findOne({ select: ["documentId"] });
+      if (!document) {
+        throw new errors.NotFoundError(`No entry found for contentType ${query.contentType}`);
+      }
+      query.entryDocumentId = document.documentId;
+    }
+    const { contentType, hasEntryAttached, entryDocumentId, locale } = query;
     const isEntryAttached = typeof hasEntryAttached === "string" ? Boolean(JSON.parse(hasEntryAttached)) : false;
     if (isEntryAttached) {
       const releases = await releaseService.findMany({
@@ -1297,7 +1315,12 @@ const releaseController = {
         },
         populate: {
           actions: {
-            fields: ["type"]
+            fields: ["type"],
+            filters: {
+              contentType,
+              entryDocumentId: entryDocumentId ?? null,
+              locale: locale ?? null
+            }
           }
         }
       });
@@ -1528,11 +1551,14 @@ const releaseActionController = {
       releaseActionsArgs.map((releaseActionArgs) => validateReleaseAction(releaseActionArgs))
     );
     const releaseActionService = getService("release-action", { strapi });
+    const releaseService = getService("release", { strapi });
     const releaseActions = await strapi.db.transaction(async () => {
       const releaseActions2 = await Promise.all(
         releaseActionsArgs.map(async (releaseActionArgs) => {
           try {
-            const action = await releaseActionService.create(releaseId, releaseActionArgs);
+            const action = await releaseActionService.create(releaseId, releaseActionArgs, {
+              disableUpdateReleaseStatus: true
+            });
             return action;
           } catch (error) {
             if (error instanceof AlreadyOnReleaseError) {
@@ -1545,6 +1571,9 @@ const releaseActionController = {
       return releaseActions2;
     });
     const newReleaseActions = releaseActions.filter((action) => action !== null);
+    if (newReleaseActions.length > 0) {
+      releaseService.updateReleaseStatus(releaseId);
+    }
     ctx.created({
       data: newReleaseActions,
       meta: {