@strapi/review-workflows 0.0.0-experimental.fdacf4285d1cada9d94ab4dcd756c5362cba1b54 → 0.0.0-next.20afc21f5d54593dc724202ebca562df76601077

package/dist/_chunks/{router-C8mPPFJk.js → router-BOXlNnrU.js}

@@ -4,10 +4,10 @@ const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
 const reactRouterDom = require("react-router-dom");
 const ProtectedListPage = React.lazy(
-  () => Promise.resolve().then(() => require("./index-p25R0AkB.js")).then((mod) => ({ default: mod.ProtectedListPage }))
+  () => Promise.resolve().then(() => require("./index-B8WmHbCU.js")).then((mod) => ({ default: mod.ProtectedListPage }))
 );
 const ProtectedEditPage = React.lazy(
-  () => Promise.resolve().then(() => require("./_id-PmPKIqUm.js")).then((mod) => ({ default: mod.ProtectedEditPage }))
+  () => Promise.resolve().then(() => require("./id-CmtaTf1x.js")).then((mod) => ({ default: mod.ProtectedEditPage }))
 );
 const routes = [
   {
@@ -21,4 +21,4 @@ const routes = [
 ];
 const Router = () => /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Routes, { children: routes.map((route) => /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Route, { ...route }, route.path)) });
 exports.Router = Router;
-//# sourceMappingURL=router-C8mPPFJk.js.map
+//# sourceMappingURL=router-BOXlNnrU.js.map

package/dist/_chunks/router-BOXlNnrU.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"router-BOXlNnrU.js","sources":["../../admin/src/router.tsx"],"sourcesContent":["/* eslint-disable check-file/filename-naming-convention */\nimport { lazy } from 'react';\n\nimport { Routes, Route, PathRouteProps } from 'react-router-dom';\n\nconst ProtectedListPage = lazy(() =>\n  import('./routes/settings').then((mod) => ({ default: mod.ProtectedListPage }))\n);\nconst ProtectedEditPage = lazy(() =>\n  import('./routes/settings/id').then((mod) => ({ default: mod.ProtectedEditPage }))\n);\n\nconst routes: PathRouteProps[] = [\n  {\n    path: '/',\n    Component: ProtectedListPage,\n  },\n  {\n    path: ':id',\n    Component: ProtectedEditPage,\n  },\n];\n\nconst Router = () => (\n  <Routes>\n    {routes.map((route) => (\n      <Route key={route.path} {...route} />\n    ))}\n  </Routes>\n);\n\nexport { Router };\n"],"names":["lazy","jsx","Routes","Route"],"mappings":";;;;;AAKA,MAAM,oBAAoBA,MAAA;AAAA,EAAK,MAC7B,QAAO,QAAA,EAAA,KAAA,MAAA,QAAA,qBAAmB,GAAE,KAAK,CAAC,SAAS,EAAE,SAAS,IAAI,kBAAA,EAAoB;AAChF;AACA,MAAM,oBAAoBA,MAAA;AAAA,EAAK,MAC7B,QAAO,QAAA,EAAA,KAAA,MAAA,QAAA,kBAAsB,GAAE,KAAK,CAAC,SAAS,EAAE,SAAS,IAAI,kBAAA,EAAoB;AACnF;AAEA,MAAM,SAA2B;AAAA,EAC/B;AAAA,IACE,MAAM;AAAA,IACN,WAAW;AAAA,EACb;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,WAAW;AAAA,EACb;AACF;AAEA,MAAM,SAAS,MACZC,2BAAAA,IAAAC,eAAAA,QAAA,EACE,iBAAO,IAAI,CAAC,UACXD,2BAAA,IAACE,wBAAwB,GAAG,MAAA,GAAhB,MAAM,IAAiB,CACpC,EACH,CAAA;;"}

package/dist/_chunks/{router-DJCVv74P.mjs → router-Jdt6SbIA.mjs}

