#45951 & #45958: Implement <ApprovalWorkflowSection /> component and Enhance toLocaleOrdinal to support string ordinals #46562
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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 |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| import React, {useCallback} from 'react'; | ||
| import {View} from 'react-native'; | ||
| import useLocalize from '@hooks/useLocalize'; | ||
| import useTheme from '@hooks/useTheme'; | ||
| import useThemeStyles from '@hooks/useThemeStyles'; | ||
| import useWindowDimensions from '@hooks/useWindowDimensions'; | ||
| import Navigation from '@libs/Navigation/Navigation'; | ||
| import ROUTES from '@src/ROUTES'; | ||
| import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow'; | ||
| import Icon from './Icon'; | ||
| import * as Expensicons from './Icon/Expensicons'; | ||
| import MenuItem from './MenuItem'; | ||
| import PressableWithoutFeedback from './Pressable/PressableWithoutFeedback'; | ||
| import Text from './Text'; | ||
|
|
||
| type ApprovalWorkflowSectionProps = { | ||
| approvalWorkflow: ApprovalWorkflow; | ||
| policyId?: string; | ||
| }; | ||
|
|
||
| function ApprovalWorkflowSection({approvalWorkflow, policyId}: ApprovalWorkflowSectionProps) { | ||
| const styles = useThemeStyles(); | ||
| const theme = useTheme(); | ||
| const {translate, toLocaleOrdinal} = useLocalize(); | ||
| const {isSmallScreenWidth} = useWindowDimensions(); | ||
| const openApprovalsEdit = useCallback( | ||
| () => Navigation.navigate(ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_EDIT.getRoute(policyId ?? '', approvalWorkflow.approvers[0].email)), | ||
| [approvalWorkflow.approvers, policyId], | ||
| ); | ||
| const approverTitle = useCallback( | ||
| (index: number) => | ||
| approvalWorkflow.approvers.length > 1 ? `${toLocaleOrdinal(index + 1, true)} ${translate('workflowsPage.approver').toLowerCase()}` : `${translate('workflowsPage.approver')}`, | ||
| [approvalWorkflow.approvers.length, toLocaleOrdinal, translate], | ||
| ); | ||
|
|
||
| return ( | ||
| <PressableWithoutFeedback | ||
| accessibilityRole="button" | ||
| style={[styles.border, isSmallScreenWidth ? styles.p3 : styles.p4, styles.flexRow, styles.justifyContentBetween, styles.mt6, styles.mbn3]} | ||
| onPress={openApprovalsEdit} | ||
| accessibilityLabel={translate('workflowsPage.addApprovalsTitle')} | ||
| > | ||
| <View style={[styles.flex1]}> | ||
| {approvalWorkflow.isDefault && ( | ||
| <View style={[styles.flexRow, styles.mb4, styles.alignItemsCenter, styles.pb1, styles.pt1]}> | ||
| <Icon | ||
| src={Expensicons.Lightbulb} | ||
| fill={theme.icon} | ||
| additionalStyles={styles.mr2} | ||
| small | ||
| /> | ||
| <Text | ||
| style={[styles.textLabelSupportingNormal]} | ||
| suppressHighlighting | ||
| > | ||
| {translate('workflowsPage.addApprovalTip')} | ||
| </Text> | ||
| </View> | ||
| )} | ||
| <MenuItem | ||
| title={translate('workflowsExpensesFromPage.title')} | ||
| style={styles.p0} | ||
| titleStyle={styles.textLabelSupportingNormal} | ||
| descriptionTextStyle={styles.textNormalThemeText} | ||
| description={approvalWorkflow.isDefault ? translate('workspace.common.everyone') : approvalWorkflow.members.map((m) => m.displayName).join(', ')} | ||
| icon={Expensicons.Users} | ||
| iconHeight={20} | ||
| iconWidth={20} | ||
| iconFill={theme.icon} | ||
| onPress={openApprovalsEdit} | ||
| shouldRemoveBackground | ||
| /> | ||
|
|
||
| {approvalWorkflow.approvers.map((approver, index) => ( | ||
| <View key={approver.email}> | ||
| <View style={{height: 16, width: 1, backgroundColor: theme.border, marginLeft: 19}} /> | ||
|
There was a problem hiding this comment. @blazejkustra Can you please explain me the choice of style here (especially There was a problem hiding this comment. These are the styles for the vertical line from the screenshot: I moved the styles as requested 👌 There was a problem hiding this comment.
|
||
| <MenuItem | ||
| title={approverTitle(index)} | ||
| style={styles.p0} | ||
| titleStyle={styles.textLabelSupportingNormal} | ||
| descriptionTextStyle={styles.textNormalThemeText} | ||
| description={approver.displayName} | ||
| icon={Expensicons.UserCheck} | ||
| iconHeight={20} | ||
| iconWidth={20} | ||
| iconFill={theme.icon} | ||
| onPress={openApprovalsEdit} | ||
| shouldRemoveBackground | ||
| /> | ||
| </View> | ||
| ))} | ||
| </View> | ||
| <Icon | ||
| src={Expensicons.ArrowRight} | ||
| fill={theme.icon} | ||
| additionalStyles={[styles.alignSelfCenter]} | ||
| /> | ||
| </PressableWithoutFeedback> | ||
| ); | ||
| } | ||
|
|
||
| export default ApprovalWorkflowSection; | ||
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
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
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.
Please add
/** */style comments to each propThere 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.
Just added, please take a quick look if they're okay :)