@strapi/content-releases 4.20.3 → 4.20.4

package/dist/server/index.mjs

@@ -1,4 +1,5 @@
 import { contentTypes as contentTypes$1, mapAsync, setCreatorFields, errors, validateYupSchema, yup as yup$1 } from "@strapi/utils";
+import isEqual from "lodash/isEqual";
 import { difference, keys } from "lodash";
 import _ from "lodash/fp";
 import EE from "@strapi/strapi/dist/utils/ee";
@@ -53,6 +54,29 @@ const ACTIONS = [
 const ALLOWED_WEBHOOK_EVENTS = {
   RELEASES_PUBLISH: "releases.publish"
 };
+const getService = (name, { strapi: strapi2 } = { strapi: global.strapi }) => {
+  return strapi2.plugin("content-releases").service(name);
+};
+const getPopulatedEntry = async (contentTypeUid, entryId, { strapi: strapi2 } = { strapi: global.strapi }) => {
+  const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
+  const populate = await populateBuilderService(contentTypeUid).populateDeep(Infinity).build();
+  const entry = await strapi2.entityService.findOne(contentTypeUid, entryId, { populate });
+  return entry;
+};
+const getEntryValidStatus = async (contentTypeUid, entry, { strapi: strapi2 } = { strapi: global.strapi }) => {
+  try {
+    await strapi2.entityValidator.validateEntityCreation(
+      strapi2.getModel(contentTypeUid),
+      entry,
+      void 0,
+      // @ts-expect-error - FIXME: entity here is unnecessary
+      entry
+    );
+    return true;
+  } catch {
+    return false;
+  }
+};
 async function deleteActionsOnDisableDraftAndPublish({
   oldContentTypes,
   contentTypes: contentTypes2
@@ -79,31 +103,151 @@ async function deleteActionsOnDeleteContentType({ oldContentTypes, contentTypes:
     });
   }
 }
+async function migrateIsValidAndStatusReleases() {
+  const releasesWithoutStatus = await strapi.db.query(RELEASE_MODEL_UID).findMany({
+    where: {
+      status: null,
+      releasedAt: null
+    },
+    populate: {
+      actions: {
+        populate: {
+          entry: true
+        }
+      }
+    }
+  });
+  mapAsync(releasesWithoutStatus, async (release2) => {
+    const actions = release2.actions;
+    const notValidatedActions = actions.filter((action) => action.isEntryValid === null);
+    for (const action of notValidatedActions) {
+      if (action.entry) {
+        const populatedEntry = await getPopulatedEntry(action.contentType, action.entry.id, {
+          strapi
+        });
+        if (populatedEntry) {
+          const isEntryValid = getEntryValidStatus(action.contentType, populatedEntry, { strapi });
+          await strapi.db.query(RELEASE_ACTION_MODEL_UID).update({
+            where: {
+              id: action.id
+            },
+            data: {
+              isEntryValid
+            }
+          });
+        }
+      }
+    }
+    return getService("release", { strapi }).updateReleaseStatus(release2.id);
+  });
+  const publishedReleases = await strapi.db.query(RELEASE_MODEL_UID).findMany({
+    where: {
+      status: null,
+      releasedAt: {
+        $notNull: true
+      }
+    }
+  });
+  mapAsync(publishedReleases, async (release2) => {
+    return strapi.db.query(RELEASE_MODEL_UID).update({
+      where: {
+        id: release2.id
+      },
+      data: {
+        status: "done"
+      }
+    });
+  });
+}
+async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: contentTypes2 }) {
+  if (oldContentTypes !== void 0 && contentTypes2 !== void 0) {
+    const contentTypesWithDraftAndPublish = Object.keys(oldContentTypes).filter(
+      (uid) => oldContentTypes[uid]?.options?.draftAndPublish
+    );
+    const releasesAffected = /* @__PURE__ */ new Set();
+    mapAsync(contentTypesWithDraftAndPublish, async (contentTypeUID) => {
+      const oldContentType = oldContentTypes[contentTypeUID];
+      const contentType = contentTypes2[contentTypeUID];
+      if (!isEqual(oldContentType?.attributes, contentType?.attributes)) {
+        const actions = await strapi.db.query(RELEASE_ACTION_MODEL_UID).findMany({
+          where: {
+            contentType: contentTypeUID
+          },
+          populate: {
+            entry: true,
+            release: true
+          }
+        });
+        await mapAsync(actions, async (action) => {
+          if (action.entry) {
+            const populatedEntry = await getPopulatedEntry(contentTypeUID, action.entry.id, {
+              strapi
+            });
+            if (populatedEntry) {
+              const isEntryValid = await getEntryValidStatus(contentTypeUID, populatedEntry, {
+                strapi
+              });
+              releasesAffected.add(action.release.id);
+              await strapi.db.query(RELEASE_ACTION_MODEL_UID).update({
+                where: {
+                  id: action.id
+                },
+                data: {
+                  isEntryValid
+                }
+              });
+            }
+          }
+        });
+      }
+    }).then(() => {
+      mapAsync(releasesAffected, async (releaseId) => {
+        return getService("release", { strapi }).updateReleaseStatus(releaseId);
+      });
+    });
+  }
+}
 const { features: features$2 } = require("@strapi/strapi/dist/utils/ee");
 const register = async ({ strapi: strapi2 }) => {
   if (features$2.isEnabled("cms-content-releases")) {
     await strapi2.admin.services.permission.actionProvider.registerMany(ACTIONS);
     strapi2.hook("strapi::content-types.beforeSync").register(deleteActionsOnDisableDraftAndPublish);
-    strapi2.hook("strapi::content-types.afterSync").register(deleteActionsOnDeleteContentType);
+    strapi2.hook("strapi::content-types.afterSync").register(deleteActionsOnDeleteContentType).register(revalidateChangedContentTypes).register(migrateIsValidAndStatusReleases);
   }
 };
