@strapi/content-releases 0.0.0-experimental.fb8e9fec2e10d6b55e3aee59c4eb76bb7a11432a → 0.0.0-experimental.fc1ac2acd58c8a5a858679956b6d102ac5ee4011

package/dist/server/index.mjs

@@ -1,7 +1,8 @@
-import { contentTypes as contentTypes$1, mapAsync, setCreatorFields, errors, validateYupSchema, yup as yup$1 } from "@strapi/utils";
+import { async, 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";
+import { scheduleJob } from "node-schedule";
 import * as yup from "yup";
 const RELEASE_MODEL_UID = "plugin::content-releases.release";
 const RELEASE_ACTION_MODEL_UID = "plugin::content-releases.release-action";
@@ -49,54 +50,178 @@ const ACTIONS = [
     pluginName: "content-releases"
   }
 ];
-async function deleteActionsOnDisableDraftAndPublish({
-  oldContentTypes,
-  contentTypes: contentTypes2
-}) {
-  if (!oldContentTypes) {
-    return;
-  }
-  for (const uid in contentTypes2) {
-    if (!oldContentTypes[uid]) {
-      continue;
-    }
-    const oldContentType = oldContentTypes[uid];
-    const contentType = contentTypes2[uid];
-    if (contentTypes$1.hasDraftAndPublish(oldContentType) && !contentTypes$1.hasDraftAndPublish(contentType)) {
-      await strapi.db?.queryBuilder(RELEASE_ACTION_MODEL_UID).delete().where({ contentType: uid }).execute();
-    }
+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 deleteActionsOnDeleteContentType({ oldContentTypes, contentTypes: contentTypes2 }) {
   const deletedContentTypes = difference(keys(oldContentTypes), keys(contentTypes2)) ?? [];
   if (deletedContentTypes.length) {
-    await mapAsync(deletedContentTypes, async (deletedContentTypeUID) => {
+    await async.map(deletedContentTypes, async (deletedContentTypeUID) => {
       return strapi.db?.queryBuilder(RELEASE_ACTION_MODEL_UID).delete().where({ contentType: deletedContentTypeUID }).execute();
     });
   }
 }
-const { features: features$2 } = require("@strapi/strapi/dist/utils/ee");
+async function migrateIsValidAndStatusReleases() {
+  const releasesWithoutStatus = await strapi.db.query(RELEASE_MODEL_UID).findMany({
+    where: {
+      status: null,
+      releasedAt: null
+    },
+    populate: {
+      actions: {
+        populate: {
+          entry: true
+        }
+      }
+    }
+  });
+  async.map(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
+      }
+    }
+  });
+  async.map(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);
+    const releasesAffected = /* @__PURE__ */ new Set();
+    async.map(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 async.map(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(() => {
+      async.map(releasesAffected, async (releaseId) => {
+        return getService("release", { strapi }).updateReleaseStatus(releaseId);
+      });
+    });
+  }
+}
 const register = async ({ strapi: strapi2 }) => {
-  if (features$2.isEnabled("cms-content-releases")) {
+  if (strapi2.ee.features.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 { features: features$1 } = require("@strapi/strapi/dist/utils/ee");
 const bootstrap = async ({ strapi: strapi2 }) => {
-  if (features$1.isEnabled("cms-content-releases")) {
+  if (strapi2.ee.features.isEnabled("cms-content-releases")) {
+    const contentTypesWithDraftAndPublish = Object.keys(strapi2.contentTypes);
     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 });
         }
       },
       /**
@@ -105,7 +230,7 @@ const bootstrap = async ({ strapi: strapi2 }) => {
        */
       async beforeDeleteMany(event) {
         const { model, params } = event;
-        if (model.kind === "collectionType" && model.options?.draftAndPublish) {
+        if (model.kind === "collectionType") {
           const { where } = params;
           const entriesToDelete = await strapi2.db.query(model.uid).findMany({ select: ["id"], where });
           event.state.entriesToDelete = entriesToDelete;
@@ -116,20 +241,98 @@ 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")) {
+      getService("scheduling", { strapi: strapi2 }).syncFromDatabase().catch((err) => {
+        strapi2.log.error(
+          "Error while syncing scheduled jobs from the database in the content-releases plugin. This could lead to errors in the releases scheduling."
+        );
+        throw err;
+      });
+      Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
+        strapi2.webhookStore.addAllowedEvent(key, value);
+      });
+    }
+  }
+};
+const destroy = async ({ strapi: strapi2 }) => {
+  if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
+    const scheduledJobs = getService("scheduling", {
+      strapi: strapi2
+    }).getAll();
+    for (const [, job] of scheduledJobs) {
+      job.cancel();
+    }
   }
 };
 const schema$1 = {
@@ -158,6 +361,17 @@ const schema$1 = {
     releasedAt: {
       type: "datetime"
     },
+    scheduledAt: {
+      type: "datetime"
+    },
+    timezone: {
+      type: "string"
+    },
+    status: {
+      type: "enumeration",
+      enum: ["ready", "blocked", "failed", "done", "empty"],
+      required: true
+    },
     actions: {
       type: "relation",
       relation: "oneToMany",
@@ -210,6 +424,9 @@ const schema = {
       relation: "manyToOne",
       target: RELEASE_MODEL_UID,
       inversedBy: "actions"
+    },
+    isEntryValid: {
+      type: "boolean"
     }
   }
 };
@@ -220,9 +437,6 @@ const contentTypes = {
   release: release$1,
   "release-action": releaseAction$1
 };
-const getService = (name, { strapi: strapi2 } = { strapi: global.strapi }) => {
-  return strapi2.plugin("content-releases").service(name);
-};
 const getGroupName = (queryValue) => {
   switch (queryValue) {
     case "contentType":
@@ -235,415 +449,563 @@ const getGroupName = (queryValue) => {
       return "contentType.displayName";
   }
 };
-const createReleaseService = ({ strapi: strapi2 }) => ({
-  async create(releaseData, { user }) {
-    const releaseWithCreatorFields = await setCreatorFields({ user })(releaseData);
-    const { validatePendingReleasesLimit, validateUniqueNameForPendingRelease } = getService(
-      "release-validation",
-      { strapi: strapi2 }
-    );
-    await Promise.all([
-      validatePendingReleasesLimit(),
-      validateUniqueNameForPendingRelease(releaseWithCreatorFields.name)
-    ]);
-    return strapi2.entityService.create(RELEASE_MODEL_UID, {
-      data: releaseWithCreatorFields
+const createReleaseService = ({ strapi: strapi2 }) => {
+  const dispatchWebhook = (event, { isPublished, release: release2, error }) => {
+    strapi2.eventHub.emit(event, {
+      isPublished,
+      error,
+      release: release2
     });
-  },
-  async findOne(id, query = {}) {
-    const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id, {
-      ...query
-    });
-    return release2;
-  },
-  findPage(query) {
-    return strapi2.entityService.findPage(RELEASE_MODEL_UID, {
-      ...query,
-      populate: {
-        actions: {
-          // @ts-expect-error Ignore missing properties
-          count: true
+  };
+  return {
+    async create(releaseData, { user }) {
+      const releaseWithCreatorFields = await setCreatorFields({ user })(releaseData);
+      const {
+        validatePendingReleasesLimit,
+        validateUniqueNameForPendingRelease,
+        validateScheduledAtIsLaterThanNow
+      } = getService("release-validation", { strapi: strapi2 });
+      await Promise.all([
+        validatePendingReleasesLimit(),
+        validateUniqueNameForPendingRelease(releaseWithCreatorFields.name),
+        validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
+      ]);
+      const release2 = await strapi2.entityService.create(RELEASE_MODEL_UID, {
+        data: {
+          ...releaseWithCreatorFields,
+          status: "empty"
         }
+      });
+      if (strapi2.features.future.isEnabled("contentReleasesScheduling") && releaseWithCreatorFields.scheduledAt) {
+        const schedulingService = getService("scheduling", { strapi: strapi2 });
+        await schedulingService.set(release2.id, release2.scheduledAt);
       }
-    });
-  },
-  async findManyWithContentTypeEntryAttached(contentTypeUid, entryId) {
-    const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
-      where: {
-        actions: {
-          target_type: contentTypeUid,
-          target_id: entryId
-        },
-        releasedAt: {
-          $null: true
+      strapi2.telemetry.send("didCreateContentRelease");
+      return release2;
+    },
+    async findOne(id, query = {}) {
+      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id, {
+        ...query
+      });
+      return release2;
+    },
+    findPage(query) {
+      return strapi2.entityService.findPage(RELEASE_MODEL_UID, {
+        ...query,
+        populate: {
+          actions: {
+            // @ts-expect-error Ignore missing properties
+            count: true
+          }
         }
-      },
-      populate: {
-        // Filter the action to get only the content type entry
-        actions: {
-          where: {
+      });
+    },
+    async findManyWithContentTypeEntryAttached(contentTypeUid, entryId) {
+      const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
+        where: {
+          actions: {
             target_type: contentTypeUid,
             target_id: entryId
+          },
+          releasedAt: {
+            $null: true
           }
-        }
-      }
-    });
-    return releases.map((release2) => {
-      if (release2.actions?.length) {
-        const [actionForEntry] = release2.actions;
-        delete release2.actions;
-        return {
-          ...release2,
-          action: actionForEntry
-        };
-      }
-      return release2;
-    });
-  },
-  async findManyWithoutContentTypeEntryAttached(contentTypeUid, entryId) {
-    const releasesRelated = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
-      where: {
-        releasedAt: {
-          $null: true
         },
-        actions: {
-          target_type: contentTypeUid,
-          target_id: entryId
-        }
-      }
-    });
-    const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
-      where: {
-        $or: [
-          {
-            id: {
-              $notIn: releasesRelated.map((release2) => release2.id)
+        populate: {
+          // Filter the action to get only the content type entry
+          actions: {
+            where: {
+              target_type: contentTypeUid,
+              target_id: entryId
             }
+          }
+        }
+      });
+      return releases.map((release2) => {
+        if (release2.actions?.length) {
+          const [actionForEntry] = release2.actions;
+          delete release2.actions;
+          return {
+            ...release2,
+            action: actionForEntry
+          };
+        }
+        return release2;
+      });
+    },
+    async findManyWithoutContentTypeEntryAttached(contentTypeUid, entryId) {
+      const releasesRelated = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
+        where: {
+          releasedAt: {
+            $null: true
           },
-          {
-            actions: null
+          actions: {
+            target_type: contentTypeUid,
+            target_id: entryId
+          }
+        }
+      });
+      const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
+        where: {
+          $or: [
+            {
+              id: {
+                $notIn: releasesRelated.map((release2) => release2.id)
+              }
+            },
+            {
+              actions: null
+            }
+          ],
+          releasedAt: {
+            $null: true
           }
-        ],
-        releasedAt: {
-          $null: true
         }
+      });
+      return releases.map((release2) => {
+        if (release2.actions?.length) {
+          const [actionForEntry] = release2.actions;
+          delete release2.actions;
+          return {
+            ...release2,
+            action: actionForEntry
+          };
+        }
+        return release2;
+      });
+    },
+    async update(id, releaseData, { user }) {
+      const releaseWithCreatorFields = await setCreatorFields({ user, isEdition: true })(
+        releaseData
+      );
+      const { validateUniqueNameForPendingRelease, validateScheduledAtIsLaterThanNow } = getService(
+        "release-validation",
+        { strapi: strapi2 }
+      );
+      await Promise.all([
+        validateUniqueNameForPendingRelease(releaseWithCreatorFields.name, id),
+        validateScheduledAtIsLaterThanNow(releaseWithCreatorFields.scheduledAt)
+      ]);
+      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id);
+      if (!release2) {
+        throw new errors.NotFoundError(`No release found for id ${id}`);
       }
-    });
-    return releases.map((release2) => {
-      if (release2.actions?.length) {
-        const [actionForEntry] = release2.actions;
-        delete release2.actions;
-        return {
-          ...release2,
-          action: actionForEntry
-        };
+      if (release2.releasedAt) {
+        throw new errors.ValidationError("Release already published");
       }
-      return release2;
-    });
-  },
-  async update(id, releaseData, { user }) {
-    const releaseWithCreatorFields = await setCreatorFields({ user, isEdition: true })(releaseData);
-    const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, id);
-    if (!release2) {
-      throw new errors.NotFoundError(`No release found for id ${id}`);
-    }
-    if (release2.releasedAt) {
-      throw new errors.ValidationError("Release already published");
-    }
-    const updatedRelease = await strapi2.entityService.update(RELEASE_MODEL_UID, id, {
-      /*
-       * The type returned from the entity service: Partial<Input<"plugin::content-releases.release">>
-       * is not compatible with the type we are passing here: UpdateRelease.Request['body']
-       */
-      // @ts-expect-error see above
-      data: releaseWithCreatorFields
-    });
-    return updatedRelease;
-  },
-  async createAction(releaseId, action) {
-    const { validateEntryContentType, validateUniqueEntry } = getService("release-validation", {
-      strapi: strapi2
-    });
-    await Promise.all([
-      validateEntryContentType(action.entry.contentType),
-      validateUniqueEntry(releaseId, action)
-    ]);
-    const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId);
-    if (!release2) {
-      throw new errors.NotFoundError(`No release found for id ${releaseId}`);
-    }
-    if (release2.releasedAt) {
-      throw new errors.ValidationError("Release already published");
-    }
-    const { entry, type } = action;
-    return strapi2.entityService.create(RELEASE_ACTION_MODEL_UID, {
-      data: {
-        type,
-        contentType: entry.contentType,
-        locale: entry.locale,
-        entry: {
-          id: entry.id,
-          __type: entry.contentType,
-          __pivot: { field: "entry" }
-        },
-        release: releaseId
-      },
-      populate: { release: { fields: ["id"] }, entry: { fields: ["id"] } }
-    });
-  },
-  async findActions(releaseId, query) {
-    const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
-      fields: ["id"]
-    });
-    if (!release2) {
-      throw new errors.NotFoundError(`No release found for id ${releaseId}`);
-    }
-    return strapi2.entityService.findPage(RELEASE_ACTION_MODEL_UID, {
-      ...query,
-      populate: {
-        entry: {
-          populate: "*"
+      const updatedRelease = await strapi2.entityService.update(RELEASE_MODEL_UID, id, {
+        /*
+         * The type returned from the entity service: Partial<Input<"plugin::content-releases.release">>
+         * is not compatible with the type we are passing here: UpdateRelease.Request['body']
+         */
+        // @ts-expect-error see above
+        data: releaseWithCreatorFields
+      });
+      if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
+        const schedulingService = getService("scheduling", { strapi: strapi2 });
+        if (releaseData.scheduledAt) {
+          await schedulingService.set(id, releaseData.scheduledAt);
+        } else if (release2.scheduledAt) {
+          schedulingService.cancel(id);
         }
-      },
-      filters: {
-        release: releaseId
       }
-    });
-  },
-  async countActions(query) {
-    return strapi2.entityService.count(RELEASE_ACTION_MODEL_UID, query);
-  },
-  async groupActions(actions, groupBy) {
-    const contentTypeUids = actions.reduce((acc, action) => {
-      if (!acc.includes(action.contentType)) {
-        acc.push(action.contentType);
+      this.updateReleaseStatus(id);
+      strapi2.telemetry.send("didUpdateContentRelease");
+      return updatedRelease;
+    },
+    async createAction(releaseId, action) {
+      const { validateEntryContentType, validateUniqueEntry } = getService("release-validation", {
+        strapi: strapi2
+      });
+      await Promise.all([
+        validateEntryContentType(action.entry.contentType),
+        validateUniqueEntry(releaseId, action)
+      ]);
+      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId);
+      if (!release2) {
+        throw new errors.NotFoundError(`No release found for id ${releaseId}`);
       }
-      return acc;
-    }, []);
-    const allReleaseContentTypesDictionary = await this.getContentTypesDataForActions(
-      contentTypeUids
-    );
-    const allLocalesDictionary = await this.getLocalesDataForActions();
-    const formattedData = actions.map((action) => {
-      const { mainField, displayName } = allReleaseContentTypesDictionary[action.contentType];
-      return {
-        ...action,
-        locale: action.locale ? allLocalesDictionary[action.locale] : null,
-        contentType: {
-          displayName,
-          mainFieldValue: action.entry[mainField],
-          uid: action.contentType
-        }
-      };
-    });
-    const groupName = getGroupName(groupBy);
-    return _.groupBy(groupName)(formattedData);
-  },
-  async getLocalesDataForActions() {
-    if (!strapi2.plugin("i18n")) {
-      return {};
-    }
-    const allLocales = await strapi2.plugin("i18n").service("locales").find() || [];
-    return allLocales.reduce((acc, locale) => {
-      acc[locale.code] = { name: locale.name, code: locale.code };
-      return acc;
-    }, {});
-  },
-  async getContentTypesDataForActions(contentTypesUids) {
-    const contentManagerContentTypeService = strapi2.plugin("content-manager").service("content-types");
-    const contentTypesData = {};
-    for (const contentTypeUid of contentTypesUids) {
-      const contentTypeConfig = await contentManagerContentTypeService.findConfiguration({
-        uid: contentTypeUid
+      if (release2.releasedAt) {
+        throw new errors.ValidationError("Release already published");
+      }
+      const { entry, type } = action;
+      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,
+            __pivot: { field: "entry" }
+          },
+          release: releaseId
+        },
+        populate: { release: { fields: ["id"] }, entry: { fields: ["id"] } }
       });
-      contentTypesData[contentTypeUid] = {
-        mainField: contentTypeConfig.settings.mainField,
-        displayName: strapi2.getModel(contentTypeUid).info.displayName
-      };
-    }
-    return contentTypesData;
-  },
-  getContentTypeModelsFromActions(actions) {
-    const contentTypeUids = actions.reduce((acc, action) => {
-      if (!acc.includes(action.contentType)) {
-        acc.push(action.contentType);
+      this.updateReleaseStatus(releaseId);
+      return releaseAction2;
+    },
+    async findActions(releaseId, query) {
+      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
+        fields: ["id"]
+      });
+      if (!release2) {
+        throw new errors.NotFoundError(`No release found for id ${releaseId}`);
       }
-      return acc;
-    }, []);
-    const contentTypeModelsMap = contentTypeUids.reduce(
-      (acc, contentTypeUid) => {
-        acc[contentTypeUid] = strapi2.getModel(contentTypeUid);
+      return strapi2.entityService.findPage(RELEASE_ACTION_MODEL_UID, {
+        ...query,
+        populate: {
+          entry: {
+            populate: "*"
+          }
+        },
+        filters: {
+          release: releaseId
+        }
+      });
+    },
+    async countActions(query) {
+      return strapi2.entityService.count(RELEASE_ACTION_MODEL_UID, query);
+    },
+    async groupActions(actions, groupBy) {
+      const contentTypeUids = actions.reduce((acc, action) => {
+        if (!acc.includes(action.contentType)) {
+          acc.push(action.contentType);
+        }
         return acc;
-      },
-      {}
-    );
-    return contentTypeModelsMap;
-  },
-  async getAllComponents() {
-    const contentManagerComponentsService = strapi2.plugin("content-manager").service("components");
-    const components = await contentManagerComponentsService.findAllComponents();
-    const componentsMap = components.reduce(
-      (acc, component) => {
-        acc[component.uid] = component;
+      }, []);
+      const allReleaseContentTypesDictionary = await this.getContentTypesDataForActions(
+        contentTypeUids
+      );
+      const allLocalesDictionary = await this.getLocalesDataForActions();
+      const formattedData = actions.map((action) => {
+        const { mainField, displayName } = allReleaseContentTypesDictionary[action.contentType];
+        return {
+          ...action,
+          locale: action.locale ? allLocalesDictionary[action.locale] : null,
+          contentType: {
+            displayName,
+            mainFieldValue: action.entry[mainField],
+            uid: action.contentType
+          }
+        };
+      });
+      const groupName = getGroupName(groupBy);
+      return _.groupBy(groupName)(formattedData);
+    },
+    async getLocalesDataForActions() {
+      if (!strapi2.plugin("i18n")) {
+        return {};
+      }
+      const allLocales = await strapi2.plugin("i18n").service("locales").find() || [];
+      return allLocales.reduce((acc, locale) => {
+        acc[locale.code] = { name: locale.name, code: locale.code };
         return acc;
-      },
-      {}
-    );
-    return componentsMap;
-  },
-  async delete(releaseId) {
-    const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
-      populate: {
-        actions: {
-          fields: ["id"]
-        }
+      }, {});
+    },
+    async getContentTypesDataForActions(contentTypesUids) {
+      const contentManagerContentTypeService = strapi2.plugin("content-manager").service("content-types");
+      const contentTypesData = {};
+      for (const contentTypeUid of contentTypesUids) {
+        const contentTypeConfig = await contentManagerContentTypeService.findConfiguration({
+          uid: contentTypeUid
+        });
+        contentTypesData[contentTypeUid] = {
+          mainField: contentTypeConfig.settings.mainField,
+          displayName: strapi2.getModel(contentTypeUid).info.displayName
+        };
       }
-    });
-    if (!release2) {
-      throw new errors.NotFoundError(`No release found for id ${releaseId}`);
-    }
-    if (release2.releasedAt) {
-      throw new errors.ValidationError("Release already published");
-    }
-    await strapi2.db.transaction(async () => {
-      await strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
-        where: {
-          id: {
-            $in: release2.actions.map((action) => action.id)
-          }
+      return contentTypesData;
+    },
+    getContentTypeModelsFromActions(actions) {
+      const contentTypeUids = actions.reduce((acc, action) => {
+        if (!acc.includes(action.contentType)) {
+          acc.push(action.contentType);
         }
-      });
-      await strapi2.entityService.delete(RELEASE_MODEL_UID, releaseId);
-    });
-    return release2;
-  },
-  async publish(releaseId) {
-    const releaseWithPopulatedActionEntries = await strapi2.entityService.findOne(
-      RELEASE_MODEL_UID,
-      releaseId,
-      {
+        return acc;
+      }, []);
+      const contentTypeModelsMap = contentTypeUids.reduce(
+        (acc, contentTypeUid) => {
+          acc[contentTypeUid] = strapi2.getModel(contentTypeUid);
+          return acc;
+        },
+        {}
+      );
+      return contentTypeModelsMap;
+    },
+    async getAllComponents() {
+      const contentManagerComponentsService = strapi2.plugin("content-manager").service("components");
+      const components = await contentManagerComponentsService.findAllComponents();
+      const componentsMap = components.reduce(
+        (acc, component) => {
+          acc[component.uid] = component;
+          return acc;
+        },
+        {}
+      );
+      return componentsMap;
+    },
+    async delete(releaseId) {
+      const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
         populate: {
           actions: {
-            populate: {
-              entry: {
-                fields: ["id"]
-              }
-            }
+            fields: ["id"]
           }
         }
+      });
+      if (!release2) {
+        throw new errors.NotFoundError(`No release found for id ${releaseId}`);
       }
