@strapi/admin 4.7.0-beta.0 → 4.9.0-alpha.0

package/ee/server/content-types/workflow-stage/index.js

@@ -0,0 +1,36 @@
+'use strict';
+
+module.exports = {
+  schema: {
+    collectionName: 'strapi_workflows_stages',
+    info: {
+      name: 'Workflow Stage',
+      description: '',
+      singularName: 'workflow-stage',
+      pluralName: 'workflow-stages',
+      displayName: 'Stages',
+    },
+    options: {},
+    pluginOptions: {
+      'content-manager': {
+        visible: false,
+      },
+      'content-type-builder': {
+        visible: false,
+      },
+    },
+    attributes: {
+      name: {
+        type: 'string',
+        configurable: false,
+      },
+      workflow: {
+        type: 'relation',
+        target: 'admin::workflow',
+        relation: 'manyToOne',
+        inversedBy: 'stages',
+        configurable: false,
+      },
+    },
+  },
+};

package/ee/server/controllers/index.js

@@ -6,4 +6,6 @@ module.exports = {
   role: require('./role'),
   user: require('./user'),
   auditLogs: require('./audit-logs'),
+  workflows: require('./workflows'),
+  stages: require('./workflows/stages'),
 };

package/ee/server/controllers/workflows/index.js

@@ -0,0 +1,36 @@
+'use strict';
+
+const { getService } = require('../../utils');
+
+module.exports = {
+  /**
+   * List all workflows
+   * @param {import('koa').BaseContext} ctx - koa context
+   */
+  async find(ctx) {
+    const { populate } = ctx.query;
+    const workflowService = getService('workflows');
+    const data = await workflowService.find({
+      populate,
+    });
+
+    ctx.body = {
+      data,
+    };
+  },
+  /**
+   * Get one workflow based on its id contained in request parameters
+   * @param {import('koa').BaseContext} ctx - koa context
+   */
+  async findById(ctx) {
+    const { id } = ctx.params;
+    const { populate } = ctx.query;
+
+    const workflowService = getService('workflows');
+    const data = await workflowService.findById(id, { populate });
+
+    ctx.body = {
+      data,
+    };
+  },
+};

package/ee/server/controllers/workflows/stages/index.js

@@ -0,0 +1,57 @@
+'use strict';
+
+const { getService } = require('../../../utils');
+const { validateUpdateStages } = require('../../../validation/review-workflows');
+
+module.exports = {
+  /**
+   * List all stages
+   * @param {import('koa').BaseContext} ctx - koa context
+   */
+  async find(ctx) {
+    const { workflow_id: workflowId } = ctx.params;
+    const { populate } = ctx.query;
+    const stagesService = getService('stages');
+
+    const data = await stagesService.find({
+      workflowId,
+      populate,
+    });
+
+    ctx.body = {
+      data,
+    };
+  },
+  /**
+   * Get one stage
+   * @param {import('koa').BaseContext} ctx - koa context
+   */
+  async findById(ctx) {
+    const { id, workflow_id: workflowId } = ctx.params;
+    const { populate } = ctx.query;
+    const stagesService = getService('stages');
+
+    const data = await stagesService.findById(id, {
+      workflowId,
+      populate,
+    });
+
+    ctx.body = {
+      data,
+    };
+  },
+
+  async replace(ctx) {
+    const { workflow_id: workflowId } = ctx.params;
+    const stagesService = getService('stages');
+    const {
+      body: { data: stages },
+    } = ctx.request;
+
+    const stagesValidated = await validateUpdateStages(stages);
+
+    const data = await stagesService.replaceWorkflowStages(workflowId, stagesValidated);
+
+    ctx.body = { data };
+  },
+};

package/ee/server/index.js

@@ -2,6 +2,7 @@
 
 module.exports = {
   register: require('./register'),
+  contentTypes: require('./content-types'),
   bootstrap: require('./bootstrap'),
   destroy: require('./destroy'),
   routes: require('./routes'),

package/ee/server/routes/index.js

@@ -148,4 +148,91 @@ module.exports = [
       ],
     },
   },
