From e82b8a76a13f5ae72dcea62c45d6cf8dfce037cd Mon Sep 17 00:00:00 2001 From: tienifr Date: Thu, 3 Nov 2022 13:30:21 +0700 Subject: [PATCH 1/4] fix: 12066 --- src/pages/workspace/WorkspaceMembersPage.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index 477dc02f9642..d8aab3955a94 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -1,6 +1,8 @@ import React from 'react'; import _ from 'underscore'; import lodashGet from 'lodash/get'; +import lodashFilter from 'lodash/filter'; + import { View, FlatList, TouchableOpacity, } from 'react-native'; @@ -126,7 +128,8 @@ class WorkspaceMembersPage extends React.Component { */ toggleAllUsers() { this.setState({showTooltipForLogin: ''}); - const policyMemberList = _.keys(lodashGet(this.props, 'policyMemberList', {})); + let policyMemberList = lodashGet(this.props, 'policyMemberList', {}); + policyMemberList = lodashFilter(_.keys(policyMemberList), policyMember => policyMemberList[policyMember].pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE); const removableMembers = _.without(policyMemberList, this.props.session.email, this.props.policy.owner); this.setState(prevState => ({ selectedEmployees: removableMembers.length !== prevState.selectedEmployees.length @@ -288,6 +291,7 @@ class WorkspaceMembersPage extends React.Component { const removableMembers = []; let data = []; _.each(policyMemberList, (policyMember, email) => { + if (policyMember.pendingAction === CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE) { return; } if (email !== this.props.session.email && email !== this.props.policy.owner) { removableMembers.push(email); } From b1120236831b6ed3acd445ab516536440f31cddf Mon Sep 17 00:00:00 2001 From: tienifr Date: Tue, 8 Nov 2022 18:03:40 +0700 Subject: [PATCH 2/4] fix: issue --- 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 d8aab3955a94..8b36da3dff0e 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -129,7 +129,7 @@ class WorkspaceMembersPage extends React.Component { toggleAllUsers() { this.setState({showTooltipForLogin: ''}); let policyMemberList = lodashGet(this.props, 'policyMemberList', {}); - policyMemberList = lodashFilter(_.keys(policyMemberList), policyMember => policyMemberList[policyMember].pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE); + policyMemberList = _.filter(_.keys(policyMemberList), policyMember => policyMemberList[policyMember].pendingAction !== CONST.RED_BRICK_ROAD_PENDING_ACTION.DELETE); const removableMembers = _.without(policyMemberList, this.props.session.email, this.props.policy.owner); this.setState(prevState => ({ selectedEmployees: removableMembers.length !== prevState.selectedEmployees.length From cb954e51b0266a53c6dcab7d37fbee371052e20c Mon Sep 17 00:00:00 2001 From: tienifr Date: Tue, 8 Nov 2022 18:09:16 +0700 Subject: [PATCH 3/4] fix: useless import --- src/pages/workspace/WorkspaceMembersPage.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index 8b36da3dff0e..bfd90e4ffba3 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -1,7 +1,6 @@ import React from 'react'; import _ from 'underscore'; import lodashGet from 'lodash/get'; -import lodashFilter from 'lodash/filter'; import { View, FlatList, TouchableOpacity, From e09bda22109ff1903eaca0cea827028504abf7a6 Mon Sep 17 00:00:00 2001 From: tienifr Date: Tue, 8 Nov 2022 18:10:08 +0700 Subject: [PATCH 4/4] fix: useless import --- src/pages/workspace/WorkspaceMembersPage.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/workspace/WorkspaceMembersPage.js b/src/pages/workspace/WorkspaceMembersPage.js index bfd90e4ffba3..0e508ce1d0b2 100644 --- a/src/pages/workspace/WorkspaceMembersPage.js +++ b/src/pages/workspace/WorkspaceMembersPage.js @@ -1,7 +1,6 @@ import React from 'react'; import _ from 'underscore'; import lodashGet from 'lodash/get'; - import { View, FlatList, TouchableOpacity, } from 'react-native';