From e9e80fffa82091c5256af1b1221d7e12b9a57525 Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Thu, 12 Aug 2021 08:58:38 -0700
Subject: [PATCH] Fixed issues with merge

---
 ui/src/app/admin/component/UserMaintenance.js | 18 ++++-----
 .../domain/provider/component/ProviderList.js |  2 +-
 .../domain/source/component/SourceList.js     | 40 +++++++++----------
 ui/src/app/metadata/view/MetadataOptions.js   |  8 ----
 4 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/ui/src/app/admin/component/UserMaintenance.js b/ui/src/app/admin/component/UserMaintenance.js
index c4542438f..e9a7b8c33 100644
--- a/ui/src/app/admin/component/UserMaintenance.js
+++ b/ui/src/app/admin/component/UserMaintenance.js
@@ -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>
@@ -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}`}
@@ -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={
@@ -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">
diff --git a/ui/src/app/metadata/domain/provider/component/ProviderList.js b/ui/src/app/metadata/domain/provider/component/ProviderList.js
index 4cd26c2b9..e97b8c4ce 100644
--- a/ui/src/app/metadata/domain/provider/component/ProviderList.js
+++ b/ui/src/app/metadata/domain/provider/component/ProviderList.js
@@ -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
diff --git a/ui/src/app/metadata/domain/source/component/SourceList.js b/ui/src/app/metadata/domain/source/component/SourceList.js
index 039228bd2..992f96b92 100644
--- a/ui/src/app/metadata/domain/source/component/SourceList.js
+++ b/ui/src/app/metadata/domain/source/component/SourceList.js
@@ -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();
@@ -33,7 +32,7 @@ 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>
@@ -41,36 +40,37 @@ export default function SourceList({ entities, onDelete, onEnable }) {
                         <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>
@@ -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}`}>
diff --git a/ui/src/app/metadata/view/MetadataOptions.js b/ui/src/app/metadata/view/MetadataOptions.js
index d66949ab2..3c78b46d0 100644
--- a/ui/src/app/metadata/view/MetadataOptions.js
+++ b/ui/src/app/metadata/view/MetadataOptions.js
@@ -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>