@@ -2,10 +2,10 @@ import { jsx } from "react/jsx-runtime";
 import { lazy } from "react";
 import { Routes, Route } from "react-router-dom";
 const ProtectedListPage = lazy(
-  () => import("./index-DJtnx2X1.mjs").then((mod) => ({ default: mod.ProtectedListPage }))
+  () => import("./index-CA5Axcoc.mjs").then((mod) => ({ default: mod.ProtectedListPage }))
 );
 const ProtectedEditPage = lazy(
-  () => import("./_id-Dt2oEiro.mjs").then((mod) => ({ default: mod.ProtectedEditPage }))
+  () => import("./id-DV0Ndeav.mjs").then((mod) => ({ default: mod.ProtectedEditPage }))
 );
 const routes = [
   {
@@ -21,4 +21,4 @@ const Router = () => /* @__PURE__ */ jsx(Routes, { children: routes.map((route)
 export {
   Router
 };
-//# sourceMappingURL=router-DJCVv74P.mjs.map
+//# sourceMappingURL=router-Jdt6SbIA.mjs.map

package/dist/_chunks/router-Jdt6SbIA.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"router-Jdt6SbIA.mjs","sources":["../../admin/src/router.tsx"],"sourcesContent":["/* eslint-disable check-file/filename-naming-convention */\nimport { lazy } from 'react';\n\nimport { Routes, Route, PathRouteProps } from 'react-router-dom';\n\nconst ProtectedListPage = lazy(() =>\n  import('./routes/settings').then((mod) => ({ default: mod.ProtectedListPage }))\n);\nconst ProtectedEditPage = lazy(() =>\n  import('./routes/settings/id').then((mod) => ({ default: mod.ProtectedEditPage }))\n);\n\nconst routes: PathRouteProps[] = [\n  {\n    path: '/',\n    Component: ProtectedListPage,\n  },\n  {\n    path: ':id',\n    Component: ProtectedEditPage,\n  },\n];\n\nconst Router = () => (\n  <Routes>\n    {routes.map((route) => (\n      <Route key={route.path} {...route} />\n    ))}\n  </Routes>\n);\n\nexport { Router };\n"],"names":[],"mappings":";;;AAKA,MAAM,oBAAoB;AAAA,EAAK,MAC7B,OAAO,sBAAmB,EAAE,KAAK,CAAC,SAAS,EAAE,SAAS,IAAI,kBAAA,EAAoB;AAChF;AACA,MAAM,oBAAoB;AAAA,EAAK,MAC7B,OAAO,mBAAsB,EAAE,KAAK,CAAC,SAAS,EAAE,SAAS,IAAI,kBAAA,EAAoB;AACnF;AAEA,MAAM,SAA2B;AAAA,EAC/B;AAAA,IACE,MAAM;AAAA,IACN,WAAW;AAAA,EACb;AAAA,EACA;AAAA,IACE,MAAM;AAAA,IACN,WAAW;AAAA,EACb;AACF;AAEA,MAAM,SAAS,MACZ,oBAAA,QAAA,EACE,iBAAO,IAAI,CAAC,UACX,oBAAC,SAAwB,GAAG,MAAA,GAAhB,MAAM,IAAiB,CACpC,EACH,CAAA;"}

package/dist/admin/index.js

@@ -1,4 +1,4 @@
 "use strict";
-const index = require("../_chunks/index-DiWo3Pu2.js");
+const index = require("../_chunks/index-BCUO98DV.js");
 module.exports = index.admin;
 //# sourceMappingURL=index.js.map

package/dist/admin/index.mjs

@@ -1,4 +1,4 @@
-import { h } from "../_chunks/index-IZXxuQ4h.mjs";
+import { h } from "../_chunks/index-CqYVkW3E.mjs";
 export {
   h as default
 };

package/dist/admin/src/services/settings.d.ts

@@ -1727,17 +1727,13 @@ declare const useGetWorkflowsQuery: import("@reduxjs/toolkit/dist/query/react/bu
         }) | undefined;
     } & import("@strapi/types/dist/modules/entity-service/params/filters").AbstractAttributesFiltering<"admin::review-workflow">) | undefined;
 } & {
-    populate?: import("@strapi/types/dist/modules/entity-service/params/populate").ArrayNotation<"admin::review-workflow"> | undefined;
+    populate?: string | undefined;
 }), import("@reduxjs/toolkit/query").BaseQueryFn<string | import("@strapi/admin/strapi-admin").QueryArguments, unknown, import("@strapi/admin/strapi-admin").BaseQueryError, {}, {}>, "ReviewWorkflow" | "ReviewWorkflowStages" | "Document" | "ContentTypeSettings", {
     workflows: GetAll.Response['data'];
     meta?: GetAll.Response['meta'];
 }, "adminApi">>, useCreateWorkflowMutation: import("@reduxjs/toolkit/dist/query/react/buildHooks").UseMutation<import("@reduxjs/toolkit/query").MutationDefinition<{
-    data: Omit<import("../../../shared/contracts/review-workflows").Workflow, "id" | "createdAt" | "updatedAt"> & {
-        stageRequiredToPublishName?: string | null | undefined;
-    };
+    data: Omit<import("../../../shared/contracts/review-workflows").Workflow, "id" | "createdAt" | "updatedAt">;
 }, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("@strapi/admin/strapi-admin").QueryArguments, unknown, import("@strapi/admin/strapi-admin").BaseQueryError, {}, {}>, "ReviewWorkflow" | "ReviewWorkflowStages" | "Document" | "ContentTypeSettings", import("../../../shared/contracts/review-workflows").Workflow, "adminApi">>, useDeleteWorkflowMutation: import("@reduxjs/toolkit/dist/query/react/buildHooks").UseMutation<import("@reduxjs/toolkit/query").MutationDefinition<Delete.Params, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("@strapi/admin/strapi-admin").QueryArguments, unknown, import("@strapi/admin/strapi-admin").BaseQueryError, {}, {}>, "ReviewWorkflow" | "ReviewWorkflowStages" | "Document" | "ContentTypeSettings", import("../../../shared/contracts/review-workflows").Workflow, "adminApi">>, useUpdateWorkflowMutation: import("@reduxjs/toolkit/dist/query/react/buildHooks").UseMutation<import("@reduxjs/toolkit/query").MutationDefinition<{
-    data: Partial<Omit<import("../../../shared/contracts/review-workflows").Workflow, "stageRequiredToPublish">> & {
-        stageRequiredToPublishName?: string | null | undefined;
-    };
+    data: Partial<import("../../../shared/contracts/review-workflows").Workflow>;
 } & Update.Params, import("@reduxjs/toolkit/query").BaseQueryFn<string | import("@strapi/admin/strapi-admin").QueryArguments, unknown, import("@strapi/admin/strapi-admin").BaseQueryError, {}, {}>, "ReviewWorkflow" | "ReviewWorkflowStages" | "Document" | "ContentTypeSettings", import("../../../shared/contracts/review-workflows").Workflow, "adminApi">>;
 export { useGetWorkflowsQuery, useCreateWorkflowMutation, useDeleteWorkflowMutation, useUpdateWorkflowMutation, type GetWorkflowsParams, };

