@strapi/plugin-users-permissions 5.0.0-beta.8 → 5.0.0-rc.0

package/LICENSE

@@ -2,7 +2,21 @@ Copyright (c) 2015-present Strapi Solutions SAS
 
 Portions of the Strapi software are licensed as follows:
 
-* All software that resides under an "ee/" directory (the “EE Software”), if that directory exists, is licensed under the license defined in "ee/LICENSE".
+* All software that resides under an "ee/" directory (the “EE Software”), if that directory exists, is licensed under the license defined below.
+
+Enterprise License
+
+If you or the company you represent has entered into a written agreement referencing the Enterprise Edition of the Strapi source code available at
+https://github.com/strapi/strapi, then such agreement applies to your use of the Enterprise Edition of the Strapi Software. If you or the company you
+represent is using the Enterprise Edition of the Strapi Software in connection with a subscription to our cloud offering, then the agreement you have
+agreed to with respect to our cloud offering and the licenses included in such agreement apply to your use of the Enterprise Edition of the Strapi Software.
+Otherwise, the Strapi Enterprise Software License Agreement (found here https://strapi.io/enterprise-terms) applies to your use of the Enterprise Edition of the Strapi Software.
+
+BY ACCESSING OR USING THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE, YOU ARE AGREEING TO BE BOUND BY THE RELEVANT REFERENCED AGREEMENT.
+IF YOU ARE NOT AUTHORIZED TO ACCEPT THESE TERMS ON BEHALF OF THE COMPANY YOU REPRESENT OR IF YOU DO NOT AGREE TO ALL OF THE RELEVANT TERMS AND CONDITIONS REFERENCED AND YOU
+HAVE NOT OTHERWISE EXECUTED A WRITTEN AGREEMENT WITH STRAPI, YOU ARE NOT AUTHORIZED TO ACCESS OR USE OR ALLOW ANY USER TO ACCESS OR USE ANY PART OF
+THE ENTERPRISE EDITION OF THE STRAPI SOFTWARE.  YOUR ACCESS RIGHTS ARE CONDITIONAL ON YOUR CONSENT TO THE RELEVANT REFERENCED TERMS TO THE EXCLUSION OF ALL OTHER TERMS;
+IF THE RELEVANT REFERENCED TERMS ARE CONSIDERED AN OFFER BY YOU, ACCEPTANCE IS EXPRESSLY LIMITED TO THE RELEVANT REFERENCED TERMS.
 
 * All software outside of the above-mentioned directories or restrictions above is available under the "MIT Expat" license as set forth below.
 
@@ -18,5 +32,6 @@ furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -6,17 +6,7 @@
 
 import React from 'react';
 
-import {
-  Button,
-  Flex,
-  Grid,
-  GridItem,
-  ModalBody,
-  ModalFooter,
-  ModalHeader,
-  ModalLayout,
-} from '@strapi/design-system';
-import { Breadcrumbs, Crumb } from '@strapi/design-system';
+import { Button, Flex, Grid, Modal, Breadcrumbs, Crumb } from '@strapi/design-system';
 import { Form, Formik } from 'formik';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
@@ -35,71 +25,65 @@ const FormModal = ({
 }) => {
   const { formatMessage } = useIntl();
 
-  if (!isOpen) {
-    return null;
-  }
-
   return (
-    <ModalLayout onClose={onToggle} labelledBy="title">
-      <ModalHeader>
-        <Breadcrumbs label={headerBreadcrumbs.join(', ')}>
-          {headerBreadcrumbs.map((crumb, index, arr) => (
-            <Crumb isCurrent={index === arr.length - 1} key={crumb}>
-              {crumb}
-            </Crumb>
-          ))}
-        </Breadcrumbs>
-      </ModalHeader>
-      <Formik
-        onSubmit={(values) => onSubmit(values)}
-        initialValues={initialData}
-        validationSchema={layout.schema}
-        validateOnChange={false}
-      >
-        {({ errors, handleChange, values }) => {
-          return (
-            <Form>
-              <ModalBody>
-                <Flex direction="column" alignItems="stretch" gap={1}>
-                  <Grid gap={5}>
-                    {layout.form.map((row) => {
-                      return row.map((input) => {
-                        return (
-                          <GridItem key={input.name} col={input.size} xs={12}>
-                            <Input
-                              {...input}
-                              error={errors[input.name]}
-                              onChange={handleChange}
-                              value={values[input.name]}
-                              providerToEditName={providerToEditName}
-                            />
-                          </GridItem>
-                        );
-                      });
-                    })}
-                  </Grid>
-                </Flex>
-              </ModalBody>
-              <ModalFooter
-                startActions={
+    <Modal.Root open={isOpen} onOpenChange={onToggle}>
+      <Modal.Content>
+        <Modal.Header>
+          <Breadcrumbs label={headerBreadcrumbs.join(', ')}>
+            {headerBreadcrumbs.map((crumb, index, arr) => (
+              <Crumb isCurrent={index === arr.length - 1} key={crumb}>
+                {crumb}
+              </Crumb>
+            ))}
+          </Breadcrumbs>
+        </Modal.Header>
+        <Formik
+          onSubmit={(values) => onSubmit(values)}
+          initialValues={initialData}
+          validationSchema={layout.schema}
+          validateOnChange={false}
+        >
+          {({ errors, handleChange, values }) => {
+            return (
+              <Form>
+                <Modal.Body>
+                  <Flex direction="column" alignItems="stretch" gap={1}>
+                    <Grid.Root gap={5}>
+                      {layout.form.map((row) => {
+                        return row.map((input) => {
+                          return (
+                            <Grid.Item key={input.name} col={input.size} xs={12}>
+                              <Input
+                                {...input}
+                                error={errors[input.name]}
+                                onChange={handleChange}
+                                value={values[input.name]}
+                                providerToEditName={providerToEditName}
+                              />
+                            </Grid.Item>
+                          );
+                        });
+                      })}
+                    </Grid.Root>
+                  </Flex>
+                </Modal.Body>
+                <Modal.Footer>
                   <Button variant="tertiary" onClick={onToggle} type="button">
                     {formatMessage({
                       id: 'app.components.Button.cancel',
                       defaultMessage: 'Cancel',
                     })}
                   </Button>
-                }
-                endActions={
                   <Button type="submit" loading={isSubmiting}>
                     {formatMessage({ id: 'global.save', defaultMessage: 'Save' })}
                   </Button>
-                }
-              />
-            </Form>
-          );
-        }}
-      </Formik>
-    </ModalLayout>
+                </Modal.Footer>
+              </Form>
+            );
+          }}
+        </Formik>
+      </Modal.Content>
+    </Modal.Root>
   );
 };
 

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

@@ -3,7 +3,8 @@ import { styled, css } from 'styled-components';
 
 const activeCheckboxWrapperStyles = css`
   background: ${(props) => props.theme.colors.primary100};
-  svg {
+
+  #cog {
     opacity: 1;
   }
 `;
@@ -13,7 +14,7 @@ const CheckboxWrapper = styled(Box)`
   justify-content: space-between;
   align-items: center;
 
-  svg {
+  #cog {
     opacity: 0;
     path {
       fill: ${(props) => props.theme.colors.primary600};

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

@@ -1,15 +1,7 @@
 import React, { useCallback, useMemo } from 'react';
 
-import {
-  Box,
-  Checkbox,
-  Flex,
-  Typography,
-  Grid,
-  GridItem,
-  VisuallyHidden,
-} from '@strapi/design-system';
-import { Cog as CogIcon } from '@strapi/icons';
+import { Box, Checkbox, Flex, Typography, Grid, VisuallyHidden } from '@strapi/design-system';
+import { Cog } from '@strapi/icons';
 import get from 'lodash/get';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
@@ -71,28 +63,27 @@ const SubCategory = ({ subCategory }) => {
         <Box paddingLeft={4}>
           <Checkbox
             name={subCategory.name}
-            value={hasAllActionsSelected}
-            onValueChange={(value) =>
+            checked={hasSomeActionsSelected ? 'indeterminate' : hasAllActionsSelected}
+            onCheckedChange={(value) =>
               handleChangeSelectAll({ target: { name: subCategory.name, value } })
             }
-            indeterminate={hasSomeActionsSelected}
           >
             {formatMessage({ id: 'app.utils.select-all', defaultMessage: 'Select all' })}
           </Checkbox>
         </Box>
       </Flex>
       <Flex paddingTop={6} paddingBottom={6}>
-        <Grid gap={2} style={{ flex: 1 }}>
+        <Grid.Root gap={2} style={{ flex: 1 }}>
           {subCategory.actions.map((action) => {
             const name = `${action.name}.enabled`;
 
             return (
-              <GridItem col={6} key={action.name}>
+              <Grid.Item col={6} key={action.name}>
                 <CheckboxWrapper isActive={isActionSelected(action.name)} padding={2} hasRadius>
                   <Checkbox
-                    value={get(modifiedData, name, false)}
+                    checked={get(modifiedData, name, false)}
                     name={name}
-                    onValueChange={(value) => onChange({ target: { name, value } })}
+                    onCheckedChange={(value) => onChange({ target: { name, value } })}
                   >
                     {action.label}
                   </Checkbox>
@@ -112,13 +103,13 @@ const SubCategory = ({ subCategory }) => {
                         }
                       )}
                     </VisuallyHidden>
-                    <CogIcon />
+                    <Cog id="cog" />
                   </button>
                 </CheckboxWrapper>
-              </GridItem>
+              </Grid.Item>
             );
           })}
-        </Grid>
+        </Grid.Root>
       </Flex>
     </Box>
   );

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

@@ -22,6 +22,7 @@ const Permissions = () => {
           <Accordion.Item key={collapse.name} value={collapse.name}>
             <Accordion.Header variant={index % 2 === 0 ? 'secondary' : undefined}>
               <Accordion.Trigger
+                caretPosition="right"
                 description={formatMessage(
                   {
                     id: 'users-permissions.Plugin.permissions.plugins.description',

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

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Flex, GridItem, Typography } from '@strapi/design-system';
+import { Flex, Grid, Typography } from '@strapi/design-system';
 import get from 'lodash/get';
 import isEmpty from 'lodash/isEmpty';
 import without from 'lodash/without';
@@ -22,7 +22,7 @@ const Policies = () => {
     : controllerRoutes.filter((o) => o.handler.endsWith(pathResolved));
 
   return (
-    <GridItem
+    <Grid.Item
       col={5}
       background="neutral150"
       paddingTop={6}
@@ -55,7 +55,7 @@ const Policies = () => {
           </Typography>
         </Flex>
       )}
-    </GridItem>
+    </Grid.Item>
   );
 };
 

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

@@ -1,6 +1,6 @@
 import React, { forwardRef, memo, useImperativeHandle, useReducer } from 'react';
 
-import { Flex, Grid, GridItem, Typography } from '@strapi/design-system';
+import { Flex, Grid, Typography } from '@strapi/design-system';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
 
@@ -61,8 +61,8 @@ const UsersPermissions = forwardRef(({ permissions, routes }, ref) => {
 
   return (
     <UsersPermissionsProvider value={providerValue}>
-      <Grid gap={0} shadow="filterShadow" hasRadius background="neutral0">
-        <GridItem col={7} paddingTop={6} paddingBottom={6} paddingLeft={7} paddingRight={7}>
+      <Grid.Root gap={0} shadow="filterShadow" hasRadius background="neutral0">
+        <Grid.Item col={7} paddingTop={6} paddingBottom={6} paddingLeft={7} paddingRight={7}>
           <Flex direction="column" alignItems="stretch" gap={6}>
             <Flex direction="column" alignItems="stretch" gap={2}>
               <Typography variant="delta" tag="h2">
@@ -80,9 +80,9 @@ const UsersPermissions = forwardRef(({ permissions, routes }, ref) => {
             </Flex>
             <Permissions />
           </Flex>
-        </GridItem>
+        </Grid.Item>
         <Policies />
-      </Grid>
+      </Grid.Root>
     </UsersPermissionsProvider>
   );
 });

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

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Box, Button, Flex, Grid, GridItem, Typography, useNotifyAT } from '@strapi/design-system';
+import { Box, Button, Flex, Grid, Typography, useNotifyAT } from '@strapi/design-system';
 import { Check } from '@strapi/icons';
 import {
   useAPIErrorHandler,
@@ -157,7 +157,7 @@ const AdvancedSettingsPage = () => {
                         defaultMessage: 'Settings',
                       })}
                     </Typography>
-                    <Grid gap={6}>
+                    <Grid.Root gap={6}>
                       {[
                         {
                           label: {
@@ -179,7 +179,7 @@ const AdvancedSettingsPage = () => {
                         },
                         ...layout,
                       ].map(({ size, ...field }) => (
-                        <GridItem key={field.name} col={size}>
+                        <Grid.Item key={field.name} col={size}>
                           <InputRenderer
                             {...field}
                             disabled={
@@ -192,9 +192,9 @@ const AdvancedSettingsPage = () => {
                               field.placeholder ? formatMessage(field.placeholder) : undefined
                             }
                           />
-                        </GridItem>
+                        </Grid.Item>
                       ))}
-                    </Grid>
+                    </Grid.Root>
                   </Flex>
                 </Box>
               </Layouts.Content>

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

@@ -1,16 +1,6 @@
 import React from 'react';
 
-import {
-  Button,
-  Grid,
-  GridItem,
-  ModalBody,
-  ModalFooter,
-  ModalHeader,
-  ModalLayout,
-  Breadcrumbs,
-  Crumb,
-} from '@strapi/design-system';
+import { Button, Grid, Modal, Breadcrumbs, Crumb, VisuallyHidden } from '@strapi/design-system';
 import { Form, InputRenderer } from '@strapi/strapi/admin';
 import PropTypes from 'prop-types';
 import { useIntl } from 'react-intl';
@@ -18,117 +8,127 @@ import { useIntl } from 'react-intl';
 import { getTrad } from '../../../utils';
 import schema from '../utils/schema';
 
-const EmailForm = ({ template, onToggle, onSubmit }) => {
+const EmailForm = ({ template = {}, onToggle, open, onSubmit }) => {
   const { formatMessage } = useIntl();
 
   return (
-    <ModalLayout
-      onClose={onToggle}
-      labelledBy={`${formatMessage({
-        id: getTrad('PopUpForm.header.edit.email-templates'),
-        defaultMessage: 'Edit email template',
-      })}, ${formatMessage({ id: getTrad(template.display), defaultMessage: template.display })}`}
-    >
-      <ModalHeader>
-        <Breadcrumbs
-          label={`${formatMessage({
-            id: getTrad('PopUpForm.header.edit.email-templates'),
-            defaultMessage: 'Edit email template',
-          })}, ${formatMessage({
-            id: getTrad(template.display),
-            defaultMessage: template.display,
-          })}`}
-        >
-          <Crumb>
-            {formatMessage({
+    <Modal.Root open={open} onOpenChange={onToggle}>
+      <Modal.Content>
+        <Modal.Header>
+          <Breadcrumbs
+            label={`${formatMessage({
               id: getTrad('PopUpForm.header.edit.email-templates'),
               defaultMessage: 'Edit email template',
-            })}
-          </Crumb>
-          <Crumb isCurrent>
-            {formatMessage({ id: getTrad(template.display), defaultMessage: template.display })}
-          </Crumb>
-        </Breadcrumbs>
-      </ModalHeader>
-      <Form onSubmit={onSubmit} initialValues={template} validationSchema={schema}>
-        {({ isSubmitting }) => {
-          return (
-            <>
-              <ModalBody>
-                <Grid gap={5}>
-                  {[
-                    {
-                      label: formatMessage({
-                        id: getTrad('PopUpForm.Email.options.from.name.label'),
-                        defaultMessage: 'Shipper name',
-                      }),
-                      name: 'options.from.name',
-                      size: 6,
-                      type: 'string',
-                    },
-                    {
-                      label: formatMessage({
-                        id: getTrad('PopUpForm.Email.options.from.email.label'),
-                        defaultMessage: 'Shipper email',
-                      }),
-                      name: 'options.from.email',
-                      size: 6,
-                      type: 'string',
-                    },
-                    {
-                      label: formatMessage({
-                        id: getTrad('PopUpForm.Email.options.response_email.label'),
-                        defaultMessage: 'Response email',
-                      }),
-                      name: 'options.response_email',
-                      size: 6,
-                      type: 'string',
-                    },
-                    {
-                      label: formatMessage({
-                        id: getTrad('PopUpForm.Email.options.object.label'),
-                        defaultMessage: 'Subject',
-                      }),
-                      name: 'options.object',
-                      size: 6,
-                      type: 'string',
-                    },
-                    {
-                      label: formatMessage({
-                        id: getTrad('PopUpForm.Email.options.message.label'),
-                        defaultMessage: 'Message',
-                      }),
-                      name: 'options.message',
-                      size: 12,
-                      type: 'text',
-                    },
-                  ].map(({ size, ...field }) => (
-                    <GridItem key={field.name} col={size}>
-                      <InputRenderer {...field} />
-                    </GridItem>
-                  ))}
-                </Grid>
-              </ModalBody>
-              <ModalFooter
-                startActions={
-                  <Button onClick={onToggle} variant="tertiary">
-                    Cancel
-                  </Button>
-                }
-                endActions={
+            })}, ${
+              template.display
+                ? formatMessage({
+                    id: getTrad(template.display),
+                    defaultMessage: template.display,
+                  })
+                : ''
+            }`}
+          >
+            <Crumb>
+              {formatMessage({
+                id: getTrad('PopUpForm.header.edit.email-templates'),
+                defaultMessage: 'Edit email template',
+              })}
+            </Crumb>
+            <Crumb isCurrent>
+              {template.display
+                ? formatMessage({ id: getTrad(template.display), defaultMessage: template.display })
+                : ''}
+            </Crumb>
+          </Breadcrumbs>
+          <VisuallyHidden>
+            <Modal.Title>
+              {`${formatMessage({
+                id: getTrad('PopUpForm.header.edit.email-templates'),
+                defaultMessage: 'Edit email template',
+              })}, ${template.display ? formatMessage({ id: getTrad(template.display), defaultMessage: template.display }) : ''}`}
+            </Modal.Title>
+          </VisuallyHidden>
+        </Modal.Header>
+        <Form onSubmit={onSubmit} initialValues={template} validationSchema={schema}>
+          {({ isSubmitting }) => {
+            return (
+              <>
+                <Modal.Body>
+                  <Grid.Root gap={5}>
+                    {[
+                      {
+                        label: formatMessage({
+                          id: getTrad('PopUpForm.Email.options.from.name.label'),
+                          defaultMessage: 'Shipper name',
+                        }),
+                        name: 'options.from.name',
+                        size: 6,
+                        type: 'string',
+                      },
+                      {
+                        label: formatMessage({
+                          id: getTrad('PopUpForm.Email.options.from.email.label'),
+                          defaultMessage: 'Shipper email',
+                        }),
+                        name: 'options.from.email',
+                        size: 6,
+                        type: 'string',
+                      },
+                      {
+                        label: formatMessage({
+                          id: getTrad('PopUpForm.Email.options.response_email.label'),
+                          defaultMessage: 'Response email',
+                        }),
+                        name: 'options.response_email',
+                        size: 6,
+                        type: 'string',
+                      },
+                      {
+                        label: formatMessage({
+                          id: getTrad('PopUpForm.Email.options.object.label'),
+                          defaultMessage: 'Subject',
+                        }),
+                        name: 'options.object',
+                        size: 6,
+                        type: 'string',
+                      },
+                      {
+                        label: formatMessage({
+                          id: getTrad('PopUpForm.Email.options.message.label'),
+                          defaultMessage: 'Message',
+                        }),
+                        name: 'options.message',
+                        size: 12,
+                        type: 'text',
+                      },
+                    ].map(({ size, ...field }) => (
+                      <Grid.Item key={field.name} col={size}>
+                        <InputRenderer {...field} />
+                      </Grid.Item>
+                    ))}
+                  </Grid.Root>
+                </Modal.Body>
+                <Modal.Footer>
+                  <Modal.Close>
+                    <Button variant="tertiary">Cancel</Button>
+                  </Modal.Close>
                   <Button loading={isSubmitting} type="submit">
                     Finish
                   </Button>
-                }
-              />
-            </>
-          );
-        }}
-      </Form>
-    </ModalLayout>
+                </Modal.Footer>
+              </>
+            );
+          }}
+        </Form>
+      </Modal.Content>
+    </Modal.Root>
   );
 };
 
+EmailForm.defaultProps = {
+  template: {},
+};
+
 EmailForm.propTypes = {
   template: PropTypes.shape({
     display: PropTypes.string,
@@ -142,7 +142,8 @@ EmailForm.propTypes = {
       object: PropTypes.string,
       response_email: PropTypes.string,
     }),
-  }).isRequired,
+  }),
+  open: PropTypes.bool.isRequired,
   onSubmit: PropTypes.func.isRequired,
   onToggle: PropTypes.func.isRequired,
 };