Skip to content
Merged
11 changes: 7 additions & 4 deletions ui/src/user/AddEditUserDialog.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,10 @@ export default class AddEditDialog extends Component<IProps, IState> {
autoFocus
margin="dense"
className="name"
label="Name *"
type="email"
label="Username *"
value={name}
name="username"
id="username"
onChange={this.handleChange.bind(this, 'name')}
fullWidth
/>
Expand All @@ -65,7 +66,9 @@ export default class AddEditDialog extends Component<IProps, IState> {
type="password"
value={pass}
fullWidth
label={isEdit ? 'Pass (empty if no change)' : 'Pass *'}
label={isEdit ? 'Password (empty if no change)' : 'Password *'}
name="password"
id="password"
onChange={this.handleChange.bind(this, 'pass')}
/>
<FormControlLabel
Expand All @@ -89,7 +92,7 @@ export default class AddEditDialog extends Component<IProps, IState> {
? passPresent
? ''
: 'password is required'
: 'name is required'
: 'username is required'
}>
<div>
<Button
Expand Down
4 changes: 4 additions & 0 deletions ui/src/user/Login.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,17 +28,21 @@ class Login extends Component<Stores<'currentUser'>> {
<form onSubmit={this.preventDefault} id="login-form">
<TextField
autoFocus
id="username"
className="name"
label="Username"
name="username"
Comment thread
jmattheis marked this conversation as resolved.
margin="dense"
autoComplete="username"
value={username}
onChange={(e) => (this.username = e.target.value)}
/>
<TextField
id="password"
type="password"
className="password"
label="Password"
name="password"
margin="normal"
autoComplete="current-password"
value={password}
Expand Down
13 changes: 9 additions & 4 deletions ui/src/user/Register.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,21 +46,26 @@ export default class RegistrationDialog extends Component<IProps, IState> {
<DialogContent>
<TextField
autoFocus
id="register-username"
margin="dense"
className="name"
label="Name *"
type="email"
label="Username *"
name="username"
value={name}
autoComplete="username"
onChange={this.handleChange.bind(this, 'name')}
fullWidth
/>
<TextField
id="register-password"
margin="dense"
className="password"
type="password"
value={pass}
fullWidth
label="Pass *"
label="Password *"
name="password"
autoComplete="new-password"
onChange={this.handleChange.bind(this, 'pass')}
/>
</DialogContent>
Expand All @@ -73,7 +78,7 @@ export default class RegistrationDialog extends Component<IProps, IState> {
? passPresent
? ''
: 'password is required'
: 'name is required'
: 'username is required'
}>
<div>
<Button
Expand Down
2 changes: 1 addition & 1 deletion ui/src/user/Users.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ class Users extends Component<WithStyles<'wrapper'> & Stores<'userStore'>> {
<Table id="user-table">
<TableHead>
<TableRow style={{textAlign: 'center'}}>
<TableCell>Name</TableCell>
<TableCell>Username</TableCell>
<TableCell>Admin</TableCell>
<TableCell />
</TableRow>
Expand Down
Loading