Skip to content

Commit 52c3170

Browse files
authored
Merge pull request #100327 from Expensify/claude-approverRowDerivedFromWorkflows
Derive the invite Approver row from the real approval workflows
2 parents 6883a3e + 5c8aa37 commit 52c3170

4 files changed

Lines changed: 243 additions & 48 deletions

File tree

‎src/hooks/useApprovalWorkflows.ts‎

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
/**
2+
* Hook that derives a workspace's approval workflows from the source of truth and reports whether the workspace
3+
* actually has a custom (advanced) approval workflow, so callers don't trust the stale `policy.approvalMode` flag.
4+
*/
5+
import {isHRAdvancedMode} from '@libs/merge/HRUtils';
6+
import {isControlPolicy} from '@libs/PolicyUtils';
7+
import {convertApprovalWorkflowRulesToWorkflows, convertPolicyEmployeesToApprovalWorkflows, filterRulesForPolicy, getApprovalWorkflowRulesForPolicy} from '@libs/WorkflowUtils';
8+
9+
import CONST from '@src/CONST';
10+
import ONYXKEYS from '@src/ONYXKEYS';
11+
import type {PersonalDetailsList, Policy} from '@src/types/onyx';
12+
import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow';
13+
import type {Member} from '@src/types/onyx/ApprovalWorkflow';
14+
import type Rule from '@src/types/onyx/Rule';
15+
16+
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
17+
18+
import useCurrentUserPersonalDetails from './useCurrentUserPersonalDetails';
19+
import useLocalize from './useLocalize';
20+
import useOnyx from './useOnyx';
21+
import usePermissions from './usePermissions';
22+
import {useAllPersonalDetails} from './usePersonalDetails';
23+
24+
type UseApprovalWorkflowsResult = {
25+
/** Every approval workflow the workspace's data describes, derived from the policy employees or the approval-workflow rules */
26+
approvalWorkflows: ApprovalWorkflow[];
27+
28+
/** The subset of `approvalWorkflows` the Workflows tab displays: only the default workflow unless the workspace uses advanced approvals */
29+
filteredApprovalWorkflows: ApprovalWorkflow[];
30+
31+
/** List of available members that can be selected in a workflow */
32+
availableMembers: Member[];
33+
34+
/** Emails that are already used as approvers in the configured workflows */
35+
usedApproverEmails: string[];
36+
37+
/** Whether the workspace has a custom (advanced) approval workflow on top of the plain default one */
38+
isAdvanceApproval: boolean;
39+
40+
/** The workspace's approval-workflow rules, exposed so consumers don't need a second `RULE` subscription */
41+
rulesCollection: OnyxCollection<Rule>;
42+
43+
/** Personal details, exposed so consumers don't need a second `PERSONAL_DETAILS_LIST` subscription */
44+
personalDetails: OnyxEntry<PersonalDetailsList>;
45+
};
46+
47+
/**
48+
* Derives approval workflows from policy employees or approval rules when `MULTIPLE_APPROVERS` is enabled.
49+
*
50+
* Prefer `isAdvanceApproval` over `policy.approvalMode`: the stored value is updated optimistically and can drift from the actual workflow structure.
51+
*/
52+
function useApprovalWorkflows(policy: OnyxEntry<Policy>): UseApprovalWorkflowsResult {
53+
const policyID = policy?.id;
54+
const {localeCompare} = useLocalize();
55+
const {isBetaEnabled} = usePermissions();
56+
const {login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
57+
const [personalDetails] = useAllPersonalDetails();
58+
const [rulesCollection] = useOnyx(ONYXKEYS.COLLECTION.RULE, {selector: (rules: OnyxCollection<Rule>) => filterRulesForPolicy(rules, policyID)});
59+
60+
const isMultipleApproversBetaEnabled = isBetaEnabled(CONST.BETAS.MULTIPLE_APPROVERS);
61+
const params = {
62+
policy,
63+
personalDetails: personalDetails ?? {},
64+
localeCompare,
65+
currentUserLogin,
66+
rules: getApprovalWorkflowRulesForPolicy(rulesCollection, policyID),
67+
};
68+
const {approvalWorkflows, availableMembers, usedApproverEmails} = isMultipleApproversBetaEnabled
69+
? convertApprovalWorkflowRulesToWorkflows(params)
70+
: convertPolicyEmployeesToApprovalWorkflows(params);
71+
72+
const isAdvanceApproval = (approvalWorkflows.length > 1 || (approvalWorkflows?.at(0)?.approvers ?? []).length > 1) && isControlPolicy(policy);
73+
74+
const filteredApprovalWorkflows =
75+
isMultipleApproversBetaEnabled ||
76+
policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.ADVANCED ||
77+
policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL ||
78+
isHRAdvancedMode(policy)
79+
? approvalWorkflows
80+
: approvalWorkflows.filter((workflow) => workflow.isDefault);
81+
82+
return {approvalWorkflows, filteredApprovalWorkflows, availableMembers, usedApproverEmails, isAdvanceApproval, rulesCollection, personalDetails};
83+
}
84+
85+
export default useApprovalWorkflows;

‎src/pages/workspace/members/WorkspaceInviteMessageComponent.tsx‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import ScreenWrapper from '@components/ScreenWrapper';
1111
import Text from '@components/Text';
1212
import TextInput from '@components/TextInput';
1313

14+
import useApprovalWorkflows from '@hooks/useApprovalWorkflows';
1415
import useAutoFocusInput from '@hooks/useAutoFocusInput';
1516
import useLocalize from '@hooks/useLocalize';
1617
import useOnyx from '@hooks/useOnyx';
@@ -33,14 +34,13 @@ import {
3334
getDefaultApprover,
3435
getMemberAccountIDsForWorkspace,
3536
goBackFromInvalidPolicy,
36-
isControlPolicy,
3737
isSubmitPolicy,
38+
shouldHideDynamicExternalWorkflowPeople,
3839
tryNavigateToSubmitWorkspaceUpgrade,
3940
} from '@libs/PolicyUtils';
4041
import {getAllPolicyExpenseChatReportActions} from '@libs/ReportUtils';
4142
import updateMultilineInputRange from '@libs/updateMultilineInputRange';
4243
import {getSearchParamFromPath} from '@libs/Url';
43-
import {filterRulesForPolicy} from '@libs/WorkflowUtils';
4444

4545
import variables from '@styles/variables';
4646

@@ -52,11 +52,10 @@ import type {Route as Routes} from '@src/ROUTES';
5252
import INPUT_IDS from '@src/types/form/WorkspaceInviteMessageForm';
5353
import type {CurrentUserPersonalDetails} from '@src/types/onyx/PersonalDetails';
5454
import type Policy from '@src/types/onyx/Policy';
55-
import type Rule from '@src/types/onyx/Rule';
5655
import {isEmptyObject} from '@src/types/utils/EmptyObject';
5756
import isLoadingOnyxValue from '@src/types/utils/isLoadingOnyxValue';
5857

59-
import type {OnyxCollection, OnyxEntry} from 'react-native-onyx';
58+
import type {OnyxEntry} from 'react-native-onyx';
6059
import type {GestureResponderEvent} from 'react-native/Libraries/Types/CoreEventTypes';
6160

6261
import {Str} from 'expensify-common';
@@ -88,6 +87,7 @@ function WorkspaceInviteMessageComponent({
8887
}: WorkspaceInviteMessageComponentProps) {
8988
const styles = useThemeStyles();
9089
const {translate, formatPhoneNumber} = useLocalize();
90+
const {isBetaEnabled} = usePermissions();
9191
const policyName = policy?.name;
9292

9393
const backToPath = typeof backTo === 'string' ? (backTo.split('?').at(0) ?? '') : '';
@@ -101,9 +101,6 @@ function WorkspaceInviteMessageComponent({
101101
const [allReportActions] = useOnyx(ONYXKEYS.COLLECTION.REPORT_ACTIONS);
102102
// Only used when this page finishes a "+N more" workflow edit, which has no edit page behind it to save the workflow.
103103
const [approvalWorkflow] = useOnyx(ONYXKEYS.APPROVAL_WORKFLOW);
104-
const policyRulesSelector = useCallback((rules: OnyxCollection<Rule>) => filterRulesForPolicy(rules, policyID), [policyID]);
105-
const [rulesCollection] = useOnyx(ONYXKEYS.COLLECTION.RULE, {selector: policyRulesSelector});
106-
const {isBetaEnabled} = usePermissions();
107104

108105
const [welcomeNote, setWelcomeNote] = useState<string>();
109106

@@ -127,8 +124,10 @@ function WorkspaceInviteMessageComponent({
127124
const approverDetails = usePersonalDetailByLogin(workspaceInviteApproverDraft);
128125
const employeePersonalDetails = usePersonalDetailsByLogins(Object.keys(policy?.employeeList ?? {}));
129126

130-
const isControl = isControlPolicy(policy);
131-
const shouldShowApproverRow = isControl && policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.ADVANCED && policy?.areWorkflowsEnabled;
127+
// `approvalMode` can drift from the actual workflow structure because it is updated optimistically.
128+
// Dynamic external workflows that hide people also have no selectable approver.
129+
const {isAdvanceApproval, rulesCollection} = useApprovalWorkflows(policy);
130+
const shouldShowApproverRow = isAdvanceApproval && !!policy?.areWorkflowsEnabled && !shouldHideDynamicExternalWorkflowPeople(policy);
132131

133132
const isApproverValid = !!workspaceInviteApproverDraft && workspaceInviteApproverDraft in (policy?.employeeList ?? {});
134133
const validatedApprover = isApproverValid ? workspaceInviteApproverDraft : undefined;

‎src/pages/workspace/workflows/tabs/WorkflowsApprovalsTab.tsx‎

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import SearchBar from '@components/SearchBar';
1010
import Text from '@components/Text';
1111
import TextLink from '@components/TextLink';
1212

13+
import useApprovalWorkflows from '@hooks/useApprovalWorkflows';
1314
import useConfirmModal from '@hooks/useConfirmModal';
1415
import useCurrentUserPersonalDetails from '@hooks/useCurrentUserPersonalDetails';
1516
import useDebouncedAccessibilityAnnouncement from '@hooks/useDebouncedAccessibilityAnnouncement';
1617
import {useMemoizedLazyExpensifyIcons} from '@hooks/useLazyAsset';
1718
import useLocalize from '@hooks/useLocalize';
1819
import useOnyx from '@hooks/useOnyx';
1920
import usePermissions from '@hooks/usePermissions';
20-
import {useAllPersonalDetails} from '@hooks/usePersonalDetails';
2121
import usePolicy from '@hooks/usePolicy';
2222
import usePolicyFeatureWriteAccess from '@hooks/usePolicyFeatureWriteAccess';
2323
import useResponsiveLayout from '@hooks/useResponsiveLayout';
@@ -35,23 +35,12 @@ import Navigation from '@libs/Navigation/Navigation';
3535
import {isTrackOnboardingChoice} from '@libs/OnboardingUtils';
3636
import {getApprovalWorkflow, hasDynamicExternalWorkflow, isControlPolicy, isGroupPolicy, isSubmitPolicy, shouldHideDynamicExternalWorkflowPeople} from '@libs/PolicyUtils';
3737
import tokenizedSearch from '@libs/tokenizedSearch';
38-
import {
39-
convertApprovalWorkflowRulesToWorkflows,
40-
convertPolicyEmployeesToApprovalWorkflows,
41-
filterRulesForPolicy,
42-
getApprovalWorkflowRulesForPolicy,
43-
getApprovalWorkflowSource,
44-
INITIAL_APPROVAL_WORKFLOW,
45-
isApprovalWorkflowLockedByIntegration,
46-
} from '@libs/WorkflowUtils';
38+
import {getApprovalWorkflowSource, INITIAL_APPROVAL_WORKFLOW, isApprovalWorkflowLockedByIntegration} from '@libs/WorkflowUtils';
4739

4840
import CONST from '@src/CONST';
4941
import ONYXKEYS from '@src/ONYXKEYS';
5042
import ROUTES, {DYNAMIC_ROUTES} from '@src/ROUTES';
5143
import type ApprovalWorkflow from '@src/types/onyx/ApprovalWorkflow';
52-
import type Rule from '@src/types/onyx/Rule';
53-
54-
import type {OnyxCollection} from 'react-native-onyx';
5544

5645
import {Str} from 'expensify-common';
5746
import React, {useCallback, useEffect, useMemo, useState} from 'react';
@@ -116,23 +105,22 @@ function WorkflowsLoadMoreCard({count, onPress}: {count: number; onPress: () =>
116105
}
117106

118107
function WorkflowsApprovalsTab({policyID}: WorkflowsApprovalsTabProps) {
119-
const {translate, localeCompare, formatPhoneNumber} = useLocalize();
108+
const {translate, formatPhoneNumber} = useLocalize();
120109
const styles = useThemeStyles();
121110
const theme = useTheme();
122111
const {shouldUseNarrowLayout} = useResponsiveLayout();
123112
const expensifyIcons = useMemoizedLazyExpensifyIcons(['Info', 'Plus']);
124113
const policy = usePolicy(policyID);
125114
const {showConfirmModal} = useConfirmModal();
126-
const {isBetaEnabled, isBetaEnabledOrUnknown} = usePermissions();
115+
const {isBetaEnabledOrUnknown} = usePermissions();
127116

128117
const isSmartLimitEnabled = policy?.areApprovalsLockedByExpensifyCard ?? false;
129118
const [transactionViolations] = useOnyx(ONYXKEYS.COLLECTION.TRANSACTION_VIOLATIONS);
130-
const [personalDetails] = useAllPersonalDetails();
131119
const [account] = useOnyx(ONYXKEYS.ACCOUNT);
132120
const [introSelected] = useOnyx(ONYXKEYS.NVP_INTRO_SELECTED);
133121
const accountManagerReportID = account?.accountManagerReportID;
134122
const isTrackIntentUser = isTrackOnboardingChoice(introSelected?.choice);
135-
const {accountID: currentUserAccountID, email: currentUserEmail = '', login: currentUserLogin = ''} = useCurrentUserPersonalDetails();
123+
const {accountID: currentUserAccountID, email: currentUserEmail = ''} = useCurrentUserPersonalDetails();
136124

137125
const {
138126
canWrite: canWriteApprovals,
@@ -142,21 +130,8 @@ function WorkflowsApprovalsTab({policyID}: WorkflowsApprovalsTabProps) {
142130

143131
const isSubmitPolicyWorkspace = isSubmitPolicy(policy);
144132

145-
const isMultipleApproversBetaEnabled = isBetaEnabled(CONST.BETAS.MULTIPLE_APPROVERS);
146-
const policyRulesSelector = useCallback((rules: OnyxCollection<Rule>) => filterRulesForPolicy(rules, policyID), [policyID]);
147-
const [rulesCollection] = useOnyx(ONYXKEYS.COLLECTION.RULE, {selector: policyRulesSelector});
148-
const {approvalWorkflows, availableMembers, usedApproverEmails} = useMemo(() => {
149-
const params = {
150-
policy,
151-
personalDetails: personalDetails ?? {},
152-
localeCompare,
153-
currentUserLogin,
154-
rules: getApprovalWorkflowRulesForPolicy(rulesCollection, policyID),
155-
};
156-
return isMultipleApproversBetaEnabled ? convertApprovalWorkflowRulesToWorkflows(params) : convertPolicyEmployeesToApprovalWorkflows(params);
157-
}, [policy, personalDetails, localeCompare, currentUserLogin, rulesCollection, policyID, isMultipleApproversBetaEnabled]);
133+
const {approvalWorkflows, filteredApprovalWorkflows, availableMembers, usedApproverEmails, isAdvanceApproval, rulesCollection, personalDetails} = useApprovalWorkflows(policy);
158134

159-
const isAdvanceApproval = (approvalWorkflows.length > 1 || (approvalWorkflows?.at(0)?.approvers ?? []).length > 1) && isControlPolicy(policy);
160135
const updateApprovalMode = isAdvanceApproval ? CONST.POLICY.APPROVAL_MODE.ADVANCED : CONST.POLICY.APPROVAL_MODE.BASIC;
161136

162137
const confirmDisableApprovals = useCallback(() => {
@@ -231,14 +206,6 @@ function WorkflowsApprovalsTab({policyID}: WorkflowsApprovalsTabProps) {
231206
const isRecruitingAdvancedModeEnabled = isRecruitingAdvancedMode(policy);
232207
const hrFinalApproverEmail = getHRFinalApprover(policy);
233208

234-
const filteredApprovalWorkflows =
235-
isMultipleApproversBetaEnabled ||
236-
policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.ADVANCED ||
237-
policy?.approvalMode === CONST.POLICY.APPROVAL_MODE.DYNAMICEXTERNAL ||
238-
isHRAdvancedModeEnabled
239-
? approvalWorkflows
240-
: approvalWorkflows.filter((workflow) => workflow.isDefault);
241-
242209
const everyoneText = translate('workspace.common.everyone');
243210

244211
const filterWorkflow = (workflow: ApprovalWorkflow, searchInput: string) => {

0 commit comments

Comments
 (0)