@strapi/content-releases 4.20.4 → 4.21.0

package/dist/server/index.mjs

@@ -179,7 +179,7 @@ async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: co
           }
         });
         await mapAsync(actions, async (action) => {
-          if (action.entry) {
+          if (action.entry && action.release) {
             const populatedEntry = await getPopulatedEntry(contentTypeUID, action.entry.id, {
               strapi
             });
@@ -207,12 +207,57 @@ async function revalidateChangedContentTypes({ oldContentTypes, contentTypes: co
     });
   }
 }
+async function disableContentTypeLocalized({ oldContentTypes, contentTypes: contentTypes2 }) {
+  if (!oldContentTypes) {
+    return;
+  }
+  for (const uid in contentTypes2) {
+    if (!oldContentTypes[uid]) {
+      continue;
+    }
+    const oldContentType = oldContentTypes[uid];
+    const contentType = contentTypes2[uid];
+    const i18nPlugin = strapi.plugin("i18n");
+    const { isLocalizedContentType } = i18nPlugin.service("content-types");
+    if (isLocalizedContentType(oldContentType) && !isLocalizedContentType(contentType)) {
+      await strapi.db.queryBuilder(RELEASE_ACTION_MODEL_UID).update({
+        locale: null
+      }).where({ contentType: uid }).execute();
+    }
+  }
+}
+async function enableContentTypeLocalized({ oldContentTypes, contentTypes: contentTypes2 }) {
+  if (!oldContentTypes) {
+    return;
+  }
+  for (const uid in contentTypes2) {
+    if (!oldContentTypes[uid]) {
+      continue;
+    }
+    const oldContentType = oldContentTypes[uid];
+    const contentType = contentTypes2[uid];
+    const i18nPlugin = strapi.plugin("i18n");
+    const { isLocalizedContentType } = i18nPlugin.service("content-types");
+    const { getDefaultLocale } = i18nPlugin.service("locales");
+    if (!isLocalizedContentType(oldContentType) && isLocalizedContentType(contentType)) {
+      const defaultLocale = await getDefaultLocale();
+      await strapi.db.queryBuilder(RELEASE_ACTION_MODEL_UID).update({
+        locale: defaultLocale
+      }).where({ contentType: uid }).execute();
+    }
+  }
+}
 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).register(revalidateChangedContentTypes).register(migrateIsValidAndStatusReleases);
+    strapi2.hook("strapi::content-types.beforeSync").register(deleteActionsOnDisableDraftAndPublish).register(disableContentTypeLocalized);
+    strapi2.hook("strapi::content-types.afterSync").register(deleteActionsOnDeleteContentType).register(enableContentTypeLocalized).register(revalidateChangedContentTypes).register(migrateIsValidAndStatusReleases);
+  }
+  if (strapi2.plugin("graphql")) {
+    const graphqlExtensionService = strapi2.plugin("graphql").service("extension");
+    graphqlExtensionService.shadowCRUD(RELEASE_MODEL_UID).disable();
+    graphqlExtensionService.shadowCRUD(RELEASE_ACTION_MODEL_UID).disable();
   }
 };
 const { features: features$1 } = require("@strapi/strapi/dist/utils/ee");
@@ -338,27 +383,23 @@ const bootstrap = async ({ strapi: strapi2 }) => {
         }
       }
     });
-    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);
-      });
-    }
+    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 scheduledJobs = getService("scheduling", {
+    strapi: strapi2
+  }).getAll();
+  for (const [, job] of scheduledJobs) {
+    job.cancel();
   }
 };
 const schema$1 = {
@@ -483,6 +524,94 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       release: release2
     });
   };
+  const publishSingleTypeAction = async (uid, actionType, entryId) => {
+    const entityManagerService = strapi2.plugin("content-manager").service("entity-manager");
+    const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
+    const populate = await populateBuilderService(uid).populateDeep(Infinity).build();
+    const entry = await strapi2.entityService.findOne(uid, entryId, { populate });
+    try {
+      if (actionType === "publish") {
+        await entityManagerService.publish(entry, uid);
+      } else {
+        await entityManagerService.unpublish(entry, uid);
+      }
+    } catch (error) {
+      if (error instanceof errors.ApplicationError && (error.message === "already.published" || error.message === "already.draft"))
+        ;
+      else {
+        throw error;
+      }
+    }
+  };
+  const publishCollectionTypeAction = async (uid, entriesToPublishIds, entriestoUnpublishIds) => {
+    const entityManagerService = strapi2.plugin("content-manager").service("entity-manager");
+    const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
+    const populate = await populateBuilderService(uid).populateDeep(Infinity).build();
+    const entriesToPublish = await strapi2.entityService.findMany(uid, {
+      filters: {
+        id: {
+          $in: entriesToPublishIds
+        }
+      },
+      populate
+    });
+    const entriesToUnpublish = await strapi2.entityService.findMany(uid, {
+      filters: {
+        id: {
+          $in: entriestoUnpublishIds
+        }
+      },
+      populate
+    });
+    if (entriesToPublish.length > 0) {
+      await entityManagerService.publishMany(entriesToPublish, uid);
+    }
+    if (entriesToUnpublish.length > 0) {
+      await entityManagerService.unpublishMany(entriesToUnpublish, uid);
+    }
+  };
+  const getFormattedActions = async (releaseId) => {
+    const actions = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).findMany({
+      where: {
+        release: {
+          id: releaseId
+        }
+      },
+      populate: {
+        entry: {
+          fields: ["id"]
+        }
+      }
+    });
+    if (actions.length === 0) {
+      throw new errors.ValidationError("No entries to publish");
+    }
+    const collectionTypeActions = {};
+    const singleTypeActions = [];
+    for (const action of 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
+        });
+      }
+    }
+    return { collectionTypeActions, singleTypeActions };
+  };
   return {
     async create(releaseData, { user }) {
       const releaseWithCreatorFields = await setCreatorFields({ user })(releaseData);
@@ -502,7 +631,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
           status: "empty"
         }
       });
