Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-10 07:25:44 +01:00
Code Issues Packages Projects Releases Activity

Renamed variable to reduce risk of confusion

Browse Source
This commit is contained in:
Philipp Czora
2018-11-06 15:48:12 +01:00
parent 081cd93c51 1a3506ce50
commit 6f44a4ed67
2 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scm-ui/src/users/components/SetUserPassword.js
View File

@@ -19,7 +19,7 @@ type Props = {
type State = { type State = {
password: string, password: string,
loading: boolean, loading: boolean,
passwordValidationError: boolean, passwordConfirmationError: boolean,
validatePasswordError: boolean, validatePasswordError: boolean,
validatePassword: string, validatePassword: string,
error?: Error, error?: Error,
@@ -33,7 +33,7 @@ class SetUserPassword extends React.Component<Props, State> {
this.state = { this.state = {
password: "", password: "",
loading: false, loading: false,
passwordValidationError: false, passwordConfirmationError: false,
validatePasswordError: false, validatePasswordError: false,
validatePassword: "", validatePassword: "",
passwordChanged: false passwordChanged: false
@@ -42,7 +42,7 @@ class SetUserPassword extends React.Component<Props, State> {
passwordIsValid = () => { passwordIsValid = () => {
return !( return !(
this.state.validatePasswordError || this.state.passwordValidationError this.state.validatePasswordError || this.state.passwordConfirmationError
); );
}; };
@@ -69,7 +69,7 @@ class SetUserPassword extends React.Component<Props, State> {
password: "", password: "",
validatePassword: "", validatePassword: "",
validatePasswordError: false, validatePasswordError: false,
passwordValidationError: false passwordConfirmationError: false
}); });
}; };
@@ -126,7 +126,7 @@ class SetUserPassword extends React.Component<Props, State> {
type="password" type="password"
onChange={this.handlePasswordValidationChange} onChange={this.handlePasswordValidationChange}
value={this.state ? this.state.validatePassword : ""} value={this.state ? this.state.validatePassword : ""}
validationError={this.state.passwordValidationError} validationError={this.state.passwordConfirmationError}
errorMessage={t("validation.passwordValidation-invalid")} errorMessage={t("validation.passwordValidation-invalid")}
helpText={t("help.passwordConfirmHelpText")} helpText={t("help.passwordConfirmHelpText")}
/> />
@@ -146,19 +146,19 @@ class SetUserPassword extends React.Component<Props, State> {
); );
this.setState({ this.setState({
validatePasswordError: !userValidator.isPasswordValid(password), validatePasswordError: !userValidator.isPasswordValid(password),
passwordValidationError: validatePasswordError, passwordConfirmationError: validatePasswordError,
password: password password: password
}); });
}; };
handlePasswordValidationChange = (validatePassword: string) => { handlePasswordValidationChange = (validatePassword: string) => {
const validatePasswordError = this.checkPasswords( const passwordConfirmed = this.checkPasswords(
this.state.password, this.state.password,
validatePassword validatePassword
); );
this.setState({ this.setState({
validatePassword, validatePassword,
passwordValidationError: !validatePasswordError passwordConfirmationError: !passwordConfirmed
}); });
}; };

12
scm-ui/src/users/components/UserForm.js
View File

@@ -22,7 +22,7 @@ type State = {
mailValidationError: boolean, mailValidationError: boolean,
nameValidationError: boolean, nameValidationError: boolean,
displayNameValidationError: boolean, displayNameValidationError: boolean,
passwordValidationError: boolean, passwordConfirmationError: boolean,
validatePasswordError: boolean, validatePasswordError: boolean,
validatePassword: string validatePassword: string
}; };
@@ -44,7 +44,7 @@ class UserForm extends React.Component<Props, State> {
mailValidationError: false, mailValidationError: false,
displayNameValidationError: false, displayNameValidationError: false,
nameValidationError: false, nameValidationError: false,
passwordValidationError: false, passwordConfirmationError: false,
validatePasswordError: false, validatePasswordError: false,
validatePassword: "" validatePassword: ""
}; };
@@ -70,7 +70,7 @@ class UserForm extends React.Component<Props, State> {
this.state.validatePasswordError || this.state.validatePasswordError ||
this.state.nameValidationError || this.state.nameValidationError ||
this.state.mailValidationError || this.state.mailValidationError ||
this.state.passwordValidationError || this.state.passwordConfirmationError ||
this.state.displayNameValidationError || this.state.displayNameValidationError ||
this.isFalsy(user.name) || this.isFalsy(user.name) ||
this.isFalsy(user.displayName) this.isFalsy(user.displayName)
@@ -117,7 +117,7 @@ class UserForm extends React.Component<Props, State> {
type="password" type="password"
onChange={this.handlePasswordValidationChange} onChange={this.handlePasswordValidationChange}
value={this.state ? this.state.validatePassword : ""} value={this.state ? this.state.validatePassword : ""}
validationError={this.state.passwordValidationError} validationError={this.state.passwordConfirmationError}
errorMessage={t("validation.passwordValidation-invalid")} errorMessage={t("validation.passwordValidation-invalid")}
helpText={t("help.passwordConfirmHelpText")} helpText={t("help.passwordConfirmHelpText")}
/> />
@@ -195,7 +195,7 @@ class UserForm extends React.Component<Props, State> {
); );
this.setState({ this.setState({
validatePasswordError: !userValidator.isPasswordValid(password), validatePasswordError: !userValidator.isPasswordValid(password),
passwordValidationError: validatePasswordError, passwordConfirmationError: validatePasswordError,
user: { ...this.state.user, password } user: { ...this.state.user, password }
}); });
}; };
@@ -207,7 +207,7 @@ class UserForm extends React.Component<Props, State> {
); );
this.setState({ this.setState({
validatePassword, validatePassword,
passwordValidationError: !validatePasswordError passwordConfirmationError: !validatePasswordError
}); });
}; };