From bd3fd02b0ceb9d22ec48746b7c6f5e940be1604d Mon Sep 17 00:00:00 2001 From: ginsuma <13113013+ginsuma@users.noreply.github.com> Date: Wed, 2 Aug 2023 23:13:50 +0700 Subject: [PATCH 1/2] Update cursor for deleted members in offline mode --- src/pages/workspace/WorkspaceMembersPage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index 5e9f80613698..cd1553467c10 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -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 === 'admin' || item.pendingAction === 'delete'; const hasError = !_.isEmpty(item.errors) || errors[item.accountID]; const isChecked = _.contains(selectedEmployees, Number(item.accountID)); return ( From 118cfe5bb578b822ac2ecc49b4378422be005918 Mon Sep 17 00:00:00 2001 From: ginsuma <13113013+ginsuma@users.noreply.github.com> Date: Thu, 3 Aug 2023 00:55:37 +0700 Subject: [PATCH 2/2] Use CONST instead --- src/pages/workspace/WorkspaceMembersPage.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index cd1553467c10..ebc26360354d 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -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); @@ -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 @@ -294,7 +294,7 @@ function WorkspaceMembersPage(props) { */ const renderItem = useCallback( ({item}) => { - const disabled = props.session.email === item.login || item.role === 'admin' || item.pendingAction === 'delete'; + 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 ( @@ -342,7 +342,7 @@ function WorkspaceMembersPage(props) { onSelectRow={() => toggleUser(item.accountID, item.pendingAction)} /> - {(props.session.accountID === item.accountID || item.role === 'admin') && ( + {(props.session.accountID === item.accountID || item.role === CONST.POLICY.ROLE.ADMIN) && ( {props.translate('common.admin')}