@strapi/plugin-users-permissions 4.0.0-beta.2 → 4.0.0-beta.20

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

@@ -1,13 +1,19 @@
 import React from 'react';
-import { Stack } from '@strapi/parts/Stack';
-import { Box } from '@strapi/parts/Box';
-import { H3, Text } from '@strapi/parts/Text';
+import styled from 'styled-components';
+import { Stack } from '@strapi/design-system/Stack';
+import { Box } from '@strapi/design-system/Box';
+import { Typography } from '@strapi/design-system/Typography';
 import map from 'lodash/map';
 import tail from 'lodash/tail';
 import { useIntl } from 'react-intl';
 import PropTypes from 'prop-types';
 import getMethodColor from './getMethodColor';
 
+const MethodBox = styled(Box)`
+  margin: -1px;
+  border-radius: ${({ theme }) => theme.spaces[1]} 0 0 ${({ theme }) => theme.spaces[1]};
+`;
+
 function BoundRoute({ route }) {
   const { formatMessage } = useIntl();
 
@@ -18,41 +24,31 @@ function BoundRoute({ route }) {
 
   return (
     <Stack size={2}>
-      <H3>
+      <Typography variant="delta" as="h3">
         {formatMessage({
           id: 'users-permissions.BoundRoute.title',
           defaultMessage: 'Bound route to',
         })}
         &nbsp;
         <span>{controller}</span>
-        <Text style={{ fontSize: 'inherit', fontWeight: 'inherit' }} textColor="primary600">
+        <Typography variant="delta" textColor="primary600">
           .{action}
-        </Text>
-      </H3>
-      <Box hasRadius background="neutral0" borderColor="neutral200">
-        <Box
-          color={colors.text}
-          background={colors.background}
-          borderColor={colors.border}
-          padding={2}
-          hasRadius
-          style={{
-            display: 'inline-block',
-            margin: '-1px',
-            borderTopRightRadius: 0,
-            borderBottomRightRadius: 0,
-          }}
-        >
-          <Text bold>{method}</Text>
-        </Box>
-        <Box style={{ display: 'inline-block' }} paddingLeft={2} paddingRight={2}>
+        </Typography>
+      </Typography>
+      <Stack horizontal hasRadius background="neutral0" borderColor="neutral200" size={0}>
+        <MethodBox background={colors.background} borderColor={colors.border} padding={2}>
+          <Typography fontWeight="bold" textColor={colors.text}>
+            {method}
+          </Typography>
+        </MethodBox>
+        <Box paddingLeft={2} paddingRight={2}>
           {map(formattedRoute, value => (
-            <Text key={value} textColor={value.includes(':') ? 'neutral600' : 'neutral900'}>
+            <Typography key={value} textColor={value.includes(':') ? 'neutral600' : 'neutral900'}>
               /{value}
-            </Text>
+            </Typography>
           ))}
         </Box>
-      </Box>
+      </Stack>
     </Stack>
   );
 }

package/admin/src/components/FormModal/Input/index.js

@@ -6,8 +6,8 @@
 
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { ToggleInput } from '@strapi/parts/ToggleInput';
-import { TextInput } from '@strapi/parts/TextInput';
+import { ToggleInput } from '@strapi/design-system/ToggleInput';
+import { TextInput } from '@strapi/design-system/TextInput';
 import PropTypes from 'prop-types';
 
 const Input = ({

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

@@ -6,11 +6,16 @@
 
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { Button } from '@strapi/parts/Button';
-import { Stack } from '@strapi/parts/Stack';
-import { Breadcrumbs, Crumb } from '@strapi/parts/Breadcrumbs';
-import { Grid, GridItem } from '@strapi/parts/Grid';
-import { ModalLayout, ModalHeader, ModalFooter, ModalBody } from '@strapi/parts/ModalLayout';
+import { Button } from '@strapi/design-system/Button';
+import { Stack } from '@strapi/design-system/Stack';
+import { Breadcrumbs, Crumb } from '@strapi/design-system/Breadcrumbs';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
+import {
+  ModalLayout,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+} from '@strapi/design-system/ModalLayout';
 import PropTypes from 'prop-types';
 import { Formik } from 'formik';
 import { Form } from '@strapi/helper-plugin';

package/admin/src/components/Permissions/PermissionRow/CheckboxWrapper.js

@@ -1,5 +1,5 @@
 import styled, { css } from 'styled-components';
-import { Box } from '@strapi/parts/Box';
+import { Box } from '@strapi/design-system/Box';
 
 const activeCheckboxWrapperStyles = css`
   background: ${props => props.theme.colors.primary100};

package/admin/src/components/Permissions/PermissionRow/SubCategory.js

@@ -2,11 +2,11 @@ import React, { useCallback, useMemo } from 'react';
 import { get } from 'lodash';
 import styled from 'styled-components';
 import PropTypes from 'prop-types';
-import { Box } from '@strapi/parts/Box';
-import { Checkbox } from '@strapi/parts/Checkbox';
-import { Row } from '@strapi/parts/Row';
-import { TableLabel } from '@strapi/parts/Text';
-import { Grid, GridItem } from '@strapi/parts/Grid';
+import { Box } from '@strapi/design-system/Box';
+import { Checkbox } from '@strapi/design-system/Checkbox';
+import { Flex } from '@strapi/design-system/Flex';
+import { Typography } from '@strapi/design-system/Typography';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
 import CogIcon from '@strapi/icons/Cog';
 import { useIntl } from 'react-intl';
 import CheckboxWrapper from './CheckboxWrapper';
@@ -59,9 +59,11 @@ const SubCategory = ({ subCategory }) => {
 
   return (
     <Box>
-      <Row justifyContent="space-between" alignItems="center">
+      <Flex justifyContent="space-between" alignItems="center">
         <Box paddingRight={4}>
-          <TableLabel textColor="neutral600">{subCategory.label}</TableLabel>
+          <Typography variant="sigma" textColor="neutral600">
+            {subCategory.label}
+          </Typography>
         </Box>
         <Border />
         <Box paddingLeft={4}>
@@ -75,8 +77,8 @@ const SubCategory = ({ subCategory }) => {
             {formatMessage({ id: 'app.utils.select-all', defaultMessage: 'Select all' })}
           </Checkbox>
         </Box>
-      </Row>
-      <Row paddingTop={6} paddingBottom={6}>
+      </Flex>
+      <Flex paddingTop={6} paddingBottom={6}>
         <Grid gap={2} style={{ flex: 1 }}>
           {subCategory.actions.map(action => {
             const name = `${action.name}.enabled`;
@@ -104,7 +106,7 @@ const SubCategory = ({ subCategory }) => {
             );
           })}
         </Grid>
-      </Row>
+      </Flex>
     </Box>
   );
 };

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

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
 import sortBy from 'lodash/sortBy';
-import { Box } from '@strapi/parts/Box';
+import { Box } from '@strapi/design-system/Box';
 import SubCategory from './SubCategory';
 
 const PermissionRow = ({ name, permissions }) => {

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

@@ -1,6 +1,8 @@
-import React, { memo, useCallback, useReducer } from 'react';
-import { Accordion, AccordionToggle, AccordionContent } from '@strapi/parts/Accordion';
+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';
+import { Stack } from '@strapi/design-system/Stack';
 import { useUsersPermissions } from '../../contexts/UsersPermissionsContext';
 import formatPluginName from '../../utils/formatPluginName';
 import PermissionRow from './PermissionRow';
@@ -14,20 +16,20 @@ const Permissions = () => {
     init(state, modifiedData)
   );
 
-  const handleToggle = useCallback(index => {
+  const handleToggle = index =>
     dispatch({
       type: 'TOGGLE_COLLAPSE',
       index,
     });
-  }, []);
 
   return (
-    <>
+    <Stack size={1}>
       {collapses.map((collapse, index) => (
         <Accordion
           expanded={collapse.isOpen}
           toggle={() => handleToggle(index)}
           key={collapse.name}
+          variant={index % 2 === 0 ? 'secondary' : undefined}
         >
           <AccordionToggle
             title={formatPluginName(collapse.name)}
@@ -41,12 +43,14 @@ const Permissions = () => {
             variant={index % 2 ? 'primary' : 'secondary'}
           />
           <AccordionContent>
-            <PermissionRow permissions={modifiedData[collapse.name]} name={collapse.name} />
+            <Box>
+              <PermissionRow permissions={modifiedData[collapse.name]} name={collapse.name} />
+            </Box>
           </AccordionContent>
         </Accordion>
       ))}
-    </>
+    </Stack>
   );
 };
 
-export default memo(Permissions);
+export default Permissions;

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

@@ -1,20 +1,23 @@
 import React from 'react';
 import { useIntl } from 'react-intl';
-import { H3, Text } from '@strapi/parts/Text';
-import { Stack } from '@strapi/parts/Stack';
-import { GridItem } from '@strapi/parts/Grid';
-import { get, isEmpty, takeRight, toLower, without } from 'lodash';
+import { Typography } from '@strapi/design-system/Typography';
+import { Stack } from '@strapi/design-system/Stack';
+import { GridItem } from '@strapi/design-system/Grid';
+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
@@ -35,19 +38,19 @@ const Policies = () => {
         </Stack>
       ) : (
         <Stack size={2}>
-          <H3>
+          <Typography variant="delta" as="h3">
             {formatMessage({
               id: 'users-permissions.Policies.header.title',
               defaultMessage: 'Advanced settings',
             })}
-          </H3>
-          <Text as="p" textColor="neutral600">
+          </Typography>
+          <Typography as="p" textColor="neutral600">
             {formatMessage({
               id: 'users-permissions.Policies.header.hint',
               defaultMessage:
                 "Select the application's actions or the plugin's actions and click on the cog icon to display the bound route",
             })}
-          </Text>
+          </Typography>
         </Stack>
       )}
     </GridItem>

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

@@ -1,8 +1,8 @@
-import React, { memo, useReducer, useCallback, forwardRef, useImperativeHandle } from 'react';
+import React, { memo, useReducer, forwardRef, useImperativeHandle } from 'react';
 import PropTypes from 'prop-types';
-import { H3, Text } from '@strapi/parts/Text';
-import { Stack } from '@strapi/parts/Stack';
-import { Grid, GridItem } from '@strapi/parts/Grid';
+import { Typography } from '@strapi/design-system/Typography';
+import { Stack } from '@strapi/design-system/Stack';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
 import { useIntl } from 'react-intl';
 import getTrad from '../../utils/getTrad';
 import Policies from '../Policies';
@@ -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,
@@ -65,20 +62,20 @@ const UsersPermissions = forwardRef(({ permissions, routes }, ref) => {
     <UsersPermissionsProvider value={providerValue}>
       <Grid gap={0} shadow="filterShadow" hasRadius background="neutral0">
         <GridItem col={7} paddingTop={6} paddingBottom={6} paddingLeft={7} paddingRight={7}>
-          <Stack size={4}>
+          <Stack size={6}>
             <Stack size={2}>
-              <H3 as="h2">
+              <Typography variant="delta" as="h2">
                 {formatMessage({
                   id: getTrad('Plugins.header.title'),
                   defaultMessage: 'Permissions',
                 })}
-              </H3>
-              <Text as="p" textColor="neutral600">
+              </Typography>
+              <Typography as="p" textColor="neutral600">
                 {formatMessage({
                   id: getTrad('Plugins.header.description'),
                   defaultMessage: 'Only actions bound by a route are listed below.',
                 })}
-              </Text>
+              </Typography>
             </Stack>
             <Permissions />
           </Stack>

package/admin/src/index.js

@@ -6,13 +6,10 @@
 // IF THE DOC IS NOT UPDATED THE PULL REQUEST WILL NOT BE MERGED
 import { prefixPluginTranslations } from '@strapi/helper-plugin';
 import pluginPkg from '../../package.json';
-import pluginLogo from './assets/images/logo.svg';
 import pluginPermissions from './permissions';
 import pluginId from './pluginId';
 import getTrad from './utils/getTrad';
 
-const pluginDescription = pluginPkg.strapi.description || pluginPkg.description;
-const icon = pluginPkg.strapi.icon;
 const name = pluginPkg.strapi.name;
 
 export default {
@@ -95,13 +92,8 @@ export default {
     );
 
     app.registerPlugin({
-      description: pluginDescription,
-      icon,
       id: pluginId,
-      isReady: true,
-      isRequired: pluginPkg.strapi.required || false,
       name,
-      pluginLogo,
     });
   },
   bootstrap() {},

package/admin/src/pages/AdvancedSettings/index.js

@@ -13,16 +13,16 @@ import {
   useOverlayBlocker,
   useRBAC,
 } from '@strapi/helper-plugin';
-import { useNotifyAT } from '@strapi/parts/LiveRegions';
-import { Main } from '@strapi/parts/Main';
-import { HeaderLayout, ContentLayout } from '@strapi/parts/Layout';
-import { Button } from '@strapi/parts/Button';
-import { Box } from '@strapi/parts/Box';
-import { Stack } from '@strapi/parts/Stack';
-import { Select, Option } from '@strapi/parts/Select';
-import { H3 } from '@strapi/parts/Text';
-import { Grid, GridItem } from '@strapi/parts/Grid';
-import CheckIcon from '@strapi/icons/CheckIcon';
+import { useNotifyAT } from '@strapi/design-system/LiveRegions';
+import { Main } from '@strapi/design-system/Main';
+import { HeaderLayout, ContentLayout } from '@strapi/design-system/Layout';
+import { Button } from '@strapi/design-system/Button';
+import { Box } from '@strapi/design-system/Box';
+import { Stack } from '@strapi/design-system/Stack';
+import { Select, Option } from '@strapi/design-system/Select';
+import { Typography } from '@strapi/design-system/Typography';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
+import Check from '@strapi/icons/Check';
 import pluginPermissions from '../../permissions';
 import { getTrad } from '../../utils';
 import layout from './utils/layout';
@@ -151,7 +151,7 @@ const AdvancedSettingsPage = () => {
                     loading={isSubmitting}
                     type="submit"
                     disabled={!canUpdate}
-                    startIcon={<CheckIcon />}
+                    startIcon={<Check />}
                     size="L"
                   >
                     {formatMessage({ id: getTrad('Form.save'), defaultMessage: 'Save' })}
@@ -169,12 +169,12 @@ const AdvancedSettingsPage = () => {
                   paddingRight={7}
                 >
                   <Stack size={4}>
-                    <H3>
+                    <Typography variant="delta" as="h2">
                       {formatMessage({
                         id: getTrad('Form.title.advancedSettings'),
                         defaultMessage: 'Settings',
                       })}
-                    </H3>
+                    </Typography>
                     <Grid gap={6}>
                       <GridItem col={6} s={12}>
                         <Select

package/admin/src/pages/EmailTemplates/components/EmailForm.js

@@ -3,11 +3,16 @@ import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 import { Form, GenericInput } from '@strapi/helper-plugin';
 import { Formik } from 'formik';
-import { ModalLayout, ModalHeader, ModalFooter, ModalBody } from '@strapi/parts/ModalLayout';
-import { Grid, GridItem } from '@strapi/parts/Grid';
-import { Button } from '@strapi/parts/Button';
-import { Breadcrumbs, Crumb } from '@strapi/parts/Breadcrumbs';
-import { Textarea } from '@strapi/parts/Textarea';
+import {
+  ModalLayout,
+  ModalHeader,
+  ModalFooter,
+  ModalBody,
+} from '@strapi/design-system/ModalLayout';
+import { Grid, GridItem } from '@strapi/design-system/Grid';
+import { Button } from '@strapi/design-system/Button';
+import { Breadcrumbs, Crumb } from '@strapi/design-system/Breadcrumbs';
+import { Textarea } from '@strapi/design-system/Textarea';
 import { getTrad } from '../../../utils';
 import schema from '../utils/schema';
 

package/admin/src/pages/EmailTemplates/components/EmailTable.js

@@ -1,14 +1,14 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
-import { Table, Thead, Tbody, Tr, Td, Th } from '@strapi/parts/Table';
-import { VisuallyHidden } from '@strapi/parts/VisuallyHidden';
-import { Text, TableLabel } from '@strapi/parts/Text';
-import { IconButton } from '@strapi/parts/IconButton';
-import EditIcon from '@strapi/icons/EditIcon';
-import Reload from '@strapi/icons/Reload';
+import { Table, Thead, Tbody, Tr, Td, Th } from '@strapi/design-system/Table';
+import { VisuallyHidden } from '@strapi/design-system/VisuallyHidden';
+import { Typography } from '@strapi/design-system/Typography';
+import { IconButton } from '@strapi/design-system/IconButton';
+import Pencil from '@strapi/icons/Pencil';
+import Reload from '@strapi/icons/Refresh';
 import { onRowClick, stopPropagation } from '@strapi/helper-plugin';
-import CheckIcon from '@strapi/icons/CheckIcon';
+import Check from '@strapi/icons/Check';
 import { getTrad } from '../../../utils';
 
 const EmailTable = ({ canUpdate, onEditClick }) => {
@@ -27,12 +27,12 @@ const EmailTable = ({ canUpdate, onEditClick }) => {
             </VisuallyHidden>
           </Th>
           <Th>
-            <TableLabel textColor="neutral600">
+            <Typography variant="sigma" textColor="neutral600">
               {formatMessage({
                 id: getTrad('Email.template.table.name.label'),
                 defaultMessage: 'name',
               })}
-            </TableLabel>
+            </Typography>
           </Th>
           <Th width="1%">
             <VisuallyHidden>
@@ -55,12 +55,12 @@ const EmailTable = ({ canUpdate, onEditClick }) => {
             />
           </Td>
           <Td>
-            <Text>
+            <Typography>
               {formatMessage({
                 id: getTrad('Email.template.reset_password'),
                 defaultMessage: 'Reset password',
               })}
-            </Text>
+            </Typography>
           </Td>
           <Td {...stopPropagation}>
             <IconButton
@@ -70,13 +70,13 @@ const EmailTable = ({ canUpdate, onEditClick }) => {
                 defaultMessage: 'Edit a template',
               })}
               noBorder
-              icon={canUpdate && <EditIcon />}
+              icon={canUpdate && <Pencil />}
             />
           </Td>
         </Tr>
         <Tr {...onRowClick({ fn: () => onEditClick('email_confirmation') })}>
           <Td>
-            <CheckIcon
+            <Check
               aria-label={formatMessage({
                 id: getTrad('Email.template.email_confirmation'),
                 defaultMessage: 'Email address confirmation',
@@ -84,12 +84,12 @@ const EmailTable = ({ canUpdate, onEditClick }) => {
             />
           </Td>
           <Td>
-            <Text>
+            <Typography>
               {formatMessage({
                 id: getTrad('Email.template.email_confirmation'),
                 defaultMessage: 'Email address confirmation',
               })}
-            </Text>
+            </Typography>
           </Td>
           <Td {...stopPropagation}>
             <IconButton
@@ -99,7 +99,7 @@ const EmailTable = ({ canUpdate, onEditClick }) => {
                 defaultMessage: 'Edit a template',
               })}
               noBorder
-              icon={canUpdate && <EditIcon />}
+              icon={canUpdate && <Pencil />}
             />
           </Td>
         </Tr>

package/admin/src/pages/EmailTemplates/index.js

@@ -11,9 +11,9 @@ import {
   useFocusWhenNavigate,
   LoadingIndicatorPage,
 } from '@strapi/helper-plugin';
-import { useNotifyAT } from '@strapi/parts/LiveRegions';
-import { Main } from '@strapi/parts/Main';
-import { ContentLayout, HeaderLayout } from '@strapi/parts/Layout';
+import { useNotifyAT } from '@strapi/design-system/LiveRegions';
+import { Main } from '@strapi/design-system/Main';
+import { ContentLayout, HeaderLayout } from '@strapi/design-system/Layout';
 import pluginPermissions from '../../permissions';
 import { getTrad } from '../../utils';
 import { fetchData, putEmailTemplate } from './utils/api';