-const getService = (name, { strapi: strapi2 } = { strapi: global.strapi }) => {
-  return strapi2.plugin("content-releases").service(name);
-};
 const { features: features$1 } = require("@strapi/strapi/dist/utils/ee");
 const bootstrap = async ({ strapi: strapi2 }) => {
   if (features$1.isEnabled("cms-content-releases")) {
+    const contentTypesWithDraftAndPublish = Object.keys(strapi2.contentTypes).filter(
+      (uid) => strapi2.contentTypes[uid]?.options?.draftAndPublish
+    );
     strapi2.db.lifecycles.subscribe({
-      afterDelete(event) {
-        const { model, result } = event;
-        if (model.kind === "collectionType" && model.options?.draftAndPublish) {
-          const { id } = result;
-          strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
-            where: {
-              target_type: model.uid,
-              target_id: id
+      models: contentTypesWithDraftAndPublish,
+      async afterDelete(event) {
+        try {
+          const { model, result } = event;
+          if (model.kind === "collectionType" && model.options?.draftAndPublish) {
+            const { id } = result;
+            const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
+              where: {
+                actions: {
+                  target_type: model.uid,
+                  target_id: id
+                }
+              }
+            });
+            await strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
+              where: {
+                target_type: model.uid,
+                target_id: id
+              }
+            });
+            for (const release2 of releases) {
+              getService("release", { strapi: strapi2 }).updateReleaseStatus(release2.id);
             }
-          });
+          }
+        } catch (error) {
+          strapi2.log.error("Error while deleting release actions after entry delete", { error });
         }
       },
       /**
@@ -123,18 +267,75 @@ const bootstrap = async ({ strapi: strapi2 }) => {
        * We make this only after deleteMany is succesfully executed to avoid errors
        */
       async afterDeleteMany(event) {
-        const { model, state } = event;
-        const entriesToDelete = state.entriesToDelete;
-        if (entriesToDelete) {
-          await strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
-            where: {
-              target_type: model.uid,
-              target_id: {
-                $in: entriesToDelete.map((entry) => entry.id)
+        try {
+          const { model, state } = event;
+          const entriesToDelete = state.entriesToDelete;
+          if (entriesToDelete) {
+            const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
+              where: {
+                actions: {
+                  target_type: model.uid,
+                  target_id: {
+                    $in: entriesToDelete.map(
+                      (entry) => entry.id
+                    )
+                  }
+                }
               }
+            });
+            await strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
+              where: {
+                target_type: model.uid,
+                target_id: {
+                  $in: entriesToDelete.map((entry) => entry.id)
+                }
+              }
+            });
+            for (const release2 of releases) {
+              getService("release", { strapi: strapi2 }).updateReleaseStatus(release2.id);
             }
+          }
+        } catch (error) {
+          strapi2.log.error("Error while deleting release actions after entry deleteMany", {
+            error
           });
         }
+      },
+      async afterUpdate(event) {
+        try {
+          const { model, result } = event;
+          if (model.kind === "collectionType" && model.options?.draftAndPublish) {
+            const isEntryValid = await getEntryValidStatus(
+              model.uid,
+              result,
+              {
+                strapi: strapi2
+              }
+            );
+            await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
+              where: {
+                target_type: model.uid,
+                target_id: result.id
+              },
+              data: {
+                isEntryValid
+              }
+            });
+            const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
+              where: {
+                actions: {
+                  target_type: model.uid,
+                  target_id: result.id
+                }
+              }
+            });
+            for (const release2 of releases) {
+              getService("release", { strapi: strapi2 }).updateReleaseStatus(release2.id);
+            }
+          }
+        } catch (error) {
+          strapi2.log.error("Error while updating release actions after entry update", { error });
+        }
       }
     });
     if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
