@strapi/plugin-users-permissions 4.0.0-beta.13 → 4.0.0-beta.17

package/admin/src/components/Permissions/index.js

@@ -1,4 +1,4 @@
-import React, { memo, useCallback, useReducer } from 'react';
+import React, { useReducer } from 'react';
 import { Accordion, AccordionToggle, AccordionContent } from '@strapi/design-system/Accordion';
 import { useIntl } from 'react-intl';
 import { Box } from '@strapi/design-system/Box';
@@ -15,12 +15,11 @@ const Permissions = () => {
     init(state, modifiedData)
   );
 
-  const handleToggle = useCallback(index => {
+  const handleToggle = index =>
     dispatch({
       type: 'TOGGLE_COLLAPSE',
       index,
     });
-  }, []);
 
   return (
     <>
@@ -52,4 +51,4 @@ const Permissions = () => {
   );
 };
 
-export default memo(Permissions);
+export default Permissions;

package/admin/src/components/Policies/index.js

@@ -3,18 +3,21 @@ import { useIntl } from 'react-intl';
 import { Typography } from '@strapi/design-system/Typography';
 import { Stack } from '@strapi/design-system/Stack';
 import { GridItem } from '@strapi/design-system/Grid';
-import { get, isEmpty, takeRight, toLower, without } from 'lodash';
+import { get, isEmpty, without } from 'lodash';
 import { useUsersPermissions } from '../../contexts/UsersPermissionsContext';
 import BoundRoute from '../BoundRoute';
 
 const Policies = () => {
   const { formatMessage } = useIntl();
   const { selectedAction, routes } = useUsersPermissions();
+
   const path = without(selectedAction.split('.'), 'controllers');
   const controllerRoutes = get(routes, path[0]);
+  const pathResolved = path.slice(1).join('.');
+
   const displayedRoutes = isEmpty(controllerRoutes)
     ? []
-    : controllerRoutes.filter(o => toLower(o.handler) === toLower(takeRight(path, 2).join('.')));
+    : controllerRoutes.filter(o => o.handler.endsWith(pathResolved));
 
   return (
     <GridItem

package/admin/src/components/UsersPermissions/index.js

@@ -1,4 +1,4 @@
-import React, { memo, useReducer, useCallback, forwardRef, useImperativeHandle } from 'react';
+import React, { memo, useReducer, forwardRef, useImperativeHandle } from 'react';
 import PropTypes from 'prop-types';
 import { Typography } from '@strapi/design-system/Typography';
 import { Stack } from '@strapi/design-system/Stack';
@@ -31,28 +31,25 @@ const UsersPermissions = forwardRef(({ permissions, routes }, ref) => {
     },
   }));
 
-  const handleChange = useCallback(({ target: { name, value } }) => {
+  const handleChange = ({ target: { name, value } }) =>
     dispatch({
       type: 'ON_CHANGE',
       keys: name.split('.'),
       value: value === 'empty__string_value' ? '' : value,
     });
-  }, []);
 
-  const handleChangeSelectAll = useCallback(({ target: { name, value } }) => {
+  const handleChangeSelectAll = ({ target: { name, value } }) =>
     dispatch({
       type: 'ON_CHANGE_SELECT_ALL',
       keys: name.split('.'),
       value,
     });
-  }, []);
 
-  const handleSelectedAction = useCallback(actionToSelect => {
+  const handleSelectedAction = actionToSelect =>
     dispatch({
       type: 'SELECT_ACTION',
       actionToSelect,
     });
-  }, []);
 
   const providerValue = {
     ...state,

package/admin/src/pages/Roles/ListPage/index.js

@@ -16,6 +16,7 @@ import {
   NoPermissions,
   LoadingIndicatorPage,
   SearchURLQuery,
+  useFocusWhenNavigate,
   useQueryParams,
   EmptyStateLayout,
   ConfirmDialog,
@@ -42,6 +43,7 @@ const RoleListPage = () => {
   const [showConfirmDelete, setShowConfirmDelete] = useState(false);
   const [isConfirmButtonLoading, setIsConfirmButtonLoading] = useState(false);
   const [roleToDelete, setRoleToDelete] = useState();
+  useFocusWhenNavigate();
 
   const queryClient = useQueryClient();
 

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@strapi/plugin-users-permissions",
-  "version": "4.0.0-beta.13",
+  "version": "4.0.0-beta.17",
   "description": "Protect your API with a full-authentication process based on JWT",
   "strapi": {
     "displayName": "Roles & Permissions",
     "name": "users-permissions",
-    "description": "users-permissions.plugin.description",
+    "description": "Protect your API with a full authentication process based on JWT. This plugin comes also with an ACL strategy that allows you to manage the permissions between the groups of users.",
     "required": true,
     "kind": "plugin"
   },
@@ -14,8 +14,8 @@
   },
   "dependencies": {
     "@purest/providers": "^1.0.2",
-    "@strapi/helper-plugin": "4.0.0-beta.13",
-    "@strapi/utils": "4.0.0-beta.13",
+    "@strapi/helper-plugin": "4.0.0-beta.17",
+    "@strapi/utils": "4.0.0-beta.17",
     "bcryptjs": "2.4.3",
     "grant-koa": "5.4.8",
     "jsonwebtoken": "^8.1.0",
@@ -56,5 +56,5 @@
     "npm": ">=6.0.0"
   },
   "license": "SEE LICENSE IN LICENSE",
-  "gitHead": "3a31a96067aa0a74cabf51282215820ba46dd447"
+  "gitHead": "8f9cf3803464d3dbfc8c1090c16bb5f53a60c6c3"
 }

package/server/content-types/permission/index.js

@@ -13,6 +13,9 @@ module.exports = {
     'content-manager': {
       visible: false,
     },
+    'content-type-builder': {
+      visible: false,
+    },
   },
   attributes: {
     action: {

package/server/content-types/role/index.js

@@ -13,6 +13,9 @@ module.exports = {
     'content-manager': {
       visible: false,
     },
+    'content-type-builder': {
+      visible: false,
+    },
   },
   attributes: {
     name: {