Refactor PersonalDetails_Update with a few new commands
#9696
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -262,6 +262,48 @@ function setPersonalDetails(details, shouldGrowl) { | |
| }); | ||
| } | ||
|
|
||
| function updateProfile(firstName, lastName, pronouns, timezone) { | ||
| const myPersonalDetails = personalDetails[currentUserEmail]; | ||
| API.write('UpdateProfile', { | ||
| // 'details' is an old param that will be removed in https://github.com/Expensify/Expensify/issues/220321 | ||
| details: JSON.stringify({firstName, lastName, pronouns}), | ||
|
Beamanator marked this conversation as resolved.
|
||
| firstName, | ||
| lastName, | ||
| pronouns, | ||
| timezone: JSON.stringify(timezone), | ||
| }, { | ||
| optimisticData: [{ | ||
| onyxMethod: CONST.ONYX.METHOD.MERGE, | ||
| key: ONYXKEYS.PERSONAL_DETAILS, | ||
| value: { | ||
| [currentUserEmail]: { | ||
| firstName, | ||
| lastName, | ||
| pronouns, | ||
| timezone, | ||
| displayName: getDisplayName(currentUserEmail, { | ||
| firstName, | ||
| lastName, | ||
| }), | ||
|
Comment on lines
+284
to
+287
Contributor
Author
There was a problem hiding this comment. FYI this will need to be added in Web-E so that all clients get updated with this displayName, I plan to add this requirement in this issue: https://github.com/Expensify/Expensify/issues/220321
Contributor
There was a problem hiding this comment. Ok, but we should not get any problems when sending this. It will get updated for other users when their refresh, but it is not included in the Pusher update you saying?
Contributor
Author
There was a problem hiding this comment. Right right exactly @mountiny - nothing will break, only the client making the change will get these updates automatically, others will get it after refresh 👍 |
||
| }, | ||
| }, | ||
| }], | ||
| failureData: [{ | ||
| onyxMethod: CONST.ONYX.METHOD.MERGE, | ||
| key: ONYXKEYS.PERSONAL_DETAILS, | ||
| value: { | ||
| [currentUserEmail]: { | ||
| firstName: myPersonalDetails.firstName, | ||
| lastName: myPersonalDetails.lastName, | ||
| pronouns: myPersonalDetails.pronouns, | ||
| timezone: myPersonalDetails.timeZone, | ||
| displayName: myPersonalDetails.displayName, | ||
| }, | ||
| }, | ||
| }], | ||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Fetches the local currency based on location and sets currency code/symbol to Onyx | ||
| */ | ||
|
|
@@ -295,14 +337,30 @@ function setAvatar(file) { | |
|
|
||
| /** | ||
| * Replaces the user's avatar image with a default avatar | ||
| */ | ||
| function deleteAvatar() { | ||
| const defaultAvatar = ReportUtils.getDefaultAvatar(currentUserEmail); | ||
|
|
||
| API.write('DeleteUserAvatar', {}, { | ||
| optimisticData: [{ | ||
| onyxMethod: CONST.ONYX.METHOD.MERGE, | ||
| key: ONYXKEYS.PERSONAL_DETAILS, | ||
| value: { | ||
| [currentUserEmail]: { | ||
| avatar: defaultAvatar, | ||
|
Beamanator marked this conversation as resolved.
|
||
| }, | ||
| }, | ||
| }], | ||
| failureData: [{ | ||
| onyxMethod: CONST.ONYX.METHOD.MERGE, | ||
| key: ONYXKEYS.PERSONAL_DETAILS, | ||
| value: { | ||
| [currentUserEmail]: { | ||
| avatar: personalDetails[currentUserEmail].avatar, | ||
| }, | ||
| }, | ||
| }], | ||
| }); | ||
| } | ||
|
|
||
| export { | ||
|
|
@@ -315,4 +373,5 @@ export { | |
| openIOUModalPage, | ||
| getMaxCharacterError, | ||
| extractFirstAndLastNameFromAvailableDetails, | ||
| updateProfile, | ||
| }; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -66,20 +66,19 @@ class ProfilePage extends Component { | |
| constructor(props) { | ||
| super(props); | ||
|
|
||
| const currentUserDetails = this.props.currentUserPersonalDetails || {}; | ||
| this.state = { | ||
| firstName: currentUserDetails.firstName || '', | ||
| hasFirstNameError: false, | ||
| lastName: currentUserDetails.lastName || '', | ||
| hasLastNameError: false, | ||
| pronouns: currentUserDetails.pronouns || '', | ||
| hasPronounError: false, | ||
| hasSelfSelectedPronouns: !_.isEmpty(currentUserDetails.pronouns) && !currentUserDetails.pronouns.startsWith(CONST.PRONOUNS.PREFIX), | ||
| selectedTimezone: lodashGet(currentUserDetails, 'timezone.selected', CONST.DEFAULT_TIME_ZONE.selected), | ||
| isAutomaticTimezone: lodashGet(currentUserDetails, 'timezone.automatic', CONST.DEFAULT_TIME_ZONE.automatic), | ||
| logins: this.getLogins(props.loginList), | ||
| avatar: {uri: currentUserDetails.avatar || ReportUtils.getDefaultAvatar(currentUserDetails.login)}, | ||
| isAvatarChanged: false, | ||
| }; | ||
|
|
||
|
|
@@ -88,6 +87,7 @@ class ProfilePage extends Component { | |
| this.updatePersonalDetails = this.updatePersonalDetails.bind(this); | ||
| this.validateInputs = this.validateInputs.bind(this); | ||
| this.updateAvatar = this.updateAvatar.bind(this); | ||
| this.deleteAvatar = this.deleteAvatar.bind(this); | ||
| } | ||
|
|
||
| componentDidUpdate(prevProps) { | ||
|
|
@@ -130,7 +130,7 @@ class ProfilePage extends Component { | |
| const login = Str.removeSMSDomain(currentLogin.partnerUserID); | ||
|
|
||
| // If there's already a login type that's validated and/or currentLogin isn't valid then return early | ||
| if ((login !== lodashGet(this.props.currentUserPersonalDetails, 'login')) && !_.isEmpty(logins[type]) | ||
| && (logins[type].validatedDate || !currentLogin.validatedDate)) { | ||
| return logins; | ||
| } | ||
|
|
@@ -153,7 +153,15 @@ class ProfilePage extends Component { | |
| * @param {Object} avatar | ||
| */ | ||
| updateAvatar(avatar) { | ||
| this.setState({avatar, isAvatarChanged: true}); | ||
| } | ||
|
|
||
| /** | ||
| * Replaces the user's current avatar image with a default avatar. | ||
| */ | ||
| deleteAvatar() { | ||
| PersonalDetails.deleteAvatar(); | ||
| this.setState({avatar: {uri: ReportUtils.getDefaultAvatar(lodashGet(this.props.currentUserPersonalDetails, 'login'))}}); | ||
| } | ||
|
|
||
| /** | ||
|
|
@@ -165,27 +173,22 @@ class ProfilePage extends Component { | |
| } | ||
|
|
||
| // Check if the user has modified their avatar | ||
| if ((lodashGet(this.props.currentUserPersonalDetails, 'avatar') !== this.state.avatar.uri) && this.state.isAvatarChanged) { | ||
| PersonalDetails.setAvatar(this.state.avatar); | ||
|
|
||
| // Reset the changed state | ||
| this.setState({isAvatarChanged: false}); | ||
| } | ||
|
|
||
| PersonalDetails.updateProfile( | ||
| this.state.firstName.trim(), | ||
| this.state.lastName.trim(), | ||
| this.state.pronouns.trim(), | ||
| { | ||
| automatic: this.state.isAutomaticTimezone, | ||
| selected: this.state.selectedTimezone, | ||
| }, | ||
| ); | ||
|
Comment on lines
+183
to
+191
Contributor
Author
There was a problem hiding this comment. This tiny change gave rise to #10215 Note: The main issue is opacity being incorrect, not the Growl being missing |
||
| } | ||
|
|
||
| validateInputs() { | ||
|
|
@@ -208,12 +211,13 @@ class ProfilePage extends Component { | |
| })); | ||
|
|
||
| // Disables button if none of the form values have changed | ||
| const currentUserDetails = this.props.currentUserPersonalDetails || {}; | ||
| const isButtonDisabled = (currentUserDetails.firstName === this.state.firstName.trim()) | ||
| && (currentUserDetails.lastName === this.state.lastName.trim()) | ||
| && (lodashGet(currentUserDetails, 'timezone.selected') === this.state.selectedTimezone) | ||
| && (lodashGet(currentUserDetails, 'timezone.automatic') === this.state.isAutomaticTimezone) | ||
| && (currentUserDetails.pronouns === this.state.pronouns.trim()) | ||
| && (!this.state.isAvatarChanged || currentUserDetails.avatarUploading); | ||
|
|
||
| const pronounsPickerValue = this.state.hasSelfSelectedPronouns ? CONST.PRONOUNS.SELF_SELECT : this.state.pronouns; | ||
|
|
||
|
|
@@ -228,11 +232,11 @@ class ProfilePage extends Component { | |
| /> | ||
| <ScrollView style={styles.flex1} contentContainerStyle={styles.p5}> | ||
| <AvatarWithImagePicker | ||
| isUploading={currentUserDetails.avatarUploading} | ||
| isUsingDefaultAvatar={this.state.avatar.uri.includes('/images/avatars/avatar')} | ||
| avatarURL={this.state.avatar.uri} | ||
| onImageSelected={this.updateAvatar} | ||
| onImageRemoved={this.deleteAvatar} | ||
| anchorPosition={styles.createMenuPositionProfile} | ||
| size={CONST.AVATAR_SIZE.LARGE} | ||
| /> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Discussed with Alex in DM, I think this function does not work as expected with the VPNs and it does not set you to the timezone of the area. However, that is how we have it now and I would argue it is better as in the chat you want others to see your actual timezone and not the VPN timezone.