Feat : show Invite button on Members page for money request reports #88459
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
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 |
|---|---|---|
| @@ -1,3 +1,4 @@ | ||
| import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; | ||
| import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton'; | ||
| import HeaderWithBackButton from '@components/HeaderWithBackButton'; | ||
| import ScreenWrapper from '@components/ScreenWrapper'; | ||
|
|
@@ -11,6 +12,7 @@ import useDynamicBackPath from '@hooks/useDynamicBackPath'; | |
| import useLocalize from '@hooks/useLocalize'; | ||
| import useOnyx from '@hooks/useOnyx'; | ||
| import usePersonalDetailSearchSelector from '@hooks/usePersonalDetailSearchSelector'; | ||
| import usePolicy from '@hooks/usePolicy'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
|
|
||
| import {inviteToGroupChat, searchUserInServer} from '@libs/actions/Report'; | ||
|
|
@@ -22,19 +24,21 @@ import {getHeaderMessage} from '@libs/PersonalDetailOptionsListUtils'; | |
| import type {OptionData} from '@libs/PersonalDetailOptionsListUtils'; | ||
| import {getLoginsByAccountIDs} from '@libs/PersonalDetailsUtils'; | ||
| import {addSMSDomainIfPhoneNumber, parsePhoneNumber} from '@libs/PhoneNumber'; | ||
| import {getReportName} from '@libs/ReportNameUtils'; | ||
| import {getParticipantsAccountIDsForDisplay, isCurrentUserSubmitter, isGroupChat, isGroupChatAdmin, isMoneyRequestReport, isOpenExpenseReport, isPolicyAdmin} from '@libs/ReportUtils'; | ||
| import StringUtils from '@libs/StringUtils'; | ||
|
|
||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import {DYNAMIC_ROUTES} from '@src/ROUTES'; | ||
|
|
||
| import reportByIDsSelector from '@selectors/ReportAttributes'; | ||
| import React, {useEffect, useMemo, useState} from 'react'; | ||
|
|
||
| import type {WithReportOrNotFoundProps} from './inbox/report/withReportOrNotFound'; | ||
|
|
||
| import withReportOrNotFound from './inbox/report/withReportOrNotFound'; | ||
| import getInvitedEmailsToAccountIDs from './InviteReportParticipantsPageUtils'; | ||
|
|
||
| type DynamicReportParticipantsInvitePageProps = WithReportOrNotFoundProps & WithNavigationTransitionEndProps; | ||
|
|
||
|
|
@@ -46,7 +50,17 @@ function DynamicReportParticipantsInvitePage({report}: DynamicReportParticipants | |
| const [countryCode = CONST.DEFAULT_COUNTRY_CODE] = useOnyx(ONYXKEYS.COUNTRY_CODE); | ||
| const [personalDetailsList] = useOnyx(ONYXKEYS.PERSONAL_DETAILS_LIST); | ||
| const [didScreenTransitionEnd, setDidScreenTransitionEnd] = useState(false); | ||
| const reportID = report.reportID; | ||
|
Contributor
There was a problem hiding this comment. With the Invite button now visible for more report types, this page is also reachable via deep link (e.g.
Contributor
There was a problem hiding this comment. I think we should add a guard here mirroring shouldShowInviteButton cc @M00rish
Contributor
Author
There was a problem hiding this comment. can you please elaborate more on this @abzokhattab, did not really get the point, thanks.
Contributor
There was a problem hiding this comment. the issue is that this page only checks if the report exists (via The button on the parent page is gated by Something like: function InviteReportParticipantsPage({report}: InviteReportParticipantsPageProps) {
const shouldShowInviteButton = isGroupChat(report) || isMoneyRequestReport(report);
if (!shouldShowInviteButton) {
return <FullPageNotFoundView shouldShow />;
}
// ...rest of the component
} |
||
| const reportAttributesSelector = useMemo(() => reportByIDsSelector([reportID]), [reportID]); | ||
| const [reportAttributes] = useOnyx(ONYXKEYS.DERIVED.REPORT_ATTRIBUTES, { | ||
| selector: reportAttributesSelector, | ||
| }); | ||
| const backPath = useDynamicBackPath(DYNAMIC_ROUTES.REPORT_PARTICIPANTS_INVITE.path); | ||
| const [session] = useOnyx(ONYXKEYS.SESSION); | ||
| const currentUserAccountID = Number(session?.accountID); | ||
| const policy = usePolicy(report.policyID); | ||
| const isReportSubmitterOrAdmin = isCurrentUserSubmitter(report) || isPolicyAdmin(policy) || (isGroupChat(report) && isGroupChatAdmin(report, currentUserAccountID)); | ||
| const shouldShowInvitePage = isReportSubmitterOrAdmin && (isGroupChat(report) || (isMoneyRequestReport(report) && isOpenExpenseReport(report))); | ||
|
|
||
| // Any existing participants and Expensify emails should not be eligible for invitation | ||
| const excludedUsers: Record<string, boolean> = { | ||
|
|
@@ -114,7 +128,7 @@ function DynamicReportParticipantsInvitePage({report}: DynamicReportParticipants | |
| toggleSelection(option); | ||
| }; | ||
|
|
||
| const reportName = StringUtils.lineBreaksToSpaces(getReportName(report, reportAttributes)); | ||
|
|
||
| const goBack = () => { | ||
| Navigation.goBack(backPath); | ||
|
|
@@ -124,19 +138,18 @@ function DynamicReportParticipantsInvitePage({report}: DynamicReportParticipants | |
| if (selectedOptions.length === 0) { | ||
| return; | ||
| } | ||
| const invitedEmailsToAccountIDs = getInvitedEmailsToAccountIDs(selectedOptions); | ||
| if (Object.keys(invitedEmailsToAccountIDs).length === 0) { | ||
| return; | ||
| } | ||
| inviteToGroupChat(report, invitedEmailsToAccountIDs, personalDetailsList, formatPhoneNumber); | ||
| goBack(); | ||
| }; | ||
|
|
||
| if (!shouldShowInvitePage) { | ||
| return <FullPageNotFoundView shouldShow />; | ||
| } | ||
|
|
||
| const getHeaderMessageText = () => { | ||
| if (sections.length > 0) { | ||
| return ''; | ||
|
|
||
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 |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| import type {InvitedEmailsToAccountIDs} from '@src/types/onyx'; | ||
|
|
||
| type InviteOption = { | ||
| accountID?: number; | ||
| login?: string; | ||
| }; | ||
|
|
||
| function getInvitedEmailsToAccountIDs(selectedOptions: InviteOption[]): InvitedEmailsToAccountIDs { | ||
| const invitedEmailsToAccountIDs: InvitedEmailsToAccountIDs = {}; | ||
|
|
||
| for (const option of selectedOptions) { | ||
| const login = option.login ?? ''; | ||
| const accountID = option.accountID; | ||
| if (!login.trim() || accountID === undefined) { | ||
| continue; | ||
| } | ||
| invitedEmailsToAccountIDs[login] = accountID; | ||
| } | ||
|
|
||
| return invitedEmailsToAccountIDs; | ||
| } | ||
|
|
||
| export default getInvitedEmailsToAccountIDs; |
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,40 @@ | ||
| import getInvitedEmailsToAccountIDs from '@pages/InviteReportParticipantsPageUtils'; | ||
|
|
||
| describe('InviteReportParticipantsPage', () => { | ||
| describe('getInvitedEmailsToAccountIDs', () => { | ||
| it('preserves optimistic account IDs for new invitees', () => { | ||
| // Given a typed invitee that does not have a real account yet | ||
| const login = 'new-user@example.com'; | ||
| const selectedOptions = [ | ||
| { | ||
| login, | ||
| accountID: 0, | ||
| }, | ||
| ]; | ||
|
|
||
| // When building the invite map | ||
| const invitedEmailsToAccountIDs = getInvitedEmailsToAccountIDs(selectedOptions); | ||
|
|
||
| // Then the optimistic accountID is preserved for the API layer | ||
| expect(Object.entries(invitedEmailsToAccountIDs)).toStrictEqual([[login, 0]]); | ||
| }); | ||
|
|
||
| it('skips malformed selected options', () => { | ||
| // Given selected options that cannot be invited | ||
| const selectedOptions = [ | ||
| { | ||
| accountID: 123, | ||
| }, | ||
| { | ||
| login: 'missing-account-id@example.com', | ||
| }, | ||
| ]; | ||
|
|
||
| // When building the invite map | ||
| const invitedEmailsToAccountIDs = getInvitedEmailsToAccountIDs(selectedOptions); | ||
|
|
||
| // Then no invalid invitee is sent to the API layer | ||
| expect(invitedEmailsToAccountIDs).toStrictEqual({}); | ||
| }); | ||
| }); | ||
| }); |
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 change is not related to the issue ... is it intended?
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.
yes it is, it solves messaging the invited member error
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.
sorry i am not following. What messaging error? It would be nice if you could share can video
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.
here's video @abzokhattab
Video.mp4