Merge branch 'feature/rw-stage-rbac-settings-permissions' into poc/permissions-parametrized-actions

packages/core/admin/ee/admin/hooks/useLicenseLimits/useLicenseLimits.js

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { useFetchClient } from '@strapi/helper-plugin';
 import { useQuery } from 'react-query';
 
-export function useLicenseLimits({ enabled } = { enabled: true }) {
+export function useLicenseLimits(queryOptions = {}) {
   const { get } = useFetchClient();
   const { data, isError, isLoading } = useQuery(
     ['ee', 'license-limit-info'],
@@ -15,11 +15,17 @@ export function useLicenseLimits({ enabled } = { enabled: true }) {
       return data;
     },
     {
-      enabled,
+      ...queryOptions,
+
+      // the request is expected to fail sometimes if a user does not
+      // have permissions
+      retry: false,
     }
   );
 
-  const license = data ?? {};
+  const license = React.useMemo(() => {
+    return data ?? {};
+  }, [data]);
 
   const getFeature = React.useCallback(
     (name) => {

packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/Stage.js

@@ -184,17 +184,17 @@ export function Stage({
     color: hex,
   }));
 
-  React.useEffect(() => {
-    dragPreviewRef(getEmptyImage(), { captureDraggingState: false });
-  }, [dragPreviewRef, index]);
-
   const { themeColorName } = getStageColorByHex(colorField.value) ?? {};
 
   const filteredRoles = roles
     // Super admins always have permissions to do everything and therefore
-    // there is no point in removing permissions for the role
+    // there is no point for this role to show up in the role combobox
     .filter((role) => role.code !== 'strapi-super-admin');
 
+  React.useEffect(() => {
+    dragPreviewRef(getEmptyImage(), { captureDraggingState: false });
+  }, [dragPreviewRef, index]);
+
   return (
     <Box ref={composedRef}>
       {liveText && <VisuallyHidden aria-live="assertive">{liveText}</VisuallyHidden>}
@@ -363,7 +363,7 @@ export function Stage({
                       // to coerce the string value back to a number
                       const nextValues = values.map((value) => ({
                         role: parseInt(value, 10),
-                        action: 'admin::review-workflow.stage.transition',
+                        action: 'admin::review-workflows.stage.transition',
                       }));
 
                       permissionsHelper.setValue(nextValues);

packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/components/Stages/Stage/tests/Stage.test.js

@@ -94,7 +94,7 @@ const ComponentFixture = ({
     {
       color: STAGE_COLOR_DEFAULT,
       name: 'something',
-      permissions: [{ role: 1, action: 'admin::review-workflow.stage.transition' }],
+      permissions: [{ role: 1, action: 'admin::review-workflows.stage.transition' }],
     },
   ],
   ...props

packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/CreateView/CreateView.js

@@ -38,7 +38,12 @@ import {
 } from '../../constants';
 import { useReviewWorkflows } from '../../hooks/useReviewWorkflows';
 import { reducer } from '../../reducer';
-import { selectIsLoading, selectIsWorkflowDirty, selectCurrentWorkflow } from '../../selectors';
+import {
+  selectIsLoading,
+  selectIsWorkflowDirty,
+  selectCurrentWorkflow,
+  selectRoles,
+} from '../../selectors';
 import { validateWorkflow } from '../../utils/validateWorkflow';
 
 export function ReviewWorkflowsCreateView() {
@@ -50,10 +55,13 @@ export function ReviewWorkflowsCreateView() {
   const toggleNotification = useNotification();
   const { collectionTypes, singleTypes, isLoading: isLoadingContentTypes } = useContentTypes();
   const { isLoading: isLoadingWorkflow, meta, workflows } = useReviewWorkflows();
-  const { isLoading: isLoadingRoles, roles } = useAdminRoles();
+  const { isLoading: isLoadingRoles, roles: serverRoles } = useAdminRoles(undefined, {
+    retry: false,
+  });
   const isLoading = useSelector(selectIsLoading);
   const currentWorkflowIsDirty = useSelector(selectIsWorkflowDirty);
   const currentWorkflow = useSelector(selectCurrentWorkflow);
+  const roles = useSelector(selectRoles);
   const [showLimitModal, setShowLimitModal] = React.useState(false);
   const { isLoading: isLicenseLoading, getFeature } = useLicenseLimits();
   const [initialErrors, setInitialErrors] = React.useState(null);
@@ -184,7 +192,7 @@ export function ReviewWorkflowsCreateView() {
     }
 
     if (!isLoadingRoles) {
-      dispatch(setRoles(roles));
+      dispatch(setRoles(serverRoles));
     }
 
     dispatch(setIsLoading(isLoadingContentTypes || isLoadingRoles));
@@ -201,7 +209,7 @@ export function ReviewWorkflowsCreateView() {
     isLoadingContentTypes,
     isLoadingRoles,
     isLoadingWorkflow,
-    roles,
+    serverRoles,
     singleTypes,
     workflows,
   ]);
@@ -242,6 +250,21 @@ export function ReviewWorkflowsCreateView() {
     currentWorkflow.stages.length,
   ]);
 
+  React.useEffect(() => {
+    const filteredRoles = roles.filter((role) => role.code !== 'strapi-super-admin');
+
+    if (!isLoading && filteredRoles.length === 0) {
+      toggleNotification({
+        blockTransition: true,
+        type: 'warning',
+        message: formatMessage({
+          id: 'Settings.review-workflows.stage.permissions.noPermissions.description',
+          defaultMessage: 'You don’t have the permission to see roles',
+        }),
+      });
+    }
+  }, [formatMessage, isLoading, roles, toggleNotification]);
+
   return (
     <>
       <Layout.DragLayerRendered />

packages/core/admin/ee/admin/pages/SettingsPage/pages/ReviewWorkflows/pages/EditView/EditView.js

@@ -45,6 +45,7 @@ import {
   selectCurrentWorkflow,
   selectHasDeletedServerStages,
   selectIsLoading,
+  selectRoles,
   selectServerState,
 } from '../../selectors';
 import { validateWorkflow } from '../../utils/validateWorkflow';
@@ -63,13 +64,16 @@ export function ReviewWorkflowsEditView() {
   const currentWorkflowIsDirty = useSelector(selectIsWorkflowDirty);
   const currentWorkflow = useSelector(selectCurrentWorkflow);
   const hasDeletedServerStages = useSelector(selectHasDeletedServerStages);
+  const roles = useSelector(selectRoles);
   const isLoading = useSelector(selectIsLoading);
   const {
     allowedActions: { canDelete, canUpdate },
   } = useRBAC(permissions.settings['review-workflows']);
   const [savePrompts, setSavePrompts] = React.useState({});
   const { getFeature, isLoading: isLicenseLoading } = useLicenseLimits();
-  const { isLoading: isLoadingRoles, roles } = useAdminRoles();
+  const { isLoading: isLoadingRoles, roles: serverRoles } = useAdminRoles(undefined, {
+    retry: false,
+  });
   const [showLimitModal, setShowLimitModal] = React.useState(false);
   const [initialErrors, setInitialErrors] = React.useState(null);
 
@@ -231,7 +235,7 @@ export function ReviewWorkflowsEditView() {
     }
 
     if (!isLoadingRoles) {
-      dispatch(setRoles(roles));
+      dispatch(setRoles(serverRoles));
     }
 
     dispatch(setIsLoading(isLoadingWorkflow || isLoadingContentTypes || isLoadingRoles));
@@ -247,7 +251,7 @@ export function ReviewWorkflowsEditView() {
     isLoadingContentTypes,
     isLoadingWorkflow,
     isLoadingRoles,
-    roles,
+    serverRoles,
     singleTypes,
     workflow,
     workflows,
@@ -290,6 +294,21 @@ export function ReviewWorkflowsEditView() {
     meta.workflowsTotal,
   ]);
 
+  React.useEffect(() => {
+    const filteredRoles = roles.filter((role) => role.code !== 'strapi-super-admin');
+
+    if (!isLoading && filteredRoles.length === 0) {
+      toggleNotification({
+        blockTransition: true,
+        type: 'warning',
+        message: formatMessage({
+          id: 'Settings.review-workflows.stage.permissions.noPermissions.description',
+          defaultMessage: 'You don’t have the permission to see roles',
+        }),
+      });
+    }
+  }, [formatMessage, isLoading, roles, toggleNotification]);
+
   // TODO: redirect back to list-view if workflow is not found?
 
   return (