Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Refactor migrate password page to functional component #21960

Merged
merged 16 commits into from
Jul 5, 2023
Merged

Refactor migrate password page to functional component #21960

Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
6f62b59
in progress
HezekielT Jun 28, 2023
d18d365
in progress
HezekielT Jun 29, 2023
2661e38
almost finished
HezekielT Jun 29, 2023
07e6eac
in progress
HezekielT Jun 29, 2023
ac7b6ee
migrated to functional component
HezekielT Jun 30, 2023
369f1e4
removed callback
HezekielT Jun 30, 2023
b8a8a6d
Merge branch 'Expensify:main' into refactor-migrate-PasswordPage-to-f…
HezekielT Jun 30, 2023
334c1df
Finished migration of PasswordPage to functional component
HezekielT Jun 30, 2023
179a569
fix lint errors
HezekielT Jun 30, 2023
22301c8
fix lint errors 2
HezekielT Jun 30, 2023
c3c088e
added callback
HezekielT Jun 30, 2023
32a87e0
fixed lint errors
HezekielT Jun 30, 2023
2f6270f
final change
HezekielT Jun 30, 2023
d39ab05
prettier issue solved
HezekielT Jun 30, 2023
5af9a7a
fix
HezekielT Jul 4, 2023
3e94326
fix change the useEffect to one-line
HezekielT Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
260 changes: 125 additions & 135 deletions src/pages/settings/PasswordPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React, {Component} from 'react';
import React, {useState, useEffect, useRef} from 'react';
import {View, ScrollView} from 'react-native';
import {withOnyx} from 'react-native-onyx';
import PropTypes from 'prop-types';
Expand Down Expand Up @@ -43,50 +43,45 @@ const propTypes = {
const defaultProps = {
account: {},
};
class PasswordPage extends Component {
constructor(props) {
super(props);

this.state = {
currentPassword: '',
newPassword: '',
errors: {
currentPassword: false,
newPassword: false,
newPasswordSameAsOld: false,
},
};

this.submit = this.submit.bind(this);
this.getErrorText = this.getErrorText.bind(this);
this.validate = this.validate.bind(this);
this.clearErrorAndSetValue = this.clearErrorAndSetValue.bind(this);

this.errorKeysMap = {
currentPassword: 'passwordPage.errors.currentPassword',
newPasswordSameAsOld: 'passwordPage.errors.newPasswordSameAsOld',
newPassword: 'passwordPage.errors.newPassword',
};
}
const errorKeysMap = {
currentPassword: 'passwordPage.errors.currentPassword',
newPasswordSameAsOld: 'passwordPage.errors.newPasswordSameAsOld',
newPassword: 'passwordPage.errors.newPassword',
};

componentWillUnmount() {
Session.clearAccountMessages();
}
function PasswordPage(props) {
const [passwordFields, setPasswordFields] = useState({
currentPassword: '',
newPassword: '',
});
const [errors, setErrors] = useState({
currentPassword: false,
newPassword: false,
newPasswordSameAsOld: false,
});

const currentPasswordInputRef = useRef(null);

useEffect(
() => () => {
Session.clearAccountMessages();
},
[],
);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can make this one-line and it still falls within our style guidelines

  useEffect(() => () => Session.clearAccountMessages(),[]);

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@NikkiWines I've made the change you requested.


/**
* @param {String} field
* @returns {String}
*/
getErrorText(field) {
return this.state.errors[field] ? this.errorKeysMap[field] : '';
}
const getErrorText = (field) => (errors[field] ? errorKeysMap[field] : '');

/**
* @param {String} field
* @param {String} value
* @param {String[]} additionalErrorsToClear
*/
clearErrorAndSetValue(field, value, additionalErrorsToClear) {
const clearErrorAndSetValue = (field, value, additionalErrorsToClear) => {
const errorsToReset = {
[field]: false,
};
Expand All @@ -95,128 +90,123 @@ class PasswordPage extends Component {
errorsToReset[errorFlag] = false;
});
}

this.setState((prevState) => ({
[field]: value,
errors: {...prevState.errors, ...errorsToReset},
}));
}
setPasswordFields((prev) => ({...prev, [field]: value}));
setErrors((prev) => ({...prev, ...errorsToReset}));
};

/**
* @returns {Boolean}
*/
validate() {
const errors = {};
const validate = () => {
const error = {};

if (!this.state.currentPassword) {
errors.currentPassword = true;
if (!passwordFields.currentPassword) {
error.currentPassword = true;
}

if (!this.state.newPassword || !ValidationUtils.isValidPassword(this.state.newPassword)) {
errors.newPassword = true;
if (!passwordFields.newPassword || !ValidationUtils.isValidPassword(passwordFields.newPassword)) {
error.newPassword = true;
}

if (this.state.currentPassword && this.state.newPassword && _.isEqual(this.state.currentPassword, this.state.newPassword)) {
errors.newPasswordSameAsOld = true;
if (passwordFields.currentPassword && passwordFields.newPassword && _.isEqual(passwordFields.currentPassword, passwordFields.newPassword)) {
error.newPasswordSameAsOld = true;
}

this.setState({errors});
return _.size(errors) === 0;
}
setErrors(() => ({...error}));
HezekielT marked this conversation as resolved.
Show resolved Hide resolved
return _.size(error) === 0;
};

/**
* Submit the form
*/
submit() {
if (!this.validate()) {
const submit = () => {
if (!validate()) {
return;
}
User.updatePassword(this.state.currentPassword, this.state.newPassword);
}

render() {
const shouldShowNewPasswordPrompt = !this.state.errors.newPassword && !this.state.errors.newPasswordSameAsOld;
return (
<ScreenWrapper
onEntryTransitionEnd={() => {
if (!this.currentPasswordInputRef) {
return;
}

this.currentPasswordInputRef.focus();
}}
>
<HeaderWithBackButton
title={this.props.translate('passwordPage.changePassword')}
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_SECURITY)}
User.updatePassword(passwordFields.currentPassword, passwordFields.newPassword);
};

const shouldShowNewPasswordPrompt = !errors.newPassword && !errors.newPasswordSameAsOld;
return (
<ScreenWrapper
onEntryTransitionEnd={() => {
if (!currentPasswordInputRef) {
HezekielT marked this conversation as resolved.
Show resolved Hide resolved
return;
}

currentPasswordInputRef.current.focus();
}}
>
<HeaderWithBackButton
title={props.translate('passwordPage.changePassword')}
onBackButtonPress={() => Navigation.goBack(ROUTES.SETTINGS_SECURITY)}
/>
{!_.isEmpty(props.account.success) ? (
<ConfirmationPage
heading={props.translate('passwordConfirmationScreen.passwordUpdated')}
shouldShowButton
onButtonPress={Navigation.goBack}
buttonText={props.translate('common.buttonConfirm')}
description={props.translate('passwordConfirmationScreen.allSet')}
/>
{!_.isEmpty(this.props.account.success) ? (
<ConfirmationPage
heading={this.props.translate('passwordConfirmationScreen.passwordUpdated')}
shouldShowButton
onButtonPress={Navigation.goBack}
buttonText={this.props.translate('common.buttonConfirm')}
description={this.props.translate('passwordConfirmationScreen.allSet')}
/>
) : (
<>
<ScrollView
style={styles.flex1}
contentContainerStyle={styles.p5}
// Allow the user to click show password while password input is focused.
// eslint-disable-next-line react/jsx-props-no-multi-spaces
keyboardShouldPersistTaps="always"
>
<Text style={[styles.mb6]}>{this.props.translate('passwordPage.changingYourPasswordPrompt')}</Text>
<View style={styles.mb6}>
<TextInput
label={`${this.props.translate('passwordPage.currentPassword')}*`}
ref={(el) => (this.currentPasswordInputRef = el)}
secureTextEntry
autoCompleteType="password"
textContentType="password"
value={this.state.currentPassword}
onChangeText={(text) => this.clearErrorAndSetValue('currentPassword', text)}
returnKeyType="done"
hasError={this.state.errors.currentPassword}
errorText={this.getErrorText('currentPassword')}
onSubmitEditing={this.submit}
/>
</View>
<View style={styles.mb6}>
<TextInput
label={`${this.props.translate('passwordPage.newPassword')}*`}
secureTextEntry
autoCompleteType="password"
textContentType="password"
value={this.state.newPassword}
hasError={this.state.errors.newPassword || this.state.errors.newPasswordSameAsOld}
errorText={this.state.errors.newPasswordSameAsOld ? this.getErrorText('newPasswordSameAsOld') : this.getErrorText('newPassword')}
onChangeText={(text) => this.clearErrorAndSetValue('newPassword', text, ['newPasswordSameAsOld'])}
onSubmitEditing={this.submit}
/>
{shouldShowNewPasswordPrompt && <Text style={[styles.textLabelSupporting, styles.mt1]}>{this.props.translate('passwordPage.newPasswordPrompt')}</Text>}
</View>
{_.every(this.state.errors, (error) => !error) && !_.isEmpty(this.props.account.errors) && (
<FormHelpMessage
isError
message={ErrorUtils.getLatestErrorMessage(this.props.account)}
/>
)}
</ScrollView>
<FixedFooter style={[styles.flexGrow0]}>
<Button
success
isLoading={this.props.account.isLoading}
text={this.props.translate('common.save')}
onPress={this.submit}
) : (
<>
<ScrollView
style={styles.flex1}
contentContainerStyle={styles.p5}
// Allow the user to click show password while password input is focused.
// eslint-disable-next-line react/jsx-props-no-multi-spaces
keyboardShouldPersistTaps="always"
>
<Text style={[styles.mb6]}>{props.translate('passwordPage.changingYourPasswordPrompt')}</Text>
<View style={styles.mb6}>
<TextInput
label={`${props.translate('passwordPage.currentPassword')}*`}
ref={currentPasswordInputRef}
secureTextEntry
autoCompleteType="password"
textContentType="password"
value={passwordFields.currentPassword}
onChangeText={(text) => clearErrorAndSetValue('currentPassword', text)}
returnKeyType="done"
hasError={errors.currentPassword}
errorText={getErrorText('currentPassword')}
onSubmitEditing={submit}
/>
</View>
<View style={styles.mb6}>
<TextInput
label={`${props.translate('passwordPage.newPassword')}*`}
secureTextEntry
autoCompleteType="password"
textContentType="password"
value={passwordFields.newPassword}
hasError={errors.newPassword || errors.newPasswordSameAsOld}
errorText={errors.newPasswordSameAsOld ? getErrorText('newPasswordSameAsOld') : getErrorText('newPassword')}
onChangeText={(text) => clearErrorAndSetValue('newPassword', text, ['newPasswordSameAsOld'])}
onSubmitEditing={submit}
/>
{shouldShowNewPasswordPrompt && <Text style={[styles.textLabelSupporting, styles.mt1]}>{props.translate('passwordPage.newPasswordPrompt')}</Text>}
</View>
{_.every(errors, (error) => !error) && !_.isEmpty(props.account.errors) && (
<FormHelpMessage
isError
message={ErrorUtils.getLatestErrorMessage(props.account)}
/>
</FixedFooter>
</>
)}
</ScreenWrapper>
);
}
)}
</ScrollView>
<FixedFooter style={[styles.flexGrow0]}>
<Button
success
isLoading={props.account.isLoading}
text={props.translate('common.save')}
onPress={submit}
/>
</FixedFooter>
</>
)}
</ScreenWrapper>
);
}

PasswordPage.propTypes = propTypes;
Expand Down