Skip to content

Commit fe5485d

Browse files
committed
Added permission check for topcoder team dialog
1 parent 3c1bc86 commit fe5485d

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/components/TeamManagement/TeamManagement.jsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ import TopcoderDialog from './TopcoderManagementDialog'
88
import UserTooltip from '../User/UserTooltip'
99
import AddIcon from '../../assets/icons/icon-ui-bold-add.svg'
1010
import Dialog from './Dialog'
11+
import PERMISSIONS from '../../config/permissions'
12+
import {checkPermission} from '../../helpers/permissions'
1113

1214
const userShape = PropTypes.shape({
1315
userId: PropTypes.number.isRequired,
@@ -65,7 +67,7 @@ class TeamManagement extends React.Component {
6567
const customerTeamManageAction = (currentUser.isCustomer || currentUser.isAdmin) ||
6668
(currentMember && currentUser.isManager)
6769
const customerTeamViewAction = !customerTeamManageAction
68-
const topcoderTeamManageAction = currentUser.isAdmin || (currentMember && currentUser.isManager)
70+
const topcoderTeamManageAction = currentUser.isAdmin || (currentMember && checkPermission(PERMISSIONS.INVITE_TOPCODER_MEMBER))
6971
const topcoderTeamViewAction = !topcoderTeamManageAction
7072
const canJoinAsCopilot = !currentMember && currentUser.isCopilot
7173
const canJoinAsManager = !currentMember && (currentUser.isManager || currentUser.isAccountManager)

src/components/TeamManagement/TopcoderManagementDialog.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ import SelectDropdown from '../SelectDropdown/SelectDropdown'
1111
import Tooltip from 'appirio-tech-react-components/components/Tooltip/Tooltip'
1212
import AutocompleteInputContainer from './AutocompleteInputContainer'
1313
import {PROJECT_MEMBER_INVITE_STATUS_REQUESTED, PROJECT_MEMBER_INVITE_STATUS_PENDING} from '../../config/constants'
14+
import PERMISSIONS from '../../config/permissions'
15+
import {checkPermission} from '../../helpers/permissions'
1416

1517
class TopcoderManagementDialog extends React.Component {
1618
constructor(props) {
@@ -137,7 +139,8 @@ class TopcoderManagementDialog extends React.Component {
137139
members, currentUser, isMember, removeMember, onCancel, removeInvite, approveOrDecline, invites = [],
138140
selectedMembers, processingInvites,
139141
} = this.props
140-
const showRemove = currentUser.isAdmin || (isMember && currentUser.isManager)
142+
console.log('is currentUser account manager : ', currentUser)
143+
const showRemove = currentUser.isAdmin || (isMember && checkPermission(PERMISSIONS.INVITE_TOPCODER_MEMBER))
141144
const showApproveDecline = currentUser.isAdmin || currentUser.isCopilotManager
142145
let i = 0
143146

0 commit comments

Comments
 (0)