Skip to content

Issue 3406 #3411

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

Merged
maxceem merged 2 commits into from
Dec 11, 2019
Merged

Issue 3406 #3411

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2d8a2f9
fixes issue-3406
sumitdaga Dec 11, 2019
bc0f5db
comment txt fix
sumitdaga Dec 11, 2019
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/components/TeamManagement/TopcoderManagementDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class TopcoderManagementDialog extends React.Component {
managerType: {},
showAlreadyMemberError: false,
errorMessage: null,
processingInviteRequestId: null, // id of invite which request is being processing
processingInviteRequestIds: [], // ids of invites for which request is being processed
}

this.onUserRoleChange = this.onUserRoleChange.bind(this)
Expand Down Expand Up @@ -156,7 +156,7 @@ class TopcoderManagementDialog extends React.Component {
members, currentUser, isMember, removeMember, onCancel, removeInvite, approveOrDecline, topcoderTeamInvites = [],
selectedMembers, processingInvites, updatingMemberIds
} = this.props
const { processingInviteRequestId } = this.state
const { processingInviteRequestIds } = this.state
const showRemove = currentUser.isAdmin || (isMember && checkPermission(PERMISSIONS.INVITE_TOPCODER_MEMBER))
const showApproveDecline = currentUser.isAdmin || currentUser.isCopilotManager
let i = 0
Expand Down Expand Up @@ -274,21 +274,21 @@ class TopcoderManagementDialog extends React.Component {
removeInvite(invite)
}
const approve = () => {
this.setState({ processingInviteRequestId: invite.id })
this.setState(prevState => ({ processingInviteRequestIds: [ ...prevState.processingInviteRequestIds, invite.id ] }))
approveOrDecline({
userId: invite.userId,
status: 'request_approved'
}).then(() => {
this.setState({ processingInviteRequestId: null })
this.setState(prevState => ({ processingInviteRequestIds: _.xor(prevState.processingInviteRequestIds, [invite.id]) }))
})
}
const decline = () => {
this.setState({ processingInviteRequestId: invite.id })
this.setState(prevState => ({ processingInviteRequestIds: [ ...prevState.processingInviteRequestIds, invite.id ] }))
approveOrDecline({
userId: invite.userId,
status: 'request_rejected'
}).then(() => {
this.setState({ processingInviteRequestId: null })
this.setState(prevState => ({ processingInviteRequestIds: _.xor(prevState.processingInviteRequestIds, [invite.id]) }))
})
}
const userFullName = getFullNameWithFallback(invite.member)
Expand All @@ -313,7 +313,7 @@ class TopcoderManagementDialog extends React.Component {
{
invite.status===PROJECT_MEMBER_INVITE_STATUS_REQUESTED && showApproveDecline &&
<div className="member-remove">
{!processingInviteRequestId ? ([
{!_.includes(processingInviteRequestIds, invite.id) ? ([
<span onClick={approve} key="approve">approve</span>,
<span onClick={decline} key="decline">decline</span>
]) : (
Expand Down