@strapi/admin 4.12.0-beta.1 → 4.12.0-beta.4

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/ListView/ListView.js

@@ -23,18 +23,22 @@ import {
   useAPIErrorHandler,
   useFetchClient,
   useNotification,
+  useRBAC,
   useTracking,
 } from '@strapi/helper-plugin';
 import { Pencil, Plus, Trash } from '@strapi/icons';
 import { useIntl } from 'react-intl';
 import { useMutation } from 'react-query';
+import { useSelector } from 'react-redux';
 import { useHistory } from 'react-router-dom';
 import styled from 'styled-components';
 
 import { useContentTypes } from '../../../../../../../../admin/src/hooks/useContentTypes';
+import { selectAdminPermissions } from '../../../../../../../../admin/src/pages/App/selectors';
 import { useLicenseLimits } from '../../../../../../hooks';
 import * as Layout from '../../components/Layout';
 import * as LimitsModal from '../../components/LimitsModal';
+import { CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME } from '../../constants';
 import { useReviewWorkflows } from '../../hooks/useReviewWorkflows';
 
 const ActionLink = styled(Link)`
@@ -76,6 +80,10 @@ export function ReviewWorkflowsListView() {
   const toggleNotification = useNotification();
   const { getFeature, isLoading: isLicenseLoading } = useLicenseLimits();
   const { trackUsage } = useTracking();
+  const permissions = useSelector(selectAdminPermissions);
+  const {
+    allowedActions: { canCreate, canDelete },
+  } = useRBAC(permissions.settings['review-workflows']);
 
   const limits = getFeature('review-workflows');
 
@@ -148,24 +156,21 @@ export function ReviewWorkflowsListView() {
 
   React.useEffect(() => {
     if (!isLoading && !isLicenseLoading) {
-      if (limits?.workflows && meta?.workflowCount >= parseInt(limits.workflows, 10)) {
+      if (
+        limits?.[CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME] &&
+        meta?.workflowCount > parseInt(limits[CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME], 10)
+      ) {
         setShowLimitModal(true);
       }
     }
-  }, [
-    isLicenseLoading,
-    isLoading,
-    limits.stagesPerWorkflow,
-    limits.workflows,
-    meta?.workflowCount,
-    meta.workflowsTotal,
-  ]);
+  }, [isLicenseLoading, isLoading, limits, meta?.workflowCount, meta.workflowsTotal]);
 
   return (
     <>
       <Layout.Header
         primaryAction={
           <LinkButton
+            disabled={!canCreate}
             startIcon={<Plus />}
             size="S"
             to="/settings/review-workflows/create"
@@ -180,7 +185,10 @@ export function ReviewWorkflowsListView() {
                * current hard-limit of 200 they will see an error thrown by the API.
                */
 
-              if (limits?.workflows && meta?.workflowCount >= parseInt(limits.workflows, 10)) {
+              if (
+                limits?.[CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME] &&
+                meta?.workflowCount >= parseInt(limits[CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME], 10)
+              ) {
                 event.preventDefault();
                 setShowLimitModal(true);
               } else {
@@ -207,42 +215,50 @@ export function ReviewWorkflowsListView() {
 
       <Layout.Root>
         {isLoading || isLoadingModels ? (
-          <Loader>
-            {formatMessage({
-              id: 'Settings.review-workflows.page.list.isLoading',
-              defaultMessage: 'Workflows are loading',
-            })}
-          </Loader>
+          <Flex justifyContent="center">
+            <Loader>
+              {formatMessage({
+                id: 'Settings.review-workflows.page.list.isLoading',
+                defaultMessage: 'Workflows are loading',
+              })}
+            </Loader>
+          </Flex>
         ) : (
           <Table
             colCount={3}
             footer={
               // TODO: we should be able to use a link here instead of an (inaccessible onClick) handler
-              <TFooter
-                icon={<Plus />}
-                onClick={() => {
-                  /**
-                   * If the current license has a workflow limit:
-                   * check if the total count of workflows exceeds that limit
-                   *
-                   * If the current license does not have a limit (e.g. offline license):
-                   * allow the user to navigate to the create-view. In case they exceed the
-                   * current hard-limit of 200 they will see an error thrown by the API.
-                   */
+              canCreate && (
+                <TFooter
+                  icon={<Plus />}
+                  onClick={() => {
+                    /**
+                     * If the current license has a workflow limit:
+                     * check if the total count of workflows exceeds that limit
+                     *
+                     * If the current license does not have a limit (e.g. offline license):
+                     * allow the user to navigate to the create-view. In case they exceed the
+                     * current hard-limit of 200 they will see an error thrown by the API.
+                     */
 
-                  if (limits?.workflows && meta?.workflowCount >= parseInt(limits.workflows, 10)) {
-                    setShowLimitModal(true);
-                  } else {
-                    push('/settings/review-workflows/create');
-                    trackUsage('willCreateWorkflow');
-                  }
-                }}
-              >
-                {formatMessage({
-                  id: 'Settings.review-workflows.list.page.create',
-                  defaultMessage: 'Create new workflow',
-                })}
-              </TFooter>
+                    if (
+                      limits?.[CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME] &&
+                      meta?.workflowCount >=
+                        parseInt(limits[CHARGEBEE_WORKFLOW_ENTITLEMENT_NAME], 10)
+                    ) {
+                      setShowLimitModal(true);
+                    } else {
+                      push('/settings/review-workflows/create');
+                      trackUsage('willCreateWorkflow');
+                    }
+                  }}
+                >
+                  {formatMessage({
+                    id: 'Settings.review-workflows.list.page.create',
+                    defaultMessage: 'Create new workflow',
+                  })}
+                </TFooter>
+              )
             }
             rowCount={1}
           >
@@ -326,21 +342,22 @@ export function ReviewWorkflowsListView() {
                         <Pencil />
                       </ActionLink>
 
-                      <IconButton
-                        aria-label={formatMessage(
-                          {
-                            id: 'Settings.review-workflows.list.page.list.column.actions.delete.label',
-                            defaultMessage: 'Delete {name}',
-                          },
-                          { name: 'Default workflow' }
-                        )}
-                        disabled={workflows.length === 1}
-                        icon={<Trash />}
-                        noBorder
-                        onClick={() => {
-                          handleDeleteWorkflow(workflow.id);
-                        }}
-                      />
+                      {workflows.length > 1 && canDelete && (
+                        <IconButton
+                          aria-label={formatMessage(
+                            {
+                              id: 'Settings.review-workflows.list.page.list.column.actions.delete.label',
+                              defaultMessage: 'Delete {name}',
+                            },
+                            { name: 'Default workflow' }
+                          )}
+                          icon={<Trash />}
+                          noBorder
+                          onClick={() => {
+                            handleDeleteWorkflow(workflow.id);
+                          }}
+                        />
+                      )}
                     </Flex>
                   </Td>
                 </Tr>

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/ListView/index.js

@@ -1,13 +1,18 @@
 import React from 'react';
 
-import { ProtectedPage } from '../../components/ProtectedPage';
+import { CheckPagePermissions } from '@strapi/helper-plugin';
+import { useSelector } from 'react-redux';
+
+import { selectAdminPermissions } from '../../../../../../../../admin/src/pages/App/selectors';
 
 import { ReviewWorkflowsListView } from './ListView';
 
 export default function () {
+  const permissions = useSelector(selectAdminPermissions);
+
   return (
-    <ProtectedPage>
+    <CheckPagePermissions permissions={permissions.settings['review-workflows'].main}>
       <ReviewWorkflowsListView />
-    </ProtectedPage>
+    </CheckPagePermissions>
   );
 }

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/reducer/index.js

@@ -22,13 +22,7 @@ export const initialState = {
       data: {
         name: '',
         contentTypes: [],
-        stages: [
-          {
-            color: STAGE_COLOR_DEFAULT,
-            name: '',
-            __temp_key__: 1,
-          },
-        ],
+        stages: [],
       },
       isDirty: false,
       hasDeletedServerStages: false,

package/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/utils/{getWorkflowValidationSchema.js → validateWorkflow.js}

@@ -1,7 +1,8 @@
+import set from 'lodash/set';
 import * as yup from 'yup';
 
-export function getWorkflowValidationSchema({ formatMessage }) {
-  return yup.object({
+export async function validateWorkflow({ values, formatMessage }) {
+  const schema = yup.object({
     contentTypes: yup.array().of(yup.string()),
     name: yup
       .string()
@@ -32,6 +33,20 @@ export function getWorkflowValidationSchema({ formatMessage }) {
                 id: 'Settings.review-workflows.validation.stage.max-length',
                 defaultMessage: 'Name can not be longer than 255 characters',
               })
+            )
+            .test(
+              'unique-name',
+              formatMessage({
+                id: 'Settings.review-workflows.validation.stage.duplicate',
+                defaultMessage: 'Stage name must be unique',
+              }),
+              function (stageName) {
+                const {
+                  options: { context },
+                } = this;
+
+                return context.stages.filter((stage) => stage.name === stageName).length === 1;
+              }
             ),
           color: yup
             .string()
@@ -46,4 +61,20 @@ export function getWorkflowValidationSchema({ formatMessage }) {
       )
       .min(1),
   });
+
+  try {
+    await schema.validate(values, { abortEarly: false, context: values });
+
+    return true;
+  } catch (error) {
+    let errors = {};
+
+    if (error instanceof yup.ValidationError) {
+      error.inner.forEach((error) => {
+        set(errors, error.path, error.message);
+      });
+    }
+
+    return errors;
+  }
 }

package/ee/admin/pages/SettingsPage/pages/SingleSignOn/utils/schema.js

@@ -6,11 +6,14 @@ const schema = yup.object().shape({
   defaultRole: yup.mixed().when('autoRegister', (value, initSchema) => {
     return value ? initSchema.required(translatedErrors.required) : initSchema.nullable();
   }),
-  ssoLockedRoles: yup.array().of(
-    yup.mixed().when('ssoLockedRoles', (value, initSchema) => {
-      return value ? initSchema.required(translatedErrors.required) : initSchema.nullable();
-    })
-  ),
+  ssoLockedRoles: yup
+    .array()
+    .nullable()
+    .of(
+      yup.mixed().when('ssoLockedRoles', (value, initSchema) => {
+        return value ? initSchema.required(translatedErrors.required) : initSchema.nullable();
+      })
+    ),
 });
 
 export default schema;

package/ee/admin/pages/SettingsPage/pages/Users/ListPage/index.js

@@ -10,4 +10,4 @@ function UserListPageEE() {
   return <UserListPageCE />;
 }
 
-export default UserListPageEE;
+export { UserListPageEE };

package/ee/server/constants/workflows.js

@@ -14,5 +14,6 @@ module.exports = {
       'You’ve reached the limit of workflows in your plan. Delete a workflow or contact Sales to enable more workflows.',
     STAGES_LIMIT:
       'You’ve reached the limit of stages for this workflow in your plan. Try deleting some stages or contact Sales to enable more stages.',
+    DUPLICATED_STAGE_NAME: 'Stage names must be unique.',
   },
 };

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

@@ -22,7 +22,7 @@ const MAX_JOIN_TABLE_NAME_SUFFIX =
 const MAX_CONTENT_TYPE_NAME_LEN = MAX_DB_TABLE_NAME_LEN - MAX_JOIN_TABLE_NAME_SUFFIX;
 
 const DEFAULT_OPTIONS = {
-  workflows: MAX_WORKFLOWS,
+  numberOfWorkflows: MAX_WORKFLOWS,
   stagesPerWorkflow: MAX_STAGES_PER_WORKFLOW,
 };
 

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

@@ -1,5 +1,6 @@
 'use strict';
 
+const { uniq } = require('lodash/fp');
 const { ValidationError } = require('@strapi/utils').errors;
 const { getService } = require('../../utils');
 const { ERRORS, MAX_WORKFLOWS, MAX_STAGES_PER_WORKFLOW } = require('../../constants/workflows');
@@ -8,12 +9,14 @@ const { clampMaxWorkflows, clampMaxStagesPerWorkflow } = require('../../utils/re
 module.exports = ({ strapi }) => {
   return {
     limits: {
-      workflows: MAX_WORKFLOWS,
+      numberOfWorkflows: MAX_WORKFLOWS,
       stagesPerWorkflow: MAX_STAGES_PER_WORKFLOW,
     },
-    register({ workflows, stagesPerWorkflow }) {
+    register({ numberOfWorkflows, stagesPerWorkflow }) {
       if (!Object.isFrozen(this.limits)) {
-        this.limits.workflows = clampMaxWorkflows(workflows || this.limits.workflows);
+        this.limits.numberOfWorkflows = clampMaxWorkflows(
+          numberOfWorkflows || this.limits.numberOfWorkflows
+        );
         this.limits.stagesPerWorkflow = clampMaxStagesPerWorkflow(
           stagesPerWorkflow || this.limits.stagesPerWorkflow
         );
@@ -32,6 +35,11 @@ module.exports = ({ strapi }) => {
       if (stages.length > this.limits.stagesPerWorkflow) {
         throw new ValidationError(ERRORS.STAGES_LIMIT);
       }
+      // Validate stage names are not duplicated
+      const stageNames = stages.map((stage) => stage.name);
+      if (uniq(stageNames).length !== stageNames.length) {
+        throw new ValidationError(ERRORS.DUPLICATED_STAGE_NAME);
+      }
     },
 
     async validateWorkflowCountStages(workflowId, countAddedStages = 0) {
@@ -52,7 +60,7 @@ module.exports = ({ strapi }) => {
     async validateWorkflowCount(countAddedWorkflows = 0) {
       const workflowsService = getService('workflows', { strapi });
       const countWorkflows = await workflowsService.count();
-      if (countWorkflows + countAddedWorkflows > this.limits.workflows) {
+      if (countWorkflows + countAddedWorkflows > this.limits.numberOfWorkflows) {
         throw new ValidationError(ERRORS.WORKFLOWS_LIMIT);
       }
     },

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

@@ -30,26 +30,35 @@ module.exports = ({ strapi }) => {
      * @param {Workflow.Stage} options.stageId - The new stage to assign the entities to
      */
     async migrate({ srcContentTypes = [], destContentTypes, stageId }) {
-      // Workflows service is using this content-types service, to avoid an infinite loop, we need to get the service in the method
       const workflowsService = getService('workflows', { strapi });
       const { created, deleted } = diffContentTypes(srcContentTypes, destContentTypes);
 
-      await mapAsync(created, async (uid) => {
-        // If it was assigned to another workflow, transfer it from the previous workflow
-        const srcWorkflow = await workflowsService.getAssignedWorkflow(uid);
-        if (srcWorkflow) {
-          // Updates all existing entities stages links to the new stage
-          await stagesService.updateEntitiesStage(uid, { toStageId: stageId });
-          return this.transferContentType(srcWorkflow, uid);
-        }
-        await updateContentTypeConfig(uid, true);
+      await mapAsync(
+        created,
+        async (uid) => {
+          // Content Types should only be assigned to one workflow
+          // However, edge cases can happen, and this handles them
+          const srcWorkflows = await workflowsService._getAssignedWorkflows(uid, {});
 
-        // Create new stages links to the new stage
-        return stagesService.updateEntitiesStage(uid, {
-          fromStageId: null,
-          toStageId: stageId,
-        });
-      });
+          if (srcWorkflows.length) {
+            // Updates all existing entities stages links to the new stage
+            await stagesService.updateEntitiesStage(uid, { toStageId: stageId });
+            // Transfer content types from the previous workflow(s)
+            await mapAsync(srcWorkflows, (srcWorkflow) =>
+              this.transferContentTypes(srcWorkflow, uid)
+            );
+          }
+          await updateContentTypeConfig(uid, true);
+
+          // Create new stages links to the new stage
+          return stagesService.updateEntitiesStage(uid, {
+            fromStageId: null,
+            toStageId: stageId,
+          });
+        },
+        // transferContentTypes can cause race conditions if called in parallel when updating the same workflow
+        { concurrency: 1 }
+      );
 
       await mapAsync(deleted, async (uid) => {
         await updateContentTypeConfig(uid, false);
@@ -58,15 +67,15 @@ module.exports = ({ strapi }) => {
     },
 
     /**
-     * Filters the content types assigned to the previous workflow.
+     * Filters the content types assigned to a workflow
      * @param {Workflow} srcWorkflow - The workflow to transfer from
      * @param {string} uid - The content type uid
      */
-    async transferContentType(srcWorkflow, uid) {
+    async transferContentTypes(srcWorkflow, uid) {
       // Update assignedContentTypes of the previous workflow
       await strapi.entityService.update(WORKFLOW_MODEL_UID, srcWorkflow.id, {
         data: {
-          contentTypes: srcWorkflow.contentTypes.filter((ct) => ct !== uid),
+          contentTypes: srcWorkflow.contentTypes.filter((contentType) => contentType !== uid),
         },
       });
     },

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

@@ -163,11 +163,23 @@ module.exports = ({ strapi }) => {
      * @returns {Promise<object|null>} - Assigned workflow object if found, or null.
      */
     async getAssignedWorkflow(uid, opts = {}) {
-      const workflows = await this.find({
+      const workflows = await this._getAssignedWorkflows(uid, opts);
+      return workflows.length > 0 ? workflows[0] : null;
+    },
+
+    /**
+     * Finds all the assigned workflows for a given content type ID.
+     * Normally, there should only be one workflow assigned to a content type.
+     * However, edge cases can occur where a content type is assigned to multiple workflows.
+     * @param {string} uid - Content type ID to find the assigned workflows for.
+     * @param {object} opts - Options for the query.
+     * @returns {Promise<object[]>} - List of assigned workflow objects.
+     */
+    async _getAssignedWorkflows(uid, opts = {}) {
+      return this.find({
         ...opts,
         filters: { contentTypes: getWorkflowContentTypeFilter({ strapi }, uid) },
       });
-      return workflows.length > 0 ? workflows[0] : null;
     },
 
     /**

package/ee/server/validation/authentication.js

@@ -10,14 +10,20 @@ const providerOptionsUpdateSchema = yup.object().shape({
     .test('is-valid-role', 'You must submit a valid default role', (roleId) => {
       return strapi.admin.services.role.exists({ id: roleId });
     }),
-  ssoLockedRoles: yup.array().of(
-    yup
-      .strapiID()
-      .required()
-      .test('is-valid-role', 'You must submit a valid role for the SSO Locked roles', (roleId) => {
-        return strapi.admin.services.role.exists({ id: roleId });
-      })
-  ),
+  ssoLockedRoles: yup
+    .array()
+    .nullable()
+    .of(
+      yup
+        .strapiID()
+        .test(
+          'is-valid-role',
+          'You must submit a valid role for the SSO Locked roles',
+          (roleId) => {
+            return strapi.admin.services.role.exists({ id: roleId });
+          }
+        )
+    ),
 });
 
 module.exports = {

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

@@ -1,5 +1,7 @@
 'use strict';
 
+/* eslint-disable func-names */
+
 const { yup, validateYupSchema } = require('@strapi/utils');
 const { hasStageAttribute } = require('../utils/review-workflows');
 
@@ -42,10 +44,11 @@ const validateContentTypes = yup.array().of(
 );
 
 const validateWorkflowCreateSchema = yup.object().shape({
-  name: yup.string().max(255).required(),
+  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'),
@@ -53,10 +56,11 @@ const validateWorkflowCreateSchema = yup.object().shape({
 });
 
 const validateWorkflowUpdateSchema = yup.object().shape({
-  name: yup.string().max(255),
+  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,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@strapi/admin",
-  "version": "4.12.0-beta.1",
+  "version": "4.12.0-beta.4",
   "description": "Strapi Admin",
   "repository": {
     "type": "git",
@@ -42,14 +42,14 @@
   "dependencies": {
     "@casl/ability": "^5.4.3",
     "@pmmmwh/react-refresh-webpack-plugin": "0.5.10",
-    "@strapi/data-transfer": "4.12.0-beta.1",
+    "@strapi/data-transfer": "4.12.0-beta.4",
     "@strapi/design-system": "1.8.2",
-    "@strapi/helper-plugin": "4.12.0-beta.1",
+    "@strapi/helper-plugin": "4.12.0-beta.4",
     "@strapi/icons": "1.8.2",
-    "@strapi/permissions": "4.12.0-beta.1",
-    "@strapi/provider-audit-logs-local": "4.12.0-beta.1",
-    "@strapi/typescript-utils": "4.12.0-beta.1",
-    "@strapi/utils": "4.12.0-beta.1",
+    "@strapi/permissions": "4.12.0-beta.4",
+    "@strapi/provider-audit-logs-local": "4.12.0-beta.4",
+    "@strapi/typescript-utils": "4.12.0-beta.4",
+    "@strapi/utils": "4.12.0-beta.4",
     "axios": "1.4.0",
     "bcryptjs": "2.4.3",
     "browserslist": "^4.17.3",
@@ -117,7 +117,7 @@
     "reselect": "^4.1.7",
     "rimraf": "3.0.2",
     "sanitize-html": "2.10.0",
-    "semver": "7.5.1",
+    "semver": "7.5.2",
     "sift": "16.0.1",
     "style-loader": "3.3.1",
     "styled-components": "5.3.3",
@@ -154,5 +154,5 @@
       }
     }
   },
-  "gitHead": "27ed22ba71f95d728726d39712c3f576536b7f21"
+  "gitHead": "edcf86b496a7bee5189cdbfeb16f5a5c0abccc81"
 }