Skip to content

Cf19 #8

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
rashmi73 merged 3 commits into from
Sep 22, 2019
Merged

Cf19 #8

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9914ec2
remove manage button and rename invitePeople button
sahil143 Sep 19, 2019
98a0489
remove view button from TeamManagement
sahil143 Sep 22, 2019
1c4cf16
Merge pull request #3317 from sahil143/issue-3294
maxceem Sep 22, 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
10 changes: 1 addition & 9 deletions src/components/TeamManagement/TeamManagement.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@ class TeamManagement extends React.Component {
const currentMember = members.filter((member) => member.userId === currentUser.userId)[0]
const modalActive = isAddingTeamMember || deletingMember || isShowJoin || showNewMemberConfirmation || deletingInvite

const customerTeamManageAction = (currentUser.isCustomer || currentUser.isAdmin) ||
(currentMember && currentUser.isManager)
const customerTeamViewAction = !customerTeamManageAction
const topcoderTeamManageAction = currentUser.isAdmin || (currentMember && checkPermission(PERMISSIONS.INVITE_TOPCODER_MEMBER))
const topcoderTeamViewAction = !topcoderTeamManageAction
const canJoinAsCopilot = !currentMember && currentUser.isCopilot
Expand All @@ -80,11 +77,6 @@ class TeamManagement extends React.Component {
<div className="projects-team">
<div className="title">
<span styleName="title-text">Team</span>
{(customerTeamManageAction || customerTeamViewAction) &&
<span className="title-action" onClick={() => onShowProjectDialog(true)}>
{customerTeamViewAction ? 'View' : 'Manage'}
</span>
}
</div>
<div className="members">
{sortedMembers.map((member, i) => {
Expand Down Expand Up @@ -113,7 +105,7 @@ class TeamManagement extends React.Component {
{ (canShowInvite) &&
<div className="join-btn" onClick={() => onShowProjectDialog(true)}>
<AddIcon />
Invite people
Manage Invitations
</div>
}
</div>
Expand Down