+
+  // Review workflow
+  {
+    method: 'GET',
+    path: '/review-workflows/workflows',
+    handler: 'workflows.find',
+    config: {
+      middlewares: [enableFeatureMiddleware('review-workflows')],
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        {
+          name: 'admin::hasPermissions',
+          config: {
+            actions: ['admin::review-workflows.read'],
+          },
+        },
+      ],
+    },
+  },
+  {
+    method: 'GET',
+    path: '/review-workflows/workflows/:id',
+    handler: 'workflows.findById',
+    config: {
+      middlewares: [enableFeatureMiddleware('review-workflows')],
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        {
+          name: 'admin::hasPermissions',
+          config: {
+            actions: ['admin::review-workflows.read'],
+          },
+        },
+      ],
+    },
+  },
+  {
+    method: 'GET',
+    path: '/review-workflows/workflows/:workflow_id/stages',
+    handler: 'stages.find',
+    config: {
+      middlewares: [enableFeatureMiddleware('review-workflows')],
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        {
+          name: 'admin::hasPermissions',
+          config: {
+            actions: ['admin::review-workflows.read'],
+          },
+        },
+      ],
+    },
+  },
+  {
+    method: 'PUT',
+    path: '/review-workflows/workflows/:workflow_id/stages',
+    handler: 'stages.replace',
+    config: {
+      middlewares: [enableFeatureMiddleware('review-workflows')],
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        {
+          name: 'admin::hasPermissions',
+          config: {
+            actions: ['admin::review-workflows.read'],
+          },
+        },
+      ],
+    },
+  },
+  {
+    method: 'GET',
+    path: '/review-workflows/workflows/:workflow_id/stages/:id',
+    handler: 'stages.findById',
+    config: {
+      middlewares: [enableFeatureMiddleware('review-workflows')],
+      policies: [
+        'admin::isAuthenticatedAdmin',
+        {
+          name: 'admin::hasPermissions',
+          config: {
+            actions: ['admin::review-workflows.read'],
+          },
+        },
+      ],
+    },
+  },
 ];

package/ee/server/services/index.js

@@ -3,4 +3,7 @@
 module.exports = {
   passport: require('./passport'),
   role: require('./role'),
+  workflows: require('./review-workflows/workflows'),
+  stages: require('./review-workflows/stages'),
+  'review-workflows': require('./review-workflows/review-workflows'),
 };

package/ee/server/services/review-workflows/review-workflows.js

@@ -0,0 +1,54 @@
+'use strict';
+
+const { getService } = require('../../utils');
+
+/**
+ * Map every stage in the array to be ordered in the relation
+ * @param {Object[]} stages
+ * @param {number} stages.id
+ * @return {Object[]}
+ */
+function buildStagesConnectArray(stages) {
+  return stages.map((stage, index) => {
+    const connect = {
+      id: stage.id,
+      position: {},
+    };
+
+    if (index === 0) {
+      connect.position.start = true;
+    } else {
+      connect.position.after = stages[index - 1].id;
+    }
+    return connect;
+  });
+}
+
+module.exports = ({ strapi }) => {
+  const workflowsService = getService('workflows', { strapi });
+  const stagesService = getService('stages', { strapi });
+
+  return {
+    async bootstrap() {
+      const wfCount = await workflowsService.count();
+      const stagesCount = await stagesService.count();
+
+      // Check if there is nothing about review-workflow in DB
+      // If any, the feature has already been initialized with a workflow and stages
+      if (wfCount === 0 && stagesCount === 0) {
+        const defaultStages = require('../../constants/default-stages.json');
+        const defaultWorkflow = require('../../constants/default-workflow.json');
+
+        const stages = await stagesService.createMany(defaultStages, { fields: ['id'] });
+        const workflow = {
+          ...defaultWorkflow,
+          stages: {
+            connect: buildStagesConnectArray(stages),
+          },
+        };
+
+        await workflowsService.create(workflow);
+      }
+    },
+  };
+};

package/ee/server/services/review-workflows/stages.js