-      if (strapi2.features.future.isEnabled("contentReleasesScheduling") && releaseWithCreatorFields.scheduledAt) {
+      if (releaseWithCreatorFields.scheduledAt) {
         const schedulingService = getService("scheduling", { strapi: strapi2 });
         await schedulingService.set(release2.id, release2.scheduledAt);
       }
@@ -627,13 +756,11 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         // @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 schedulingService = getService("scheduling", { strapi: strapi2 });
+      if (releaseData.scheduledAt) {
+        await schedulingService.set(id, releaseData.scheduledAt);
+      } else if (release2.scheduledAt) {
+        schedulingService.cancel(id);
       }
       this.updateReleaseStatus(id);
       strapi2.telemetry.send("didUpdateContentRelease");
@@ -799,7 +926,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         });
         await strapi2.entityService.delete(RELEASE_MODEL_UID, releaseId);
       });
-      if (strapi2.features.future.isEnabled("contentReleasesScheduling") && release2.scheduledAt) {
+      if (release2.scheduledAt) {
         const schedulingService = getService("scheduling", { strapi: strapi2 });
         await schedulingService.cancel(release2.id);
       }
@@ -807,145 +934,71 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       return release2;
     },
     async publish(releaseId) {
-      try {
-        const releaseWithPopulatedActionEntries = await strapi2.entityService.findOne(
-          RELEASE_MODEL_UID,
-          releaseId,
-          {
-            populate: {
-              actions: {
-                populate: {
-                  entry: {
-                    fields: ["id"]
-                  }
-                }
-              }
-            }
-          }
-        );
-        if (!releaseWithPopulatedActionEntries) {
+      const {
+        release: release2,
+        error
+      } = await strapi2.db.transaction(async ({ trx }) => {
+        const lockedRelease = await strapi2.db?.queryBuilder(RELEASE_MODEL_UID).where({ id: releaseId }).select(["id", "name", "releasedAt", "status"]).first().transacting(trx).forUpdate().execute();
+        if (!lockedRelease) {
           throw new errors.NotFoundError(`No release found for id ${releaseId}`);
         }
-        if (releaseWithPopulatedActionEntries.releasedAt) {
+        if (lockedRelease.releasedAt) {
           throw new errors.ValidationError("Release already published");
         }
-        if (releaseWithPopulatedActionEntries.actions.length === 0) {
-          throw new errors.ValidationError("No entries to publish");
+        if (lockedRelease.status === "failed") {
+          throw new errors.ValidationError("Release failed 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);
-              }
-            } catch (error) {
-              if (error instanceof errors.ApplicationError && (error.message === "already.published" || error.message === "already.draft")) {
-              } else {
-                throw error;
-              }
-            }
-          }
-          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);
+        try {
+          strapi2.log.info(`[Content Releases] Starting to publish release ${lockedRelease.name}`);
+          const { collectionTypeActions, singleTypeActions } = await getFormattedActions(
+            releaseId
+          );
+          await strapi2.db.transaction(async () => {
+            for (const { uid, action, id } of singleTypeActions) {
+              await publishSingleTypeAction(uid, action, id);
             }
-            if (entriesToUnpublish.length > 0) {
-              await entityManagerService.unpublishMany(entriesToUnpublish, contentTypeUid);
+            for (const contentTypeUid of Object.keys(collectionTypeActions)) {
+              const uid = contentTypeUid;
+              await publishCollectionTypeAction(
+                uid,
+                collectionTypeActions[uid].entriesToPublishIds,
+                collectionTypeActions[uid].entriesToUnpublishIds
+              );
             }
-          }
-        });
-        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
+          });
+          const release22 = await strapi2.db.query(RELEASE_MODEL_UID).update({
+            where: {
+              id: releaseId
+            },
+            data: {
+              status: "done",
+              releasedAt: /* @__PURE__ */ new Date()
             }
-          }
-        });
-        if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
+          });
           dispatchWebhook(ALLOWED_WEBHOOK_EVENTS.RELEASES_PUBLISH, {
             isPublished: true,
-            release: release2
+            release: release22
           });
-        }
-        strapi2.telemetry.send("didPublishContentRelease");
-        return release2;
-      } catch (error) {
-        if (strapi2.features.future.isEnabled("contentReleasesScheduling")) {
+          strapi2.telemetry.send("didPublishContentRelease");
+          return { release: release22, error: null };
+        } catch (error2) {
           dispatchWebhook(ALLOWED_WEBHOOK_EVENTS.RELEASES_PUBLISH, {
             isPublished: false,
-            error
+            error: error2
           });
-        }
-        strapi2.db.query(RELEASE_MODEL_UID).update({
-          where: { id: releaseId },
-          data: {
+          await strapi2.db?.queryBuilder(RELEASE_MODEL_UID).where({ id: releaseId }).update({
             status: "failed"
-          }
-        });
+          }).transacting(trx).execute();
+          return {
+            release: null,
+            error: error2
+          };
+        }
+      });
+      if (error) {
         throw error;
       }
