Repository navigation
Keep the workspace member Role page working right after inviting a member #103855
+462
−34
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| import {getMemberLoginByAccountID} from '@libs/WorkArrangementUtils'; | ||
|
|
||
| import type {PersonalDetails, PersonalDetailsList, Policy} from '@src/types/onyx'; | ||
|
|
||
| import type {OnyxEntry} from 'react-native-onyx'; | ||
|
|
||
| import usePersonalDetailByLogin from './usePersonalDetailByLogin'; | ||
|
|
||
| type WorkspaceMemberFromRoute = { | ||
| /** The member's login, empty when the member can't be resolved */ | ||
| memberLogin: string; | ||
|
|
||
| /** The member's personal details, looked up by login so they survive the optimistic accountID swap */ | ||
| memberPersonalDetails: PersonalDetails | undefined; | ||
|
|
||
| /** The member's current accountID, which differs from the route's once the invite request finishes */ | ||
| accountID: number; | ||
| }; | ||
|
|
||
| /** | ||
| * Resolves the workspace member a member page was opened for. The route may hold the optimistic accountID of a member | ||
| * who was just invited, which stops matching personal details once the backend supplies the real one, so the member | ||
| * is resolved by login instead. | ||
| */ | ||
| function useWorkspaceMemberFromRoute(policy: OnyxEntry<Policy>, personalDetails: OnyxEntry<PersonalDetailsList>, routeAccountID: number): WorkspaceMemberFromRoute { | ||
| const memberLogin = personalDetails?.[routeAccountID]?.login ?? getMemberLoginByAccountID(policy, routeAccountID); | ||
| const memberPersonalDetails = usePersonalDetailByLogin(memberLogin); | ||
| const accountID = memberPersonalDetails?.accountID ?? routeAccountID; | ||
|
|
||
| return {memberLogin, memberPersonalDetails, accountID}; | ||
| } | ||
|
|
||
| export default useWorkspaceMemberFromRoute; |
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
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 |
|---|---|---|
|
|
@@ -5,6 +5,7 @@ import type {ListItemType} from '@components/WorkspaceMemberRoleList'; | |
| import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails'; | ||
| import useRedirectSubmitWorkspaceFeatureUpgrade from '@hooks/useRedirectSubmitWorkspaceFeatureUpgrade'; | ||
| import useRuleBotGuardModal from '@hooks/useRuleBotGuardModal'; | ||
| import useWorkspaceMemberFromRoute from '@hooks/useWorkspaceMemberFromRoute'; | ||
|
|
||
| import {updateWorkspaceMembersRole} from '@libs/actions/Policy/Member'; | ||
| import {isRuleBotEnforcingRules} from '@libs/AgentRulesUtils'; | ||
|
|
@@ -33,19 +34,21 @@ type WorkspaceMemberDetailsRolePageProps = Omit<WithPolicyAndFullscreenLoadingPr | |
| }; | ||
|
|
||
| function WorkspaceMemberDetailsRolePage({policy, personalDetails, route}: WorkspaceMemberDetailsRolePageProps) { | ||
| const routeAccountID = Number(route.params.accountID); | ||
| const policyID = route.params.policyID; | ||
| const showRuleBotGuardModal = useRuleBotGuardModal(); | ||
| const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails(); | ||
|
Contributor
There was a problem hiding this comment. ❌ CONSISTENCY-3 (docs)This three-line member-resolution block — Extract the block into a single shared hook in const {memberLogin, accountID} = useWorkspaceMemberFromRoute(policy, personalDetails, routeAccountID);Reviewed at: 35b9afd | Please rate this suggestion with 👍 or 👎 to help us improve! Reactions are used to monitor reviewer efficiency.
Contributor
Author
There was a problem hiding this comment. Fixed in 5f0aaba. I moved the block into a new hook, |
||
| const {memberLogin, accountID} = useWorkspaceMemberFromRoute(policy, personalDetails, routeAccountID); | ||
| const member = policy?.employeeList?.[memberLogin]; | ||
| const canManageSelectedMemberRole = canMemberAssignRole(policy, currentUserLogin, member?.role); | ||
| // The Authorized Payer (reimburser) must stay a valid payer, so restrict them to the roles that can pay (for example Admin or Payments Admin). | ||
| const isReimburser = isPolicyReimburser(policy, memberLogin); | ||
| const allowedRoles = getAllowedRolesForMember(policy, memberLogin); | ||
| // Go back with the route's accountID so it matches the details screen below, which keeps the optimistic accountID it was opened with. | ||
| const memberDetailsRoute = ROUTES.WORKSPACE_MEMBER_DETAILS.getRoute(policyID, routeAccountID); | ||
| useRedirectSubmitWorkspaceFeatureUpgrade({ | ||
| policy, | ||
| backTo: memberDetailsRoute, | ||
| upgradeFeatureAlias: CONST.UPGRADE_FEATURE_INTRO_MAPPING.roles.alias, | ||
| }); | ||
|
|
||
|
|
@@ -65,7 +68,7 @@ function WorkspaceMemberDetailsRolePage({policy, personalDetails, route}: Worksp | |
| return; | ||
| } | ||
| updateWorkspaceMembersRole(policy, [memberLogin], [accountID], value); | ||
| Navigation.goBack(memberDetailsRoute); | ||
| }; | ||
|
|
||
| return ( | ||
|
|
@@ -84,7 +87,7 @@ function WorkspaceMemberDetailsRolePage({policy, personalDetails, route}: Worksp | |
| policy={policy} | ||
| onSelectRole={changeRole} | ||
| allowedRoles={allowedRoles} | ||
| navigateBackTo={memberDetailsRoute} | ||
| /> | ||
| </ScreenWrapper> | ||
| </AccessOrNotFoundWrapper> | ||
|
|
||
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
Oops, something went wrong.
Oops, something went wrong.
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.
This file ships two behavior changes that no test exercises:
navigateBackToDetailsnow goes back withrouteAccountID(the stale optimistic id) instead ofmemberAccountID(line 87).setEmployeeWorkArrangementis now called with the resolved realaccountIDinstead ofmemberAccountID(line 99).Both mirror the Role-page fix, which has solid coverage in the new
WorkspaceMemberDetailsRolePageTest. Please add an equivalent test for the Work arrangement flow under a stale optimisticaccountID. It should assert that:setEmployeeWorkArrangementreceives the real account id.goBacktargets the details route built with the stale id, so it returns to the existing details screen instead of stacking a new one.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.
Fixed in 20e2616.
main'sWorkArrangementPageTestalready covers both cases with an optimistic accountID that swaps to a synced one:uses the resolved account ID for the first arrangement change after an offline invite syncschecks thatsetEmployeeWorkArrangementreceives the real accountID.All 33 tests across the four member-page suites pass.