587: Add roles radio group

Author: carrollsa

src/client/src/pages/UserManagement/Components/Dialog/NewUserDialog.jsx

@@ -19,6 +19,7 @@ import {
     buildUsernameValidation
 } from '../../Validations';
 import useAlert from "../../../../hooks/useAlert";
+import RolesRadioGroup from "../RolesRadioGroup";
 
 
 export default function NewUserDialog(props) {
@@ -99,18 +100,6 @@ export default function NewUserDialog(props) {
                     {(responseError || errors.username) && // This is a little janky... Could be improved upon.
                         <Typography color="error">{responseError || errors.username.message}</Typography>
                     }
-                    <TextField
-                        {...register("role")}
-                        margin="dense"
-                        id="role-input"
-                        label="Role - user/admin"
-                        onBlur={() => trigger("role")}
-                        variant="standard"
-                        fullWidth
-                    />
-                    {errors.role &&
-                        <Typography color="error">{errors.role.message}</Typography>
-                    }
                     <TextField
                         {...register("password")}
                         margin="dense"
@@ -135,6 +124,10 @@ export default function NewUserDialog(props) {
                     {errors.confirmPassword &&
                         <Typography color="error">{errors.confirmPassword.message}</Typography>
                     }
+                    <RolesRadioGroup id="roles-radio-group" register={register} />
+                    {errors.role &&
+                        <Typography color="error">{errors.role.message}</Typography>
+                    }
                     <DialogActions>
                         <Button
                             onClick={onClose}