Skip to content

Fix people admin workspace access pages #95338

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

Open
ShridharGoel wants to merge 4 commits into
base: main
Choose a base branch
from
+27 −17
Open

Fix people admin workspace access pages #95338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bbf5a72
Fix people admin workspace access
ShridharGoel Jul 5, 2026
c503255
Simplify workflow approver access checks
ShridharGoel Jul 6, 2026
8d9f318
Avoid redundant approver picker access gate
ShridharGoel Jul 6, 2026
49f1172
Fix invite approver access for people admins
ShridharGoel Jul 6, 2026
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
32 changes: 21 additions & 11 deletions src/pages/workspace/WorkspaceInviteMessageApproverPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,18 @@ import {setWorkspaceInviteApproverDraft} from '@libs/actions/Policy/Member';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {SettingsNavigatorParamList} from '@libs/Navigation/types';
import {getDefaultApprover, getMemberAccountIDsForWorkspace} from '@libs/PolicyUtils';
import {getDefaultApprover, getMemberAccountIDsForWorkspace, goBackFromInvalidPolicy} from '@libs/PolicyUtils';

import CONST from '@src/CONST';
import ONYXKEYS from '@src/ONYXKEYS';
import type SCREENS from '@src/SCREENS';
import {isEmptyObject} from '@src/types/utils/EmptyObject';

import React from 'react';

import type {WithPolicyAndFullscreenLoadingProps} from './withPolicyAndFullscreenLoading';

import AccessOrNotFoundWrapper from './AccessOrNotFoundWrapper';
import MemberRightIcon from './MemberRightIcon';
import withPolicyAndFullscreenLoading from './withPolicyAndFullscreenLoading';

Expand Down Expand Up @@ -110,16 +112,24 @@ function WorkspaceInviteMessageApproverPage({policy, personalDetails, isLoadingR
};

return (
<ApproverSelectionList
testID="WorkspaceInviteMessageApproverPage"
headerTitle={translate('workflowsPage.approver')}
policy={policy}
isLoadingReportData={isLoadingReportData}
onBackButtonPress={goBack}
initiallyFocusedOptionKey={selectedApprover}
allApprovers={allApprovers}
onSelectApprover={handleOnSelectApprover}
/>
<AccessOrNotFoundWrapper
policyID={policyID}
policyFeature={CONST.POLICY.POLICY_FEATURE.MEMBERS}
policyFeatureAccess={CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE}
fullPageNotFoundViewProps={{subtitleKey: isEmptyObject(policy) ? undefined : 'workspace.common.notAuthorized', onLinkPress: goBackFromInvalidPolicy}}
>
<ApproverSelectionList
testID="WorkspaceInviteMessageApproverPage"
headerTitle={translate('workflowsPage.approver')}
policy={policy}
isLoadingReportData={isLoadingReportData}
onBackButtonPress={goBack}
initiallyFocusedOptionKey={selectedApprover}
allApprovers={allApprovers}
onSelectApprover={handleOnSelectApprover}
shouldRequirePolicyAdmin={false}
/>
</AccessOrNotFoundWrapper>
);
}

Expand Down
2 changes: 2 additions & 0 deletions src/pages/workspace/members/WorkspaceMemberCustomFieldPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,8 @@ function WorkspaceMemberCustomFieldPage({policy, route, personalDetails}: Worksp
<AccessOrNotFoundWrapper
policyID={policyID}
accessVariants={[CONST.POLICY.ACCESS_VARIANTS.ADMIN, CONST.POLICY.ACCESS_VARIANTS.CONTROL]}
policyFeature={CONST.POLICY.POLICY_FEATURE.MEMBERS}
policyFeatureAccess={CONST.POLICY.POLICY_FEATURE_ACCESS.WRITE}
>
<ScreenWrapper
testID="WorkspaceMemberCustomFieldPage"
Expand Down
5 changes: 2 additions & 3 deletions src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsApproverPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
import {addSMSDomainIfPhoneNumber} from '@libs/PhoneNumber';
import {canMemberWrite, getDefaultApprover, getMemberAccountIDsForWorkspace, isExpensifyTeam, shouldFilterExpensifyTeam} from '@libs/PolicyUtils';
import {getDefaultApprover, getMemberAccountIDsForWorkspace, isExpensifyTeam, shouldFilterExpensifyTeam} from '@libs/PolicyUtils';

import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
import MemberRightIcon from '@pages/workspace/MemberRightIcon';
Expand Down Expand Up @@ -61,8 +61,7 @@ function WorkspaceWorkflowsApprovalsApproverPage({policy, personalDetails, isLoa
const approversFromWorkflow = approvalWorkflow?.approvers;
const isDefault = approvalWorkflow?.isDefault;

const canWriteApprovals = canMemberWrite(policy, currentUserLogin, CONST.POLICY.POLICY_FEATURE.WORKFLOWS_APPROVALS);
const shouldShowNotFoundView = !canWriteApprovals || isAnyHRReadOnlyWorkflowMode(policy);
const shouldShowNotFoundView = isAnyHRReadOnlyWorkflowMode(policy);
const shouldFilterOutExpensifyTeam = shouldFilterExpensifyTeam(policy?.owner, currentUserLogin);

const allApprovers: SelectionListApprover[] = useMemo(() => {
Expand Down
5 changes: 2 additions & 3 deletions src/pages/workspace/workflows/approvals/WorkspaceWorkflowsApprovalsOverLimitApproverPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import {isAnyHRReadOnlyWorkflowMode} from '@libs/HRUtils';
import Navigation from '@libs/Navigation/Navigation';
import type {PlatformStackScreenProps} from '@libs/Navigation/PlatformStackNavigation/types';
import type {WorkspaceSplitNavigatorParamList} from '@libs/Navigation/types';
import {canMemberWrite, getMemberAccountIDsForWorkspace, isExpensifyTeam, shouldFilterExpensifyTeam} from '@libs/PolicyUtils';
import {getMemberAccountIDsForWorkspace, isExpensifyTeam, shouldFilterExpensifyTeam} from '@libs/PolicyUtils';

import AccessOrNotFoundWrapper from '@pages/workspace/AccessOrNotFoundWrapper';
import MemberRightIcon from '@pages/workspace/MemberRightIcon';
Expand Down Expand Up @@ -52,8 +52,7 @@ function WorkspaceWorkflowsApprovalsOverLimitApproverPage({policy, personalDetai

const currentApproverEmail = currentApprover?.email;

const canWriteApprovals = canMemberWrite(policy, currentUserLogin, CONST.POLICY.POLICY_FEATURE.WORKFLOWS_APPROVALS);
const shouldShowNotFoundView = !canWriteApprovals || isAnyHRReadOnlyWorkflowMode(policy);
const shouldShowNotFoundView = isAnyHRReadOnlyWorkflowMode(policy);
const shouldFilterOutExpensifyTeam = shouldFilterExpensifyTeam(policy?.owner, currentUserLogin);

const allApprovers: SelectionListApprover[] = (() => {
Expand Down
Loading