+      return release2;
     },
     async updateAction(actionId, releaseId, update) {
       const updatedAction = await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
@@ -1032,6 +1085,12 @@ const createReleaseService = ({ strapi: strapi2 }) => {
     }
   };
 };
+class AlreadyOnReleaseError extends errors.ApplicationError {
+  constructor(message) {
+    super(message);
+    this.name = "AlreadyOnReleaseError";
+  }
+}
 const createReleaseValidationService = ({ strapi: strapi2 }) => ({
   async validateUniqueEntry(releaseId, releaseActionArgs) {
     const release2 = await strapi2.entityService.findOne(RELEASE_MODEL_UID, releaseId, {
@@ -1044,7 +1103,7 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
       (action) => Number(action.entry.id) === Number(releaseActionArgs.entry.id) && action.contentType === releaseActionArgs.entry.contentType
     );
     if (isEntryInRelease) {
-      throw new errors.ValidationError(
+      throw new AlreadyOnReleaseError(
         `Entry with id ${releaseActionArgs.entry.id} and contentType ${releaseActionArgs.entry.contentType} already exists in release with id ${releaseId}`
       );
     }
@@ -1152,7 +1211,7 @@ const createSchedulingService = ({ strapi: strapi2 }) => {
 const services = {
   release: createReleaseService,
   "release-validation": createReleaseValidationService,
-  ...strapi.features.future.isEnabled("contentReleasesScheduling") ? { scheduling: createSchedulingService } : {}
+  scheduling: createSchedulingService
 };
 const RELEASE_SCHEMA = yup.object().shape({
   name: yup.string().trim().required(),
@@ -1328,6 +1387,38 @@ const releaseActionController = {
       data: releaseAction2
     };
   },
+  async createMany(ctx) {
+    const releaseId = ctx.params.releaseId;
+    const releaseActionsArgs = ctx.request.body;
+    await Promise.all(
+      releaseActionsArgs.map((releaseActionArgs) => validateReleaseAction(releaseActionArgs))
+    );
+    const releaseService = getService("release", { strapi });
+    const releaseActions = await strapi.db.transaction(async () => {
+      const releaseActions2 = await Promise.all(
+        releaseActionsArgs.map(async (releaseActionArgs) => {
+          try {
+            const action = await releaseService.createAction(releaseId, releaseActionArgs);
+            return action;
+          } catch (error) {
+            if (error instanceof AlreadyOnReleaseError) {
+              return null;
+            }
+            throw error;
+          }
+        })
+      );
+      return releaseActions2;
+    });
+    const newReleaseActions = releaseActions.filter((action) => action !== null);
+    ctx.body = {
+      data: newReleaseActions,
+      meta: {
+        entriesAlreadyInRelease: releaseActions.length - newReleaseActions.length,
+        totalEntries: releaseActions.length
+      }
+    };
+  },
   async findMany(ctx) {
     const releaseId = ctx.params.releaseId;
     const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
@@ -1513,6 +1604,22 @@ const releaseAction = {
         ]
       }
     },
+    {
+      method: "POST",
+      path: "/:releaseId/actions/bulk",
+      handler: "release-action.createMany",
+      config: {
+        policies: [
+          "admin::isAuthenticatedAdmin",
+          {
+            name: "admin::hasPermissions",
+            config: {
+              actions: ["plugin::content-releases.create-action"]
+            }
+          }
+        ]
+      }
+    },
     {
       method: "GET",
       path: "/:releaseId/actions",
@@ -1581,6 +1688,9 @@ const getPlugin = () => {
     };
   }
   return {
+    // Always return register, it handles its own feature check
+    register,
+    // Always return contentTypes to avoid losing data when the feature is disabled
     contentTypes
   };
 };