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

Jump to bottom

Update cursor for deleted members in offline mode #24065

Merged
merged 2 commits into from
Aug 7, 2023
Merged

Update cursor for deleted members in offline mode #24065

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bd3fd02
Update cursor for deleted members in offline mode
ginsuma Aug 2, 2023
118cfe5
Use CONST instead
ginsuma Aug 2, 2023
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
8 changes: 4 additions & 4 deletions src/pages/workspace/WorkspaceMembersPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ function WorkspaceMembersPage(props) {
*/
const dismissError = useCallback(
(item) => {
if (item.pendingAction === 'delete') {
if (item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) {
Policy.clearDeleteMemberError(props.route.params.policyID, item.accountID);
} else {
Policy.clearAddMemberError(props.route.params.policyID, item.accountID);
Expand All @@ -281,7 +281,7 @@ function WorkspaceMembersPage(props) {
* @param {Object} policyMember
* @returns {Boolean}
*/
const isDeletedPolicyMember = (policyMember) => !props.network.isOffline && policyMember.pendingAction === 'delete' && _.isEmpty(policyMember.errors);
const isDeletedPolicyMember = (policyMember) => !props.network.isOffline && policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE && _.isEmpty(policyMember.errors);

/**
* Render a workspace member component
Expand All @@ -294,7 +294,7 @@ function WorkspaceMembersPage(props) {
*/
const renderItem = useCallback(
({item}) => {
const disabled = props.session.email === item.login || item.role === 'admin';
const disabled = props.session.email === item.login || item.role === CONST.POLICY.ROLE.ADMIN || item.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE;
const hasError = !_.isEmpty(item.errors) || errors[item.accountID];
const isChecked = _.contains(selectedEmployees, Number(item.accountID));
return (
Expand Down Expand Up @@ -342,7 +342,7 @@ function WorkspaceMembersPage(props) {
onSelectRow={() => toggleUser(item.accountID, item.pendingAction)}
/>
</View>
{(props.session.accountID === item.accountID || item.role === 'admin') && (
{(props.session.accountID === item.accountID || item.role === CONST.POLICY.ROLE.ADMIN) && (
<View style={[styles.badge, styles.peopleBadge]}>
<Text style={[styles.peopleBadgeText]}>{props.translate('common.admin')}</Text>
</View>
Expand Down
Loading