- )
- }
-}
-
-AutoCompleteInput.propTypes = {
- searchMembers: PT.array,
- keyword: PT.string,
- isPopupVisible: PT.bool,
- onKeywordChange: PT.func,
- onSelectNewMember: PT.func,
- onToggleSearchPopup: PT.func
-}
-
-export default uncontrollable(AutoCompleteInput, {
- isPopupVisible: 'onToggleSearchPopup'
-})
diff --git a/src/components/TeamManagement/DeleteModal.jsx b/src/components/TeamManagement/DeleteModal.jsx
deleted file mode 100644
index 57cac7fee..000000000
--- a/src/components/TeamManagement/DeleteModal.jsx
+++ /dev/null
@@ -1,65 +0,0 @@
-import React from 'react'
-import PropTypes from 'prop-types'
-
-const DeleteModal = ({onCancel, onConfirm, isCustomer, isCopilot, isManager, isLeave}) => {
- let title
- let content
- let btnText
-
- const removeTmpl = (name) =>
- `The ${name} will lose all rights to the project and can’t see or interact with it anymore. ` +
- `Do you still want to remove the ${name}`
-
- if (isCustomer) {
- title = 'You are about to remove a member'
- content = removeTmpl('customer')
- btnText = 'Remove member'
- }
-
- if (isCopilot) {
- title = 'You are about to remove a copilot'
- content = removeTmpl('copilot')
- btnText = 'Remove copilot'
- }
-
- if (isManager) {
- title = 'You are about to remove a manager'
- content = removeTmpl('manager')
- btnText = 'Remove manager'
- }
-
- if (isLeave) {
- title = 'You are about to leave the project'
- content = 'Once you leave, somebody on the team has to add you for you to be able to see the project. Do you still want to leave the project?'
- btnText = 'Leave Project'
- }
-
- return (
-
- {member.firstName} {member.lastName} will become responsible for the project and be able to add and remove team members. Are you sure you want to proceed?
-
+ Project Member(s) can't be invited again. Please remove them from list.
+
}
+
+
+
+
+
+ )
+ }
+}
+
+Dialog.propTypes = {
+ processingInvites: PT.bool.isRequired,
+ currentUser: PT.object.isRequired,
+ members: PT.arrayOf(PT.object).isRequired,
+ isMember: PT.bool.isRequired,
+ onCancel: PT.func.isRequired,
+ removeMember: PT.func.isRequired,
+ invites: PT.arrayOf(PT.object),
+ sendInvite: PT.func.isRequired,
+ removeInvite: PT.func.isRequired,
+}
+
+export default Dialog
diff --git a/src/components/TeamManagement/TeamManagement.jsx b/src/components/TeamManagement/TeamManagement.jsx
index bffb1ac93..c96e7c99e 100644
--- a/src/components/TeamManagement/TeamManagement.jsx
+++ b/src/components/TeamManagement/TeamManagement.jsx
@@ -1,18 +1,14 @@
import _ from 'lodash'
import React from 'react'
import PropTypes from 'prop-types'
-import cn from 'classnames'
import uncontrollable from 'uncontrollable'
import './TeamManagement.scss'
-import MemberRow from './MemberRow'
-import Panel from '../Panel/Panel'
-import DeleteModal from './DeleteModal'
-import OwnerModal from './OwnerModal'
-import AddTeamMember from './AddTeamMember'
-import NewMemberConfirmModal from './NewMemberConfirmModal'
-import Join from './Join'
-import MobileExpandable from '../MobileExpandable/MobileExpandable'
-import { PROJECT_ROLE_MANAGER, PROJECT_ROLE_CUSTOMER } from '../../config/constants'
+import ProjectDialog from './ProjectManagementDialog'
+import TopcoderDialog from './TopcoderManagementDialog'
+import UserTooltip from '../User/UserTooltip'
+import AddIcon from '../../assets/icons/icon-ui-bold-add.svg'
+import Dialog from './Dialog'
+
const userShape = PropTypes.shape({
userId: PropTypes.number.isRequired,
handle: PropTypes.string.isRequired,
@@ -24,111 +20,224 @@ const userShape = PropTypes.shape({
isCustomer: PropTypes.bool
})
+const REMOVE_INVITATION_TITLE = 'You\'re about to remove an invitation'
+const REMOVE_TITLE = 'You\'re about to delete a member from the team'
+const LEAVE_TITLE = 'You\'re about to leave the project'
-/**
- * Function to help sort the order in which members are displayed
- */
-const calcMemberPriority = m => {
- let priority = 0
- if (m.role === PROJECT_ROLE_CUSTOMER) priority += 5
- if (m.role === PROJECT_ROLE_MANAGER) priority += 2
+const LEAVE_MESSAGE = `Once you leave, somebody on your team has to add you for you to be
+ for you to be able to see the project. Do you stil want to leave?`
- if (m.isPrimary) priority++
- return -priority
-}
+const JOIN_MESSAGE = `You are about to join the project. Once you join you will be responsible for project delivery.
+ Are you sure you want to join?`
-const TeamManagement = (props) => {
- const {
- currentUser, members, deletingMember, isAddingTeamMember, onMemberDeleteConfirm, onMemberDelete, isShowJoin,
- newOwner, onChangeOwner, onChangeOwnerConfirm, onToggleAddTeamMember, showNewMemberConfirmation, onAddNewMember,
- onToggleNewMemberConfirm, onKeywordChange
- } = props
- const currentMember = members.filter((member) => member.userId === currentUser.userId)[0]
- const owner = members.filter((member) => member.isPrimary && member.isCustomer)[0]
- const modalActive = isAddingTeamMember || deletingMember || isShowJoin || showNewMemberConfirmation
- const canJoin = !currentMember && (currentUser.isCopilot || currentUser.isManager)
-
- const sortedMembers = _.sortBy(members, [(member) => {
- return calcMemberPriority(member)
- }])
-
- const _onAddNewMember = () => {
- onToggleNewMemberConfirm(false)
- onAddNewMember()
- }
- const _onAddMemberCancel = () => {
- onKeywordChange('')
- onToggleNewMemberConfirm(false)
+const REMOVE_USER_MESSAGE = `You are about to remove USERNAME from your team.
+ They will lose all rights to the project and can't see or interact with it anymore.
+ Do you still want to remove the member?`
+
+const REMOVE_INVITE_MESSAGE = `Once you cancel the invitation for
+ USEREMAIL they won't be able to access the project. You will have to invite them again
+ in order for them to gain access`
+
+class TeamManagement extends React.Component {
+
+ componentWillReceiveProps(nextProps) {
+ if (this.props.processingMembers !== nextProps.processingMembers && (!nextProps.processingMembers)) {
+ this.props.onJoin(false)
+ this.props.onMemberDelete(null)
+ }
+ if (this.props.processingInvites !== nextProps.processingInvites && (!nextProps.processingInvites)) {
+ this.props.onDeleteInvite(null)
+ }
}
- return (
-