diff --git a/src/components/UserCard/index.js b/src/components/UserCard/index.js index 67f1cc08..bac63ba4 100644 --- a/src/components/UserCard/index.js +++ b/src/components/UserCard/index.js @@ -42,11 +42,11 @@ class UserCard extends Component { isUpdatingPermission: true }) - const { user, updateProjectNember } = this.props + const { user, updateProjectMember } = this.props try { const newUserInfoRole = await updateProjectMemberRole(user.projectId, user.id, newRole) - updateProjectNember(newUserInfoRole) + updateProjectMember(newUserInfoRole) this.setState({ showSuccessModal: true }) } catch (e) { const error = _.get( @@ -72,7 +72,7 @@ class UserCard extends Component { ) } {this.state.showWarningModal && ( - <AlertModal + <AlertsModal title={`Cannot update permission for ${user.handle}`} message={this.state.permissionUpdateError} theme={theme} @@ -190,7 +190,7 @@ class UserCard extends Component { UserCard.propTypes = { isInvite: PropTypes.bool, user: PropTypes.object, - updateProjectNember: PropTypes.func.isRequired, + updateProjectMember: PropTypes.func.isRequired, onRemoveClick: PropTypes.func.isRequired, isEditable: PropTypes.bool } diff --git a/src/components/Users/index.js b/src/components/Users/index.js index e328e230..6f59407f 100644 --- a/src/components/Users/index.js +++ b/src/components/Users/index.js @@ -109,7 +109,7 @@ class Users extends Component { async onRemoveConfirmClick () { if (this.state.isRemoving) { return } - const { removeProjectNember, invitedMembers } = this.props + const { removeProjectMember, invitedMembers } = this.props const userToRemove = this.state.userToRemove const isInvite = !!_.find(invitedMembers, { email: userToRemove.email }) try { @@ -117,7 +117,7 @@ class Users extends Component { await ( isInvite ? deleteProjectMemberInvite(userToRemove.projectId, userToRemove.id) : removeUserFromProject(userToRemove.projectId, userToRemove.id) ) - removeProjectNember(userToRemove) + removeProjectMember(userToRemove) this.resetRemoveUserState() } catch (e) { @@ -156,7 +156,7 @@ class Users extends Component { projects, projectMembers, invitedMembers, - updateProjectNember, + updateProjectMember, isEditable, isSearchingUserProjects, resultSearchUserProjects, @@ -277,7 +277,7 @@ class Users extends Component { <UserCard user={member} onRemoveClick={this.onRemoveClick} - updateProjectNember={updateProjectNember} + updateProjectMember={updateProjectMember} isEditable={isEditable} /> </li> ) @@ -293,7 +293,7 @@ class Users extends Component { isInvite user={member} onRemoveClick={this.onRemoveClick} - updateProjectNember={updateProjectNember} + updateProjectMember={updateProjectMember} isEditable={isEditable} /> </li> ) @@ -311,8 +311,8 @@ class Users extends Component { Users.propTypes = { loadProject: PropTypes.func.isRequired, - updateProjectNember: PropTypes.func.isRequired, - removeProjectNember: PropTypes.func.isRequired, + updateProjectMember: PropTypes.func.isRequired, + removeProjectMember: PropTypes.func.isRequired, addNewProjectInvite: PropTypes.func.isRequired, addNewProjectMember: PropTypes.func.isRequired, auth: PropTypes.object, diff --git a/src/containers/Users/index.js b/src/containers/Users/index.js index dabaa0b5..1abc4c25 100644 --- a/src/containers/Users/index.js +++ b/src/containers/Users/index.js @@ -24,8 +24,8 @@ class Users extends Component { isAdmin: false } this.loadProject = this.loadProject.bind(this) - this.updateProjectNember = this.updateProjectNember.bind(this) - this.removeProjectNember = this.removeProjectNember.bind(this) + this.updateProjectMember = this.updateProjectMember.bind(this) + this.removeProjectMember = this.removeProjectMember.bind(this) this.addNewProjectInvite = this.addNewProjectInvite.bind(this) this.addNewProjectMember = this.addNewProjectMember.bind(this) this.loadNextProjects = this.loadNextProjects.bind(this) @@ -92,7 +92,7 @@ class Users extends Component { }) } - updateProjectNember (newMemberInfo) { + updateProjectMember (newMemberInfo) { const { projectMembers } = this.state const newProjectMembers = projectMembers.map(pm => pm.id === newMemberInfo.id ? ({ ...pm, @@ -105,7 +105,7 @@ class Users extends Component { this.updateLoginUserRoleInProject(newProjectMembers, loggedInUser) } - removeProjectNember (projectMember) { + removeProjectMember (projectMember) { const { projectMembers, invitedMembers } = this.state const newProjectMembers = _.filter(projectMembers, pm => pm.id !== projectMember.id) const newInvitedMembers = _.filter(invitedMembers, pm => pm.id !== projectMember.id) @@ -156,8 +156,8 @@ class Users extends Component { <UsersComponent projects={projects} loadProject={this.loadProject} - updateProjectNember={this.updateProjectNember} - removeProjectNember={this.removeProjectNember} + updateProjectMember={this.updateProjectMember} + removeProjectMember={this.removeProjectMember} addNewProjectMember={this.addNewProjectMember} addNewProjectInvite={this.addNewProjectInvite} loadNextProjects={this.loadNextProjects}