Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix approver field disappears after deselecting the user #47955

Merged
merged 5 commits into from
Aug 27, 2024
Merged

Fix approver field disappears after deselecting the user #47955

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e09c37d
fix approver field disappears after deselecting the user
bernhardoj Aug 24, 2024
e589aa5
Merge branch 'main' into fix/47723-approver-field-disappears-after-un…
bernhardoj Aug 27, 2024
45632a5
reverts
bernhardoj Aug 27, 2024
4415d28
show approver instead of additional approver if approver is empty
bernhardoj Aug 27, 2024
9653b57
store the approver length to a var
bernhardoj Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/pages/workspace/workflows/approvals/ApprovalWorkflowEditor.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@ function ApprovalWorkflowEditor({approvalWorkflow, removeApprovalWorkflow, polic
const styles = useThemeStyles();
const theme = useTheme();
const {translate, toLocaleOrdinal} = useLocalize();
const approverCount = approvalWorkflow.approvers.length;

const approverDescription = useCallback(
(index: number) =>
approvalWorkflow.approvers.length > 1 ? `${toLocaleOrdinal(index + 1, true)} ${translate('workflowsPage.approver').toLowerCase()}` : `${translate('workflowsPage.approver')}`,
[approvalWorkflow.approvers.length, toLocaleOrdinal, translate],
(index: number) => (approverCount > 1 ? `${toLocaleOrdinal(index + 1, true)} ${translate('workflowsPage.approver').toLowerCase()}` : `${translate('workflowsPage.approver')}`),
[approverCount, toLocaleOrdinal, translate],
);

const members = useMemo(() => {
Expand Down Expand Up @@ -94,15 +94,15 @@ function ApprovalWorkflowEditor({approvalWorkflow, removeApprovalWorkflow, polic

// User should be allowed to add additional approver only if they upgraded to Control Plan, otherwise redirected to the Upgrade Page
const addAdditionalApprover = useCallback(() => {
if (!PolicyUtils.isControlPolicy(policy)) {
if (!PolicyUtils.isControlPolicy(policy) && approverCount > 0) {
Navigation.navigate(ROUTES.WORKSPACE_UPGRADE.getRoute(policyID, CONST.UPGRADE_FEATURE_INTRO_MAPPING.approvals.alias, Navigation.getActiveRoute()));
return;
}
Navigation.navigate(
ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_APPROVER.getRoute(policyID, approvalWorkflow.approvers.length, ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_NEW.getRoute(policyID)),
ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_APPROVER.getRoute(policyID, approverCount, ROUTES.WORKSPACE_WORKFLOWS_APPROVALS_NEW.getRoute(policyID)),
CONST.NAVIGATION.ACTION_TYPE.PUSH,
);
}, [approvalWorkflow.approvers.length, policy, policyID]);
}, [approverCount, policy, policyID]);

return (
<ScrollView
Expand Down Expand Up @@ -156,7 +156,7 @@ function ApprovalWorkflowEditor({approvalWorkflow, removeApprovalWorkflow, polic
})}

<MenuItemWithTopDescription
description={translate('workflowsCreateApprovalsPage.additionalApprover')}
description={approverCount > 0 ? translate('workflowsCreateApprovalsPage.additionalApprover') : translate('workflowsPage.approver')}
onPress={addAdditionalApprover}
shouldShowRightIcon
wrapperStyle={styles.sectionMenuItemTopDescription}
Expand Down
Loading