Skip to content

feat: remove copilots #4200

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 1 commit into from
Nov 23, 2020
Merged

feat: remove copilots #4200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 25 additions & 0 deletions docs/permissions.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,31 @@ <h2 class="anchor-container">
</div>
</div>
</div>
<div class="row border-top">
<div class="col py-2">
<div class="permission-title anchor-container">
<a href="#REMOVE_COPILOTS" name="REMOVE_COPILOTS" class="anchor"></a>Remove Copilots
</div>
<div class="permission-variable"><small><code>REMOVE_COPILOTS</code></small></div>
<div class="text-black-50 small-text">Remove copilots form the project.</div>
</div>
<div class="col-9 py-2">
<div>
<span class="badge badge-primary" title="Allowed Project Role">manager</span>
<span class="badge badge-primary" title="Allowed Project Role">account_manager</span>
<span class="badge badge-primary" title="Allowed Project Role">account_executive</span>
<span class="badge badge-primary" title="Allowed Project Role">project_manager</span>
<span class="badge badge-primary" title="Allowed Project Role">program_manager</span>
<span class="badge badge-primary" title="Allowed Project Role">solution_architect</span>
</div>

<div>
<span class="badge badge-success" title="Allowed Topcoder Role">administrator</span>
<span class="badge badge-success" title="Allowed Topcoder Role">Connect Admin</span>
<span class="badge badge-success" title="Allowed Topcoder Role">Connect Copilot Manager</span>
</div>
</div>
</div>
<div class="row border-top">
<div class="col py-2">
<div class="permission-title anchor-container">
Expand Down
5 changes: 3 additions & 2 deletions src/components/TeamManagement/CopilotManagementDialog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ class ProjectManagementDialog extends React.Component {
onCancel, copilotTeamInvites = [], selectedMembers, processingInvites,
} = this.props
const canManageCopilots = hasPermission(PERMISSIONS.MANAGE_COPILOTS)
const canRemoveCopilots = hasPermission(PERMISSIONS.REMOVE_COPILOTS)
const showSuggestions = hasPermission(PERMISSIONS.SEE_MEMBER_SUGGESTIONS)
let i = 0
return (
Expand Down Expand Up @@ -138,7 +139,7 @@ class ProjectManagementDialog extends React.Component {
</span>
</div>
</div>
{canManageCopilots && <div className="member-remove" onClick={remove}>
{(canManageCopilots || canRemoveCopilots) && <div className="member-remove" onClick={remove}>
{(currentUser.userId === member.userId) ? 'Leave' : 'Remove'}
</div>}
</div>
Expand Down Expand Up @@ -169,7 +170,7 @@ class ProjectManagementDialog extends React.Component {
{ (!hasUserId) && <span className="member-email">{invite.email}</span>}
</span>
</div>
{canManageCopilots && <div className="member-remove" onClick={remove}>
{(canManageCopilots || canRemoveCopilots) && <div className="member-remove" onClick={remove}>
Remove
<span className="email-date">
Invited {moment(invite.createdAt).format('MMM D, YY')}
Expand Down
3 changes: 2 additions & 1 deletion src/components/TeamManagement/TeamManagement.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,7 @@ class TeamManagement extends React.Component {
const customerTeamManageAction = hasPermission(PERMISSIONS.MANAGE_CUSTOMER_TEAM)
const topcoderTeamManageAction = hasPermission(PERMISSIONS.MANAGE_TOPCODER_TEAM)
const copilotTeamManageAction = hasPermission(PERMISSIONS.MANAGE_COPILOTS)
const copilotRemoveAction = hasPermission(PERMISSIONS.REMOVE_COPILOTS)
const canRequestCopilot = hasPermission(PERMISSIONS.REQUEST_COPILOTS)
const canJoinTopcoderTeam = !currentMember && hasPermission(PERMISSIONS.JOIN_TOPCODER_TEAM)

Expand Down Expand Up @@ -191,7 +192,7 @@ class TeamManagement extends React.Component {
<div className="projects-team">
<div className="title">
<span styleName="title-text">Copilot</span>
{copilotTeamManageAction &&
{(copilotTeamManageAction || copilotRemoveAction) &&
<span className="title-action" onClick={() => onShowCopilotDialog(true)}>
Manage
</span>
Expand Down
15 changes: 15 additions & 0 deletions src/config/permissions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,6 +228,21 @@ export const PERMISSIONS = {
]
},

REMOVE_COPILOTS: {
meta: {
group: 'Project Members',
title: 'Remove Copilots',
description: 'Remove copilots form the project.',
},
projectRoles: [
..._.difference(PROJECT_ALL, [PROJECT_ROLE_COPILOT, PROJECT_ROLE_CUSTOMER])
],
topcoderRoles: [
...TOPCODER_ADMINS,
ROLE_CONNECT_COPILOT_MANAGER
]
},

MANAGE_TOPCODER_TEAM: {
meta: {
group: 'Project Members',
Expand Down