@@ -192,6 +393,11 @@ const schema$1 = {
     timezone: {
       type: "string"
     },
+    status: {
+      type: "enumeration",
+      enum: ["ready", "blocked", "failed", "done", "empty"],
+      required: true
+    },
     actions: {
       type: "relation",
       relation: "oneToMany",
@@ -244,6 +450,9 @@ const schema = {
       relation: "manyToOne",
       target: RELEASE_MODEL_UID,
       inversedBy: "actions"
+    },
+    isEntryValid: {
+      type: "boolean"
     }
   }
 };
@@ -288,7 +497,10 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
       ]);
       const release2 = await strapi2.entityService.create(RELEASE_MODEL_UID, {
-        data: releaseWithCreatorFields
+        data: {
+          ...releaseWithCreatorFields,
+          status: "empty"
+        }
       });
       if (strapi2.features.future.isEnabled("contentReleasesScheduling") && releaseWithCreatorFields.scheduledAt) {
         const schedulingService = getService("scheduling", { strapi: strapi2 });
@@ -423,6 +635,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
           schedulingService.cancel(id);
         }
       }
+      this.updateReleaseStatus(id);
       strapi2.telemetry.send("didUpdateContentRelease");
       return updatedRelease;
     },
@@ -442,11 +655,14 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         throw new errors.ValidationError("Release already published");
       }
       const { entry, type } = action;
-      return strapi2.entityService.create(RELEASE_ACTION_MODEL_UID, {
+      const populatedEntry = await getPopulatedEntry(entry.contentType, entry.id, { strapi: strapi2 });
+      const isEntryValid = await getEntryValidStatus(entry.contentType, populatedEntry, { strapi: strapi2 });
+      const releaseAction2 = await strapi2.entityService.create(RELEASE_ACTION_MODEL_UID, {
         data: {
           type,
           contentType: entry.contentType,
           locale: entry.locale,
+          isEntryValid,
           entry: {
             id: entry.id,
             __type: entry.contentType,
@@ -456,6 +672,8 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         },
         populate: { release: { fields: ["id"] }, entry: { fields: ["id"] } }
       });
+      this.updateReleaseStatus(releaseId);
+      return releaseAction2;
     },
     async findActions(releaseId, query) {
       const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
@@ -720,6 +938,12 @@ const createReleaseService = ({ strapi: strapi2 }) => {
             error
           });
         }
+        strapi2.db.query(RELEASE_MODEL_UID).update({
+          where: { id: releaseId },
+          data: {
+            status: "failed"
+          }
+        });
         throw error;
       }
     },
@@ -760,7 +984,51 @@ const createReleaseService = ({ strapi: strapi2 }) => {
           `Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
         );
       }
+      this.updateReleaseStatus(releaseId);
       return deletedAction;
+    },
+    async updateReleaseStatus(releaseId) {
+      const [totalActions, invalidActions] = await Promise.all([
+        this.countActions({
+          filters: {
+            release: releaseId
+          }
+        }),
+        this.countActions({
+          filters: {
+            release: releaseId,
+            isEntryValid: false
+          }
+        })
+      ]);
+      if (totalActions > 0) {
+        if (invalidActions > 0) {
+          return strapi2.db.query(RELEASE_MODEL_UID).update({
+            where: {
+              id: releaseId
+            },
+            data: {
+              status: "blocked"
+            }
+          });
+        }
+        return strapi2.db.query(RELEASE_MODEL_UID).update({
+          where: {
+            id: releaseId
+          },
+          data: {
+            status: "ready"
+          }
+        });
+      }
+      return strapi2.db.query(RELEASE_MODEL_UID).update({
+        where: {
+          id: releaseId
+        },
+        data: {
+          status: "empty"
+        }
+      });
     }
   };
 };
@@ -937,7 +1205,12 @@ const releaseController = {
           }
         };
       });
-      ctx.body = { data, meta: { pagination } };
+      const pendingReleasesCount = await strapi.query(RELEASE_MODEL_UID).count({
+        where: {
+          releasedAt: null
+        }
+      });
+      ctx.body = { data, meta: { pagination, pendingReleasesCount } };
     }
   },
   async findOne(ctx) {