@@ -0,0 +1,133 @@
+'use strict';
+
+const {
+  mapAsync,
+  errors: { ApplicationError },
+} = require('@strapi/utils');
+
+const { STAGE_MODEL_UID } = require('../../constants/workflows');
+const { getService } = require('../../utils');
+
+module.exports = ({ strapi }) => {
+  const workflowsService = getService('workflows', { strapi });
+
+  return {
+    find({ workflowId, populate }) {
+      const params = {
+        filters: { workflow: workflowId },
+        populate,
+      };
+      return strapi.entityService.findMany(STAGE_MODEL_UID, params);
+    },
+
+    findById(id, { workflowId, populate }) {
+      const params = {
+        filters: { workflow: workflowId },
+        populate,
+      };
+      return strapi.entityService.findOne(STAGE_MODEL_UID, id, params);
+    },
+
+    createMany(stagesList, { fields }) {
+      const params = {
+        select: fields,
+      };
+      return Promise.all(
+        stagesList.map((stage) =>
+          strapi.entityService.create(STAGE_MODEL_UID, { data: stage, ...params })
+        )
+      );
+    },
+
+    update(stageId, stageData) {
+      return strapi.entityService.update(STAGE_MODEL_UID, stageId, { data: stageData });
+    },
+
+    delete(stageId) {
+      return strapi.entityService.delete(STAGE_MODEL_UID, stageId);
+    },
+
+    count() {
+      return strapi.entityService.count(STAGE_MODEL_UID);
+    },
+
+    async replaceWorkflowStages(workflowId, stages) {
+      const workflow = await workflowsService.findById(workflowId, { populate: ['stages'] });
+
+      const { created, updated, deleted } = getDiffBetweenStages(workflow.stages, stages);
+
+      assertAtLeastOneStageRemain(workflow.stages, { created, deleted });
+
+      return strapi.db.transaction(async () => {
+        const newStages = await this.createMany(created, { fields: ['id'] });
+        const stagesIds = stages.map((stage) => stage.id ?? newStages.shift().id);
+
+        await mapAsync(updated, (stage) => this.update(stage.id, stage));
+        await mapAsync(deleted, (stage) => this.delete(stage.id));
+        return workflowsService.update(workflowId, {
+          stages: stagesIds,
+        });
+      });
+    },
+  };
+};
+
+/**
+ * Compares two arrays of stages and returns an object indicating the differences.
+ *
+ * The function compares the `id` properties of each stage in `sourceStages` and `comparisonStages` to determine if the stage is present in both arrays.
+ * If a stage with the same `id` is found in both arrays but the `name` property is different, the stage is considered updated.
+ * If a stage with a particular `id` is only found in `comparisonStages`, it is considered created.
+ * If a stage with a particular `id` is only found in `sourceStages`, it is considered deleted.
+ *
+ * @typedef {{id: Number, name: String, workflow: Number}} Stage
+ * @typedef {{created: Stage[], updated: Stage[], deleted: Stage[]}} DiffStages
+ *
+ * The DiffStages object has three properties: `created`, `updated`, and `deleted`.
+ * `created` is an array of stages that are in `comparisonStages` but not in `sourceStages`.
+ * `updated` is an array of stages that have different names in `comparisonStages` and `sourceStages`.
+ * `deleted` is an array of stages that are in `sourceStages` but not in `comparisonStages`.
+ *
+ * @param {Stage[]} sourceStages
+ * @param {Stage[]} comparisonStages
+ * @returns { DiffStages }
+ */
+function getDiffBetweenStages(sourceStages, comparisonStages) {
+  const result = comparisonStages.reduce(
+    (acc, stageToCompare) => {
+      const srcStage = sourceStages.find((stage) => stage.id === stageToCompare.id);
+
+      if (!srcStage) {
+        acc.created.push(stageToCompare);
+      } else if (srcStage.name !== stageToCompare.name) {
+        acc.updated.push(stageToCompare);
+      }
+      return acc;
+    },
+    { created: [], updated: [] }
+  );
+
+  result.deleted = sourceStages.filter(
+    (srcStage) => !comparisonStages.some((cmpStage) => cmpStage.id === srcStage.id)
+  );
+
+  return result;
+}
+
+/**
+ * Asserts that at least one stage remains in the workflow after applying deletions and additions.
+ *
+ * @param {Array} workflowStages - An array of stages in the current workflow.
+ * @param {Object} diffStages - An object containing the stages to be deleted and created.
+ * @param {Array} diffStages.deleted - An array of stages that are planned to be deleted from the workflow.
+ * @param {Array} diffStages.created - An array of stages that are planned to be created in the workflow.
+ *
+ * @throws {ApplicationError} If the number of remaining stages in the workflow after applying deletions and additions is less than 1.
+ */
+function assertAtLeastOneStageRemain(workflowStages, diffStages) {
+  const remainingStagesCount =
+    workflowStages.length - diffStages.deleted.length + diffStages.created.length;
+  if (remainingStagesCount < 1) {
+    throw new ApplicationError('At least one stage must remain in the workflow.');
+  }
+}

