@strapi/review-workflows 0.0.0-experimental.fdacf4285d1cada9d94ab4dcd756c5362cba1b54 → 0.0.0-next.3c5400321681b66eb35ab84c11113a78c1d9386e

package/dist/server/index.mjs

@@ -6386,8 +6386,7 @@ const WORKFLOW_POPULATE = {
         }
       }
     }
-  },
-  stageRequiredToPublish: true
+  }
 };
 function checkVersionThreshold(startVersion, currentVersion, thresholdVersion) {
   return semver$1.gte(currentVersion, thresholdVersion) && semver$1.lt(startVersion, thresholdVersion);
@@ -6608,12 +6607,6 @@ const workflow = {
         relation: "oneToMany",
         mappedBy: "workflow"
       },
-      stageRequiredToPublish: {
-        type: "relation",
-        target: "plugin::review-workflows.workflow-stage",
-        relation: "oneToOne",
-        required: false
-      },
       contentTypes: {
         type: "json",
         required: true,
@@ -6763,7 +6756,6 @@ const bootstrap = async (args) => {
   const docsMiddlewares = getService("document-service-middlewares");
   strapi.documents.use(docsMiddlewares.assignStageOnCreate);
   strapi.documents.use(docsMiddlewares.handleStageOnUpdate);
-  strapi.documents.use(docsMiddlewares.checkStageBeforePublish);
 };
 const destroy = async ({ strapi: strapi2 }) => {
 };
@@ -6996,9 +6988,9 @@ const processFilters = ({ strapi: strapi2 }, filters = {}) => {
 };
 const processPopulate = (populate) => {
   if (!populate) {
-    return WORKFLOW_POPULATE;
+    return populate;
   }
-  return populate;
+  return WORKFLOW_POPULATE;
 };
 const workflows$1 = ({ strapi: strapi2 }) => {
   const workflowsContentTypes = workflowsContentTypesFactory({ strapi: strapi2 });
@@ -7049,15 +7041,6 @@ const workflows$1 = ({ strapi: strapi2 }) => {
         const stages2 = await getService("stages", { strapi: strapi2 }).createMany(opts.data.stages);
         const mapIds = fp.map(fp.get("id"));
         createOpts = fp.set("data.stages", mapIds(stages2), createOpts);
-        if (opts.data.stageRequiredToPublishName) {
-          const stageRequiredToPublish = stages2.find(
-            (stage) => stage.name === opts.data.stageRequiredToPublishName
-          );
-          if (!stageRequiredToPublish) {
-            throw new errors.ApplicationError("Stage required to publish does not exist");
-          }
-          createOpts = fp.set("data.stageRequiredToPublish", stageRequiredToPublish.id, createOpts);
-        }
         if (opts.data.contentTypes) {
           await workflowsContentTypes.migrate({
             destContentTypes: opts.data.contentTypes,
@@ -7078,7 +7061,6 @@ const workflows$1 = ({ strapi: strapi2 }) => {
     async update(workflow2, opts) {
       const stageService = getService("stages", { strapi: strapi2 });
       let updateOpts = { ...opts, populate: { ...WORKFLOW_POPULATE } };
-      let updatedStages = [];
       let updatedStageIds;
       await workflowValidator.validateWorkflowCount();
       return strapi2.db.transaction(async () => {
@@ -7087,28 +7069,9 @@ const workflows$1 = ({ strapi: strapi2 }) => {
           opts.data.stages.forEach(
             (stage) => this.assertStageBelongsToWorkflow(stage.id, workflow2)
           );
-          updatedStages = await stageService.replaceStages(
-            workflow2.stages,
-            opts.data.stages,
-            workflow2.contentTypes
-          );
-          updatedStageIds = updatedStages.map((stage) => stage.id);
+          updatedStageIds = await stageService.replaceStages(workflow2.stages, opts.data.stages, workflow2.contentTypes).then((stages2) => stages2.map((stage) => stage.id));
           updateOpts = fp.set("data.stages", updatedStageIds, updateOpts);
         }
-        if (opts.data.stageRequiredToPublishName !== void 0) {
-          const stages2 = updatedStages ?? workflow2.stages;
-          if (opts.data.stageRequiredToPublishName === null) {
-            updateOpts = fp.set("data.stageRequiredToPublish", null, updateOpts);
-          } else {
-            const stageRequiredToPublish = stages2.find(
-              (stage) => stage.name === opts.data.stageRequiredToPublishName
-            );
-            if (!stageRequiredToPublish) {
-              throw new errors.ApplicationError("Stage required to publish does not exist");
-            }
-            updateOpts = fp.set("data.stageRequiredToPublish", stageRequiredToPublish.id, updateOpts);
-          }
-        }
         if (opts.data.contentTypes) {
           await workflowsContentTypes.migrate({
             srcContentTypes: workflow2.contentTypes,
@@ -7368,7 +7331,9 @@ const stages$1 = ({ strapi: strapi2 }) => {
       const entity = await strapi2.documents(model).update({
         documentId,
         locale,
-        data: { [ENTITY_STAGE_ATTRIBUTE]: stage },
+        // Stage doesn't have DP or i18n enabled, connecting it through the `id`
+        // will be safer than relying on the `documentId` + `locale` + `status` transformation
+        data: { [ENTITY_STAGE_ATTRIBUTE]: fp.pick(["id"], stage) },
         populate: [ENTITY_STAGE_ATTRIBUTE]
       });
       metrics.sendDidChangeEntryStage();
@@ -7644,13 +7609,13 @@ const reviewWorkflowsMetrics = {
   sendDidSendReviewWorkflowPropertiesOnceAWeek,
   sendDidEditAssignee
 };
-function _typeof(obj) {
+function _typeof(o) {
   "@babel/helpers - typeof";
-  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(obj2) {
-    return typeof obj2;
-  } : function(obj2) {
-    return obj2 && "function" == typeof Symbol && obj2.constructor === Symbol && obj2 !== Symbol.prototype ? "symbol" : typeof obj2;
-  }, _typeof(obj);
+  return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o2) {
+    return typeof o2;
+  } : function(o2) {
+    return o2 && "function" == typeof Symbol && o2.constructor === Symbol && o2 !== Symbol.prototype ? "symbol" : typeof o2;
+  }, _typeof(o);
 }
 function toInteger(dirtyNumber) {
   if (dirtyNumber === null || dirtyNumber === true || dirtyNumber === false) {
@@ -7785,7 +7750,12 @@ const reviewWorkflowsWeeklyMetrics = ({ strapi: strapi2 }) => {
     },
     async registerCron() {
       const weeklySchedule = await this.ensureWeeklyStoredCronSchedule();
-      strapi2.cron.add({ [weeklySchedule]: this.sendMetrics.bind(this) });
+      strapi2.cron.add({
+        reviewWorkflowsWeekly: {
+          task: this.sendMetrics.bind(this),
+          options: weeklySchedule
+        }
+      });
     }
   };
 };
@@ -7867,27 +7837,9 @@ const handleStageOnUpdate = async (ctx, next) => {
   }
   return next();
 };
-const checkStageBeforePublish = async (ctx, next) => {
-  if (ctx.action !== "publish") {
-    return next();
-  }
-  const workflow2 = await getService("workflows").getAssignedWorkflow(ctx.contentType.uid, {
-    populate: "stageRequiredToPublish"
-  });
-  if (!workflow2 || !workflow2.stageRequiredToPublish) {
-    return next();
-  }
-  const { documentId } = ctx.params;
-  const entryStage = await getEntityStage(ctx.contentType.uid, documentId, ctx.params);
-  if (entryStage.id !== workflow2.stageRequiredToPublish.id) {
-    throw new errors.ValidationError("Entry is not at the required stage to publish");
-  }
-  return next();
-};
 const documentServiceMiddleware = () => ({
   assignStageOnCreate,
-  handleStageOnUpdate,
-  checkStageBeforePublish
+  handleStageOnUpdate
 });
 const services = {
   workflows: workflows$1,
@@ -7937,14 +7889,12 @@ const validateContentTypes = yup.array().of(
 const validateWorkflowCreateSchema = yup.object().shape({
   name: yup.string().max(255).min(1, "Workflow name can not be empty").required(),
   stages: yup.array().of(stageObject).uniqueProperty("name", "Stage name must be unique").min(1, "Can not create a workflow without stages").max(200, "Can not have more than 200 stages").required("Can not create a workflow without stages"),
-  contentTypes: validateContentTypes,
-  stageRequiredToPublishName: yup.string().min(1).nullable()
+  contentTypes: validateContentTypes
 });
 const validateWorkflowUpdateSchema = yup.object().shape({
   name: yup.string().max(255).min(1, "Workflow name can not be empty"),
   stages: yup.array().of(stageObject).uniqueProperty("name", "Stage name must be unique").min(1, "Can not update a workflow without stages").max(200, "Can not have more than 200 stages"),
-  contentTypes: validateContentTypes,
-  stageRequiredToPublishName: yup.string().min(1).nullable()
+  contentTypes: validateContentTypes
 });
 const validateUpdateAssigneeOnEntitySchema = yup.object().shape({
   id: yup.number().integer().min(1).nullable()