@strapi/content-releases 4.20.2 → 4.20.3

package/dist/server/index.mjs

@@ -50,6 +50,9 @@ const ACTIONS = [
     pluginName: "content-releases"
   }
 ];
+const ALLOWED_WEBHOOK_EVENTS = {
+  RELEASES_PUBLISH: "releases.publish"
+};
 async function deleteActionsOnDisableDraftAndPublish({
   oldContentTypes,
   contentTypes: contentTypes2
@@ -141,6 +144,9 @@ const bootstrap = async ({ strapi: strapi2 }) => {
         );
         throw err;
       });
+      Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
+        strapi2.webhookStore.addAllowedEvent(key, value);
+      });
     }
   }
 };
@@ -260,468 +266,504 @@ const getGroupName = (queryValue) => {
       return "contentType.displayName";
   }
 };
-const createReleaseService = ({ strapi: strapi2 }) => ({
-  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
+const createReleaseService = ({ strapi: strapi2 }) => {
+  const dispatchWebhook = (event, { isPublished, release: release2, error }) => {
+    strapi2.eventHub.emit(event, {
+      isPublished,
+      error,
+      release: release2
     });
-    if (strapi2.features.future.isEnabled("contentReleasesScheduling") && releaseWithCreatorFields.scheduledAt) {
-      const schedulingService = getService("scheduling", { strapi: strapi2 });
-      await schedulingService.set(release2.id, release2.scheduledAt);
-    }
-    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
-        }
+  };
+  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
+      });
+      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
+      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
+          }
+        }
+      });
+    },
+    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
+          }
         },
-        releasedAt: {
-          $null: true
+        populate: {
+          // Filter the action to get only the content type entry
+          actions: {
+            where: {
+              target_type: contentTypeUid,
+              target_id: entryId
+            }
+          }
         }
-      },
-      populate: {
-        // Filter the action to get only the content type entry
-        actions: {
-          where: {
+      });
+      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)
+              }
+            },
+            {
+              actions: null
+            }
+          ],
+          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 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 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);
         }
       }
-    });
-    const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
-      where: {
-        $or: [
-          {
-            id: {
-              $notIn: releasesRelated.map((release2) => release2.id)
-            }
-          },
-          {
-            actions: null
-          }
-        ],
-        releasedAt: {
-          $null: true
-        }
+      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 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 { 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}`);
-    }
-    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
-    });
-    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);
+      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 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" }
+      return strapi2.entityService.findPage(RELEASE_ACTION_MODEL_UID, {
+        ...query,
+        populate: {
+          entry: {
+            populate: "*"
+          }
         },
-        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: "*"
+        filters: {
+          release: releaseId
         }
-      },
-      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;
-    }, []);
-    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
+      });
+    },
+    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);
         }
-      };
-    });
-    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
+        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
+          }
+        };
       });
-      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);
+      const groupName = getGroupName(groupBy);
+      return _.groupBy(groupName)(formattedData);
+    },
+    async getLocalesDataForActions() {
+      if (!strapi2.plugin("i18n")) {
+        return {};
       }
-      return acc;
-    }, []);
-    const contentTypeModelsMap = contentTypeUids.reduce(
-      (acc, contentTypeUid) => {
-        acc[contentTypeUid] = strapi2.getModel(contentTypeUid);
+      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 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;
+      }, {});
+    },
+    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
+        };
+      }
+      return contentTypesData;
+    },
+    getContentTypeModelsFromActions(actions) {
+      const contentTypeUids = actions.reduce((acc, action) => {
+        if (!acc.includes(action.contentType)) {
+          acc.push(action.contentType);
+        }
         return acc;
-      },
-      {}
-    );
-    return componentsMap;
-  },
-  async delete(releaseId) {
-    const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
-      populate: {
-        actions: {
-          fields: ["id"]
+      }, []);
+      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: {
+            fields: ["id"]
+          }
         }
+      });
+      if (!release2) {
+        throw new errors.NotFoundError(`No release found for id ${releaseId}`);
       }
-    });
-    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)
+      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)
+            }
           }
-        }
+        });
+        await strapi2.entityService.delete(RELEASE_MODEL_UID, releaseId);
       });
-      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);
-    }
-    return release2;
-  },
-  async publish(releaseId) {
-    const releaseWithPopulatedActionEntries = await strapi2.entityService.findOne(
-      RELEASE_MODEL_UID,
-      releaseId,
-      {
-        populate: {
-          actions: {
+      if (strapi2.features.future.isEnabled("contentReleasesScheduling") && release2.scheduledAt) {
+        const schedulingService = getService("scheduling", { strapi: strapi2 });
+        await schedulingService.cancel(release2.id);
+      }
+      strapi2.telemetry.send("didDeleteContentRelease");
+      return release2;
+    },
+    async publish(releaseId) {
+      try {
+        const releaseWithPopulatedActionEntries = await strapi2.entityService.findOne(
+          RELEASE_MODEL_UID,
+          releaseId,
+          {
             populate: {
-              entry: {
-                fields: ["id"]
+              actions: {
+                populate: {
+                  entry: {
+                    fields: ["id"]
+                  }
+                }
               }
             }
           }
+        );
+        if (!releaseWithPopulatedActionEntries) {
+          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 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 (releaseWithPopulatedActionEntries.releasedAt) {
+          throw new errors.ValidationError("Release already published");
         }
-        if (action.type === "publish") {
-          collectionTypeActions[contentTypeUid].entriestoPublishIds.push(action.entry.id);
-        } else {
-          collectionTypeActions[contentTypeUid].entriesToUnpublishIds.push(action.entry.id);
+        if (releaseWithPopulatedActionEntries.actions.length === 0) {
+          throw new errors.ValidationError("No entries to publish");
         }
-      } 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);
+        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 {
-            await entityManagerService.unpublish(entry, uid);
-          }
-        } catch (error) {
-          if (error instanceof errors.ApplicationError && (error.message === "already.published" || error.message === "already.draft"))
-            ;
-          else {
-            throw error;
+            singleTypeActions.push({
+              uid: contentTypeUid,
+              action: action.type,
+              id: action.entry.id
+            });
           }
         }
-      }
-      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
+        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;
+              }
+            }
           }
-        );
-        const entriesToUnpublish = await strapi2.entityService.findMany(
-          contentTypeUid,
-          {
-            filters: {
-              id: {
-                $in: entriesToUnpublishIds
+          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
               }
-            },
-            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);
+            }
           }
-        );
-        if (entriesToPublish.length > 0) {
-          await entityManagerService.publishMany(entriesToPublish, 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
+          });
         }
+        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()
-      }
-    });
-    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
+    },
+    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 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`
+        );
       }
-    });
-    if (!deletedAction) {
-      throw new errors.NotFoundError(
-        `Action with id ${actionId} not found in release with id ${releaseId} or it is already published`
-      );
+      return deletedAction;
     }
-    return deletedAction;
-  }
-});
+  };
+};
 const createReleaseValidationService = ({ strapi: strapi2 }) => ({
   async validateUniqueEntry(releaseId, releaseActionArgs) {
     const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
@@ -846,11 +888,21 @@ const services = {
 };
 const RELEASE_SCHEMA = yup.object().shape({
   name: yup.string().trim().required(),
-  // scheduledAt is a date, but we always receive strings from the client
   scheduledAt: yup.string().nullable(),
-  timezone: yup.string().when("scheduledAt", {
-    is: (scheduledAt) => !!scheduledAt,
-    then: yup.string().required(),
+  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();