-    );
-    if (!releaseWithPopulatedActionEntries) {
-      throw new errors.NotFoundError(`No release found for id ${releaseId}`);
-    }
-    if (releaseWithPopulatedActionEntries.releasedAt) {
-      throw new errors.ValidationError("Release already published");
-    }
-    if (releaseWithPopulatedActionEntries.actions.length === 0) {
-      throw new errors.ValidationError("No entries to publish");
-    }
-    const actions = {};
-    for (const action of releaseWithPopulatedActionEntries.actions) {
-      const contentTypeUid = action.contentType;
-      if (!actions[contentTypeUid]) {
-        actions[contentTypeUid] = {
-          entriestoPublishIds: [],
-          entriesToUnpublishIds: []
-        };
+      if (release2.releasedAt) {
+        throw new errors.ValidationError("Release already published");
       }
-      if (action.type === "publish") {
-        actions[contentTypeUid].entriestoPublishIds.push(action.entry.id);
-      } else {
-        actions[contentTypeUid].entriesToUnpublishIds.push(action.entry.id);
+      await strapi2.db.transaction(async () => {
+        await strapi2.db.query(RELEASE_ACTION_MODEL_UID).deleteMany({
+          where: {
+            id: {
+              $in: release2.actions.map((action) => action.id)
+            }
+          }
+        });
+        await strapi2.entityService.delete(RELEASE_MODEL_UID, releaseId);
+      });
+      if (strapi2.features.future.isEnabled("contentReleasesScheduling") && release2.scheduledAt) {
+        const schedulingService = getService("scheduling", { strapi: strapi2 });
+        await schedulingService.cancel(release2.id);
       }
-    }
-    const entityManagerService = strapi2.plugin("content-manager").service("entity-manager");
-    const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
-    await strapi2.db.transaction(async () => {
-      for (const contentTypeUid of Object.keys(actions)) {
-        const populate = await populateBuilderService(contentTypeUid).populateDeep(Infinity).build();
-        const { entriestoPublishIds, entriesToUnpublishIds } = actions[contentTypeUid];
-        const entriesToPublish = await strapi2.entityService.findMany(
-          contentTypeUid,
+      strapi2.telemetry.send("didDeleteContentRelease");
+      return release2;
+    },
+    async publish(releaseId) {
+      try {
+        const releaseWithPopulatedActionEntries = await strapi2.entityService.findOne(
+          RELEASE_MODEL_UID,
+          releaseId,
           {
-            filters: {
-              id: {
-                $in: entriestoPublishIds
+            populate: {
+              actions: {
+                populate: {
+                  entry: {
+                    fields: ["id"]
+                  }
+                }
               }
-            },
-            populate
+            }
           }
         );
-        const entriesToUnpublish = await strapi2.entityService.findMany(
-          contentTypeUid,
-          {
-            filters: {
-              id: {
-                $in: entriesToUnpublishIds
+        if (!releaseWithPopulatedActionEntries) {
+          throw new errors.NotFoundError(`No release found for id ${releaseId}`);
+        }
+        if (releaseWithPopulatedActionEntries.releasedAt) {
+          throw new errors.ValidationError("Release already published");
+        }
+        if (releaseWithPopulatedActionEntries.actions.length === 0) {
+          throw new errors.ValidationError("No entries to publish");
+        }
+        const collectionTypeActions = {};
+        const singleTypeActions = [];
+        for (const action of releaseWithPopulatedActionEntries.actions) {
+          const contentTypeUid = action.contentType;
+          if (strapi2.contentTypes[contentTypeUid].kind === "collectionType") {
+            if (!collectionTypeActions[contentTypeUid]) {
+              collectionTypeActions[contentTypeUid] = {
+                entriestoPublishIds: [],
+                entriesToUnpublishIds: []
+              };
+            }
+            if (action.type === "publish") {
+              collectionTypeActions[contentTypeUid].entriestoPublishIds.push(action.entry.id);
+            } else {
+              collectionTypeActions[contentTypeUid].entriesToUnpublishIds.push(action.entry.id);
+            }
+          } else {
+            singleTypeActions.push({
+              uid: contentTypeUid,
+              action: action.type,
+              id: action.entry.id
+            });
+          }
+        }
+        const entityManagerService = strapi2.plugin("content-manager").service("entity-manager");
+        const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
+        await strapi2.db.transaction(async () => {
+          for (const { uid, action, id } of singleTypeActions) {
+            const populate = await populateBuilderService(uid).populateDeep(Infinity).build();
+            const entry = await strapi2.entityService.findOne(uid, id, { populate });
+            try {
+              if (action === "publish") {
+                await entityManagerService.publish(entry, uid);
+              } else {
+                await entityManagerService.unpublish(entry, uid);
               }
-            },
-            populate
+            } catch (error) {
+              if (error instanceof errors.ApplicationError && (error.message === "already.published" || error.message === "already.draft")) {
+              } else {
+                throw error;
+              }
+            }
           }
-        );
-        if (entriesToPublish.length > 0) {
-          await entityManagerService.publishMany(entriesToPublish, contentTypeUid);
+          for (const contentTypeUid of Object.keys(collectionTypeActions)) {
+            const populate = await populateBuilderService(contentTypeUid).populateDeep(Infinity).build();
+            const { entriestoPublishIds, entriesToUnpublishIds } = collectionTypeActions[contentTypeUid];
+            const entriesToPublish = await strapi2.entityService.findMany(
+              contentTypeUid,
+              {
+                filters: {
+                  id: {
+                    $in: entriestoPublishIds
+                  }
+                },
+                populate
+              }
+            );
+            const entriesToUnpublish = await strapi2.entityService.findMany(
+              contentTypeUid,
+              {
+                filters: {
+                  id: {
+                    $in: entriesToUnpublishIds
+                  }
+                },
+                populate
+              }
+            );
+            if (entriesToPublish.length > 0) {
+              await entityManagerService.publishMany(entriesToPublish, contentTypeUid);
+            }
+            if (entriesToUnpublish.length > 0) {
+              await entityManagerService.unpublishMany(entriesToUnpublish, contentTypeUid);
+            }
+          }
+        });
+        const release2 = await strapi2.entityService.update(RELEASE_MODEL_UID, releaseId, {
+          data: {
+            /*
+             * The type returned from the entity service: Partial<Input<"plugin::content-releases.release">> looks like it's wrong
+             */
+            // @ts-expect-error see above
+            releasedAt: /* @__PURE__ */ new Date()
+          },
+          populate: {
+            actions: {
+              // @ts-expect-error is not expecting count but it is working
+              count: true
+            }
+          }
+        });
+        if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
+          dispatchWebhook(ALLOWED_WEBHOOK_EVENTS.RELEASES_PUBLISH, {
+            isPublished: true,
+            release: release2
+          });
         }
-        if (entriesToUnpublish.length > 0) {
-          await entityManagerService.unpublishMany(entriesToUnpublish, contentTypeUid);
+        strapi2.telemetry.send("didPublishContentRelease");
+        return release2;
+      } catch (error) {
+        if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
+          dispatchWebhook(ALLOWED_WEBHOOK_EVENTS.RELEASES_PUBLISH, {
+            isPublished: false,
+            error
+          });
         }
+        strapi2.db.query(RELEASE_MODEL_UID).update({
+          where: { id: releaseId },
+          data: {
+            status: "failed"
+          }
+        });
+        throw error;
       }
-    });
-    const release2 = await strapi2.entityService.update(RELEASE_MODEL_UID, releaseId, {
-      data: {
-        /*
-         * The type returned from the entity service: Partial<Input<"plugin::content-releases.release">> looks like it's wrong
-         */
-        // @ts-expect-error see above
-        releasedAt: /* @__PURE__ */ new Date()
+    },
+    async updateAction(actionId, releaseId, update) {
+      const updatedAction = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
+        where: {
+          id: actionId,
+          release: {
+            id: releaseId,
+            releasedAt: {
+              $null: true
+            }
+          }
+        },
+        data: update
+      });
+      if (!updatedAction) {
+        throw new errors.NotFoundError(
+          `Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
+        );
       }
-    });
-    return release2;
-  },
-  async updateAction(actionId, releaseId, update) {
-    const updatedAction = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
-      where: {
-        id: actionId,
-        release: {
-          id: releaseId,
-          releasedAt: {
-            $null: true
+      return updatedAction;
+    },
+    async deleteAction(actionId, releaseId) {
+      const deletedAction = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).delete({
+        where: {
+          id: actionId,
+          release: {
+            id: releaseId,
+            releasedAt: {
+              $null: true
+            }
           }
         }
-      },
-      data: update
-    });
-    if (!updatedAction) {
-      throw new errors.NotFoundError(
-        `Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
-      );
-    }
-    return updatedAction;
-  },
-  async deleteAction(actionId, releaseId) {
-    const deletedAction = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).delete({
-      where: {
-        id: actionId,
-        release: {
-          id: releaseId,
-          releasedAt: {
-            $null: true
+      });
+      if (!deletedAction) {
+        throw new errors.NotFoundError(
+          `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"
+          }
+        });
       }
-    });
-    if (!deletedAction) {
-      throw new errors.NotFoundError(
-        `Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
-      );
+      return strapi2.db.query(RELEASE_MODEL_UID).update({
+        where: {
+          id: releaseId
+        },
+        data: {
+          status: "empty"
+        }
+      });
     }
-    return deletedAction;
-  }
-});
+  };
+};
 const createReleaseValidationService = ({ strapi: strapi2 }) => ({
   async validateUniqueEntry(releaseId, releaseActionArgs) {
     const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
@@ -666,17 +1028,9 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
     if (!contentType) {
       throw new errors.NotFoundError(`No content type found for uid ${contentTypeUid}`);
     }
-    if (!contentType.options?.draftAndPublish) {
-      throw new errors.ValidationError(
-        `Content type with uid ${contentTypeUid} does not have draftAndPublish enabled`
-      );
-    }
   },
   async validatePendingReleasesLimit() {
-    const maximumPendingReleases = (
-      // @ts-expect-error - options is not typed into features
-      EE.features.get("cms-content-releases")?.options?.maximumReleases || 3
-    );
+    const maximumPendingReleases = strapi2.ee.features.get("cms-content-releases")?.options?.maximumReleases || 3;
     const [, pendingReleasesCount] = await strapi2.db.query(RELEASE_MODEL_UID).findWithCount({
       filters: {
         releasedAt: {
@@ -688,27 +1042,103 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
       throw new errors.ValidationError("You have reached the maximum number of pending releases");
     }
   },
-  async validateUniqueNameForPendingRelease(name) {
+  async validateUniqueNameForPendingRelease(name, id) {
     const pendingReleases = await strapi2.entityService.findMany(RELEASE_MODEL_UID, {
       filters: {
         releasedAt: {
           $null: true
         },
-        name
+        name,
+        ...id && { id: { $ne: id } }
       }
     });
     const isNameUnique = pendingReleases.length === 0;
     if (!isNameUnique) {
       throw new errors.ValidationError(`Release with name ${name} already exists`);
     }
+  },
+  async validateScheduledAtIsLaterThanNow(scheduledAt) {
+    if (scheduledAt && new Date(scheduledAt) <= /* @__PURE__ */ new Date()) {
+      throw new errors.ValidationError("Scheduled at must be later than now");
+    }
   }
 });
+const createSchedulingService = ({ strapi: strapi2 }) => {
+  const scheduledJobs = /* @__PURE__ */ new Map();
+  return {
+    async set(releaseId, scheduleDate) {
+      const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({ where: { id: releaseId, releasedAt: null } });
+      if (!release2) {
+        throw new errors.NotFoundError(`No release found for id ${releaseId}`);
+      }
+      const job = scheduleJob(scheduleDate, async () => {
+        try {
+          await getService("release").publish(releaseId);
+        } catch (error) {
+        }
+        this.cancel(releaseId);
+      });
+      if (scheduledJobs.has(releaseId)) {
+        this.cancel(releaseId);
+      }
+      scheduledJobs.set(releaseId, job);
+      return scheduledJobs;
+    },
+    cancel(releaseId) {
+      if (scheduledJobs.has(releaseId)) {
+        scheduledJobs.get(releaseId).cancel();
+        scheduledJobs.delete(releaseId);
+      }
+      return scheduledJobs;
+    },
+    getAll() {
+      return scheduledJobs;
+    },
+    /**
+     * On bootstrap, we can use this function to make sure to sync the scheduled jobs from the database that are not yet released
+     * This is useful in case the server was restarted and the scheduled jobs were lost
+     * This also could be used to sync different Strapi instances in case of a cluster
+     */
+    async syncFromDatabase() {
+      const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
+        where: {
+          scheduledAt: {
+            $gte: /* @__PURE__ */ new Date()
+          },
+          releasedAt: null
+        }
+      });
+      for (const release2 of releases) {
+        this.set(release2.id, release2.scheduledAt);
+      }
+      return scheduledJobs;
+    }
+  };
+};
 const services = {
   release: createReleaseService,
-  "release-validation": createReleaseValidationService
+  "release-validation": createReleaseValidationService,
+  ...strapi.features.future.isEnabled("contentReleasesScheduling") ? { scheduling: createSchedulingService } : {}
 };
 const RELEASE_SCHEMA = yup.object().shape({
-  name: yup.string().trim().required()
+  name: yup.string().trim().required(),
+  scheduledAt: yup.string().nullable(),
+  isScheduled: yup.boolean().optional(),
+  time: yup.string().when("isScheduled", {
+    is: true,
+    then: yup.string().trim().required(),
+    otherwise: yup.string().nullable()
+  }),
+  timezone: yup.string().when("isScheduled", {
+    is: true,
+    then: yup.string().required().nullable(),
+    otherwise: yup.string().nullable()
+  }),
+  date: yup.string().when("isScheduled", {
+    is: true,
+    then: yup.string().required().nullable(),
+    otherwise: yup.string().nullable()
+  })
 }).required().noUnknown();
 const validateRelease = validateYupSchema(RELEASE_SCHEMA);
 const releaseController = {
@@ -741,26 +1171,30 @@ 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) {
     const id = ctx.params.id;
     const releaseService = getService("release", { strapi });
     const release2 = await releaseService.findOne(id, { populate: ["createdBy"] });
-    const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
-      ability: ctx.state.userAbility,
-      model: RELEASE_MODEL_UID
-    });
-    const sanitizedRelease = await permissionsManager.sanitizeOutput(release2);
+    if (!release2) {
+      throw new errors.NotFoundError(`Release not found for id: ${id}`);
+    }
     const count = await releaseService.countActions({
       filters: {
         release: id
       }
     });
-    if (!release2) {
-      throw new errors.NotFoundError(`Release not found for id: ${id}`);
-    }
+    const sanitizedRelease = {
+      ...release2,
+      createdBy: release2.createdBy ? strapi.admin.services.user.sanitizeUser(release2.createdBy) : null
+    };
     const data = {
       ...sanitizedRelease,
       actions: {
@@ -813,8 +1247,27 @@ const releaseController = {
     const id = ctx.params.id;
     const releaseService = getService("release", { strapi });
     const release2 = await releaseService.publish(id, { user });
+    const [countPublishActions, countUnpublishActions] = await Promise.all([
+      releaseService.countActions({
+        filters: {
+          release: id,
+          type: "publish"
+        }
+      }),
+      releaseService.countActions({
+        filters: {
+          release: id,
+          type: "unpublish"
+        }
+      })
+    ]);
     ctx.body = {
-      data: release2
+      data: release2,
+      meta: {
+        totalEntries: countPublishActions + countUnpublishActions,
+        totalPublishedEntries: countPublishActions,
+        totalUnpublishedEntries: countUnpublishActions
+      }
     };
   }
 };
@@ -864,7 +1317,7 @@ const releaseActionController = {
       acc[action.contentType] = contentTypePermissionsManager.sanitizeOutput;
       return acc;
     }, {});
-    const sanitizedResults = await mapAsync(results, async (action) => ({
+    const sanitizedResults = await async.map(results, async (action) => ({
       ...action,
       entry: await contentTypeOutputSanitizers[action.contentType](action.entry)
     }));
@@ -1080,12 +1533,12 @@ const routes = {
   release,
   "release-action": releaseAction
 };
-const { features } = require("@strapi/strapi/dist/utils/ee");
 const getPlugin = () => {
-  if (features.isEnabled("cms-content-releases")) {
+  if (strapi.ee.features.isEnabled("cms-content-releases")) {
     return {
       register,
       bootstrap,
+      destroy,
       contentTypes,
       services,
       controllers,