From 1eb9a5db853aad5dd7f9690f5d4c5f0b7a1619fe Mon Sep 17 00:00:00 2001
From: Ryan Mathis <rmathis@unicon.net>
Date: Mon, 13 Jun 2022 12:41:33 -0700
Subject: [PATCH] Fixed issue with groups

---
 ui/src/app/admin/Groups.js                    | 2 +-
 ui/src/app/admin/component/AccessRequest.js   | 5 +++--
 ui/src/app/admin/component/UserMaintenance.js | 9 +++++----
 ui/src/setupProxy.js                          | 2 +-
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ui/src/app/admin/Groups.js b/ui/src/app/admin/Groups.js
index a1853f5e3..8326f9cd1 100644
--- a/ui/src/app/admin/Groups.js
+++ b/ui/src/app/admin/Groups.js
@@ -25,7 +25,7 @@ export function Groups() {
                 <Route path={`${path}/:id/edit`} render={() =>
                     <EditGroup />
                 } />
-                <Route path={`${path}`} exact render={
+                <Route path={`${path}`} exact render={() =>
                     <Redirect to={`${url}/list`} />
                 } />
             </Switch>
diff --git a/ui/src/app/admin/component/AccessRequest.js b/ui/src/app/admin/component/AccessRequest.js
index c20e5a543..e2fd1400f 100644
--- a/ui/src/app/admin/component/AccessRequest.js
+++ b/ui/src/app/admin/component/AccessRequest.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import Button from 'react-bootstrap/Button';
+import Form from 'react-bootstrap/Form';
 import Translate from '../../i18n/components/translate';
 
 export function AccessRequest({ users, roles, onDeleteUser, onChangeUserRole }) {
@@ -40,12 +41,12 @@ export function AccessRequest({ users, roles, onDeleteUser, onChangeUserRole })
                                 <Translate value="label.role">Role</Translate>
                             </label>
                             <div className="col">
-                                <select id={`role-${i}`} name={user.username} value={user.role} className="form-control form-control-sm"
+                                <Form.Select id={`role-${i}`} name={user.username} value={user.role} className="form-control form-control-sm"
                                     disablevalidation="true" onChange={(event) => onChangeUserRole(user, event.target.value)}>
                                     {roles.map((role, ridx) =>
                                         <option value={role} key={ridx}>{ role }</option>
                                     )}
-                                </select>
+                                </Form.Select>
                             </div>
                         </div>
                     </div>
diff --git a/ui/src/app/admin/component/UserMaintenance.js b/ui/src/app/admin/component/UserMaintenance.js
index e9a7b8c33..eba2150cd 100644
--- a/ui/src/app/admin/component/UserMaintenance.js
+++ b/ui/src/app/admin/component/UserMaintenance.js
@@ -3,6 +3,7 @@ import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faTrash } from '@fortawesome/free-solid-svg-icons';
 import Button from 'react-bootstrap/Button';
+import Form from 'react-bootstrap/Form';
 import OverlayTrigger from 'react-bootstrap/OverlayTrigger';
 import Tooltip from 'react-bootstrap/Tooltip';
 
@@ -41,7 +42,7 @@ export default function UserMaintenance({ users, roles, loading, onDeleteUser, o
                                         <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
+                                            <Form.Select
                                                 id={`role-${user.username}`}
                                                 name={`role-${user.username}`}
                                                 className="form-control"
@@ -52,7 +53,7 @@ export default function UserMaintenance({ users, roles, loading, onDeleteUser, o
                                                 {roles.map((role, ridx) => (
                                                     <option key={role} value={role}>{role}</option>
                                                 ))}
-                                            </select>
+                                            </Form.Select>
                                         </td>
                                         <td className="align-middle">
                                             <OverlayTrigger
@@ -62,7 +63,7 @@ export default function UserMaintenance({ users, roles, loading, onDeleteUser, o
                                             }>
                                                 <span className="d-block">
                                                     <label htmlFor={`group-${user.username}`} className="sr-only"><Translate value="action.user-group">User group</Translate></label>
-                                                    <select
+                                                    <Form.Select
                                                         id={`group-${user.username}`}
                                                         name={`group-${user.username}`}
                                                         className="form-control"
@@ -74,7 +75,7 @@ export default function UserMaintenance({ users, roles, loading, onDeleteUser, o
                                                         {groups.map((g, ridx) => (
                                                             <option key={ridx} value={g.resourceId}>{g.name}</option>
                                                         ))}
-                                                    </select>
+                                                    </Form.Select>
                                                 </span>
                                             </OverlayTrigger>
                                             
diff --git a/ui/src/setupProxy.js b/ui/src/setupProxy.js
index 78c38f7fb..bbd4523b8 100644
--- a/ui/src/setupProxy.js
+++ b/ui/src/setupProxy.js
@@ -3,7 +3,7 @@ const { createProxyMiddleware } = require('http-proxy-middleware');
 
 module.exports = function (app) {
 
-    const port = 10101;
+    const port = 8080;
 
     app.use(
         '/api',