package/ee/server/services/review-workflows/workflows.js

@@ -0,0 +1,25 @@
+'use strict';
+
+const { WORKFLOW_MODEL_UID } = require('../../constants/workflows');
+
+module.exports = ({ strapi }) => ({
+  find(opts) {
+    return strapi.entityService.findMany(WORKFLOW_MODEL_UID, opts);
+  },
+
+  findById(id, opts) {
+    return strapi.entityService.findOne(WORKFLOW_MODEL_UID, id, opts);
+  },
+
+  create(workflowData) {
+    return strapi.entityService.create(WORKFLOW_MODEL_UID, { data: workflowData });
+  },
+
+  count() {
+    return strapi.entityService.count(WORKFLOW_MODEL_UID);
+  },
+
+  update(id, workflowData) {
+    return strapi.entityService.update(WORKFLOW_MODEL_UID, id, { data: workflowData });
+  },
+});

package/ee/server/utils/index.js

@@ -0,0 +1,8 @@
+'use strict';
+
+const getService = (name, { strapi } = { strapi: global.strapi }) => {
+  return strapi.service(`admin::${name}`);
+};
+module.exports = {
+  getService,
+};

package/ee/server/utils/test.js

@@ -0,0 +1,11 @@
+'use strict';
+
+/**
+ * Execute a test suite only if the condition is true
+ * @return Jest.Describe
+ */
+const describeOnCondition = (bool) => (bool ? describe : describe.skip);
+
+module.exports = {
+  describeOnCondition,
+};

package/ee/server/validation/review-workflows.js

@@ -0,0 +1,17 @@
+'use strict';
+
+const { yup, validateYupSchema } = require('@strapi/utils');
+
+const stageObject = yup.object().shape({
+  id: yup.number().integer().min(1),
+  name: yup.string().max(255).required(),
+});
+
+const validateUpdateStagesSchema = yup.array().of(stageObject).required();
+
+module.exports = {
+  validateUpdateStages: validateYupSchema(validateUpdateStagesSchema, {
+    strict: false,
+    stripUnknown: true,
+  }),
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.7.0-beta.0",
+  "version": "4.9.0-alpha.0",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -46,15 +46,15 @@
     "@casl/ability": "^5.4.3",
     "@fingerprintjs/fingerprintjs": "3.3.6",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/babel-plugin-switch-ee-ce": "4.7.0-beta.0",
-    "@strapi/data-transfer": "4.7.0-beta.0",
+    "@strapi/babel-plugin-switch-ee-ce": "4.9.0-alpha.0",
+    "@strapi/data-transfer": "4.9.0-alpha.0",
     "@strapi/design-system": "1.6.3",
-    "@strapi/helper-plugin": "4.7.0-beta.0",
+    "@strapi/helper-plugin": "4.9.0-alpha.0",
     "@strapi/icons": "1.6.3",
-    "@strapi/permissions": "4.7.0-beta.0",
-    "@strapi/provider-audit-logs-local": "4.7.0-beta.0",
-    "@strapi/typescript-utils": "4.7.0-beta.0",
-    "@strapi/utils": "4.7.0-beta.0",
+    "@strapi/permissions": "4.9.0-alpha.0",
+    "@strapi/provider-audit-logs-local": "4.9.0-alpha.0",
+    "@strapi/typescript-utils": "4.9.0-alpha.0",
+    "@strapi/utils": "4.9.0-alpha.0",
     "axios": "1.2.2",
     "babel-loader": "^9.1.2",
     "babel-plugin-styled-components": "2.0.2",
@@ -73,6 +73,7 @@
     "find-root": "1.1.0",
     "fork-ts-checker-webpack-plugin": "7.2.1",
     "formik": "^2.2.6",
+    "fractional-indexing": "3.2.0",
     "fs-extra": "10.0.0",
     "highlight.js": "^10.4.1",
     "history": "^4.9.0",
@@ -100,7 +101,6 @@
     "markdown-it-sup": "1.0.0",
     "match-sorter": "^4.0.2",
     "mini-css-extract-plugin": "2.7.2",
-    "node-polyfill-webpack-plugin": "2.0.1",
     "node-schedule": "2.1.0",
     "p-map": "4.0.0",
     "passport-local": "1.0.0",
@@ -114,7 +114,7 @@
     "react-error-boundary": "3.1.4",
     "react-fast-compare": "^3.2.0",
     "react-helmet": "^6.1.0",
-    "react-intl": "6.2.7",
+    "react-intl": "6.2.8",
     "react-is": "^17.0.2",
     "react-query": "3.24.3",
     "react-redux": "8.0.5",
@@ -144,10 +144,10 @@
     "@testing-library/user-event": "14.4.3",
     "duplicate-dependencies-webpack-plugin": "^1.0.2",
     "glob": "8.0.3",
-    "msw": "1.0.0",
+    "msw": "1.0.1",
     "react-test-renderer": "^17.0.2",
     "speed-measure-webpack-plugin": "1.5.0",
-    "webpack-bundle-analyzer": "^4.7.0"
+    "webpack-bundle-analyzer": "^4.8.0"
   },
   "peerDependencies": {
     "@strapi/strapi": "^4.3.4"
@@ -165,5 +165,5 @@
       }
     }
   },
