@strapi/plugin-users-permissions 0.0.0-next.f4ff842a3cb7b83db540bee67554b704e042b042 → 0.0.0-next.f5312617ca16b870c2bf1adcea2c69b676979e29

package/dist/_chunks/{index-MuQRbm-o.mjs → index-CnX2wiLY.mjs}

@@ -1,20 +1,20 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import * as React from "react";
 import { createContext, useContext, useMemo, useCallback, useReducer, forwardRef, useImperativeHandle, memo, useEffect, useState } from "react";
-import { translatedErrors, useNotification, useFetchClient, useAPIErrorHandler, CheckPagePermissions, useOverlayBlocker, useTracking, SettingsPageTitle, Form, LoadingIndicatorPage, Link, pxToRem, onRowClick, stopPropagation, CheckPermissions, getFetchClient, useQueryParams, useFocusWhenNavigate, useRBAC, useFilter, useCollator, LinkButton, SearchURLQuery, NoPermissions, EmptyStateLayout, ConfirmDialog, AnErrorOccurred } from "@strapi/helper-plugin";
-import { useHistory, useRouteMatch, Switch, Route } from "react-router-dom";
-import { g as getTrad, P as PERMISSIONS } from "./index-iu-7wU8h.mjs";
-import { Box, Flex, Typography, Checkbox, Grid, GridItem, VisuallyHidden, Accordion, AccordionToggle, AccordionContent, Main, HeaderLayout, Button, ContentLayout, TextInput, Textarea, Link as Link$1, Tbody, Tr, Td, IconButton, useNotifyAT, Layout, ActionLayout, Table, Thead, Th } from "@strapi/design-system";
-import { Cog, Check, ArrowLeft, Pencil, Trash, Plus } from "@strapi/icons";
-import { Formik } from "formik";
+import { translatedErrors, useNotification, useFetchClient, useAPIErrorHandler, Page, useTracking, Layouts, BackButton, useQueryParams, useRBAC, SearchInput, ConfirmDialog } from "@strapi/strapi/admin";
+import { useNavigate, useMatch, NavLink, Routes, Route } from "react-router-dom";
+import { g as getTrad, P as PERMISSIONS } from "./index-R4R0dEOv.mjs";
+import { Box, Flex, Typography, Checkbox, Grid, VisuallyHidden, Accordion, Main, Button, Field, TextInput, Textarea, Link, Tbody, Tr, Td, IconButton, useNotifyAT, useFilter, useCollator, LinkButton, Table, Thead, Th, EmptyStateLayout, Dialog } from "@strapi/design-system";
+import { Cog, Check, Pencil, Trash, Plus } from "@strapi/icons";
+import { Formik, Form } from "formik";
 import { useIntl } from "react-intl";
 import { useQueries, useMutation, useQuery } from "react-query";
 import PropTypes from "prop-types";
 import upperFirst from "lodash/upperFirst";
 import sortBy from "lodash/sortBy";
 import get from "lodash/get";
-import styled, { css } from "styled-components";
-import produce from "immer";
+import { css, styled } from "styled-components";
+import { produce } from "immer";
 import isEmpty from "lodash/isEmpty";
 import without from "lodash/without";
 import map from "lodash/map";
@@ -59,7 +59,8 @@ const init$1 = (initialState2, permissions) => {
 };
 const activeCheckboxWrapperStyles = css`
   background: ${(props) => props.theme.colors.primary100};
-  svg {
+
+  #cog {
     opacity: 1;
   }
 `;
