Updated UI for approvers

TIER · Oct 20, 2022 · d859e1b · d859e1b
1 parent 8ff78b6
commit d859e1b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/...end/src/main/groovy/edu/internet2/tier/shibboleth/admin/ui/configuration/DevConfig.groovy b/...end/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
@@ -804,4 +804,5 @@ label.approve=Approve
 label.disapprove=Unapprove
 label.approval=Approval
 value.approved=Approved
-value.disapproved=Not Approved
+value.disapproved=Not Approved
+label.group-approvers=Approvers
diff --git 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 }) {
                                                 <th>
                                                     <Translate value="label.group-description">Group Description</Translate>
                                                 </th>
+                                                <th>
+                                                    <Translate value="label.group-approvers">Approvers</Translate>
+                                                </th>
                                                 <th><span className="sr-only"><Translate value="label.actions">Actions</Translate></span></th>
                                             </tr>
                                         </thead>
@@ -51,6 +54,7 @@ export function GroupsList({ groups, onDelete }) {
                                                 <tr key={i}>
                                                     <td>{group.name}</td>
                                                     <td>{group.description || ''}</td>
+                                                    <td>{group.approversList?.length > 0 ? group.approversList[0].approverGroupIds.join(', ') : '-'}</td>
                                                     <td className="text-end">
                                                         <Link to={`../groups/${group.resourceId}/edit`} className="btn btn-link text-primary">
                                                             <FontAwesomeIcon icon={faEdit} size="lg" />

diff --git 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
                                             <td className="text-center align-middle">
                                                 <span className="d-flex justify-content-center align-items-center">
                                                     {onApprove ?
-                                                    <Form.Check
-                                                        type="switch"
+                                                    <Button variant={source.approved ? 'outline-success' : 'outline-success' }
                                                         id={`approve-switch-${source.id}`}
-                                                        size="lg"
-                                                        aria-label={translator(source.approved ? 'label.disapprove' : 'label.approve')}
-                                                        onChange={({ target: { checked } }) => onApprove(source, checked)}
-                                                        checked={source.approved}
-                                                    >
-                                                    </Form.Check>
+                                                        size="sm" className=""
+                                                            onClick={() => onApprove(source, !source.approved)}>
+                                                                <span className=" me-1">
+                                                                    <Translate value={source.approved ? 'label.disapprove' : 'label.approve'} />
+                                                                </span>
+                                                        <FontAwesomeIcon size="lg" icon={faCheck} />
+                                                    </Button>
                                                     :
                                                     <Badge bg={source.approved ? 'success' : 'danger'}>
                                                         <Translate value={source.approved ? 'value.approved' : 'value.disapproved'}></Translate>