Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions src/components/TeamManagement/AddTeamMember.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ AddTeamMember.propTypes = {
selectedNewMember: PropTypes.object,
onToggleAddTeamMember: PropTypes.func.isRequired,
onKeywordChange: PropTypes.func.isRequired,
onKeywordPaste: PropTypes.func.isRequired,
onAddNewMember: PropTypes.func.isRequired
}

Expand Down
9 changes: 8 additions & 1 deletion src/components/TeamManagement/AutoCompleteInput.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ class AutoCompleteInput extends React.Component {

render() {
const {
isPopupVisible, searchMembers, keyword, onKeywordChange, onSelectNewMember, onToggleSearchPopup, selectedNewMember
isPopupVisible, searchMembers, keyword, onKeywordChange, onSelectNewMember, onToggleSearchPopup,
selectedNewMember, onKeywordPaste
} = this.props

const renderMember = (member, i) => {
Expand All @@ -54,6 +55,11 @@ class AutoCompleteInput extends React.Component {
)
}
const _onKeywordChange = e => onKeywordChange(e.target.value)
const _onKeywordPaste = e => {
e.stopPropagation()
e.preventDefault()
return onKeywordPaste(e.clipboardData.getData('Text'))
}
const _onToggleSearchPopup = () => onToggleSearchPopup(true)
return (
<div className="input-icon-group tc-file-field__inputs">
Expand All @@ -77,6 +83,7 @@ class AutoCompleteInput extends React.Component {
className="tc-file-field__inputs"
type="text"
placeholder="username"
onPaste={_onKeywordPaste}
onChange={_onKeywordChange}
onClick={_onToggleSearchPopup}
onKeyUp={_onToggleSearchPopup}
Expand Down
15 changes: 15 additions & 0 deletions src/projects/actions/projectMember.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { addProjectMember as addMember,
updateProjectMember as updateMember,
loadMemberSuggestions as loadMemberSuggestionsAPI
} from '../../api/projectMembers'
import { getUserProfile } from '../../api/users'
import { loadMembers } from '../../actions/members'

import {ADD_PROJECT_MEMBER, REMOVE_PROJECT_MEMBER, UPDATE_PROJECT_MEMBER,
Expand All @@ -19,6 +20,20 @@ export function loadMemberSuggestions(value) {
}
}

export function loadMemberProfileForSuggestions(value) {
return (dispatch) => {
return dispatch({
type: LOAD_MEMBER_SUGGESTIONS,
payload: getUserProfile(value).then((member) => {
if (member) {
return [member]
}
return []
}).catch(() => loadMemberSuggestionsAPI(value))
})
}
}

function addProjectMemberWithData(dispatch, projectId, member) {
return new Promise((resolve, reject) => {
return dispatch({
Expand Down
14 changes: 12 additions & 2 deletions src/projects/detail/containers/TeamManagementContainer.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
} from '../../../config/constants'
import TeamManagement from '../../../components/TeamManagement/TeamManagement'
import { addProjectMember, updateProjectMember, removeProjectMember,
loadMemberSuggestions
loadMemberSuggestions, loadMemberProfileForSuggestions
} from '../../actions/projectMember'


Expand All @@ -19,6 +19,7 @@ class TeamManagementContainer extends Component {
constructor(props) {
super(props)
this.onKeywordChange = this.onKeywordChange.bind(this)
this.onKeywordPaste = this.onKeywordPaste.bind(this)
this.onSelectNewMember = this.onSelectNewMember.bind(this)
this.onAddNewMember = this.onAddNewMember.bind(this)
this.onToggleAddTeamMember = this.onToggleAddTeamMember.bind(this)
Expand Down Expand Up @@ -114,6 +115,13 @@ class TeamManagementContainer extends Component {
this.setState({ keyword, selectedNewMember: null })
}

onKeywordPaste(keyword) {
if (keyword && keyword.length > AUTOCOMPLETE_TRIGGER_LENGTH) {
this.props.loadMemberProfileForSuggestions(keyword)
this.setState({ keyword, selectedNewMember: null })
}
}

onSelectNewMember(selectedNewMember) {
const keyword = selectedNewMember ? selectedNewMember.handle : ''
const { members } = this.props
Expand Down Expand Up @@ -208,6 +216,7 @@ class TeamManagementContainer extends Component {
currentUser={this.props.currentUser}
members={projectMembers}
onKeywordChange={this.onKeywordChange}
onKeywordPaste={this.onKeywordPaste}
onSelectNewMember={this.onSelectNewMember}
onAddNewMember={this.onAddNewMember}
onToggleNewMemberConfirm={ this.onToggleNewMemberConfirm }
Expand Down Expand Up @@ -242,7 +251,8 @@ const mapDispatchToProps = {
addProjectMember,
removeProjectMember,
updateProjectMember,
loadMemberSuggestions
loadMemberSuggestions,
loadMemberProfileForSuggestions,
}

TeamManagementContainer.propTypes = {
Expand Down