@@ -68,7 +69,7 @@ const CheckboxWrapper = styled(Box)`
   justify-content: space-between;
   align-items: center;
 
-  svg {
+  #cog {
     opacity: 0;
     path {
       fill: ${(props) => props.theme.colors.primary600};
@@ -118,22 +119,21 @@ const SubCategory = ({ subCategory }) => {
         Checkbox,
         {
           name: subCategory.name,
-          value: hasAllActionsSelected,
-          onValueChange: (value) => handleChangeSelectAll({ target: { name: subCategory.name, value } }),
-          indeterminate: hasSomeActionsSelected,
+          checked: hasSomeActionsSelected ? "indeterminate" : hasAllActionsSelected,
+          onCheckedChange: (value) => handleChangeSelectAll({ target: { name: subCategory.name, value } }),
           children: formatMessage({ id: "app.utils.select-all", defaultMessage: "Select all" })
         }
       ) })
     ] }),
-    /* @__PURE__ */ jsx(Flex, { paddingTop: 6, paddingBottom: 6, children: /* @__PURE__ */ jsx(Grid, { gap: 2, style: { flex: 1 }, children: subCategory.actions.map((action) => {
+    /* @__PURE__ */ jsx(Flex, { paddingTop: 6, paddingBottom: 6, children: /* @__PURE__ */ jsx(Grid.Root, { gap: 2, style: { flex: 1 }, children: subCategory.actions.map((action) => {
       const name = `${action.name}.enabled`;
-      return /* @__PURE__ */ jsx(GridItem, { col: 6, children: /* @__PURE__ */ jsxs(CheckboxWrapper, { isActive: isActionSelected(action.name), padding: 2, hasRadius: true, children: [
+      return /* @__PURE__ */ jsx(Grid.Item, { col: 6, direction: "column", alignItems: "stretch", children: /* @__PURE__ */ jsxs(CheckboxWrapper, { isActive: isActionSelected(action.name), padding: 2, hasRadius: true, children: [
         /* @__PURE__ */ jsx(
           Checkbox,
           {
-            value: get(modifiedData, name, false),
+            checked: get(modifiedData, name, false),
             name,
-            onValueChange: (value) => onChange({ target: { name, value } }),
+            onCheckedChange: (value) => onChange({ target: { name, value } }),
             children: action.label
           }
         ),
@@ -144,7 +144,7 @@ const SubCategory = ({ subCategory }) => {
             onClick: () => onSelectedAction(action.name),
             style: { display: "inline-flex", alignItems: "center" },
             children: [
-              /* @__PURE__ */ jsx(VisuallyHidden, { as: "span", children: formatMessage(
+              /* @__PURE__ */ jsx(VisuallyHidden, { tag: "span", children: formatMessage(
                 {
                   id: "app.utils.show-bound-route",
                   defaultMessage: "Show bound route for {route}"
@@ -153,7 +153,7 @@ const SubCategory = ({ subCategory }) => {
                   route: action.name
                 }
               ) }),
-              /* @__PURE__ */ jsx(Cog, {})
+              /* @__PURE__ */ jsx(Cog, { id: "cog" })
             ]
           }
         )
@@ -224,41 +224,24 @@ const reducer$1 = (state, action) => (
 const Permissions = () => {
   const { modifiedData } = useUsersPermissions();
   const { formatMessage } = useIntl();
-  const [{ collapses }, dispatch] = useReducer(
-    reducer$1,
-    initialState$1,
-    (state) => init$1(state, modifiedData)
-  );
-  const handleToggle = (index) => dispatch({
-    type: "TOGGLE_COLLAPSE",
-    index
-  });
-  return /* @__PURE__ */ jsx(Flex, { direction: "column", alignItems: "stretch", gap: 1, children: collapses.map((collapse, index) => /* @__PURE__ */ jsxs(
-    Accordion,
-    {
-      expanded: collapse.isOpen,
-      onToggle: () => handleToggle(index),
-      variant: index % 2 === 0 ? "secondary" : void 0,
-      children: [
-        /* @__PURE__ */ jsx(
-          AccordionToggle,
+  const [{ collapses }] = useReducer(reducer$1, initialState$1, (state) => init$1(state, modifiedData));
+  return /* @__PURE__ */ jsx(Accordion.Root, { size: "M", children: /* @__PURE__ */ jsx(Flex, { direction: "column", alignItems: "stretch", gap: 1, children: collapses.map((collapse, index) => /* @__PURE__ */ jsxs(Accordion.Item, { value: collapse.name, children: [
+    /* @__PURE__ */ jsx(Accordion.Header, { variant: index % 2 === 0 ? "secondary" : void 0, children: /* @__PURE__ */ jsx(
+      Accordion.Trigger,
+      {
+        caretPosition: "right",
+        description: formatMessage(
           {
-            title: formatPluginName(collapse.name),
-            description: formatMessage(
-              {
-                id: "users-permissions.Plugin.permissions.plugins.description",
-                defaultMessage: "Define all allowed actions for the {name} plugin."
-              },
-              { name: collapse.name }
-            ),
-            variant: index % 2 ? "primary" : "secondary"
-          }
+            id: "users-permissions.Plugin.permissions.plugins.description",
+            defaultMessage: "Define all allowed actions for the {name} plugin."
+          },
+          { name: collapse.name }
         ),
-        /* @__PURE__ */ jsx(AccordionContent, { children: /* @__PURE__ */ jsx(PermissionRow, { permissions: modifiedData[collapse.name], name: collapse.name }) })
-      ]
-    },
-    collapse.name
-  )) });
+        children: formatPluginName(collapse.name)
+      }
+    ) }),
+    /* @__PURE__ */ jsx(Accordion.Content, { children: /* @__PURE__ */ jsx(PermissionRow, { permissions: modifiedData[collapse.name], name: collapse.name }) })
+  ] }, collapse.name)) }) });
 };
 const getMethodColor = (verb) => {
   switch (verb) {
@@ -310,7 +293,7 @@ function BoundRoute({ route }) {
   const [controller = "", action = ""] = title ? title.split(".") : [];
   const colors = getMethodColor(route.method);
   return /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 2, children: [
-    /* @__PURE__ */ jsxs(Typography, { variant: "delta", as: "h3", children: [
+    /* @__PURE__ */ jsxs(Typography, { variant: "delta", tag: "h3", children: [
       formatMessage({
         id: "users-permissions.BoundRoute.title",
         defaultMessage: "Bound route to"
@@ -353,7 +336,7 @@ const Policies = () => {
   const pathResolved = path.slice(1).join(".");
   const displayedRoutes = isEmpty(controllerRoutes) ? [] : controllerRoutes.filter((o) => o.handler.endsWith(pathResolved));
   return /* @__PURE__ */ jsx(
-    GridItem,
+    Grid.Item,
     {
       col: 5,
       background: "neutral150",
@@ -362,15 +345,17 @@ const Policies = () => {
       paddingLeft: 7,
       paddingRight: 7,
       style: { minHeight: "100%" },
+      direction: "column",
+      alignItems: "stretch",
       children: selectedAction ? /* @__PURE__ */ jsx(Flex, { direction: "column", alignItems: "stretch", gap: 2, children: displayedRoutes.map((route, key) => (
         // eslint-disable-next-line react/no-array-index-key
         /* @__PURE__ */ jsx(BoundRoute, { route }, key)
       )) }) : /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 2, children: [
-        /* @__PURE__ */ jsx(Typography, { variant: "delta", as: "h3", children: formatMessage({
+        /* @__PURE__ */ jsx(Typography, { variant: "delta", tag: "h3", children: formatMessage({
           id: "users-permissions.Policies.header.title",
           defaultMessage: "Advanced settings"
         }) }),
-        /* @__PURE__ */ jsx(Typography, { as: "p", textColor: "neutral600", children: formatMessage({
+        /* @__PURE__ */ jsx(Typography, { tag: "p", textColor: "neutral600", children: 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"
         }) })
@@ -472,20 +457,32 @@ const UsersPermissions = forwardRef(({ permissions, routes }, ref) => {
     onChangeSelectAll: handleChangeSelectAll,
     onSelectedAction: handleSelectedAction
   };
-  return /* @__PURE__ */ jsx(UsersPermissionsProvider, { value: providerValue, children: /* @__PURE__ */ jsxs(Grid, { gap: 0, shadow: "filterShadow", hasRadius: true, background: "neutral0", children: [
-    /* @__PURE__ */ jsx(GridItem, { col: 7, paddingTop: 6, paddingBottom: 6, paddingLeft: 7, paddingRight: 7, children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: [
-      /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 2, children: [
-        /* @__PURE__ */ jsx(Typography, { variant: "delta", as: "h2", children: formatMessage({
-          id: getTrad("Plugins.header.title"),
-          defaultMessage: "Permissions"
-        }) }),
-        /* @__PURE__ */ jsx(Typography, { as: "p", textColor: "neutral600", children: formatMessage({
-          id: getTrad("Plugins.header.description"),
-          defaultMessage: "Only actions bound by a route are listed below."
-        }) })
-      ] }),
-      /* @__PURE__ */ jsx(Permissions, {})
-    ] }) }),
+  return /* @__PURE__ */ jsx(UsersPermissionsProvider, { value: providerValue, children: /* @__PURE__ */ jsxs(Grid.Root, { gap: 0, shadow: "filterShadow", hasRadius: true, background: "neutral0", children: [
+    /* @__PURE__ */ jsx(
+      Grid.Item,
+      {
+        col: 7,
+        paddingTop: 6,
+        paddingBottom: 6,
+        paddingLeft: 7,
+        paddingRight: 7,
+        direction: "column",
+        alignItems: "stretch",
+        children: /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 6, children: [
+          /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 2, children: [
+            /* @__PURE__ */ jsx(Typography, { variant: "delta", tag: "h2", children: formatMessage({
+              id: getTrad("Plugins.header.title"),
+              defaultMessage: "Permissions"
+            }) }),
+            /* @__PURE__ */ jsx(Typography, { tag: "p", textColor: "neutral600", children: formatMessage({
+              id: getTrad("Plugins.header.description"),
+              defaultMessage: "Only actions bound by a route are listed below."
+            }) })
+          ] }),
+          /* @__PURE__ */ jsx(Permissions, {})
+        ] })
+      }
+    ),
     /* @__PURE__ */ jsx(Policies, {})
   ] }) });
 });
@@ -495,8 +492,8 @@ UsersPermissions.propTypes = {
 };
 const UsersPermissions$1 = memo(UsersPermissions);
 const createRoleSchema = yup.object().shape({
-  name: yup.string().required(translatedErrors.required),
-  description: yup.string().required(translatedErrors.required)
+  name: yup.string().required(translatedErrors.required.id),
+  description: yup.string().required(translatedErrors.required.id)
 });
 const cleanPermissions = (permissions) => Object.keys(permissions).reduce((acc, current) => {
   const currentPermission = permissions[current].controllers;
@@ -514,7 +511,7 @@ const cleanPermissions = (permissions) => Object.keys(permissions).reduce((acc,
   return acc;
 }, {});
 const usePlugins = () => {
-  const toggleNotification = useNotification();
+  const { toggleNotification } = useNotification();
   const { get: get2 } = useFetchClient();
   const { formatAPIError } = useAPIErrorHandler(getTrad);
   const [
@@ -551,7 +548,7 @@ const usePlugins = () => {
   useEffect(() => {
     if (permissionsError) {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatAPIError(permissionsError)
       });
     }
@@ -559,7 +556,7 @@ const usePlugins = () => {
   useEffect(() => {
     if (routesError) {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatAPIError(routesError)
       });
     }
@@ -577,9 +574,8 @@ const usePlugins = () => {
 };
 const CreatePage = () => {
   const { formatMessage } = useIntl();
-  const toggleNotification = useNotification();
-  const { goBack } = useHistory();
-  const { lockApp, unlockApp } = useOverlayBlocker();
+  const { toggleNotification } = useNotification();
+  const navigate = useNavigate();
   const { isLoading: isLoadingPlugins, permissions, routes } = usePlugins();
   const { trackUsage } = useTracking();
   const permissionsRef = React.useRef();
@@ -587,33 +583,34 @@ const CreatePage = () => {
   const mutation = useMutation((body) => post(`/users-permissions/roles`, body), {
     onError() {
       toggleNotification({
-        type: "warning",
-        message: {
+        type: "danger",
+        message: formatMessage({
           id: "notification.error",
           defaultMessage: "An error occurred"
-        }
+        })
       });
     },
     onSuccess() {
       trackUsage("didCreateRole");
       toggleNotification({
         type: "success",
-        message: {
+        message: formatMessage({
           id: getTrad("Settings.roles.created"),
           defaultMessage: "Role created"
-        }
+        })
       });
-      goBack();
+      navigate(-1);
     }
   });
   const handleCreateRoleSubmit = async (data) => {
-    lockApp();
     const permissions2 = permissionsRef.current.getPermissions();
     await mutation.mutate({ ...data, ...permissions2, users: [] });
-    unlockApp();
   };
   return /* @__PURE__ */ jsxs(Main, { children: [
-    /* @__PURE__ */ jsx(SettingsPageTitle, { name: "Roles" }),
+    /* @__PURE__ */ jsx(Page.Title, { children: formatMessage(
+      { id: "Settings.PageTitle", defaultMessage: "Settings - {name}" },
+      { name: "Roles" }
+    ) }),
     /* @__PURE__ */ jsx(
       Formik,
       {
@@ -623,7 +620,7 @@ const CreatePage = () => {
         validationSchema: createRoleSchema,
         children: ({ handleSubmit, values, handleChange, errors }) => /* @__PURE__ */ jsxs(Form, { noValidate: true, onSubmit: handleSubmit, children: [
           /* @__PURE__ */ jsx(
-            HeaderLayout,
+            Layouts.Header,
             {
               primaryAction: !isLoadingPlugins && /* @__PURE__ */ jsx(Button, { type: "submit", loading: mutation.isLoading, startIcon: /* @__PURE__ */ jsx(Check, {}), children: formatMessage({
                 id: "global.save",
@@ -639,7 +636,7 @@ const CreatePage = () => {
               })
             }
           ),
-          /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsxs(
+          /* @__PURE__ */ jsx(Layouts.Content, { children: /* @__PURE__ */ jsxs(
             Flex,
             {
               background: "neutral0",
@@ -654,40 +651,44 @@ const CreatePage = () => {
               shadow: "filterShadow",
               children: [
                 /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", children: [
-                  /* @__PURE__ */ jsx(Typography, { variant: "delta", as: "h2", children: formatMessage({
+                  /* @__PURE__ */ jsx(Typography, { variant: "delta", tag: "h2", children: formatMessage({
                     id: getTrad("EditPage.form.roles"),
                     defaultMessage: "Role details"
                   }) }),
-                  /* @__PURE__ */ jsxs(Grid, { gap: 4, children: [
-                    /* @__PURE__ */ jsx(GridItem, { col: 6, children: /* @__PURE__ */ jsx(
-                      TextInput,
+                  /* @__PURE__ */ jsxs(Grid.Root, { gap: 4, children: [
+                    /* @__PURE__ */ jsx(Grid.Item, { col: 6, direction: "column", alignItems: "stretch", children: /* @__PURE__ */ jsxs(
+                      Field.Root,
                       {
                         name: "name",
-                        value: values.name || "",
-                        onChange: handleChange,
-                        label: formatMessage({
-                          id: "global.name",
-                          defaultMessage: "Name"
-                        }),
                         error: errors?.name ? formatMessage({ id: errors.name, defaultMessage: "Name is required" }) : false,
-                        required: true
+                        required: true,
+                        children: [
+                          /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+                            id: "global.name",
+                            defaultMessage: "Name"
+                          }) }),
+                          /* @__PURE__ */ jsx(TextInput, { value: values.name || "", onChange: handleChange }),
+                          /* @__PURE__ */ jsx(Field.Error, {})
+                        ]
                       }
                     ) }),
-                    /* @__PURE__ */ jsx(GridItem, { col: 6, children: /* @__PURE__ */ jsx(
-                      Textarea,
+                    /* @__PURE__ */ jsx(Grid.Item, { col: 6, direction: "column", alignItems: "stretch", children: /* @__PURE__ */ jsxs(
+                      Field.Root,
                       {
-                        id: "description",
-                        value: values.description || "",
-                        onChange: handleChange,
-                        label: formatMessage({
-                          id: "global.description",
-                          defaultMessage: "Description"
-                        }),
+                        name: "description",
                         error: errors?.description ? formatMessage({
                           id: errors.description,
                           defaultMessage: "Description is required"
                         }) : false,
-                        required: true
+                        required: true,
+                        children: [
+                          /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+                            id: "global.description",
+                            defaultMessage: "Description"
+                          }) }),
+                          /* @__PURE__ */ jsx(Textarea, { value: values.description || "", onChange: handleChange }),
+                          /* @__PURE__ */ jsx(Field.Error, {})
+                        ]
                       }
                     ) })
                   ] })
@@ -708,14 +709,13 @@ const CreatePage = () => {
     )
   ] });
 };
-const ProtectedRolesCreatePage = () => /* @__PURE__ */ jsx(CheckPagePermissions, { permissions: PERMISSIONS.createRole, children: /* @__PURE__ */ jsx(CreatePage, {}) });
+const ProtectedRolesCreatePage = () => /* @__PURE__ */ jsx(Page.Protect, { permissions: PERMISSIONS.createRole, children: /* @__PURE__ */ jsx(CreatePage, {}) });
 const EditPage = () => {
   const { formatMessage } = useIntl();
-  const toggleNotification = useNotification();
-  const { lockApp, unlockApp } = useOverlayBlocker();
+  const { toggleNotification } = useNotification();
   const {
     params: { id }
-  } = useRouteMatch(`/settings/users-permissions/roles/:id`);
+  } = useMatch(`/settings/users-permissions/roles/:id`);
   const { get: get2 } = useFetchClient();
   const { isLoading: isLoadingPlugins, routes } = usePlugins();
   const {
@@ -734,32 +734,33 @@ const EditPage = () => {
   const mutation = useMutation((body) => put(`/users-permissions/roles/${id}`, body), {
     onError(error) {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatAPIError(error)
       });
     },
     async onSuccess() {
       toggleNotification({
         type: "success",
-        message: {
+        message: formatMessage({
           id: getTrad("Settings.roles.created"),
           defaultMessage: "Role edited"
-        }
+        })
       });
       await refetchRole();
     }
   });
   const handleEditRoleSubmit = async (data) => {
-    lockApp();
     const permissions = permissionsRef.current.getPermissions();
     await mutation.mutate({ ...data, ...permissions, users: [] });
-    unlockApp();
   };
   if (isLoadingRole) {
-    return /* @__PURE__ */ jsx(LoadingIndicatorPage, {});
+    return /* @__PURE__ */ jsx(Page.Loading, {});
   }
   return /* @__PURE__ */ jsxs(Main, { children: [
-    /* @__PURE__ */ jsx(SettingsPageTitle, { name: "Roles" }),
+    /* @__PURE__ */ jsx(Page.Title, { children: formatMessage(
+      { id: "Settings.PageTitle", defaultMessage: "Settings - {name}" },
+      { name: "Roles" }
+    ) }),
     /* @__PURE__ */ jsx(
       Formik,
       {
@@ -769,9 +770,9 @@ const EditPage = () => {
         validationSchema: createRoleSchema,
         children: ({ handleSubmit, values, handleChange, errors }) => /* @__PURE__ */ jsxs(Form, { noValidate: true, onSubmit: handleSubmit, children: [
           /* @__PURE__ */ jsx(
-            HeaderLayout,
+            Layouts.Header,
             {
-              primaryAction: !isLoadingPlugins && /* @__PURE__ */ jsx(
+              primaryAction: !isLoadingPlugins ? /* @__PURE__ */ jsx(
                 Button,
                 {
                   disabled: role.code === "strapi-super-admin",
@@ -783,16 +784,13 @@ const EditPage = () => {
                     defaultMessage: "Save"
                   })
                 }
-              ),
+              ) : null,
               title: role.name,
               subtitle: role.description,
-              navigationAction: /* @__PURE__ */ jsx(Link, { startIcon: /* @__PURE__ */ jsx(ArrowLeft, {}), to: "/settings/users-permissions/roles", children: formatMessage({
-                id: "global.back",
-                defaultMessage: "Back"
-              }) })
+              navigationAction: /* @__PURE__ */ jsx(BackButton, {})
             }
           ),
-          /* @__PURE__ */ jsx(ContentLayout, { children: /* @__PURE__ */ jsxs(
+          /* @__PURE__ */ jsx(Layouts.Content, { children: /* @__PURE__ */ jsxs(
             Flex,
             {
               background: "neutral0",
@@ -807,40 +805,47 @@ const EditPage = () => {
               shadow: "filterShadow",
               children: [
                 /* @__PURE__ */ jsxs(Flex, { direction: "column", alignItems: "stretch", gap: 4, children: [
-                  /* @__PURE__ */ jsx(Typography, { variant: "delta", as: "h2", children: formatMessage({
+                  /* @__PURE__ */ jsx(Typography, { variant: "delta", tag: "h2", children: formatMessage({
                     id: getTrad("EditPage.form.roles"),
                     defaultMessage: "Role details"
                   }) }),
-                  /* @__PURE__ */ jsxs(Grid, { gap: 4, children: [
-                    /* @__PURE__ */ jsx(GridItem, { col: 6, children: /* @__PURE__ */ jsx(
-                      TextInput,
+                  /* @__PURE__ */ jsxs(Grid.Root, { gap: 4, children: [
+                    /* @__PURE__ */ jsx(Grid.Item, { col: 6, direction: "column", alignItems: "stretch", children: /* @__PURE__ */ jsxs(
+                      Field.Root,
                       {
                         name: "name",
-                        value: values.name || "",
-                        onChange: handleChange,
-                        label: formatMessage({
-                          id: "global.name",
-                          defaultMessage: "Name"
-                        }),
-                        error: errors?.name ? formatMessage({ id: errors.name, defaultMessage: "Name is required" }) : false,
-                        required: true
+                        error: errors?.name ? formatMessage({
+                          id: errors.name,
+                          defaultMessage: "Name is required"
+                        }) : false,
+                        required: true,
+                        children: [
+                          /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+                            id: "global.name",
+                            defaultMessage: "Name"
+                          }) }),
+                          /* @__PURE__ */ jsx(TextInput, { value: values.name || "", onChange: handleChange }),
+                          /* @__PURE__ */ jsx(Field.Error, {})
+                        ]
                       }
                     ) }),
-                    /* @__PURE__ */ jsx(GridItem, { col: 6, children: /* @__PURE__ */ jsx(
-                      Textarea,
+                    /* @__PURE__ */ jsx(Grid.Item, { col: 6, direction: "column", alignItems: "stretch", children: /* @__PURE__ */ jsxs(
+                      Field.Root,
                       {
-                        id: "description",
-                        value: values.description || "",
-                        onChange: handleChange,
-                        label: formatMessage({
-                          id: "global.description",
-                          defaultMessage: "Description"
-                        }),
+                        name: "description",
                         error: errors?.description ? formatMessage({
                           id: errors.description,
                           defaultMessage: "Description is required"
                         }) : false,
-                        required: true
+                        required: true,
+                        children: [
+                          /* @__PURE__ */ jsx(Field.Label, { children: formatMessage({
+                            id: "global.description",
+                            defaultMessage: "Description"
+                          }) }),
+                          /* @__PURE__ */ jsx(Textarea, { value: values.description || "", onChange: handleChange }),
+                          /* @__PURE__ */ jsx(Field.Error, {})
+                        ]
                       }
                     ) })
                   ] })
@@ -861,18 +866,18 @@ const EditPage = () => {
     )
   ] });
 };
-const ProtectedRolesEditPage = () => /* @__PURE__ */ jsx(CheckPagePermissions, { permissions: PERMISSIONS.updateRole, children: /* @__PURE__ */ jsx(EditPage, {}) });
-const EditLink = styled(Link$1)`
+const ProtectedRolesEditPage = () => /* @__PURE__ */ jsx(Page.Protect, { permissions: PERMISSIONS.updateRole, children: /* @__PURE__ */ jsx(EditPage, {}) });
+const EditLink = styled(Link)`
   align-items: center;
-  height: ${pxToRem(32)};
+  height: 3.2rem;
+  width: 3.2rem;
   display: flex;
   justify-content: center;
-  padding: ${({ theme }) => `${theme.spaces[2]}}`};
-  width: ${pxToRem(32)};
+  padding: ${({ theme }) => `${theme.spaces[2]}`};
 
   svg {
-    height: ${pxToRem(12)};
-    width: ${pxToRem(12)};
+    height: 1.6rem;
+    width: 1.6rem;
 
     path {
       fill: ${({ theme }) => theme.colors.neutral500};
@@ -888,19 +893,16 @@ const EditLink = styled(Link$1)`
     }
   }
 `;
-const TableBody = ({ sortedRoles, canDelete, permissions, setRoleToDelete, onDelete }) => {
+const TableBody = ({ sortedRoles, canDelete, canUpdate, setRoleToDelete, onDelete }) => {
   const { formatMessage } = useIntl();
-  const { push } = useHistory();
+  const navigate = useNavigate();
   const [showConfirmDelete, setShowConfirmDelete] = onDelete;
   const checkCanDeleteRole = (role) => canDelete && !["public", "authenticated"].includes(role.type);
   const handleClickDelete = (id) => {
     setRoleToDelete(id);
     setShowConfirmDelete(!showConfirmDelete);
   };
-  const handleClickEdit = (id) => {
-    push(`/settings/users-permissions/roles/${id}`);
-  };
-  return /* @__PURE__ */ jsx(Tbody, { children: sortedRoles?.map((role) => /* @__PURE__ */ jsxs(Tr, { ...onRowClick({ fn: () => handleClickEdit(role.id) }), children: [
+  return /* @__PURE__ */ jsx(Tbody, { children: sortedRoles?.map((role) => /* @__PURE__ */ jsxs(Tr, { onClick: () => navigate(role.id.toString()), children: [
     /* @__PURE__ */ jsx(Td, { width: "20%", children: /* @__PURE__ */ jsx(Typography, { children: role.name }) }),
     /* @__PURE__ */ jsx(Td, { width: "50%", children: /* @__PURE__ */ jsx(Typography, { children: role.description }) }),
     /* @__PURE__ */ jsx(Td, { width: "30%", children: /* @__PURE__ */ jsx(Typography, { children: formatMessage(
@@ -910,82 +912,58 @@ const TableBody = ({ sortedRoles, canDelete, permissions, setRoleToDelete, onDel
       },
       { number: role.nb_users }
     ) }) }),
-    /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "end", ...stopPropagation, children: [
-      /* @__PURE__ */ jsx(CheckPermissions, { permissions: permissions.updateRole, children: /* @__PURE__ */ jsx(
+    /* @__PURE__ */ jsx(Td, { children: /* @__PURE__ */ jsxs(Flex, { justifyContent: "end", onClick: (e) => e.stopPropagation(), children: [
+      canUpdate ? /* @__PURE__ */ jsx(
         EditLink,
         {
-          to: `/settings/users-permissions/roles/${role.id}`,
+          tag: NavLink,
+          to: role.id.toString(),
           "aria-label": formatMessage(
             { id: "app.component.table.edit", defaultMessage: "Edit {target}" },
             { target: `${role.name}` }
           ),
           children: /* @__PURE__ */ jsx(Pencil, {})
         }
-      ) }),
-      checkCanDeleteRole(role) && /* @__PURE__ */ jsx(CheckPermissions, { permissions: permissions.deleteRole, children: /* @__PURE__ */ jsx(
+      ) : null,
+      checkCanDeleteRole(role) && /* @__PURE__ */ jsx(
         IconButton,
         {
-          onClick: () => handleClickDelete(role.id),
-          noBorder: true,
-          icon: /* @__PURE__ */ jsx(Trash, {}),
+          onClick: () => handleClickDelete(role.id.toString()),
+          variant: "ghost",
           label: formatMessage(
             { id: "global.delete-target", defaultMessage: "Delete {target}" },
             { target: `${role.name}` }
-          )
+          ),
+          children: /* @__PURE__ */ jsx(Trash, {})
         }
-      ) })
+      )
     ] }) })
   ] }, role.name)) });
 };
 TableBody.defaultProps = {
-  canDelete: false
+  canDelete: false,
+  canUpdate: false
 };
 TableBody.propTypes = {
   onDelete: PropTypes.array.isRequired,
-  permissions: PropTypes.object.isRequired,
   setRoleToDelete: PropTypes.func.isRequired,
   sortedRoles: PropTypes.array.isRequired,
-  canDelete: PropTypes.bool
-};
-const fetchData = async (toggleNotification, notifyStatus) => {
-  try {
-    const { get: get2 } = getFetchClient();
-    const { data } = await get2("/users-permissions/roles");
-    notifyStatus("The roles have loaded successfully");
-    return data;
-  } catch (err) {
-    toggleNotification({
-      type: "warning",
-      message: { id: "notification.error" }
-    });
-    throw new Error(err);
-  }
-};
-const deleteData = async (id, toggleNotification) => {
-  try {
-    const { del } = getFetchClient();
-    await del(`/users-permissions/roles/${id}`);
-  } catch (error) {
-    toggleNotification({
-      type: "warning",
-      message: { id: "notification.error", defaultMessage: "An error occured" }
-    });
-  }
+  canDelete: PropTypes.bool,
+  canUpdate: PropTypes.bool
 };
 const RolesListPage = () => {
   const { trackUsage } = useTracking();
   const { formatMessage, locale } = useIntl();
-  const toggleNotification = useNotification();
+  const { toggleNotification } = useNotification();
   const { notifyStatus } = useNotifyAT();
   const [{ query }] = useQueryParams();
   const _q = query?._q || "";
   const [showConfirmDelete, setShowConfirmDelete] = useState(false);
-  const [isConfirmButtonLoading, setIsConfirmButtonLoading] = useState(false);
   const [roleToDelete, setRoleToDelete] = useState();
-  useFocusWhenNavigate();
+  const { del, get: get2 } = useFetchClient();
   const {
     isLoading: isLoadingForPermissions,
-    allowedActions: { canRead, canDelete }
+    allowedActions: { canRead, canDelete, canCreate, canUpdate }
   } = useRBAC({
     create: PERMISSIONS.createRole,
     read: PERMISSIONS.readRoles,
@@ -997,20 +975,43 @@ const RolesListPage = () => {
     data: { roles },
     isFetching,
     refetch
-  } = useQuery("get-roles", () => fetchData(toggleNotification, notifyStatus), {
+  } = useQuery("get-roles", () => fetchData(toggleNotification, formatMessage, notifyStatus), {
     initialData: {},
     enabled: canRead
   });
-  const { includes } = useFilter(locale, {
+  const { contains } = useFilter(locale, {
     sensitivity: "base"
   });
   const formatter = useCollator(locale, {
     sensitivity: "base"
   });
-  const isLoading = isLoadingForData || isFetching;
+  const isLoading = isLoadingForData || isFetching || isLoadingForPermissions;
   const handleShowConfirmDelete = () => {
     setShowConfirmDelete(!showConfirmDelete);
   };
+  const deleteData = async (id, formatMessage2, toggleNotification2) => {
+    try {
+      await del(`/users-permissions/roles/${id}`);
+    } catch (error) {
+      toggleNotification2({
+        type: "danger",
+        message: formatMessage2({ id: "notification.error", defaultMessage: "An error occured" })
+      });
+    }
+  };
+  const fetchData = async (toggleNotification2, formatMessage2, notifyStatus2) => {
+    try {
+      const { data } = await get2("/users-permissions/roles");
+      notifyStatus2("The roles have loaded successfully");
+      return data;
+    } catch (err) {
+      toggleNotification2({
+        type: "danger",
+        message: formatMessage2({ id: "notification.error", defaultMessage: "An error occurred" })
+      });
+      throw new Error(err);
+    }
+  };
   const emptyLayout = {
     roles: {
       id: getTrad("Roles.empty"),
@@ -1025,28 +1026,32 @@ const RolesListPage = () => {
     id: "global.roles",
     defaultMessage: "Roles"
   });
-  const deleteMutation = useMutation((id) => deleteData(id, toggleNotification), {
+  const deleteMutation = useMutation((id) => deleteData(id, formatMessage, toggleNotification), {
     async onSuccess() {
       await refetch();
     }
   });
   const handleConfirmDelete = async () => {
-    setIsConfirmButtonLoading(true);
     await deleteMutation.mutateAsync(roleToDelete);
     setShowConfirmDelete(!showConfirmDelete);
-    setIsConfirmButtonLoading(false);
   };
-  const sortedRoles = (roles || []).filter((role) => includes(role.name, _q) || includes(role.description, _q)).sort(
+  const sortedRoles = (roles || []).filter((role) => contains(role.name, _q) || contains(role.description, _q)).sort(
     (a, b) => formatter.compare(a.name, b.name) || formatter.compare(a.description, b.description)
   );
   const emptyContent = _q && !sortedRoles.length ? "search" : "roles";
   const colCount = 4;
   const rowCount = (roles?.length || 0) + 1;
-  return /* @__PURE__ */ jsxs(Layout, { children: [
-    /* @__PURE__ */ jsx(SettingsPageTitle, { name: pageTitle }),
-    /* @__PURE__ */ jsxs(Main, { "aria-busy": isLoading, children: [
+  if (isLoading) {
+    return /* @__PURE__ */ jsx(Page.Loading, {});
+  }
+  return /* @__PURE__ */ jsxs(Layouts.Root, { children: [
+    /* @__PURE__ */ jsx(Page.Title, { children: formatMessage(
+      { id: "Settings.PageTitle", defaultMessage: "Settings - {name}" },
+      { name: pageTitle }
+    ) }),
+    /* @__PURE__ */ jsxs(Page.Main, { children: [
       /* @__PURE__ */ jsx(
-        HeaderLayout,
+        Layouts.Header,
         {
           title: formatMessage({
             id: "global.roles",
@@ -1056,10 +1061,11 @@ const RolesListPage = () => {
             id: "Settings.roles.list.description",
             defaultMessage: "List of roles"
           }),
-          primaryAction: /* @__PURE__ */ jsx(CheckPermissions, { permissions: PERMISSIONS.createRole, children: /* @__PURE__ */ jsx(
+          primaryAction: canCreate ? /* @__PURE__ */ jsx(
             LinkButton,
             {
-              to: "/settings/users-permissions/roles/new",
+              to: "new",
+              tag: NavLink,
               onClick: () => trackUsage("willCreateRole"),
               startIcon: /* @__PURE__ */ jsx(Plus, {}),
               size: "S",
@@ -1068,14 +1074,14 @@ const RolesListPage = () => {
                 defaultMessage: "Add new role"
               })
             }
-          ) })
+          ) : null
         }
       ),
       /* @__PURE__ */ jsx(
-        ActionLayout,
+        Layouts.Action,
         {
           startActions: /* @__PURE__ */ jsx(
-            SearchURLQuery,
+            SearchInput,
             {
               label: formatMessage({
                 id: "app.component.search.label",
@@ -1085,9 +1091,8 @@ const RolesListPage = () => {
           )
         }
       ),
-      /* @__PURE__ */ jsxs(ContentLayout, { children: [
-        !canRead && /* @__PURE__ */ jsx(NoPermissions, {}),
-        (isLoading || isLoadingForPermissions) && /* @__PURE__ */ jsx(LoadingIndicatorPage, {}),
+      /* @__PURE__ */ jsxs(Layouts.Content, { children: [
+        !canRead && /* @__PURE__ */ jsx(Page.NoPermissions, {}),
         canRead && sortedRoles && sortedRoles?.length ? /* @__PURE__ */ jsxs(Table, { colCount, rowCount, children: [
           /* @__PURE__ */ jsx(Thead, { children: /* @__PURE__ */ jsxs(Tr, { children: [
             /* @__PURE__ */ jsx(Th, { children: /* @__PURE__ */ jsx(Typography, { variant: "sigma", textColor: "neutral600", children: formatMessage({ id: "global.name", defaultMessage: "Name" }) }) }),
@@ -1109,51 +1114,29 @@ const RolesListPage = () => {
             {
               sortedRoles,
               canDelete,
+              canUpdate,
               permissions: PERMISSIONS,
               setRoleToDelete,
               onDelete: [showConfirmDelete, setShowConfirmDelete]
             }
           )
-        ] }) : /* @__PURE__ */ jsx(EmptyStateLayout, { content: emptyLayout[emptyContent] })
+        ] }) : /* @__PURE__ */ jsx(EmptyStateLayout, { content: formatMessage(emptyLayout[emptyContent]) })
       ] }),
-      /* @__PURE__ */ jsx(
-        ConfirmDialog,
-        {
-          isConfirmButtonLoading,
-          onConfirm: handleConfirmDelete,
-          onToggleDialog: handleShowConfirmDelete,
-          isOpen: showConfirmDelete
-        }
-      )
+      /* @__PURE__ */ jsx(Dialog.Root, { open: showConfirmDelete, onOpenChange: handleShowConfirmDelete, children: /* @__PURE__ */ jsx(ConfirmDialog, { onConfirm: handleConfirmDelete }) })
     ] })
   ] });
 };
 const ProtectedRolesListPage = () => {
-  return /* @__PURE__ */ jsx(CheckPagePermissions, { permissions: PERMISSIONS.accessRoles, children: /* @__PURE__ */ jsx(RolesListPage, {}) });
+  return /* @__PURE__ */ jsx(Page.Protect, { permissions: PERMISSIONS.accessRoles, children: /* @__PURE__ */ jsx(RolesListPage, {}) });
 };
 const Roles = () => {
-  return /* @__PURE__ */ jsx(CheckPagePermissions, { permissions: PERMISSIONS.accessRoles, children: /* @__PURE__ */ jsxs(Switch, { children: [
-    /* @__PURE__ */ jsx(
-      Route,
-      {
-        path: "/settings/users-permissions/roles/new",
-        component: ProtectedRolesCreatePage,
-        exact: true
-      }
-    ),
-    /* @__PURE__ */ jsx(
-      Route,
-      {
-        path: "/settings/users-permissions/roles/:id",
-        component: ProtectedRolesEditPage,
-        exact: true
-      }
-    ),
-    /* @__PURE__ */ jsx(Route, { path: "/settings/users-permissions/roles", component: ProtectedRolesListPage, exact: true }),
-    /* @__PURE__ */ jsx(Route, { path: "", component: AnErrorOccurred })
+  return /* @__PURE__ */ jsx(Page.Protect, { permissions: PERMISSIONS.accessRoles, children: /* @__PURE__ */ jsxs(Routes, { children: [
+    /* @__PURE__ */ jsx(Route, { index: true, element: /* @__PURE__ */ jsx(ProtectedRolesListPage, {}) }),
+    /* @__PURE__ */ jsx(Route, { path: "new", element: /* @__PURE__ */ jsx(ProtectedRolesCreatePage, {}) }),
+    /* @__PURE__ */ jsx(Route, { path: ":id", element: /* @__PURE__ */ jsx(ProtectedRolesEditPage, {}) })
   ] }) });
 };
 export {
   Roles as default
 };
-//# sourceMappingURL=index-MuQRbm-o.mjs.map
+//# sourceMappingURL=index-CnX2wiLY.mjs.map