@strapi/content-releases 5.0.0-beta.0 → 5.0.0-beta.10

package/dist/server/index.js

@@ -76,10 +76,10 @@ const ACTIONS = [
 const ALLOWED_WEBHOOK_EVENTS = {
   RELEASES_PUBLISH: "releases.publish"
 };
-const getService = (name, { strapi: strapi2 } = { strapi: global.strapi }) => {
+const getService = (name, { strapi: strapi2 }) => {
   return strapi2.plugin("content-releases").service(name);
 };
-const getPopulatedEntry = async (contentTypeUid, entryId, { strapi: strapi2 } = { strapi: global.strapi }) => {
+const getPopulatedEntry = async (contentTypeUid, entryId, { strapi: strapi2 }) => {
   const populateBuilderService = strapi2.plugin("content-manager").service("populate-builder");
   const populate = await populateBuilderService(contentTypeUid).populateDeep(Infinity).build();
   const entry = await strapi2.db.query(contentTypeUid).findOne({
@@ -88,7 +88,7 @@ const getPopulatedEntry = async (contentTypeUid, entryId, { strapi: strapi2 } =
   });
   return entry;
 };
-const getEntryValidStatus = async (contentTypeUid, entry, { strapi: strapi2 } = { strapi: global.strapi }) => {
+const getEntryValidStatus = async (contentTypeUid, entry, { strapi: strapi2 }) => {
   try {
     await strapi2.entityValidator.validateEntityCreation(
       strapi2.getModel(contentTypeUid),
@@ -236,13 +236,16 @@ async function disableContentTypeLocalized({ oldContentTypes, contentTypes: cont
   if (!oldContentTypes) {
     return;
   }
+  const i18nPlugin = strapi.plugin("i18n");
+  if (!i18nPlugin) {
+    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({
@@ -255,13 +258,16 @@ async function enableContentTypeLocalized({ oldContentTypes, contentTypes: conte
   if (!oldContentTypes) {
     return;
   }
+  const i18nPlugin = strapi.plugin("i18n");
+  if (!i18nPlugin) {
+    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)) {
@@ -274,7 +280,7 @@ async function enableContentTypeLocalized({ oldContentTypes, contentTypes: conte
 }
 const register = async ({ strapi: strapi2 }) => {
   if (strapi2.ee.features.isEnabled("cms-content-releases")) {
-    await strapi2.admin.services.permission.actionProvider.registerMany(ACTIONS);
+    await strapi2.service("admin::permission").actionProvider.registerMany(ACTIONS);
     strapi2.hook("strapi::content-types.beforeSync").register(disableContentTypeLocalized).register(deleteActionsOnDisableDraftAndPublish);
     strapi2.hook("strapi::content-types.afterSync").register(deleteActionsOnDeleteContentType).register(enableContentTypeLocalized).register(revalidateChangedContentTypes).register(migrateIsValidAndStatusReleases);
   }
@@ -344,9 +350,7 @@ const bootstrap = async ({ strapi: strapi2 }) => {
                 actions: {
                   target_type: model.uid,
                   target_id: {
-                    $in: entriesToDelete.map(
-                      (entry) => entry.id
-                    )
+                    $in: entriesToDelete.map((entry) => entry.id)
                   }
                 }
               }
@@ -373,13 +377,9 @@ const bootstrap = async ({ strapi: strapi2 }) => {
         try {
           const { model, result } = event;
           if (model.kind === "collectionType" && model.options?.draftAndPublish) {
-            const isEntryValid = await getEntryValidStatus(
-              model.uid,
-              result,
-              {
-                strapi: strapi2
-              }
-            );
+            const isEntryValid = await getEntryValidStatus(model.uid, result, {
+              strapi: strapi2
+            });
             await strapi2.db.query(RELEASE_ACTION_MODEL_UID).update({
               where: {
                 target_type: model.uid,
@@ -413,7 +413,7 @@ const bootstrap = async ({ strapi: strapi2 }) => {
       throw err;
     });
     Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
-      strapi2.webhookStore.addAllowedEvent(key, value);
+      strapi2.get("webhookStore").addAllowedEvent(key, value);
     });
   }
 };
@@ -662,7 +662,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       return release2;
     },
     async findOne(id, query = {}) {
-      const dbQuery = utils.convertQueryParams.transformParamsToQuery(RELEASE_MODEL_UID, query);
+      const dbQuery = strapi2.get("query-params").transform(RELEASE_MODEL_UID, query);
       const release2 = await strapi2.db.query(RELEASE_MODEL_UID).findOne({
         ...dbQuery,
         where: { id }
@@ -670,7 +670,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       return release2;
     },
     findPage(query) {
-      const dbQuery = utils.convertQueryParams.transformParamsToQuery(RELEASE_MODEL_UID, query ?? {});
+      const dbQuery = strapi2.get("query-params").transform(RELEASE_MODEL_UID, query ?? {});
       return strapi2.db.query(RELEASE_MODEL_UID).findPage({
         ...dbQuery,
         populate: {
@@ -680,12 +680,18 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         }
       });
     },
-    async findManyWithContentTypeEntryAttached(contentTypeUid, entryId) {
+    async findManyWithContentTypeEntryAttached(contentTypeUid, entriesIds) {
+      let entries = entriesIds;
+      if (!Array.isArray(entriesIds)) {
+        entries = [entriesIds];
+      }
       const releases = await strapi2.db.query(RELEASE_MODEL_UID).findMany({
         where: {
           actions: {
             target_type: contentTypeUid,
-            target_id: entryId
+            target_id: {
+              $in: entries
+            }
           },
           releasedAt: {
             $null: true
@@ -696,18 +702,25 @@ const createReleaseService = ({ strapi: strapi2 }) => {
           actions: {
             where: {
               target_type: contentTypeUid,
-              target_id: entryId
+              target_id: {
+                $in: entries
+              }
+            },
+            populate: {
+              entry: {
+                select: ["id"]
+              }
             }
           }
         }
       });
       return releases.map((release2) => {
         if (release2.actions?.length) {
-          const [actionForEntry] = release2.actions;
+          const actionsForEntry = release2.actions;
           delete release2.actions;
           return {
             ...release2,
-            action: actionForEntry
+            actions: actionsForEntry
           };
         }
         return release2;
@@ -831,10 +844,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       if (!release2) {
         throw new utils.errors.NotFoundError(`No release found for id ${releaseId}`);
       }
-      const dbQuery = utils.convertQueryParams.transformParamsToQuery(
-        RELEASE_ACTION_MODEL_UID,
-        query ?? {}
-      );
+      const dbQuery = strapi2.get("query-params").transform(RELEASE_ACTION_MODEL_UID, query ?? {});
       return strapi2.db.query(RELEASE_ACTION_MODEL_UID).findPage({
         ...dbQuery,
         populate: {
@@ -848,10 +858,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
       });
     },
     async countActions(query) {
-      const dbQuery = utils.convertQueryParams.transformParamsToQuery(
-        RELEASE_ACTION_MODEL_UID,
-        query ?? {}
-      );
+      const dbQuery = strapi2.get("query-params").transform(RELEASE_ACTION_MODEL_UID, query ?? {});
       return strapi2.db.query(RELEASE_ACTION_MODEL_UID).count(dbQuery);
     },
     async groupActions(actions, groupBy) {
@@ -861,9 +868,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         }
         return acc;
       }, []);
-      const allReleaseContentTypesDictionary = await this.getContentTypesDataForActions(
-        contentTypeUids
-      );
+      const allReleaseContentTypesDictionary = await this.getContentTypesDataForActions(contentTypeUids);
       const allLocalesDictionary = await this.getLocalesDataForActions();
       const formattedData = actions.map((action) => {
         const { mainField, displayName } = allReleaseContentTypesDictionary[action.contentType];
@@ -985,9 +990,7 @@ const createReleaseService = ({ strapi: strapi2 }) => {
         }
         try {
           strapi2.log.info(`[Content Releases] Starting to publish release ${lockedRelease.name}`);
-          const { collectionTypeActions, singleTypeActions } = await getFormattedActions(
-            releaseId
-          );
+          const { collectionTypeActions, singleTypeActions } = await getFormattedActions(releaseId);
           await strapi2.db.transaction(async () => {
             for (const { uid, action, id } of singleTypeActions) {
               await publishSingleTypeAction(uid, action, id);
@@ -1158,7 +1161,8 @@ const createReleaseValidationService = ({ strapi: strapi2 }) => ({
     }
   },
   async validatePendingReleasesLimit() {
-    const maximumPendingReleases = strapi2.ee.features.get("cms-content-releases")?.options?.maximumReleases || 3;
+    const featureCfg = strapi2.ee.features.get("cms-content-releases");
+    const maximumPendingReleases = typeof featureCfg === "object" && featureCfg?.options?.maximumReleases || 3;
     const [, pendingReleasesCount] = await strapi2.db.query(RELEASE_MODEL_UID).findWithCount({
       filters: {
         releasedAt: {
@@ -1201,7 +1205,7 @@ const createSchedulingService = ({ strapi: strapi2 }) => {
       }
       const job = nodeSchedule.scheduleJob(scheduleDate, async () => {
         try {
-          await getService("release").publish(releaseId);
+          await getService("release", { strapi: strapi2 }).publish(releaseId);
         } catch (error) {
         }
         this.cancel(releaseId);
@@ -1271,7 +1275,7 @@ const RELEASE_SCHEMA = yup__namespace.object().shape({
 const validateRelease = utils.validateYupSchema(RELEASE_SCHEMA);
 const releaseController = {
   async findMany(ctx) {
-    const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
+    const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
       ability: ctx.state.userAbility,
       model: RELEASE_MODEL_UID
     });
@@ -1321,7 +1325,7 @@ const releaseController = {
     });
     const sanitizedRelease = {
       ...release2,
-      createdBy: release2.createdBy ? strapi.admin.services.user.sanitizeUser(release2.createdBy) : null
+      createdBy: release2.createdBy ? strapi.service("admin::user").sanitizeUser(release2.createdBy) : null
     };
     const data = {
       ...sanitizedRelease,
@@ -1333,19 +1337,48 @@ const releaseController = {
     };
     ctx.body = { data };
   },
+  async mapEntriesToReleases(ctx) {
+    const { contentTypeUid, entriesIds } = ctx.query;
+    if (!contentTypeUid || !entriesIds) {
+      throw new utils.errors.ValidationError("Missing required query parameters");
+    }
+    const releaseService = getService("release", { strapi });
+    const releasesWithActions = await releaseService.findManyWithContentTypeEntryAttached(
+      contentTypeUid,
+      entriesIds
+    );
+    const mappedEntriesInReleases = releasesWithActions.reduce(
+      // TODO: Fix for v5 removed mappedEntriedToRelease
+      (acc, release2) => {
+        release2.actions.forEach((action) => {
+          if (!acc[action.entry.id]) {
+            acc[action.entry.id] = [{ id: release2.id, name: release2.name }];
+          } else {
+            acc[action.entry.id].push({ id: release2.id, name: release2.name });
+          }
+        });
+        return acc;
+      },
+      // TODO: Fix for v5 removed mappedEntriedToRelease
+      {}
+    );
+    ctx.body = {
+      data: mappedEntriesInReleases
+    };
+  },
   async create(ctx) {
     const user = ctx.state.user;
     const releaseArgs = ctx.request.body;
     await validateRelease(releaseArgs);
     const releaseService = getService("release", { strapi });
     const release2 = await releaseService.create(releaseArgs, { user });
-    const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
+    const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
       ability: ctx.state.userAbility,
       model: RELEASE_MODEL_UID
     });
-    ctx.body = {
+    ctx.created({
       data: await permissionsManager.sanitizeOutput(release2)
-    };
+    });
   },
   async update(ctx) {
     const user = ctx.state.user;
@@ -1354,7 +1387,7 @@ const releaseController = {
     await validateRelease(releaseArgs);
     const releaseService = getService("release", { strapi });
     const release2 = await releaseService.update(id, releaseArgs, { user });
-    const permissionsManager = strapi.admin.services.permission.createPermissionsManager({
+    const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
       ability: ctx.state.userAbility,
       model: RELEASE_MODEL_UID
     });
@@ -1418,9 +1451,9 @@ const releaseActionController = {
     await validateReleaseAction(releaseActionArgs);
     const releaseService = getService("release", { strapi });
     const releaseAction2 = await releaseService.createAction(releaseId, releaseActionArgs);
-    ctx.body = {
+    ctx.created({
       data: releaseAction2
-    };
+    });
   },
   async createMany(ctx) {
     const releaseId = ctx.params.releaseId;
@@ -1446,17 +1479,17 @@ const releaseActionController = {
       return releaseActions2;
     });
     const newReleaseActions = releaseActions.filter((action) => action !== null);
-    ctx.body = {
+    ctx.created({
       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({
+    const permissionsManager = strapi.service("admin::permission").createPermissionsManager({
       ability: ctx.state.userAbility,
       model: RELEASE_ACTION_MODEL_UID
     });
@@ -1470,7 +1503,7 @@ const releaseActionController = {
       if (acc[action.contentType]) {
         return acc;
       }
-      const contentTypePermissionsManager = strapi.admin.services.permission.createPermissionsManager({
+      const contentTypePermissionsManager = strapi.service("admin::permission").createPermissionsManager({
         ability: ctx.state.userAbility,
         model: action.contentType
       });
@@ -1522,6 +1555,22 @@ const controllers = { release: releaseController, "release-action": releaseActio
 const release = {
   type: "admin",
   routes: [
+    {
+      method: "GET",
+      path: "/mapEntriesToReleases",
+      handler: "release.mapEntriesToReleases",
+      config: {
+        policies: [
+          "admin::isAuthenticatedAdmin",
+          {
+            name: "admin::hasPermissions",
+            config: {
+              actions: ["plugin::content-releases.read"]
+            }
+          }
+        ]
+      }
+    },
     {
       method: "POST",
       path: "/",