diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js index e4f3e21b5e..a370b3c799 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ConditionsModal/index.js @@ -1,10 +1,12 @@ import React, { useMemo, useState } from 'react'; import PropTypes from 'prop-types'; -import { Box } from '@strapi/design-system/Box'; import { Button } from '@strapi/design-system/Button'; -import { Divider } from '@strapi/design-system/Divider'; -import { Stack } from '@strapi/design-system/Stack'; -import { ModalFooter, ModalHeader, ModalLayout } from '@strapi/design-system/ModalLayout'; +import { + ModalFooter, + ModalHeader, + ModalLayout, + ModalBody, +} from '@strapi/design-system/ModalLayout'; import { Breadcrumbs, Crumb } from '@strapi/design-system/Breadcrumbs'; import { Typography } from '@strapi/design-system/Typography'; import produce from 'immer'; @@ -88,48 +90,35 @@ const ConditionsModal = ({ actions, headerBreadCrumbs, isFormDisabled, onClosed, ))} - - - + + {actionsToDisplay.length === 0 && ( + {formatMessage({ - id: 'Settings.permissions.conditions.define-conditions', - defaultMessage: 'Define conditions', + id: 'Settings.permissions.conditions.no-actions', + defaultMessage: + 'You first need to select actions (create, read, update, ...) before defining conditions on them.', })} - - - - - {actionsToDisplay.length === 0 && ( - - {formatMessage({ - id: 'Settings.permissions.conditions.no-actions', - defaultMessage: - 'You first need to select actions (create, read, update, ...) before defining conditions on them.', - })} - - )} -
    - {actionsToDisplay.map(({ actionId, label, pathToConditionsObject }, index) => { - const name = pathToConditionsObject.join('..'); + )} +
      + {actionsToDisplay.map(({ actionId, label, pathToConditionsObject }, index) => { + const name = pathToConditionsObject.join('..'); - return ( - - ); - })} -
    - - - + return ( + + ); + })} +
+
diff --git a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js index 0c7926914e..0a269f3d27 100644 --- a/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js +++ b/packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/EditPage/components/ContentTypeCollapse/Collapse/index.js @@ -232,7 +232,7 @@ const Collapse = ({ {isModalOpen && (