-  "gitHead": "880ba7af867ad43c4cc45b47467b76a9b5606b6e"
+  "gitHead": "35f783d0dc07db101e7e62cb4d682f751551f452"
 }

package/server/bootstrap.js

@@ -78,7 +78,6 @@ module.exports = async () => {
   const userService = getService('user');
   const roleService = getService('role');
   const apiTokenService = getService('api-token');
-  const transferService = getService('transfer');
   const tokenService = getService('token');
 
   await roleService.createRolesIfNoneExist();
@@ -94,6 +93,5 @@ module.exports = async () => {
   await syncAPITokensPermissions();
 
   apiTokenService.checkSaltIsDefined();
-  transferService.token.checkSaltIsDefined();
   tokenService.checkSecretIsDefined();
 };

package/server/config/admin-actions.js

@@ -10,22 +10,6 @@ module.exports = {
       category: 'plugins and marketplace',
       subCategory: 'marketplace',
     },
-    {
-      uid: 'marketplace.plugins.install',
-      displayName: 'Install (only for dev env)',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'plugins and marketplace',
-      subCategory: 'plugins',
-    },
-    {
-      uid: 'marketplace.plugins.uninstall',
-      displayName: 'Uninstall (only for dev env)',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'plugins and marketplace',
-      subCategory: 'plugins',
-    },
     {
       uid: 'webhooks.create',
       displayName: 'Create',
@@ -180,53 +164,5 @@ module.exports = {
       section: 'settings',
       category: 'project',
     },
-    {
-      uid: 'transfer.tokens.access',
-      displayName: 'Access the transfer tokens settings page',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'transfer tokens',
-      subCategory: 'transfer tokens',
-    },
-    {
-      uid: 'transfer.tokens.create',
-      displayName: 'Create (generate)',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'transfer tokens',
-      subCategory: 'general',
-    },
-    {
-      uid: 'transfer.tokens.read',
-      displayName: 'Read',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'transfer tokens',
-      subCategory: 'general',
-    },
-    {
-      uid: 'transfer.tokens.update',
-      displayName: 'Update',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'transfer tokens',
-      subCategory: 'general',
-    },
-    {
-      uid: 'transfer.tokens.regenerate',
-      displayName: 'Regenerate',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'transfer tokens',
-      subCategory: 'general',
-    },
-    {
-      uid: 'transfer.tokens.delete',
-      displayName: 'Delete (revoke)',
-      pluginName: 'admin',
-      section: 'settings',
-      category: 'transfer tokens',
-      subCategory: 'general',
-    },
   ],
 };

package/server/content-types/index.js

@@ -6,6 +6,4 @@ module.exports = {
   role: { schema: require('./Role') },
   'api-token': { schema: require('./api-token') },
   'api-token-permission': { schema: require('./api-token-permission') },
-  'transfer-token': { schema: require('./transfer-token') },
-  'transfer-token-permission': { schema: require('./transfer-token-permission') },
 };