@strapi/content-releases 0.0.0-next.4052765aa209dd4f3d92b81baee295fc0213c04c → 0.0.0-next.4119cc523a8fec549bb2f1869c6e789650f7f4de

package/dist/server/index.mjs

@@ -88,6 +88,13 @@ const isEntryValid = async (contentTypeUid, entry, { strapi: strapi2 }) => {
       // @ts-expect-error - FIXME: entity here is unnecessary
       entry
     );
+    const workflowsService = strapi2.plugin("review-workflows").service("workflows");
+    const workflow = await workflowsService.getAssignedWorkflow(contentTypeUid, {
+      populate: "stageRequiredToPublish"
+    });
+    if (workflow?.stageRequiredToPublish) {
+      return entry.strapi_stage.id === workflow.stageRequiredToPublish.id;
+    }
     return true;
   } catch {
     return false;
@@ -101,7 +108,11 @@ const getEntry = async ({
   status = "draft"
 }, { strapi: strapi2 }) => {
   if (documentId) {
-    return strapi2.documents(contentType).findOne({ documentId, locale, populate, status });
+    const entry = await strapi2.documents(contentType).findOne({ documentId, locale, populate, status });
+    if (status === "published" && !entry) {
+      return strapi2.documents(contentType).findOne({ documentId, locale, populate, status: "draft" });
+    }
+    return entry;
   }
   return strapi2.documents(contentType).findFirst({ locale, populate, status });
 };
@@ -306,6 +317,10 @@ async function enableContentTypeLocalized({ oldContentTypes, contentTypes: conte
 const addEntryDocumentToReleaseActions = {
   name: "content-releases::5.0.0-add-entry-document-id-to-release-actions",
   async up(trx, db) {
+    const hasTable = await trx.schema.hasTable("strapi_release_actions");
+    if (!hasTable) {
+      return;
+    }
     const hasPolymorphicColumn = await trx.schema.hasColumn("strapi_release_actions", "target_id");
     if (hasPolymorphicColumn) {
       const hasEntryDocumentIdColumn = await trx.schema.hasColumn(
@@ -347,6 +362,7 @@ const register = async ({ strapi: strapi2 }) => {
 const updateActionsStatusAndUpdateReleaseStatus = async (contentType, entry) => {
   const releases = await strapi.db.query(RELEASE_MODEL_UID).findMany({
     where: {
+      releasedAt: null,
       actions: {
         contentType,
         entryDocumentId: entry.documentId,
@@ -355,7 +371,7 @@ const updateActionsStatusAndUpdateReleaseStatus = async (contentType, entry) =>
     }
   });
   const entryStatus = await isEntryValid(contentType, entry, { strapi });
-  await strapi.db.query(RELEASE_ACTION_MODEL_UID).update({
+  await strapi.db.query(RELEASE_ACTION_MODEL_UID).updateMany({
     where: {
       contentType,
       entryDocumentId: entry.documentId,
@@ -459,8 +475,8 @@ const bootstrap = async ({ strapi: strapi2 }) => {
             const { where } = event.params;
             deleteReleasesActionsAndUpdateReleaseStatus({
               contentType: model.uid,
-              locale: where.locale ?? null,
-              ...where.documentId && { entryDocumentId: where.documentId }
+              locale: where?.locale ?? null,
+              ...where?.documentId && { entryDocumentId: where.documentId }
             });
           }
         } catch (error) {
@@ -1015,16 +1031,26 @@ const createReleaseActionService = ({ strapi: strapi2 }) => {
       const groupName = getGroupName(groupBy);
       return _.groupBy(groupName)(formattedData);
     },
-    getContentTypeModelsFromActions(actions) {
+    async getContentTypeModelsFromActions(actions) {
       const contentTypeUids = actions.reduce((acc, action) => {
         if (!acc.includes(action.contentType)) {
           acc.push(action.contentType);
         }
         return acc;
       }, []);
-      const contentTypeModelsMap = contentTypeUids.reduce(
-        (acc, contentTypeUid) => {
-          acc[contentTypeUid] = strapi2.getModel(contentTypeUid);
+      const workflowsService = strapi2.plugin("review-workflows").service("workflows");
+      const contentTypeModelsMap = await async.reduce(contentTypeUids)(
+        async (accPromise, contentTypeUid) => {
+          const acc = await accPromise;
+          const contentTypeModel = strapi2.getModel(contentTypeUid);
+          const workflow = await workflowsService.getAssignedWorkflow(contentTypeUid, {
+            populate: "stageRequiredToPublish"
+          });
+          acc[contentTypeUid] = {
+            ...contentTypeModel,
+            hasReviewWorkflow: !!workflow,
+            stageRequiredToPublish: workflow?.stageRequiredToPublish
+          };
           return acc;
         },
         {}
@@ -1099,6 +1125,54 @@ const createReleaseActionService = ({ strapi: strapi2 }) => {
       }
       getService("release", { strapi: strapi2 }).updateReleaseStatus(releaseId);
       return deletedAction;
+    },
+    async validateActionsByContentTypes(contentTypeUids) {
+      const actions = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).findMany({
+        where: {
+          contentType: {
+            $in: contentTypeUids
+          },
+          // We only want to validate actions that are going to be published
+          type: "publish",
+          release: {
+            releasedAt: {
+              $null: true
+            }
+          }
+        },
+        populate: { release: true }
+      });
+      const releasesUpdated = [];
+      await async.map(actions, async (action) => {
+        const isValid = await getDraftEntryValidStatus(
+          {
+            contentType: action.contentType,
+            documentId: action.entryDocumentId,
+            locale: action.locale
+          },
+          { strapi: strapi2 }
+        );
+        await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
+          where: {
+            id: action.id
+          },
+          data: {
+            isEntryValid: isValid
+          }
+        });
+        if (!releasesUpdated.includes(action.release.id)) {
+          releasesUpdated.push(action.release.id);
+        }
+        return {
+          id: action.id,
+          isEntryValid: isValid
+        };
+      });
+      if (releasesUpdated.length > 0) {
+        await async.map(releasesUpdated, async (releaseId) => {
+          await getService("release", { strapi: strapi2 }).updateReleaseStatus(releaseId);
+        });
+      }
     }
   };
 };
@@ -1617,7 +1691,7 @@ const releaseActionController = {
       entry: action.entry ? await contentTypeOutputSanitizers[action.contentType](action.entry) : {}
     }));
     const groupedData = await releaseActionService.groupActions(sanitizedResults, query.sort);
-    const contentTypes2 = releaseActionService.getContentTypeModelsFromActions(results);
+    const contentTypes2 = await releaseActionService.getContentTypeModelsFromActions(results);
     const releaseService = getService("release", { strapi });
     const components = await releaseService.getAllComponents();
     ctx.body = {