feat(review-workflows): remove deleted content-types in assigned workflows (#17053)

* feat(review-workflows): migrate old to new stage attribute name

* feat(reviewWorkflows): remove ct from workflows when deleted

* fix(operators): re-add $jsonSupersetOf to available operators

packages/core/admin/ee/server/migrations/review-workflows-deleted-ct-in-workflows.js

@@ -0,0 +1,39 @@
+'use strict';
+
+const { difference, keys } = require('lodash/fp');
+const { mapAsync } = require('@strapi/utils');
+const { WORKFLOW_MODEL_UID } = require('../constants/workflows');
+const { getWorkflowContentTypeFilter } = require('../utils/review-workflows');
+
+/**
+ * @param {Object} oldContentTypes
+ * @param {Object} contentTypes
+ * @return {Promise<void>}
+ */
+async function migrateDeletedCTInWorkflows({ oldContentTypes, contentTypes }) {
+  const deletedContentTypes = difference(keys(oldContentTypes), keys(contentTypes)) ?? [];
+
+  if (deletedContentTypes.length) {
+    await mapAsync(deletedContentTypes, async (deletedContentTypeUID) => {
+      const workflow = await strapi.query(WORKFLOW_MODEL_UID).findOne({
+        select: ['id', 'contentTypes'],
+        where: {
+          contentTypes: getWorkflowContentTypeFilter({ strapi }, deletedContentTypeUID),
+        },
+      });
+
+      if (workflow) {
+        await strapi.query(WORKFLOW_MODEL_UID).update({
+          where: { id: workflow.id },
+          data: {
+            contentTypes: workflow.contentTypes.filter(
+              (contentTypeUID) => contentTypeUID !== deletedContentTypeUID
+            ),
+          },
+        });
+      }
+    });
+  }
+}
+
+module.exports = migrateDeletedCTInWorkflows;

packages/core/admin/ee/server/register.js

@@ -7,6 +7,7 @@ const migrateReviewWorkflowStagesColor = require('./migrations/review-workflows-
 const migrateReviewWorkflowName = require('./migrations/review-workflows-workflow-name');
 const migrateWorkflowsContentTypes = require('./migrations/review-workflows-content-types');
 const migrateStageAttribute = require('./migrations/review-workflows-stage-attribute');
+const migrateDeletedCTInWorkflows = require('./migrations/review-workflows-deleted-ct-in-workflows');
 const createAuditLogsService = require('./services/audit-logs');
 const reviewWorkflowsMiddlewares = require('./middlewares/review-workflows');
 const { getService } = require('./utils');
@@ -22,9 +23,12 @@ module.exports = async ({ strapi }) => {
   }
   if (features.isEnabled('review-workflows')) {
     strapi.hook('strapi::content-types.beforeSync').register(migrateStageAttribute);
-    strapi.hook('strapi::content-types.afterSync').register(migrateReviewWorkflowStagesColor);
-    strapi.hook('strapi::content-types.afterSync').register(migrateReviewWorkflowName);
-    strapi.hook('strapi::content-types.afterSync').register(migrateWorkflowsContentTypes);
+    strapi
+      .hook('strapi::content-types.afterSync')
+      .register(migrateReviewWorkflowStagesColor)
+      .register(migrateReviewWorkflowName)
+      .register(migrateWorkflowsContentTypes)
+      .register(migrateDeletedCTInWorkflows);
     const reviewWorkflowService = getService('review-workflows');
 
     reviewWorkflowsMiddlewares.contentTypeMiddleware(strapi);

packages/core/admin/ee/server/services/review-workflows/workflows/index.js

@@ -4,20 +4,14 @@ const { set, isString } = require('lodash/fp');
 const { ApplicationError, ValidationError } = require('@strapi/utils').errors;
 const { WORKFLOW_MODEL_UID } = require('../../../constants/workflows');
 const { getService } = require('../../../utils');
+const { getWorkflowContentTypeFilter } = require('../../../utils/review-workflows');
 const workflowsContentTypesFactory = require('./content-types');
 
-const getContentTypeFilter = ({ strapi }, contentType) => {
-  if (strapi.db.dialect.supportsOperator('$jsonSupersetOf')) {
-    return { $jsonSupersetOf: JSON.stringify([contentType]) };
-  }
-  return { $contains: `"${contentType}"` };
-};
-
 const processFilters = ({ strapi }, filters = {}) => {
   const processedFilters = { ...filters };
 
   if (isString(filters.contentTypes)) {
-    processedFilters.contentTypes = getContentTypeFilter({ strapi }, filters.contentTypes);
+    processedFilters.contentTypes = getWorkflowContentTypeFilter({ strapi }, filters.contentTypes);
   }
 
   return processedFilters;
@@ -169,7 +163,7 @@ module.exports = ({ strapi }) => {
     async getAssignedWorkflow(uid, opts = {}) {
       const workflows = await this.find({
         ...opts,
-        filters: { contentTypes: getContentTypeFilter({ strapi }, uid) },
+        filters: { contentTypes: getWorkflowContentTypeFilter({ strapi }, uid) },
       });
       return workflows.length > 0 ? workflows[0] : null;
     },

packages/core/admin/ee/server/utils/review-workflows.js

@@ -16,7 +16,15 @@ const getVisibleContentTypesUID = pipe([
 
 const hasStageAttribute = has(['attributes', ENTITY_STAGE_ATTRIBUTE]);
 
+const getWorkflowContentTypeFilter = ({ strapi }, contentType) => {
+  if (strapi.db.dialect.supportsOperator('$jsonSupersetOf')) {
+    return { $jsonSupersetOf: JSON.stringify([contentType]) };
+  }
+  return { $contains: `"${contentType}"` };
+};
+
 module.exports = {
   getVisibleContentTypesUID,
   hasStageAttribute,
+  getWorkflowContentTypeFilter,
 };

packages/core/utils/lib/operators.js

@@ -24,6 +24,7 @@ const WHERE_OPERATORS = [
   '$notContains',
   '$containsi',
   '$notContainsi',
+  '$jsonSupersetOf',
 ];
 
 const CAST_OPERATORS = [