Skip to content

Commit a3a3ab7

Browse files
committed
fix inviting by handles, issue #2846
1 parent 0ddda2e commit a3a3ab7

File tree

3 files changed

+10
-13
lines changed

3 files changed

+10
-13
lines changed

src/components/TeamManagement/AutocompleteInputContainer.jsx

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,13 @@ class AutocompleteInputContainer extends React.Component {
2222
}
2323

2424
onUpdate(inputValue) {
25-
inputValue = inputValue.map(value => {
26-
value.isEmail = (/(.+)@(.+){2,}\.(.+){2,}/).test(value.label)
27-
if (value.isEmail) {
28-
value.handle = value.label
29-
}
30-
return value
31-
})
32-
25+
const inputValueNormalized = inputValue.map(value => ({
26+
...value,
27+
isEmail: (/(.+)@(.+){2,}\.(.+){2,}/).test(value.label)
28+
}))
29+
3330
if (this.props.onUpdate) {
34-
this.props.onUpdate(inputValue)
31+
this.props.onUpdate(inputValueNormalized)
3532
}
3633
this.props.onClearUserSuggestions()
3734
}

src/components/TeamManagement/ProjectManagementDialog.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ class Dialog extends React.Component {
3030
onChange(selectedMembers) {
3131
// If a member invited with email exists in selectedMembers
3232
let present = _.some(this.state.invitedMembers, invited => _.findIndex(selectedMembers,
33-
selectedMember => selectedMember.isEmail && selectedMember.handle === invited.email) > -1)
33+
selectedMember => selectedMember.isEmail && selectedMember.label === invited.email) > -1)
3434
// If a member invited with handle exists in selectedMembers
3535
present = present || _.some(this.state.invitedMembers, invited => {
3636
if (!invited.member) {
3737
return false
3838
}
3939
return _.findIndex(selectedMembers,
40-
selectedMember => !selectedMember.isEmail && selectedMember.handle === invited.member.handle) > -1
40+
selectedMember => !selectedMember.isEmail && selectedMember.label === invited.member.handle) > -1
4141
})
4242
// If members exist in selectedMembers
4343
present = present || _.some(this.state.members, m => _.findIndex(selectedMembers,
44-
selectedMember => selectedMember.handle === m.handle) > -1)
44+
selectedMember => selectedMember.label === m.handle) > -1)
4545
this.setState({
4646
validInviteText: !present,
4747
showAlreadyMemberError: present

src/projects/detail/containers/TeamManagementContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ class TeamManagementContainer extends Component {
163163
const handles = []
164164
const emails = []
165165
selectedMembers.map(selectedOption => {
166-
const value = selectedOption.handle
166+
const value = selectedOption.label
167167
// Test if its email
168168
if (selectedOption.isEmail) {
169169
emails.push(value)

0 commit comments

Comments
 (0)