diff --git a/src/library-authoring/author-library/LibraryAuthoringPage.jsx b/src/library-authoring/author-library/LibraryAuthoringPage.jsx index 458c366f..50cbbe6e 100644 --- a/src/library-authoring/author-library/LibraryAuthoringPage.jsx +++ b/src/library-authoring/author-library/LibraryAuthoringPage.jsx @@ -7,11 +7,12 @@ import { Button, Card, Navbar, - Modal, Dropdown, SearchField, Form, Pagination, + ModalDialog, + ActionRow, } from '@edx/paragon'; import { v4 as uuid4 } from 'uuid'; import { faPlus, faSync } from '@fortawesome/free-solid-svg-icons'; @@ -79,7 +80,7 @@ export const BlockPreviewBase = ({ {block.display_name} - { library.allow_lti && ( + {library.allow_lti && ( <> - setShowDeleteModal(false)} - body={( -
-

- {intl.formatMessage(messages['library.detail.block.delete.modal.body'])} -

-
- )} - buttons={[ - , - ]} - /> + > + + + {intl.formatMessage(messages['library.detail.block.delete.modal.title'])} + + + + {intl.formatMessage(messages['library.detail.block.delete.modal.body'])} + + + + + Close + + + + + {showPreviews && ( @@ -274,7 +279,7 @@ const ButtonTogglesBase = ({ ); @@ -425,16 +430,16 @@ export const LibraryAuthoringPageBase = ({ : null} {library.type !== LIBRARY_TYPES.COMPLEX && ( - + )} {library.type === LIBRARY_TYPES.COMPLEX && ( diff --git a/src/library-authoring/library-access/UserAccessWidget.jsx b/src/library-authoring/library-access/UserAccessWidget.jsx index c391e40e..8e961cab 100644 --- a/src/library-authoring/library-access/UserAccessWidget.jsx +++ b/src/library-authoring/library-access/UserAccessWidget.jsx @@ -2,8 +2,9 @@ Component for displaying and modifying a user's access level for a library. */ import { + ActionRow, Badge, - Button, Card, Col, Modal, Row, + Button, Card, Col, ModalDialog, Row, } from '@edx/paragon'; import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { faTrash } from '@fortawesome/free-solid-svg-icons'; @@ -40,99 +41,113 @@ export const UserAccessWidget = ({ {isAdmin && ( - - - {(user.access_level === LIBRARY_ACCESS.ADMIN) && adminLocked && ( - - {intl.formatMessage(messages['library.access.info.admin_unlock'])} - - )} - {user.access_level === LIBRARY_ACCESS.ADMIN && multipleAdmins && ( - - - setShowDeprivModal(false)} - body={( -
-

+ + + {(user.access_level === LIBRARY_ACCESS.ADMIN) && adminLocked && ( + + {intl.formatMessage(messages['library.access.info.admin_unlock'])} + + )} + {user.access_level === LIBRARY_ACCESS.ADMIN && multipleAdmins && ( + + + setShowDeprivModal(false)} + > + + + + {intl.formatMessage(messages['library.access.modal.remove_admin.title'])} + + + {intl.formatMessage( messages['library.access.modal.remove_admin.body'], { library: library.title, email: user.email }, )} -

-
- )} - buttons={[ - , - ]} - /> - - )} - {user.access_level === LIBRARY_ACCESS.READ && ( - - - - )} - {user.access_level === LIBRARY_ACCESS.AUTHOR && ( - <> - - + + + + + Close + + , + + + - - - - )} - {(!((user.access_level === LIBRARY_ACCESS.ADMIN) && adminLocked)) && ( - - - setShowRemoveModal(false)} - body={( -
-

+ )} + {user.access_level === LIBRARY_ACCESS.AUTHOR && ( + <> + + + + + + + + )} + {(!((user.access_level === LIBRARY_ACCESS.ADMIN) && adminLocked)) && ( + + + setShowRemoveModal(false)} + > + + + + {intl.formatMessage(messages['library.access.modal.remove.title'])} + + + {intl.formatMessage( messages['library.access.modal.remove.body'], { library: library.title, email: user.email }, )} -

-
- )} - buttons={[ - , - ]} - /> - - )} -
- + + + + + Close + + , + + + + + )} +
+ )}