@strapi/review-workflows 0.0.0-experimental.fdacf4285d1cada9d94ab4dcd756c5362cba1b54 → 0.0.0-next.185e16fdc3e6f1895610ab73932bc3f044bb59e9

package/dist/server/index.mjs

@@ -6562,8 +6562,40 @@ function extendReviewWorkflowContentTypes({ strapi: strapi2 }) {
     });
   }
 }
+function persistRWOnDowngrade({ strapi: strapi2 }) {
+  const { removePersistedTablesWithSuffix, persistTables } = getAdminService("persist-tables");
+  return async ({ contentTypes: contentTypes2 }) => {
+    const getStageTableToPersist = (contentTypeUID) => {
+      const { attributes, tableName } = strapi2.db.metadata.get(contentTypeUID);
+      const joinTableName = attributes[ENTITY_STAGE_ATTRIBUTE].joinTable.name;
+      return {
+        name: joinTableName,
+        dependsOn: [{ name: tableName }]
+      };
+    };
+    const getAssigneeTableToPersist = (contentTypeUID) => {
+      const { attributes, tableName } = strapi2.db.metadata.get(contentTypeUID);
+      const joinTableName = attributes[ENTITY_ASSIGNEE_ATTRIBUTE].joinTable.name;
+      return {
+        name: joinTableName,
+        dependsOn: [{ name: tableName }]
+      };
+    };
+    const enabledRWContentTypes = fp.pipe([
+      getVisibleContentTypesUID,
+      fp.filter((uid) => hasStageAttribute(contentTypes2[uid]))
+    ])(contentTypes2);
+    const stageJoinTablesToPersist = enabledRWContentTypes.map(getStageTableToPersist);
+    await removePersistedTablesWithSuffix("_strapi_stage_lnk");
+    await persistTables(stageJoinTablesToPersist);
+    const assigneeJoinTablesToPersist = enabledRWContentTypes.map(getAssigneeTableToPersist);
+    await removePersistedTablesWithSuffix("_strapi_assignee_lnk");
+    await persistTables(assigneeJoinTablesToPersist);
+  };
+}
 const register = async ({ strapi: strapi2 }) => {
   strapi2.hook("strapi::content-types.beforeSync").register(migrateStageAttribute);
+  strapi2.hook("strapi::content-types.afterSync").register(persistRWOnDowngrade({ strapi: strapi2 }));
   strapi2.hook("strapi::content-types.afterSync").register(migrateReviewWorkflowStagesColor).register(migrateReviewWorkflowStagesRoles).register(migrateReviewWorkflowName).register(migrateWorkflowsContentTypes).register(migrateDeletedCTInWorkflows);
   reviewWorkflowsMiddlewares.contentTypeMiddleware(strapi2);
   extendReviewWorkflowContentTypes({ strapi: strapi2 });
@@ -7064,8 +7096,12 @@ const workflows$1 = ({ strapi: strapi2 }) => {
             stageId: stages2[0].id
           });
         }
-        metrics.sendDidCreateWorkflow();
-        return strapi2.db.query(WORKFLOW_MODEL_UID).create(strapi2.get("query-params").transform(WORKFLOW_MODEL_UID, createOpts));
+        const createdWorkflow = await strapi2.db.query(WORKFLOW_MODEL_UID).create(strapi2.get("query-params").transform(WORKFLOW_MODEL_UID, createOpts));
+        metrics.sendDidCreateWorkflow(createdWorkflow.id, !!opts.data.stageRequiredToPublishName);
+        if (opts.data.stageRequiredToPublishName) {
+          await strapi2.plugin("content-releases").service("release-action").validateActionsByContentTypes(opts.data.contentTypes);
+        }
+        return createdWorkflow;
       });
     },
     /**
@@ -7116,12 +7152,17 @@ const workflows$1 = ({ strapi: strapi2 }) => {
             stageId: updatedStageIds ? updatedStageIds[0] : workflow2.stages[0].id
           });
         }
-        metrics.sendDidEditWorkflow();
+        metrics.sendDidEditWorkflow(workflow2.id, !!opts.data.stageRequiredToPublishName);
         const query = strapi2.get("query-params").transform(WORKFLOW_MODEL_UID, updateOpts);
-        return strapi2.db.query(WORKFLOW_MODEL_UID).update({
+        const updatedWorkflow = await strapi2.db.query(WORKFLOW_MODEL_UID).update({
           ...query,
           where: { id: workflow2.id }
         });
+        await strapi2.plugin("content-releases").service("release-action").validateActionsByContentTypes([
+          ...workflow2.contentTypes,
+          ...opts.data.contentTypes || []
+        ]);
+        return updatedWorkflow;
       });
     },
     /**
@@ -7144,10 +7185,12 @@ const workflows$1 = ({ strapi: strapi2 }) => {
           destContentTypes: []
         });
         const query = strapi2.get("query-params").transform(WORKFLOW_MODEL_UID, opts);
-        return strapi2.db.query(WORKFLOW_MODEL_UID).delete({
+        const deletedWorkflow = await strapi2.db.query(WORKFLOW_MODEL_UID).delete({
           ...query,
           where: { id: workflow2.id }
         });
+        await strapi2.plugin("content-releases").service("release-action").validateActionsByContentTypes(workflow2.contentTypes);
+        return deletedWorkflow;
       });
     },
     /**
@@ -7359,8 +7402,9 @@ const stages$1 = ({ strapi: strapi2 }) => {
     /**
      * Update the stage of an entity
      */
