Merged in bugfix/user_editing (pull request #166)

Bugfix/user editing
This commit is contained in:
Maren Süwer
2019-01-31 09:41:55 +00:00

View File

@@ -61,16 +61,42 @@ class UserForm extends React.Component<Props, State> {
return false;
}
createUserComponentsAreInvalid = () => {
const user = this.state.user;
if (!this.props.user) {
return (
this.state.nameValidationError ||
this.isFalsy(user.name) ||
!this.state.passwordValid
);
} else {
return false;
}
};
editUserComponentsAreUnchanged = () => {
const user = this.state.user;
if (this.props.user) {
return (
this.props.user.displayName === user.displayName &&
this.props.user.mail === user.mail &&
this.props.user.admin === user.admin &&
this.props.user.active === user.active
);
} else {
return false;
}
};
isValid = () => {
const user = this.state.user;
return !(
this.state.nameValidationError ||
this.createUserComponentsAreInvalid() ||
this.editUserComponentsAreUnchanged() ||
this.state.mailValidationError ||
this.state.displayNameValidationError ||
this.isFalsy(user.name) ||
this.isFalsy(user.displayName) ||
this.isFalsy(user.mail) ||
!this.state.passwordValid
this.isFalsy(user.mail)
);
};