diff --git a/src/languages/de.ts b/src/languages/de.ts index 87aeda4b9cf0..3e2c4c962055 100644 --- a/src/languages/de.ts +++ b/src/languages/de.ts @@ -545,6 +545,7 @@ const translations: TranslationDeepObject = { vacationDelegate: 'Urlaubsvertretung', expensifyLogo: 'Expensify-Logo', duplicateReport: 'Duplizierten Bericht', + approver: 'Genehmiger', }, socials: { podcast: 'Folgen Sie uns auf Podcast', diff --git a/src/languages/en.ts b/src/languages/en.ts index 3071cc93a34e..2a8110dd3d3f 100644 --- a/src/languages/en.ts +++ b/src/languages/en.ts @@ -564,6 +564,7 @@ const translations = { quarter: 'Quarter', vacationDelegate: 'Vacation delegate', expensifyLogo: 'Expensify logo', + approver: 'Approver', }, socials: { podcast: 'Follow us on Podcast', diff --git a/src/languages/es.ts b/src/languages/es.ts index be37b20ac138..cfbb97070456 100644 --- a/src/languages/es.ts +++ b/src/languages/es.ts @@ -409,6 +409,7 @@ const translations: TranslationDeepObject = { quarter: 'Trimestre', vacationDelegate: 'Delegado de vacaciones', expensifyLogo: 'Logo de Expensify', + approver: 'Aprobador', }, socials: { podcast: 'Síguenos en Podcast', diff --git a/src/languages/fr.ts b/src/languages/fr.ts index 8b272af443ae..926502368a8b 100644 --- a/src/languages/fr.ts +++ b/src/languages/fr.ts @@ -545,6 +545,7 @@ const translations: TranslationDeepObject = { vacationDelegate: 'Délégué de vacances', expensifyLogo: 'Logo Expensify', duplicateReport: 'Note de frais en double', + approver: 'Approbateur', }, socials: { podcast: 'Suivez-nous sur Podcast', diff --git a/src/languages/it.ts b/src/languages/it.ts index 47062d49a649..36b4beaa1eb8 100644 --- a/src/languages/it.ts +++ b/src/languages/it.ts @@ -545,6 +545,7 @@ const translations: TranslationDeepObject = { vacationDelegate: 'Delega ferie', expensifyLogo: 'Logo Expensify', duplicateReport: 'Report duplicato', + approver: 'Approvante', }, socials: { podcast: 'Seguici su Podcast', diff --git a/src/languages/ja.ts b/src/languages/ja.ts index dc4dc18eb2c7..09951e59b315 100644 --- a/src/languages/ja.ts +++ b/src/languages/ja.ts @@ -544,6 +544,7 @@ const translations: TranslationDeepObject = { vacationDelegate: '休暇代理人', expensifyLogo: 'Expensifyロゴ', duplicateReport: 'レポートを複製', + approver: '承認者', }, socials: { podcast: 'ポッドキャストでフォロー', diff --git a/src/languages/nl.ts b/src/languages/nl.ts index 343e5b846cd4..4a2cf0dff6a9 100644 --- a/src/languages/nl.ts +++ b/src/languages/nl.ts @@ -544,6 +544,7 @@ const translations: TranslationDeepObject = { vacationDelegate: 'Vertegenwoordiger tijdens vakantie', expensifyLogo: 'Expensify-logo', duplicateReport: 'Dubbel rapport', + approver: 'Fiatteur', }, socials: { podcast: 'Volg ons op Podcast', diff --git a/src/languages/pl.ts b/src/languages/pl.ts index e780d643ea9f..c8ee78041d4a 100644 --- a/src/languages/pl.ts +++ b/src/languages/pl.ts @@ -544,6 +544,7 @@ const translations: TranslationDeepObject = { vacationDelegate: 'Zastępca urlopowy', expensifyLogo: 'Logo Expensify', duplicateReport: 'Zduplikowany raport', + approver: 'Osoba zatwierdzająca', }, socials: { podcast: 'Śledź nas na Podcast', diff --git a/src/languages/pt-BR.ts b/src/languages/pt-BR.ts index f66ac076c26f..c6eaf7119b44 100644 --- a/src/languages/pt-BR.ts +++ b/src/languages/pt-BR.ts @@ -543,6 +543,7 @@ const translations: TranslationDeepObject = { vacationDelegate: 'Delegado de férias', expensifyLogo: 'Logo da Expensify', duplicateReport: 'Duplicar relatório', + approver: 'Aprovador', }, socials: { podcast: 'Siga-nos no Podcast', diff --git a/src/languages/zh-hans.ts b/src/languages/zh-hans.ts index 994ad21c357e..5369c295f602 100644 --- a/src/languages/zh-hans.ts +++ b/src/languages/zh-hans.ts @@ -540,6 +540,7 @@ const translations: TranslationDeepObject = { vacationDelegate: '休假代理', expensifyLogo: 'Expensify徽标', duplicateReport: '重复报销单', + approver: '审批人', }, socials: { podcast: '在播客上关注我们', diff --git a/src/libs/actions/Policy/Category.ts b/src/libs/actions/Policy/Category.ts index 0c7b372fe455..cf838cc990bf 100644 --- a/src/libs/actions/Policy/Category.ts +++ b/src/libs/actions/Policy/Category.ts @@ -1604,7 +1604,7 @@ function setPolicyCategoryApprover(policyID: string, categoryName: string, appro ], }); } else if (existingCategoryApproverRule?.approver === approver) { - updatedApprovalRules = updatedApprovalRules.filter((rule) => rule.approver !== approver); + updatedApprovalRules = updatedApprovalRules.filter((rule) => rule !== existingCategoryApproverRule); newApprover = ''; } else { const indexToUpdate = updatedApprovalRules.indexOf(existingCategoryApproverRule); diff --git a/src/libs/actions/Policy/Tag.ts b/src/libs/actions/Policy/Tag.ts index b86d2834f094..d7f4e8566f9c 100644 --- a/src/libs/actions/Policy/Tag.ts +++ b/src/libs/actions/Policy/Tag.ts @@ -1188,7 +1188,7 @@ function setPolicyTagApprover(policy: OnyxEntry, tag: string, approver: const policyID = policy.id; const prevApprovalRules = policy?.rules?.approvalRules ?? []; const approverRuleToUpdate = PolicyUtils.getTagApproverRule(policy, tag); - const filteredApprovalRules = approverRuleToUpdate ? prevApprovalRules.filter((rule) => rule.id !== approverRuleToUpdate.id) : prevApprovalRules; + const filteredApprovalRules = approverRuleToUpdate ? prevApprovalRules.filter((rule) => rule !== approverRuleToUpdate) : prevApprovalRules; const toBeUnselected = approverRuleToUpdate?.approver === approver; const updatedApproverRule = approverRuleToUpdate diff --git a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx index 5c5c24d0844b..8dfc2aaada1f 100644 --- a/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx +++ b/src/pages/workspace/categories/WorkspaceCategoriesPage.tsx @@ -1,6 +1,7 @@ import React, {useCallback, useEffect, useMemo, useState} from 'react'; import {InteractionManager, View} from 'react-native'; import ActivityIndicator from '@components/ActivityIndicator'; +import Avatar from '@components/Avatar'; import Button from '@components/Button'; import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu'; import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types'; @@ -39,12 +40,14 @@ import useStyleUtils from '@hooks/useStyleUtils'; import useThemeStyles from '@hooks/useThemeStyles'; import {isConnectionInProgress, isConnectionUnverified} from '@libs/actions/connections'; import {turnOffMobileSelectionMode} from '@libs/actions/MobileSelectionMode'; -import {getDecodedCategoryName} from '@libs/CategoryUtils'; +import {getCategoryApproverRule, getDecodedCategoryName} from '@libs/CategoryUtils'; import {canUseTouchScreen} from '@libs/DeviceCapabilities'; +import {formatPhoneNumber} from '@libs/LocalePhoneNumber'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types'; import {isDisablingOrDeletingLastEnabledCategory} from '@libs/OptionsListUtils'; +import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils'; import {getConnectedIntegration, getCurrentConnectionName, hasAccountingConnections, hasTags, isControlPolicy, shouldShowSyncError} from '@libs/PolicyUtils'; import tokenizedSearch from '@libs/tokenizedSearch'; import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper'; @@ -89,6 +92,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { const [selectedCategories, setSelectedCategories] = useState([]); const canSelectMultiple = isSmallScreenWidth ? isMobileSelectionModeEnabled : true; const isControlPolicyWithWideLayout = !shouldUseNarrowLayout && isControlPolicy(policy); + const shouldShowApproverColumn = isControlPolicyWithWideLayout && !!policy?.areRulesEnabled; const icons = useMemoizedLazyExpensifyIcons(['Checkmark', 'Close', 'Download', 'Gear', 'Plus', 'Table', 'Trashcan'] as const); const illustrations = useMemoizedLazyIllustrations(['FolderOpen']); @@ -208,6 +212,11 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { return acc; } + const approverEmail = shouldShowApproverColumn ? (getCategoryApproverRule(policy?.rules?.approvalRules ?? [], value.name)?.approver ?? '') : ''; + const approverPersonalDetail = getPersonalDetailByEmail(approverEmail); + const {avatar, displayName = approverEmail, accountID} = approverPersonalDetail ?? {}; + const approverDisplayName = displayName ? formatPhoneNumber(displayName) : ''; + acc.push({ text: getDecodedCategoryName(value.name), keyForList: value.name, @@ -224,6 +233,28 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { {value['GL Code']} + {shouldShowApproverColumn && ( + + {approverDisplayName ? ( + <> + + + {approverDisplayName} + + + ) : null} + + )} { const results = tokenizedSearch([categoryOption], searchInput, (option) => [option.text ?? '', option.alternateText ?? '']); @@ -298,7 +343,7 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { return null; } - // Show GL Code column only on wide screens for control policies + // Show GL Code column only on wide screens for control policies. Approver column additionally requires rules to be enabled if (isControlPolicyWithWideLayout) { return ( @@ -308,6 +353,11 @@ function WorkspaceCategoriesPage({route}: WorkspaceCategoriesPageProps) { {translate('workspace.categories.glCode')} + {shouldShowApproverColumn && ( + + {translate('common.approver')} + + )} {translate('common.enabled')} diff --git a/src/pages/workspace/tags/WorkspaceTagsPage.tsx b/src/pages/workspace/tags/WorkspaceTagsPage.tsx index 0beaf60639f6..1ce5b2ff15d4 100644 --- a/src/pages/workspace/tags/WorkspaceTagsPage.tsx +++ b/src/pages/workspace/tags/WorkspaceTagsPage.tsx @@ -1,6 +1,7 @@ import React, {useCallback, useEffect, useMemo, useState} from 'react'; import {InteractionManager, View} from 'react-native'; import ActivityIndicator from '@components/ActivityIndicator'; +import Avatar from '@components/Avatar'; import Button from '@components/Button'; import ButtonWithDropdownMenu from '@components/ButtonWithDropdownMenu'; import type {DropdownOption} from '@components/ButtonWithDropdownMenu/types'; @@ -49,14 +50,17 @@ import { setWorkspaceTagRequired, } from '@libs/actions/Policy/Tag'; import {canUseTouchScreen} from '@libs/DeviceCapabilities'; +import {formatPhoneNumber} from '@libs/LocalePhoneNumber'; import Navigation from '@libs/Navigation/Navigation'; import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types'; import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types'; import {isDisablingOrDeletingLastEnabledTag, isMakingLastRequiredTagListOptional} from '@libs/OptionsListUtils'; +import {getPersonalDetailByEmail} from '@libs/PersonalDetailsUtils'; import { getCleanedTagName, getConnectedIntegration, getCurrentConnectionName, + getTagApproverRule, getTagLists, hasAccountingConnections as hasAccountingConnectionsPolicyUtils, hasDependentTags as hasDependentTagsPolicyUtils, @@ -110,6 +114,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { const canSelectMultiple = !hasDependentTags && (shouldUseNarrowLayout ? isMobileSelectionModeEnabled : true); const isControlPolicyWithWideLayout = !shouldUseNarrowLayout && isControlPolicy(policy); + const shouldShowApproverColumn = isControlPolicyWithWideLayout && !isMultiLevelTags && !!policy?.areRulesEnabled; const fetchTags = useCallback(() => { openPolicyTagsPage(policyID); }, [policyID]); @@ -268,66 +273,95 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { }); } - return Object.values(policyTagLists?.at(0)?.tags ?? {}).map((tag) => ({ - value: tag.name, - text: getCleanedTagName(tag.name), - keyForList: tag.name, - pendingAction: tag.pendingAction, - errors: tag.errors ?? undefined, - enabled: tag.enabled, - isDisabled: tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, - rightElement: isControlPolicyWithWideLayout ? ( - <> - - - {tag['GL Code']} - - - - { - if (isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), [tag])) { - showConfirmModal({ - title: translate('workspace.tags.cannotDeleteOrDisableAllTags.title'), - prompt: translate('workspace.tags.cannotDeleteOrDisableAllTags.description'), - confirmText: translate('common.buttonConfirm'), - shouldShowCancelButton: false, - }); - return; - } - updateWorkspaceTagEnabled(newValue, tag.name); - }} - showLockIcon={isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), [tag])} - /> - - - ) : ( - { - if (isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), [tag])) { - showConfirmModal({ - title: translate('workspace.tags.cannotDeleteOrDisableAllTags.title'), - prompt: translate('workspace.tags.cannotDeleteOrDisableAllTags.description'), - confirmText: translate('common.buttonConfirm'), - shouldShowCancelButton: false, - }); - return; - } - updateWorkspaceTagEnabled(newValue, tag.name); - }} - showLockIcon={isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), [tag])} - /> - ), - })); + return Object.values(policyTagLists?.at(0)?.tags ?? {}).map((tag) => { + const approverEmail = shouldShowApproverColumn ? (getTagApproverRule(policy, tag.name)?.approver ?? '') : ''; + const approverPersonalDetail = getPersonalDetailByEmail(approverEmail); + const {avatar, displayName = approverEmail, accountID} = approverPersonalDetail ?? {}; + const approverDisplayName = displayName ? formatPhoneNumber(displayName) : ''; + + return { + value: tag.name, + text: getCleanedTagName(tag.name), + keyForList: tag.name, + pendingAction: tag.pendingAction, + errors: tag.errors ?? undefined, + enabled: tag.enabled, + isDisabled: tag.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE, + rightElement: isControlPolicyWithWideLayout ? ( + <> + + + {tag['GL Code']} + + + {shouldShowApproverColumn && ( + + {approverDisplayName ? ( + <> + + + {approverDisplayName} + + + ) : null} + + )} + + { + if (isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), [tag])) { + showConfirmModal({ + title: translate('workspace.tags.cannotDeleteOrDisableAllTags.title'), + prompt: translate('workspace.tags.cannotDeleteOrDisableAllTags.description'), + confirmText: translate('common.buttonConfirm'), + shouldShowCancelButton: false, + }); + return; + } + updateWorkspaceTagEnabled(newValue, tag.name); + }} + showLockIcon={isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), [tag])} + /> + + + ) : ( + { + if (isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), [tag])) { + showConfirmModal({ + title: translate('workspace.tags.cannotDeleteOrDisableAllTags.title'), + prompt: translate('workspace.tags.cannotDeleteOrDisableAllTags.description'), + confirmText: translate('common.buttonConfirm'), + shouldShowCancelButton: false, + }); + return; + } + updateWorkspaceTagEnabled(newValue, tag.name); + }} + showLockIcon={isDisablingOrDeletingLastEnabledTag(policyTagLists.at(0), [tag])} + /> + ), + }; + }); }, [ isMultiLevelTags, policyTagLists, @@ -342,6 +376,10 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { glCodeTextStyle, switchContainerStyle, showConfirmModal, + shouldShowApproverColumn, + styles.alignItemsCenter, + styles.flexRow, + styles.mr3, ]); const filterTag = useCallback((tag: TagListItem, searchInput: string) => { @@ -396,7 +434,7 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { ); } - // Show GL Code column only on wide screens for control policies + // Show GL Code column only on wide screens for control policies. Approver column additionally requires rules to be enabled if (isControlPolicyWithWideLayout && !isMultiLevelTags) { return ( @@ -406,6 +444,11 @@ function WorkspaceTagsPage({route}: WorkspaceTagsPageProps) { {translate('workspace.tags.glCode')} + {shouldShowApproverColumn && ( + + {translate('common.approver')} + + )} {translate('common.enabled')}