@strapi/plugin-users-permissions 4.20.5 → 5.0.0-alpha.1

package/dist/_chunks/{index-XqdaO5WZ.js → index-6E51D69B.js}

@@ -2,12 +2,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const jsxRuntime = require("react/jsx-runtime");
 const React = require("react");
-const helperPlugin = require("@strapi/helper-plugin");
+const admin = require("@strapi/strapi/admin");
 const reactRouterDom = require("react-router-dom");
-const index = require("./index-O9AAUvyy.js");
+const index = require("./index-yKMi8hKt.js");
 const designSystem = require("@strapi/design-system");
-const icons = require("@strapi/icons");
+const Icons = require("@strapi/icons");
 const formik = require("formik");
+const Helmet = require("./Helmet-d9JljxUo.js");
 const reactIntl = require("react-intl");
 const reactQuery = require("react-query");
 const PropTypes = require("prop-types");
@@ -15,7 +16,7 @@ const upperFirst = require("lodash/upperFirst");
 const sortBy = require("lodash/sortBy");
 const get = require("lodash/get");
 const styled = require("styled-components");
-const produce = require("immer");
+const createNextState2 = require("immer");
 const isEmpty = require("lodash/isEmpty");
 const without = require("lodash/without");
 const map = require("lodash/map");
@@ -23,6 +24,8 @@ const tail = require("lodash/tail");
 const set = require("lodash/set");
 const take = require("lodash/take");
 const yup = require("yup");
+const v2 = require("@strapi/design-system/v2");
+const helperPlugin = require("@strapi/helper-plugin");
 const _interopDefault = (e) => e && e.__esModule ? e : { default: e };
 function _interopNamespace(e) {
   if (e && e.__esModule)
@@ -48,7 +51,6 @@ const upperFirst__default = /* @__PURE__ */ _interopDefault(upperFirst);
 const sortBy__default = /* @__PURE__ */ _interopDefault(sortBy);
 const get__default = /* @__PURE__ */ _interopDefault(get);
 const styled__default = /* @__PURE__ */ _interopDefault(styled);
-const produce__default = /* @__PURE__ */ _interopDefault(produce);
 const isEmpty__default = /* @__PURE__ */ _interopDefault(isEmpty);
 const without__default = /* @__PURE__ */ _interopDefault(without);
 const map__default = /* @__PURE__ */ _interopDefault(map);
@@ -187,7 +189,7 @@ const SubCategory = ({ subCategory }) => {
                   route: action.name
                 }
               ) }),
-              /* @__PURE__ */ jsxRuntime.jsx(icons.Cog, {})
+              /* @__PURE__ */ jsxRuntime.jsx(Icons.Cog, {})
             ]
           }
         )