-    async updateEntity(documentId, locale, model, stageId) {
+    async updateEntity(entityToUpdate, model, stageId) {
       const stage = await this.findById(stageId);
+      const { documentId, locale } = entityToUpdate;
       await workflowValidator.validateWorkflowCount();
       if (!stage) {
         throw new ApplicationError$2(`Selected stage does not exist`);
@@ -7368,9 +7412,15 @@ 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]
       });
+      const { tableName } = strapi2.db.metadata.get(model);
+      await strapi2.db.connection(tableName).where({ id: entityToUpdate.id }).update({
+        updated_at: new Date(entityToUpdate.updatedAt)
+      });
       metrics.sendDidChangeEntryStage();
       return entity;
     },
@@ -7517,32 +7567,28 @@ const assignees$1 = ({ strapi: strapi2 }) => {
     /**
      * Update the assignee of an entity
      */
-    async updateEntityAssignee(documentId, locale, model, assigneeId) {
-      if (fp.isNil(assigneeId)) {
-        return this.deleteEntityAssignee(documentId, locale, model);
-      }
-      const userExists = await getAdminService("user", { strapi: strapi2 }).exists({ id: assigneeId });
-      if (!userExists) {
-        throw new ApplicationError(`Selected user does not exist`);
+    async updateEntityAssignee(entityToUpdate, model, assigneeId) {
+      const { documentId, locale } = entityToUpdate;
+      if (!fp.isNil(assigneeId)) {
+        const userExists = await getAdminService("user", { strapi: strapi2 }).exists({ id: assigneeId });
+        if (!userExists) {
+          throw new ApplicationError(`Selected user does not exist`);
+        }
       }
-      metrics.sendDidEditAssignee(await this.findEntityAssigneeId(documentId, model), assigneeId);
-      return strapi2.documents(model).update({
+      const oldAssigneeId = await this.findEntityAssigneeId(entityToUpdate.id, model);
+      metrics.sendDidEditAssignee(oldAssigneeId, assigneeId || null);
+      const entity = await strapi2.documents(model).update({
         documentId,
         locale,
-        data: { [ENTITY_ASSIGNEE_ATTRIBUTE]: assigneeId },
+        data: { [ENTITY_ASSIGNEE_ATTRIBUTE]: assigneeId || null },
         populate: [ENTITY_ASSIGNEE_ATTRIBUTE],
         fields: []
       });
-    },
-    async deleteEntityAssignee(documentId, locale, model) {
-      metrics.sendDidEditAssignee(await this.findEntityAssigneeId(documentId, model), null);
-      return strapi2.documents(model).update({
-        documentId,
-        locale,
-        data: { [ENTITY_ASSIGNEE_ATTRIBUTE]: null },
-        populate: [ENTITY_ASSIGNEE_ATTRIBUTE],
-        fields: []
+      const { tableName } = strapi2.db.metadata.get(model);
+      await strapi2.db.connection(tableName).where({ id: entityToUpdate.id }).update({
+        updated_at: new Date(entityToUpdate.updatedAt)
       });
+      return entity;
     }
   };
 };
@@ -7615,11 +7661,11 @@ const sendDidDeleteStage = async () => {
 const sendDidChangeEntryStage = async () => {
   strapi.telemetry.send("didChangeEntryStage", {});
 };
-const sendDidCreateWorkflow = async () => {
-  strapi.telemetry.send("didCreateWorkflow", {});
+const sendDidCreateWorkflow = async (workflowId, hasRequiredStageToPublish) => {
+  strapi.telemetry.send("didCreateWorkflow", { workflowId, hasRequiredStageToPublish });
 };
-const sendDidEditWorkflow = async () => {
-  strapi.telemetry.send("didEditWorkflow", {});
+const sendDidEditWorkflow = async (workflowId, hasRequiredStageToPublish) => {
+  strapi.telemetry.send("didEditWorkflow", { workflowId, hasRequiredStageToPublish });
 };
 const sendDidEditAssignee = async (fromId, toId) => {
   strapi.telemetry.send("didEditAssignee", { from: fromId, to: toId });
@@ -7644,13 +7690,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 +7831,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
+        }
+      });
     }
   };
 };
@@ -8147,12 +8198,7 @@ const stages = {
     );
     const workflow2 = await workflowService.assertContentTypeBelongsToWorkflow(modelUID);
     workflowService.assertStageBelongsToWorkflow(stageId, workflow2);
-    const updatedEntity = await stagesService.updateEntity(
-      entity.documentId,
-      entity.locale,
-      modelUID,
-      stageId
-    );
+    const updatedEntity = await stagesService.updateEntity(entity, modelUID, stageId);
     ctx.body = { data: await sanitizeOutput(updatedEntity) };
   },
   /**
@@ -8249,12 +8295,7 @@ const assignees = {
       "You should pass a valid id to the body of the put request."
     );
     await workflowService.assertContentTypeBelongsToWorkflow(model);
-    const updatedEntity = await assigneeService.updateEntityAssignee(
-      documentId,
-      locale || null,
-      model,
-      assigneeId
-    );
+    const updatedEntity = await assigneeService.updateEntityAssignee(entity, model, assigneeId);
     ctx.body = { data: await sanitizeOutput(updatedEntity) };
   }
 };