package/dist/server/index.js

@@ -6387,8 +6387,7 @@ const WORKFLOW_POPULATE = {
         }
       }
     }
-  },
-  stageRequiredToPublish: true
+  }
 };
 function checkVersionThreshold(startVersion, currentVersion, thresholdVersion) {
   return semver$1.gte(currentVersion, thresholdVersion) && semver$1.lt(startVersion, thresholdVersion);
@@ -6609,12 +6608,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,
@@ -6764,7 +6757,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 }) => {
 };
@@ -6997,9 +6989,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 });
@@ -7050,15 +7042,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 utils.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,
@@ -7079,7 +7062,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 () => {
@@ -7088,28 +7070,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 utils.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,
@@ -7369,7 +7332,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();
@@ -7645,13 +7610,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) {
@@ -7786,7 +7751,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
+        }
+      });
     }
   };
 };
@@ -7868,27 +7838,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 utils.errors.ValidationError("Entry is not at the required stage to publish");
-  }
-  return next();
-};
 const documentServiceMiddleware = () => ({
   assignStageOnCreate,
-  handleStageOnUpdate,
-  checkStageBeforePublish
+  handleStageOnUpdate
 });
 const services = {
   workflows: workflows$1,
@@ -7938,14 +7890,12 @@ const validateContentTypes = utils.yup.array().of(
 const validateWorkflowCreateSchema = utils.yup.object().shape({
   name: utils.yup.string().max(255).min(1, "Workflow name can not be empty").required(),
   stages: utils.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: utils.yup.string().min(1).nullable()
+  contentTypes: validateContentTypes
 });
 const validateWorkflowUpdateSchema = utils.yup.object().shape({
   name: utils.yup.string().max(255).min(1, "Workflow name can not be empty"),
   stages: utils.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: utils.yup.string().min(1).nullable()
+  contentTypes: validateContentTypes
 });
 const validateUpdateAssigneeOnEntitySchema = utils.yup.object().shape({
   id: utils.yup.number().integer().min(1).nullable()