@@ -239,7 +241,7 @@ const initialState$1 = {
 };
 const reducer$1 = (state, action) => (
   // eslint-disable-next-line consistent-return
-  produce__default.default(state, (draftState) => {
+  createNextState2.produce(state, (draftState) => {
     switch (action.type) {
       case "TOGGLE_COLLAPSE": {
         draftState.collapses = state.collapses.map((collapse, index2) => {
@@ -427,7 +429,7 @@ const initialState = {
   selectedAction: "",
   policies: []
 };
-const reducer = (state, action) => produce__default.default(state, (draftState) => {
+const reducer = (state, action) => createNextState2.produce(state, (draftState) => {
   switch (action.type) {
     case "ON_CHANGE": {
       const keysLength = action.keys.length;
@@ -529,8 +531,8 @@ UsersPermissions.propTypes = {
 };
 const UsersPermissions$1 = React.memo(UsersPermissions);
 const createRoleSchema = yup__namespace.object().shape({
-  name: yup__namespace.string().required(helperPlugin.translatedErrors.required),
-  description: yup__namespace.string().required(helperPlugin.translatedErrors.required)
+  name: yup__namespace.string().required(admin.translatedErrors.required.id),
+  description: yup__namespace.string().required(admin.translatedErrors.required.id)
 });
 const cleanPermissions = (permissions) => Object.keys(permissions).reduce((acc, current) => {
   const currentPermission = permissions[current].controllers;
@@ -548,9 +550,9 @@ const cleanPermissions = (permissions) => Object.keys(permissions).reduce((acc,
   return acc;
 }, {});
 const usePlugins = () => {
-  const toggleNotification = helperPlugin.useNotification();
-  const { get: get2 } = helperPlugin.useFetchClient();
-  const { formatAPIError } = helperPlugin.useAPIErrorHandler(index.getTrad);
+  const { toggleNotification } = admin.useNotification();
+  const { get: get2 } = admin.useFetchClient();
+  const { formatAPIError } = admin.useAPIErrorHandler(index.getTrad);
   const [
     {
       data: permissions,
@@ -585,7 +587,7 @@ const usePlugins = () => {
   React.useEffect(() => {
     if (permissionsError) {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatAPIError(permissionsError)
       });
     }
@@ -593,7 +595,7 @@ const usePlugins = () => {
   React.useEffect(() => {
     if (routesError) {
       toggleNotification({
-        type: "warning",
+        type: "danger",
         message: formatAPIError(routesError)
       });
     }
@@ -611,43 +613,48 @@ const usePlugins = () => {
 };
 const CreatePage = () => {
   const { formatMessage } = reactIntl.useIntl();
-  const toggleNotification = helperPlugin.useNotification();
-  const { goBack } = reactRouterDom.useHistory();
-  const { lockApp, unlockApp } = helperPlugin.useOverlayBlocker();
+  const { toggleNotification } = admin.useNotification();
+  const navigate = reactRouterDom.useNavigate();
   const { isLoading: isLoadingPlugins, permissions, routes } = usePlugins();
-  const { trackUsage } = helperPlugin.useTracking();
+  const { trackUsage } = admin.useTracking();
   const permissionsRef = React__namespace.useRef();
-  const { post } = helperPlugin.useFetchClient();
+  const { post } = admin.useFetchClient();
   const mutation = reactQuery.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: index.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__ */ jsxRuntime.jsxs(designSystem.Main, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.SettingsPageTitle, { name: "Roles" }),
+    /* @__PURE__ */ jsxRuntime.jsx(
+      Helmet.HelmetExport,
+      {
+        title: formatMessage(
+          { id: "Settings.PageTitle", defaultMessage: "Settings - {name}" },
+          { name: "Roles" }
+        )
+      }
+    ),
     /* @__PURE__ */ jsxRuntime.jsx(
       formik.Formik,
       {
@@ -655,11 +662,11 @@ const CreatePage = () => {
         initialValues: { name: "", description: "" },
         onSubmit: handleCreateRoleSubmit,
         validationSchema: createRoleSchema,
-        children: ({ handleSubmit, values, handleChange, errors }) => /* @__PURE__ */ jsxRuntime.jsxs(helperPlugin.Form, { noValidate: true, onSubmit: handleSubmit, children: [
+        children: ({ handleSubmit, values, handleChange, errors }) => /* @__PURE__ */ jsxRuntime.jsxs(formik.Form, { noValidate: true, onSubmit: handleSubmit, children: [
           /* @__PURE__ */ jsxRuntime.jsx(
             designSystem.HeaderLayout,
             {
-              primaryAction: !isLoadingPlugins && /* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { type: "submit", loading: mutation.isLoading, startIcon: /* @__PURE__ */ jsxRuntime.jsx(icons.Check, {}), children: formatMessage({
+              primaryAction: !isLoadingPlugins && /* @__PURE__ */ jsxRuntime.jsx(designSystem.Button, { type: "submit", loading: mutation.isLoading, startIcon: /* @__PURE__ */ jsxRuntime.jsx(Icons.Check, {}), children: formatMessage({
                 id: "global.save",
                 defaultMessage: "Save"
               }) }),
@@ -742,15 +749,14 @@ const CreatePage = () => {
     )
   ] });
 };
-const ProtectedRolesCreatePage = () => /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.CheckPagePermissions, { permissions: index.PERMISSIONS.createRole, children: /* @__PURE__ */ jsxRuntime.jsx(CreatePage, {}) });
+const ProtectedRolesCreatePage = () => /* @__PURE__ */ jsxRuntime.jsx(admin.Page.Protect, { permissions: index.PERMISSIONS.createRole, children: /* @__PURE__ */ jsxRuntime.jsx(CreatePage, {}) });
 const EditPage = () => {
   const { formatMessage } = reactIntl.useIntl();
-  const toggleNotification = helperPlugin.useNotification();
-  const { lockApp, unlockApp } = helperPlugin.useOverlayBlocker();
+  const { toggleNotification } = admin.useNotification();
   const {
     params: { id }
-  } = reactRouterDom.useRouteMatch(`/settings/users-permissions/roles/:id`);
-  const { get: get2 } = helperPlugin.useFetchClient();
+  } = reactRouterDom.useMatch(`/settings/users-permissions/roles/:id`);
+  const { get: get2 } = admin.useFetchClient();
   const { isLoading: isLoadingPlugins, routes } = usePlugins();
   const {
     data: role,
@@ -763,37 +769,43 @@ const EditPage = () => {
     return role2;
   });
   const permissionsRef = React__namespace.useRef();
-  const { put } = helperPlugin.useFetchClient();
-  const { formatAPIError } = helperPlugin.useAPIErrorHandler();
+  const { put } = admin.useFetchClient();
+  const { formatAPIError } = admin.useAPIErrorHandler();
   const mutation = reactQuery.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: index.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__ */ jsxRuntime.jsx(helperPlugin.LoadingIndicatorPage, {});
+    return /* @__PURE__ */ jsxRuntime.jsx(admin.Page.Loading, {});
   }
   return /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Main, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.SettingsPageTitle, { name: "Roles" }),
+    /* @__PURE__ */ jsxRuntime.jsx(
+      Helmet.HelmetExport,
+      {
+        title: formatMessage(
+          { id: "Settings.PageTitle", defaultMessage: "Settings - {name}" },
+          { name: "Roles" }
+        )
+      }
+    ),
     /* @__PURE__ */ jsxRuntime.jsx(
       formik.Formik,
       {
@@ -801,29 +813,26 @@ const EditPage = () => {
         initialValues: { name: role.name, description: role.description },
         onSubmit: handleEditRoleSubmit,
         validationSchema: createRoleSchema,
-        children: ({ handleSubmit, values, handleChange, errors }) => /* @__PURE__ */ jsxRuntime.jsxs(helperPlugin.Form, { noValidate: true, onSubmit: handleSubmit, children: [
+        children: ({ handleSubmit, values, handleChange, errors }) => /* @__PURE__ */ jsxRuntime.jsxs(formik.Form, { noValidate: true, onSubmit: handleSubmit, children: [
           /* @__PURE__ */ jsxRuntime.jsx(
             designSystem.HeaderLayout,
             {
-              primaryAction: !isLoadingPlugins && /* @__PURE__ */ jsxRuntime.jsx(
+              primaryAction: !isLoadingPlugins ? /* @__PURE__ */ jsxRuntime.jsx(
                 designSystem.Button,
                 {
                   disabled: role.code === "strapi-super-admin",
                   type: "submit",
                   loading: mutation.isLoading,
-                  startIcon: /* @__PURE__ */ jsxRuntime.jsx(icons.Check, {}),
+                  startIcon: /* @__PURE__ */ jsxRuntime.jsx(Icons.Check, {}),
                   children: formatMessage({
                     id: "global.save",
                     defaultMessage: "Save"
                   })
                 }
-              ),
+              ) : null,
               title: role.name,
               subtitle: role.description,
-              navigationAction: /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.Link, { startIcon: /* @__PURE__ */ jsxRuntime.jsx(icons.ArrowLeft, {}), to: "/settings/users-permissions/roles", children: formatMessage({
-                id: "global.back",
-                defaultMessage: "Back"
-              }) })
+              navigationAction: /* @__PURE__ */ jsxRuntime.jsx(admin.BackButton, {})
             }
           ),
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.ContentLayout, { children: /* @__PURE__ */ jsxRuntime.jsxs(
@@ -895,18 +904,18 @@ const EditPage = () => {
     )
   ] });
 };
-const ProtectedRolesEditPage = () => /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.CheckPagePermissions, { permissions: index.PERMISSIONS.updateRole, children: /* @__PURE__ */ jsxRuntime.jsx(EditPage, {}) });
+const ProtectedRolesEditPage = () => /* @__PURE__ */ jsxRuntime.jsx(admin.Page.Protect, { permissions: index.PERMISSIONS.updateRole, children: /* @__PURE__ */ jsxRuntime.jsx(EditPage, {}) });
 const EditLink = styled__default.default(designSystem.Link)`
   align-items: center;
-  height: ${helperPlugin.pxToRem(32)};
+  height: ${32 / 16}rem;
   display: flex;
   justify-content: center;
   padding: ${({ theme }) => `${theme.spaces[2]}}`};
-  width: ${helperPlugin.pxToRem(32)};
+  width: ${32 / 16}rem;
 
   svg {
-    height: ${helperPlugin.pxToRem(12)};
-    width: ${helperPlugin.pxToRem(12)};
+    height: ${12 / 16}rem;
+    width: ${12 / 16}rem;
 
     path {
       fill: ${({ theme }) => theme.colors.neutral500};
@@ -922,19 +931,16 @@ const EditLink = styled__default.default(designSystem.Link)`
     }
   }
 `;
-const TableBody = ({ sortedRoles, canDelete, permissions, setRoleToDelete, onDelete }) => {
+const TableBody = ({ sortedRoles, canDelete, canUpdate, setRoleToDelete, onDelete }) => {
   const { formatMessage } = reactIntl.useIntl();
-  const { push } = reactRouterDom.useHistory();
+  const navigate = reactRouterDom.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__ */ jsxRuntime.jsx(designSystem.Tbody, { children: sortedRoles?.map((role) => /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Tr, { ...helperPlugin.onRowClick({ fn: () => handleClickEdit(role.id) }), children: [
+  return /* @__PURE__ */ jsxRuntime.jsx(designSystem.Tbody, { children: sortedRoles?.map((role) => /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Tr, { onClick: () => navigate(role.id.toString()), children: [
     /* @__PURE__ */ jsxRuntime.jsx(designSystem.Td, { width: "20%", children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { children: role.name }) }),
     /* @__PURE__ */ jsxRuntime.jsx(designSystem.Td, { width: "50%", children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { children: role.description }) }),
     /* @__PURE__ */ jsxRuntime.jsx(designSystem.Td, { width: "30%", children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { children: formatMessage(
@@ -944,82 +950,58 @@ const TableBody = ({ sortedRoles, canDelete, permissions, setRoleToDelete, onDel
       },
       { number: role.nb_users }
     ) }) }),
-    /* @__PURE__ */ jsxRuntime.jsx(designSystem.Td, { children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { justifyContent: "end", ...helperPlugin.stopPropagation, children: [
-      /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.CheckPermissions, { permissions: permissions.updateRole, children: /* @__PURE__ */ jsxRuntime.jsx(
+    /* @__PURE__ */ jsxRuntime.jsx(designSystem.Td, { children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Flex, { justifyContent: "end", onClick: (e) => e.stopPropagation(), children: [
+      canUpdate ? /* @__PURE__ */ jsxRuntime.jsx(
         EditLink,
         {
-          to: `/settings/users-permissions/roles/${role.id}`,
+          to: role.id.toString(),
           "aria-label": formatMessage(
             { id: "app.component.table.edit", defaultMessage: "Edit {target}" },
             { target: `${role.name}` }
           ),
-          children: /* @__PURE__ */ jsxRuntime.jsx(icons.Pencil, {})
+          children: /* @__PURE__ */ jsxRuntime.jsx(Icons.Pencil, {})
         }
-      ) }),
-      checkCanDeleteRole(role) && /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.CheckPermissions, { permissions: permissions.deleteRole, children: /* @__PURE__ */ jsxRuntime.jsx(
+      ) : null,
+      checkCanDeleteRole(role) && /* @__PURE__ */ jsxRuntime.jsx(
         designSystem.IconButton,
         {
-          onClick: () => handleClickDelete(role.id),
+          onClick: () => handleClickDelete(role.id.toString()),
           noBorder: true,
-          icon: /* @__PURE__ */ jsxRuntime.jsx(icons.Trash, {}),
+          icon: /* @__PURE__ */ jsxRuntime.jsx(Icons.Trash, {}),
           label: formatMessage(
             { id: "global.delete-target", defaultMessage: "Delete {target}" },
             { target: `${role.name}` }
           )
         }
-      ) })
+      )
     ] }) })
   ] }, role.name)) });
 };
 TableBody.defaultProps = {
-  canDelete: false
+  canDelete: false,
+  canUpdate: false
 };
 TableBody.propTypes = {
   onDelete: PropTypes__default.default.array.isRequired,
   permissions: PropTypes__default.default.object.isRequired,
   setRoleToDelete: PropTypes__default.default.func.isRequired,
   sortedRoles: PropTypes__default.default.array.isRequired,
-  canDelete: PropTypes__default.default.bool
-};
-const fetchData = async (toggleNotification, notifyStatus) => {
-  try {
-    const { get: get2 } = helperPlugin.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 } = helperPlugin.getFetchClient();
-    await del(`/users-permissions/roles/${id}`);
-  } catch (error) {
-    toggleNotification({
-      type: "warning",
-      message: { id: "notification.error", defaultMessage: "An error occured" }
-    });
-  }
+  canDelete: PropTypes__default.default.bool,
+  canUpdate: PropTypes__default.default.bool
 };
 const RolesListPage = () => {
-  const { trackUsage } = helperPlugin.useTracking();
+  const { trackUsage } = admin.useTracking();
   const { formatMessage, locale } = reactIntl.useIntl();
-  const toggleNotification = helperPlugin.useNotification();
+  const { toggleNotification } = admin.useNotification();
   const { notifyStatus } = designSystem.useNotifyAT();
-  const [{ query }] = helperPlugin.useQueryParams();
+  const [{ query }] = admin.useQueryParams();
   const _q = query?._q || "";
   const [showConfirmDelete, setShowConfirmDelete] = React.useState(false);
-  const [isConfirmButtonLoading, setIsConfirmButtonLoading] = React.useState(false);
   const [roleToDelete, setRoleToDelete] = React.useState();
-  helperPlugin.useFocusWhenNavigate();
+  const { del, get: get2 } = admin.useFetchClient();
   const {
     isLoading: isLoadingForPermissions,
-    allowedActions: { canRead, canDelete }
+    allowedActions: { canRead, canDelete, canCreate, canUpdate }
   } = helperPlugin.useRBAC({
     create: index.PERMISSIONS.createRole,
     read: index.PERMISSIONS.readRoles,
@@ -1031,20 +1013,43 @@ const RolesListPage = () => {
     data: { roles },
     isFetching,
     refetch
-  } = reactQuery.useQuery("get-roles", () => fetchData(toggleNotification, notifyStatus), {
+  } = reactQuery.useQuery("get-roles", () => fetchData(toggleNotification, formatMessage, notifyStatus), {
     initialData: {},
     enabled: canRead
   });
-  const { includes } = helperPlugin.useFilter(locale, {
+  const { contains } = designSystem.useFilter(locale, {
     sensitivity: "base"
   });
-  const formatter = helperPlugin.useCollator(locale, {
+  const formatter = designSystem.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" })
+      });
+      throw new Error(err);
+    }
+  };
   const emptyLayout = {
     roles: {
       id: index.getTrad("Roles.empty"),
@@ -1059,26 +1064,35 @@ const RolesListPage = () => {
     id: "global.roles",
     defaultMessage: "Roles"
   });
-  const deleteMutation = reactQuery.useMutation((id) => deleteData(id, toggleNotification), {
+  const deleteMutation = reactQuery.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;
+  if (isLoading) {
+    return /* @__PURE__ */ jsxRuntime.jsx(admin.Page.Loading, {});
+  }
   return /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Layout, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.SettingsPageTitle, { name: pageTitle }),
-    /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Main, { "aria-busy": isLoading, children: [
+    /* @__PURE__ */ jsxRuntime.jsx(
+      Helmet.HelmetExport,
+      {
+        title: formatMessage(
+          { id: "Settings.PageTitle", defaultMessage: "Settings - {name}" },
+          { name: pageTitle }
+        )
+      }
+    ),
+    /* @__PURE__ */ jsxRuntime.jsxs(admin.Page.Main, { children: [
       /* @__PURE__ */ jsxRuntime.jsx(
         designSystem.HeaderLayout,
         {
@@ -1090,26 +1104,28 @@ const RolesListPage = () => {
             id: "Settings.roles.list.description",
             defaultMessage: "List of roles"
           }),
-          primaryAction: /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.CheckPermissions, { permissions: index.PERMISSIONS.createRole, children: /* @__PURE__ */ jsxRuntime.jsx(
-            helperPlugin.LinkButton,
+          primaryAction: canCreate ? /* @__PURE__ */ jsxRuntime.jsx(
+            v2.LinkButton,
             {
-              to: "/settings/users-permissions/roles/new",
+              to: "new",
+              as: reactRouterDom.NavLink,
               onClick: () => trackUsage("willCreateRole"),
-              startIcon: /* @__PURE__ */ jsxRuntime.jsx(icons.Plus, {}),
+              startIcon: /* @__PURE__ */ jsxRuntime.jsx(Icons.Plus, {}),
               size: "S",
               children: formatMessage({
                 id: index.getTrad("List.button.roles"),
                 defaultMessage: "Add new role"
               })
             }
-          ) })
+          ) : null,
+          navigationAction: /* @__PURE__ */ jsxRuntime.jsx(admin.BackButton, {})
         }
       ),
       /* @__PURE__ */ jsxRuntime.jsx(
         designSystem.ActionLayout,
         {
           startActions: /* @__PURE__ */ jsxRuntime.jsx(
-            helperPlugin.SearchURLQuery,
+            admin.SearchInput,
             {
               label: formatMessage({
                 id: "app.component.search.label",
@@ -1120,8 +1136,7 @@ const RolesListPage = () => {
         }
       ),
       /* @__PURE__ */ jsxRuntime.jsxs(designSystem.ContentLayout, { children: [
-        !canRead && /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.NoPermissions, {}),
-        (isLoading || isLoadingForPermissions) && /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.LoadingIndicatorPage, {}),
+        !canRead && /* @__PURE__ */ jsxRuntime.jsx(admin.Page.NoPermissions, {}),
         canRead && sortedRoles && sortedRoles?.length ? /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Table, { colCount, rowCount, children: [
           /* @__PURE__ */ jsxRuntime.jsx(designSystem.Thead, { children: /* @__PURE__ */ jsxRuntime.jsxs(designSystem.Tr, { children: [
             /* @__PURE__ */ jsxRuntime.jsx(designSystem.Th, { children: /* @__PURE__ */ jsxRuntime.jsx(designSystem.Typography, { variant: "sigma", textColor: "neutral600", children: formatMessage({ id: "global.name", defaultMessage: "Name" }) }) }),
@@ -1143,19 +1158,19 @@ const RolesListPage = () => {
             {
               sortedRoles,
               canDelete,
+              canUpdate,
               permissions: index.PERMISSIONS,
               setRoleToDelete,
               onDelete: [showConfirmDelete, setShowConfirmDelete]
             }
           )
-        ] }) : /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.EmptyStateLayout, { content: emptyLayout[emptyContent] })
+        ] }) : /* @__PURE__ */ jsxRuntime.jsx(designSystem.EmptyStateLayout, { content: formatMessage(emptyLayout[emptyContent]) })
       ] }),
       /* @__PURE__ */ jsxRuntime.jsx(
-        helperPlugin.ConfirmDialog,
+        admin.ConfirmDialog,
         {
-          isConfirmButtonLoading,
           onConfirm: handleConfirmDelete,
-          onToggleDialog: handleShowConfirmDelete,
+          onClose: handleShowConfirmDelete,
           isOpen: showConfirmDelete
         }
       )
@@ -1163,29 +1178,14 @@ const RolesListPage = () => {
   ] });
 };
 const ProtectedRolesListPage = () => {
-  return /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.CheckPagePermissions, { permissions: index.PERMISSIONS.accessRoles, children: /* @__PURE__ */ jsxRuntime.jsx(RolesListPage, {}) });
+  return /* @__PURE__ */ jsxRuntime.jsx(admin.Page.Protect, { permissions: index.PERMISSIONS.accessRoles, children: /* @__PURE__ */ jsxRuntime.jsx(RolesListPage, {}) });
 };
 const Roles = () => {
-  return /* @__PURE__ */ jsxRuntime.jsx(helperPlugin.CheckPagePermissions, { permissions: index.PERMISSIONS.accessRoles, children: /* @__PURE__ */ jsxRuntime.jsxs(reactRouterDom.Switch, { children: [
-    /* @__PURE__ */ jsxRuntime.jsx(
-      reactRouterDom.Route,
-      {
-        path: "/settings/users-permissions/roles/new",
-        component: ProtectedRolesCreatePage,
-        exact: true
-      }
-    ),
-    /* @__PURE__ */ jsxRuntime.jsx(
-      reactRouterDom.Route,
-      {
-        path: "/settings/users-permissions/roles/:id",
-        component: ProtectedRolesEditPage,
-        exact: true
-      }
-    ),
-    /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Route, { path: "/settings/users-permissions/roles", component: ProtectedRolesListPage, exact: true }),
-    /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Route, { path: "", component: helperPlugin.AnErrorOccurred })
+  return /* @__PURE__ */ jsxRuntime.jsx(admin.Page.Protect, { permissions: index.PERMISSIONS.accessRoles, children: /* @__PURE__ */ jsxRuntime.jsxs(reactRouterDom.Routes, { children: [
+    /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Route, { index: true, element: /* @__PURE__ */ jsxRuntime.jsx(ProtectedRolesListPage, {}) }),
+    /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Route, { path: "new", element: /* @__PURE__ */ jsxRuntime.jsx(ProtectedRolesCreatePage, {}) }),
+    /* @__PURE__ */ jsxRuntime.jsx(reactRouterDom.Route, { path: ":id", element: /* @__PURE__ */ jsxRuntime.jsx(ProtectedRolesEditPage, {}) })
   ] }) });
 };
 exports.default = Roles;
-//# sourceMappingURL=index-XqdaO5WZ.js.map
+//# sourceMappingURL=index-6E51D69B.js.map