[CRITICAL] Implement <WorkspaceWorkflowsApprovalsExpensesFromPage /> for Member Selection #46484
There are no files selected for viewing
This file contains 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 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 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 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 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,28 +1,169 @@ | ||
| import type {StackScreenProps} from '@react-navigation/stack'; | ||
| import React, {useCallback, useEffect, useMemo, useState} from 'react'; | ||
| import type {SectionListData} from 'react-native'; | ||
| import {useOnyx} from 'react-native-onyx'; | ||
| import Badge from '@components/Badge'; | ||
| import FullPageNotFoundView from '@components/BlockingViews/FullPageNotFoundView'; | ||
| import FormAlertWithSubmitButton from '@components/FormAlertWithSubmitButton'; | ||
| import HeaderWithBackButton from '@components/HeaderWithBackButton'; | ||
| import {FallbackAvatar} from '@components/Icon/Expensicons'; | ||
| import ScreenWrapper from '@components/ScreenWrapper'; | ||
| import SelectionList from '@components/SelectionList'; | ||
| import InviteMemberListItem from '@components/SelectionList/InviteMemberListItem'; | ||
| import type {Section} from '@components/SelectionList/types'; | ||
| import Text from '@components/Text'; | ||
| import useDebouncedState from '@hooks/useDebouncedState'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import * as DeviceCapabilities from '@libs/DeviceCapabilities'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import type {FullScreenNavigatorParamList} from '@libs/Navigation/types'; | ||
| import * as OptionsListUtils from '@libs/OptionsListUtils'; | ||
| import * as PolicyUtils from '@libs/PolicyUtils'; | ||
| import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; | ||
| import withPolicyAndFullscreenLoading from '@pages/workspace/withPolicyAndFullscreenLoading'; | ||
| import type {WithPolicyAndFullscreenLoadingProps} from '@pages/workspace/withPolicyAndFullscreenLoading'; | ||
| import * as Workflow from '@userActions/Workflow'; | ||
| import CONST from '@src/CONST'; | ||
| import ONYXKEYS from '@src/ONYXKEYS'; | ||
| import ROUTES from '@src/ROUTES'; | ||
| import type SCREENS from '@src/SCREENS'; | ||
| import type {Member} from '@src/types/onyx/ApprovalWorkflow'; | ||
| import type {Icon} from '@src/types/onyx/OnyxCommon'; | ||
| import {isEmptyObject} from '@src/types/utils/EmptyObject'; | ||
|
|
||
| type SelectionListMember = { | ||
| text: string; | ||
| alternateText: string; | ||
| keyForList: string; | ||
| isSelected: boolean; | ||
| login: string; | ||
| rightElement?: React.ReactNode; | ||
| icons?: Icon[]; | ||
| }; | ||
|
|
||
| type MembersSection = SectionListData<SelectionListMember, Section<SelectionListMember>>; | ||
|
|
||
| type WorkspaceWorkflowsApprovalsExpensesFromPageProps = WithPolicyAndFullscreenLoadingProps & | ||
| StackScreenProps<FullScreenNavigatorParamList, typeof SCREENS.WORKSPACE.WORKFLOWS_APPROVALS_EXPENSES_FROM>; | ||
|
|
||
| function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportData = true, route}: WorkspaceWorkflowsApprovalsExpensesFromPageProps) { | ||
| const styles = useThemeStyles(); | ||
| const {translate} = useLocalize(); | ||
| const [didScreenTransitionEnd, setDidScreenTransitionEnd] = useState(false); | ||
| const [searchTerm, debouncedSearchTerm, setSearchTerm] = useDebouncedState(''); | ||
| const [approvalWorkflow, approvalWorkflowMetadata] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW); | ||
| const [selectedMembers, setSelectedMembers] = useState<SelectionListMember[]>([]); | ||
|
|
||
| // eslint-disable-next-line rulesdir/no-negated-variables | ||
| const shouldShowNotFoundView = (isEmptyObject(policy) && !isLoadingReportData) || !PolicyUtils.isPolicyAdmin(policy) || PolicyUtils.isPendingDeletePolicy(policy); | ||
|
|
||
| useEffect(() => { | ||
| if (!approvalWorkflow?.members) { | ||
| return; | ||
| } | ||
|
|
||
| setSelectedMembers( | ||
| approvalWorkflow.members.map((member) => { | ||
| const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList); | ||
| const accountID = Number(policyMemberEmailsToAccountIDs[member.email] ?? ''); | ||
| const isAdmin = policy?.employeeList?.[member.email].role === CONST.REPORT.ROLE.ADMIN; | ||
|
|
||
| return { | ||
| text: member.displayName, | ||
| alternateText: member.email, | ||
| keyForList: member.email, | ||
| isSelected: true, | ||
| login: member.email, | ||
| icons: [{source: member.avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: member.displayName, id: accountID}], | ||
| rightElement: isAdmin ? <Badge text={translate('common.admin')} /> : undefined, | ||
| }; | ||
| }), | ||
| ); | ||
| }, [approvalWorkflow?.members, policy?.employeeList, translate]); | ||
|
|
||
| const sections: MembersSection[] = useMemo(() => { | ||
| const members: SelectionListMember[] = [...selectedMembers]; | ||
|
|
||
| if (approvalWorkflow?.availableMembers) { | ||
| const availableMembers = approvalWorkflow.availableMembers | ||
| .map((member) => { | ||
| const isAdmin = policy?.employeeList?.[member.email].role === CONST.REPORT.ROLE.ADMIN; | ||
| const policyMemberEmailsToAccountIDs = PolicyUtils.getMemberAccountIDsForWorkspace(policy?.employeeList); | ||
| const accountID = Number(policyMemberEmailsToAccountIDs[member.email] ?? ''); | ||
|
|
||
| return { | ||
| text: member.displayName, | ||
| alternateText: member.email, | ||
| keyForList: member.email, | ||
| isSelected: false, | ||
| login: member.email, | ||
| icons: [{source: member.avatar ?? FallbackAvatar, type: CONST.ICON_TYPE_AVATAR, name: member.displayName, id: accountID}], | ||
| rightElement: isAdmin ? <Badge text={translate('common.admin')} /> : undefined, | ||
| }; | ||
| }) | ||
| .filter((member) => !selectedMembers.some((selectedOption) => selectedOption.login === member.login)); | ||
|
|
||
| members.push(...availableMembers); | ||
| } | ||
|
|
||
| const filteredMembers = | ||
| debouncedSearchTerm !== '' | ||
| ? members.filter((option) => { | ||
| const searchValue = OptionsListUtils.getSearchValueForPhoneOrEmail(debouncedSearchTerm); | ||
| const isPartOfSearchTerm = !!option.text?.toLowerCase().includes(searchValue) || !!option.login?.toLowerCase().includes(searchValue); | ||
| return isPartOfSearchTerm; | ||
| }) | ||
| : members; | ||
|
|
||
| return [ | ||
| { | ||
| title: undefined, | ||
| data: filteredMembers, | ||
| shouldShow: true, | ||
| }, | ||
| ]; | ||
| }, [approvalWorkflow?.availableMembers, debouncedSearchTerm, policy?.employeeList, selectedMembers, translate]); | ||
|
|
||
| const nextStep = useCallback(() => { | ||
| const members: Member[] = selectedMembers.map((member) => ({displayName: member.text, avatar: member.icons?.[0]?.source, email: member.login})); | ||
| Workflow.setApprovalWorkflowMembers(members); | ||
|
|
||
| const firstApprover = approvalWorkflow?.approvers?.[0]?.email; | ||
| if (approvalWorkflow?.isBeingEdited && firstApprover) { | ||
| Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EDIT.getRoute(route.params.policyID, firstApprover)); | ||
| } else { | ||
| Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_APPROVER.getRoute(route.params.policyID)); | ||
| } | ||
| }, [approvalWorkflow?.approvers, approvalWorkflow?.isBeingEdited, route.params.policyID, selectedMembers]); | ||
|
|
||
| const goBack = useCallback(() => { | ||
| if (!approvalWorkflow?.isBeingEdited) { | ||
| Workflow.clearApprovalWorkflow(); | ||
| } | ||
| Navigation.goBack(); | ||
| }, [approvalWorkflow?.isBeingEdited]); | ||
|
Comment on lines
+140
to
+145
There was a problem hiding this comment. Clearing the approval workflow on going back caused the not found view to appear briefly while hiding the modal (#50094). Also this We went with a different approach that is to clear the workflow (from |
||
|
|
||
| const nextButton = useMemo( | ||
| () => ( | ||
| <FormAlertWithSubmitButton | ||
| isDisabled={!selectedMembers.length} | ||
| buttonText={translate('common.next')} | ||
| onSubmit={nextStep} | ||
| containerStyles={[styles.flexReset, styles.flexGrow0, styles.flexShrink0, styles.flexBasisAuto]} | ||
| enabledWhenOffline | ||
| /> | ||
| ), | ||
| [nextStep, selectedMembers.length, styles.flexBasisAuto, styles.flexGrow0, styles.flexReset, styles.flexShrink0, translate], | ||
| ); | ||
|
|
||
| const toggleMember = (member: SelectionListMember) => { | ||
| const isAlreadySelected = selectedMembers.some((selectedOption) => selectedOption.login === member.login); | ||
| setSelectedMembers(isAlreadySelected ? selectedMembers.filter((selectedOption) => selectedOption.login !== member.login) : [...selectedMembers, {...member, isSelected: true}]); | ||
| }; | ||
|
|
||
| const headerMessage = useMemo(() => (searchTerm && !sections[0].data.length ? translate('common.noResultsFound') : ''), [searchTerm, sections, translate]); | ||
|
|
||
| return ( | ||
| <AccessOrNotFoundWrapper | ||
| policyID={route.params.policyID} | ||
|
|
@@ -31,6 +172,7 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat | |
| <ScreenWrapper | ||
| includeSafeAreaPaddingBottom={false} | ||
| testID={WorkspaceWorkflowsApprovalsExpensesFromPage.displayName} | ||
| onEntryTransitionEnd={() => setDidScreenTransitionEnd(true)} | ||
| > | ||
| <FullPageNotFoundView | ||
| shouldShow={shouldShowNotFoundView} | ||
|
|
@@ -40,7 +182,22 @@ function WorkspaceWorkflowsApprovalsExpensesFromPage({policy, isLoadingReportDat | |
| > | ||
| <HeaderWithBackButton | ||
| title={translate('workflowsExpensesFromPage.title')} | ||
| onBackButtonPress={goBack} | ||
| /> | ||
| <Text style={[styles.textHeadlineH1, styles.mh5, styles.mv3]}>{translate('workflowsExpensesFromPage.header')}</Text> | ||
| <SelectionList | ||
| canSelectMultiple | ||
| sections={sections} | ||
| ListItem={InviteMemberListItem} | ||
| textInputLabel={translate('selectionList.findMember')} | ||
| textInputValue={searchTerm} | ||
| onChangeText={setSearchTerm} | ||
| headerMessage={headerMessage} | ||
| onSelectRow={toggleMember} | ||
| showScrollIndicator | ||
| showLoadingPlaceholder={!didScreenTransitionEnd || approvalWorkflowMetadata.status === 'loading'} | ||
| shouldPreventDefaultFocusOnSelectRow={!DeviceCapabilities.canUseTouchScreen()} | ||
| footerContent={nextButton} | ||
| /> | ||
| </FullPageNotFoundView> | ||
| </ScreenWrapper> | ||
|
|
||
This file contains 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.
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.
Translation already approved here