Skip to content

Commit

Permalink
Fixed issues with merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmathis
rmathis committed Aug 12, 2021
1 parent 986abd2 commit e9e80ff
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 38 deletions.
18 changes: 9 additions & 9 deletions ui/src/app/admin/component/UserMaintenance.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ export default function UserMaintenance({ users, roles, loading, onDeleteUser, o
<thead>
<tr>
<th scope="col"><Translate value="label.user-id">UserId</Translate></th>
<th scope="col" ><Translate value="label.name">Name</Translate></th>
<th scope="col"><Translate value="label.name">Name</Translate></th>
<th scope="col"><Translate value="label.email">Email</Translate></th>
<th scope="col" ><Translate value="label.role">Role</Translate></th>
<th scope="col" ><Translate value="label.group">Group</Translate></th>
<th scope="col"><Translate value="label.role">Role</Translate></th>
<th scope="col"><Translate value="label.group">Group</Translate></th>
<th scope="col"><Translate value="label.delete">Delete?</Translate></th>
</tr>
</thead>
Expand All @@ -36,10 +36,10 @@ export default function UserMaintenance({ users, roles, loading, onDeleteUser, o
<React.Fragment>
{users.map((user, idx) =>
<tr key={idx}>
<th>{user.username}</th>
<td>{user.firstName} {user.lastName}</td>
<td>{user.emailAddress}</td>
<td>
<td className="align-middle">{user.username}</td>
<td className="align-middle">{user.firstName} {user.lastName}</td>
<td className="align-middle">{user.emailAddress}</td>
<td className="align-middle">
<label htmlFor={`role-${user.username}`} className="sr-only"><Translate value="action.user-role">User role</Translate></label>
<select
id={`role-${user.username}`}
Expand All @@ -54,7 +54,7 @@ export default function UserMaintenance({ users, roles, loading, onDeleteUser, o
))}
</select>
</td>
<td>
<td className="align-middle">
<OverlayTrigger
trigger={user.role === 'ROLE_ADMIN' ? ['hover', 'focus'] : []}
overlay={
Expand All @@ -79,7 +79,7 @@ export default function UserMaintenance({ users, roles, loading, onDeleteUser, o
</OverlayTrigger>

</td>
<td>
<td className="align-middle">
{currentUser.username !== user.username &&
<Button className="text-danger" variant="link" onClick={() => onDeleteUser(user.username)}>
<span className="sr-only">
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/metadata/domain/provider/component/ProviderList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export function ProviderList({ entities, reorder = true, first, last, onEnable,
<td className="align-middle">{ provider['@type'] }</td>
<td className="align-middle">{ provider.createdBy }</td>
<td className="align-middle"><FormattedDate date={provider.createdDate} /></td>
<td className="">
<td className="align-middle">
<span className="d-flex justify-content-end">
{onEnable && isAdmin ?
<Form.Check
Expand Down
40 changes: 20 additions & 20 deletions ui/src/app/metadata/domain/source/component/SourceList.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,16 @@ 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';
import { Scroller } from '../../../../dashboard/component/Scroller';
import { useTranslator } from '../../../../i18n/hooks';
import { DeleteSourceConfirmation } from './DeleteSourceConfirmation';
import { useIsAdmin } from '../../../../core/user/UserContext';
import { GroupsProvider } from '../../../../admin/hoc/GroupsProvider';

export default function SourceList({ entities, onDelete, onEnable }) {
export default function SourceList({ entities, onDelete, onEnable, onChangeGroup }) {

const translator = useTranslator();
const isAdmin = useIsAdmin();
Expand All @@ -33,44 +32,45 @@ export default function SourceList({ entities, onDelete, onEnable }) {
<th className="w-25"><Translate value="label.entity-id">Entity ID</Translate></th>
<th className=""><Translate value="label.author">Author</Translate></th>
<th className=""><Translate value="label.creation-date">Created Date</Translate></th>
<th className=""><Translate value="label.enabled">Enabled</Translate></th>
<th className="text-center"><Translate value="label.enabled">Enabled</Translate></th>
{isAdmin && onChangeGroup && <th className=""><Translate value="label.group">Group</Translate></th> }
{onDelete && <th className="w-auto"></th>}
</tr>
</thead>
<tbody>
{limited.map((source, idx) =>
<tr key={idx}>
<td>
<td className="align-middle">
<Link to={`/metadata/source/${source.id}/configuration/options`}>{source.serviceProviderName}</Link>
</td>
<td>
<td className="align-middle">
{source.entityId}
</td>
<td>
<td className="align-middle">
{source.createdBy}
</td>
<td><FormattedDate date={source.createdDate} /></td>
<td className="">
<td className="align-middle"><FormattedDate date={source.createdDate} /></td>
<td className="text-center align-middle">
<span className="d-flex justify-content-center align-items-center">
{onEnable && isAdmin ?
<Button
variant="success"
size="sm"
checked={source.serviceEnabled}
onClick={() => onEnable(source)}
<Form.Check
type="switch"
id="custom-switch"
size="lg"
aria-label={translator(source.serviceEnabled ? 'label.disable' : 'label.enable')}
onChange={({ target: { checked } }) => onEnable(source, checked)}
aria-label={translator(source.serviceEnabled ? 'label.disable' : 'label.enable')}>
<Translate value={ source.enabled ? 'label.disable' : 'label.enable' }>Disable</Translate>
{!source.enabled && <>&nbsp;<FontAwesomeIcon icon={faCheck} size="lg" /></> }
</Button>
checked={source.serviceEnabled}
>
</Form.Check>
:
<Badge variant={source.serviceEnabled ? 'success' : 'danger'}>
<Translate value={source.serviceEnabled ? 'value.enabled' : 'value.disabled'}></Translate>
</Badge>
}
</span>
</td>
{isAdmin && onChangeGroup &&
<td className="">
<td className="align-middle">
<GroupsProvider>
{(groups, removeGroup, loadingGroups) =>
<React.Fragment>
Expand All @@ -94,7 +94,7 @@ export default function SourceList({ entities, onDelete, onEnable }) {
</td>
}
{onDelete &&
<td className="text-right">
<td className="text-right align-middle">
<OverlayTrigger trigger={source.serviceEnabled ? ['hover', 'focus'] : []} placement="left"
overlay={
<Popover id={`delete-source-btn-${idx}`}>
Expand Down
8 changes: 0 additions & 8 deletions ui/src/app/metadata/view/MetadataOptions.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,6 @@ export function MetadataOptions ({reload}) {
</Button>
}
</div>
{type === 'source' && remove &&
<Button className="btn btn-outline btn-sm btn-danger align-self-start"
disabled={metadata.serviceEnabled}
onClick={() => remove(metadata.id, redirectOnDelete)}>
<Translate value="action.delete" />
<FontAwesomeIcon icon={faTrash} className="ml-2" />
</Button>
}
</MetadataHeader>
<div className="px-3 my-3 d-flex justify-content-between" id="navigation">
<div>
Expand Down

0 comments on commit e9e80ff

Please sign in to comment.