diff --git a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy index 70892cbb7..a04d74e57 100644 --- a/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy +++ b/backend/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy @@ -149,16 +149,16 @@ class DevConfig { roles.add(roleRepository.findByName('ROLE_USER').get()) it }, new User().with { - username = 'none' - password = '{noop}nonepass' + username = 'Approver' + password = '{noop}password' firstName = 'Bad' lastName = 'robot' emailAddress = 'badboy@institution.edu' roles.add(roleRepository.findByName('ROLE_NONE').get()) it }, new User().with { - username = 'none2' - password = '{noop}none2pass' + username = 'Submitter' + password = '{noop}password' firstName = 'Bad' lastName = 'robot2' emailAddress = 'badboy2@institution.edu' diff --git a/backend/src/main/resources/i18n/messages.properties b/backend/src/main/resources/i18n/messages.properties index 812ae4383..2fca47751 100644 --- a/backend/src/main/resources/i18n/messages.properties +++ b/backend/src/main/resources/i18n/messages.properties @@ -804,4 +804,5 @@ label.approve=Approve label.disapprove=Unapprove label.approval=Approval value.approved=Approved -value.disapproved=Not Approved \ No newline at end of file +value.disapproved=Not Approved +label.group-approvers=Approvers \ No newline at end of file diff --git a/ui/src/app/admin/container/GroupsList.js b/ui/src/app/admin/container/GroupsList.js index 6540901c1..8260a621a 100644 --- a/ui/src/app/admin/container/GroupsList.js +++ b/ui/src/app/admin/container/GroupsList.js @@ -43,6 +43,9 @@ export function GroupsList({ groups, onDelete }) { Group Description + + Approvers + Actions @@ -51,6 +54,7 @@ export function GroupsList({ groups, onDelete }) { {group.name} {group.description || ''} + {group.approversList?.length > 0 ? group.approversList[0].approverGroupIds.join(', ') : '-'} diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js index b8af68e82..5095744f1 100644 --- a/ui/src/app/metadata/domain/source/component/SourceList.js +++ b/ui/src/app/metadata/domain/source/component/SourceList.js @@ -6,8 +6,9 @@ import Button from 'react-bootstrap/Button'; import Form from 'react-bootstrap/Form'; import OverlayTrigger from 'react-bootstrap/OverlayTrigger'; + import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; -import { faTrash } from '@fortawesome/free-solid-svg-icons'; +import { faTrash, faCheck } from '@fortawesome/free-solid-svg-icons'; import FormattedDate from '../../../../core/components/FormattedDate'; import Translate from '../../../../i18n/components/translate'; @@ -63,15 +64,15 @@ export default function SourceList({ entities, onDelete, onEnable, onApprove, on {onApprove ? - onApprove(source, checked)} - checked={source.approved} - > - + size="sm" className="" + onClick={() => onApprove(source, !source.approved)}> + + + + + :