fix: edge case fixes for Join/Decline buttons

ref issue #3310

Author: maxceem

src/projects/detail/ProjectDetail.jsx

@@ -163,7 +163,7 @@ class ProjectDetail extends Component {
       this.onUserInviteAction(queryUrlParams.invitation === 'accept')
     }
 
-    if (project && project.invites.length > 0 && this.shouldForceCallAcceptRefuseRequest()) {
+    if (project && project.invites && project.invites.length > 0 && this.shouldForceCallAcceptRefuseRequest()) {
       // remove invitation query param
       this.props.history.replace(`/projects/${this.props.match.params.projectId}`)
     }

src/projects/list/components/Projects/Projects.jsx

@@ -203,24 +203,28 @@ class Projects extends Component {
    * @param {Bool} isAccept is accept invite
    */
   callInviteRequest(project, isAccept) {
-    const isAcceptingInvite = (isAcception) => {
+    const setIsAcceptingInvite = (isAccepting) => {
       const { isAcceptingInvite } = this.state
-      isAcceptingInvite[project.id] = isAcception
-      this.setState({ isAcceptingInvite })
+
+      this.setState({ isAcceptingInvite: {
+          ...isAcceptingInvite,
+          [project.id]: isAccepting
+        }
+      })
     }
 
-    isAcceptingInvite(true)
+    setIsAcceptingInvite(true)
 
     this.props.acceptOrRefuseInvite(project.id, {
       userId: this.props.currentUser.userId,
       email: this.props.currentUser.email,
       status: isAccept ? PROJECT_MEMBER_INVITE_STATUS_ACCEPTED : PROJECT_MEMBER_INVITE_STATUS_REFUSED
     }, this.props.currentUser).then(() => {
-      isAcceptingInvite(false)
+      setIsAcceptingInvite(false)
     }) .catch((err) => {
       // if we fail to accept invite
       console.log(err)
-      isAcceptingInvite(false)
+      setIsAcceptingInvite(false)
     })
   }
 

src/projects/reducers/projectSearch.js

@@ -73,7 +73,7 @@ export default function(state = initialState, action) {
       const bigRoles = _.intersectionWith(roles, ADMIN_ROLES.concat(MANAGER_ROLES), _.isEqual)
 
       const projectIndex = _.findIndex(projects, {id: action.meta.projectId})
-      if (!_.isNil(projectIndex)) {
+      if (projectIndex > -1) {
         if (bigRoles.length === 0) {
           // remove project from the search list if normal user refuse invite
           return update(state, {
@@ -82,7 +82,7 @@ export default function(state = initialState, action) {
         } else {
           // remove user from invites list
           const userIndex = _.findIndex(projects[projectIndex].invites, {userId: action.meta.currentUser.userId})
-          if (!_.isNil(userIndex)) {
+          if (userIndex > -1) {
             const updatedProject = update(projects[projectIndex], {
               invites: { $splice: [[userIndex, 1]] },
             })
@@ -96,15 +96,29 @@ export default function(state = initialState, action) {
       // user accept invite
       const { projects } = state
       const projectIndex = _.findIndex(projects, {id: action.meta.projectId})
-      if (!_.isNil(projectIndex)) {
-        const user = _.cloneDeep(_.pick(action.meta.currentUser, [
-          'userId', 'projectId', 'photoURL', 'handle',
-        ]))
-        user.role = action.payload.role
-        user.deletedAt = null
-        const updatedProject = update(projects[projectIndex], {
-          members: { $push: [user] },
+
+      if (projectIndex > -1) {
+        // construct member for the project member list
+        const member = _.pick(action.meta.currentUser, [
+          'userId', 'photoURL', 'handle',
+        ])
+        member.role = action.payload.role
+        member.projectId = action.meta.projectId
+
+        // add new member to member list
+        let updatedProject = update(projects[projectIndex], {
+          members: { $push: [member] },
         })
+
+        // remove user from invites list
+        const userIndex = _.findIndex(projects[projectIndex].invites, {userId: action.meta.currentUser.userId})
+        if (userIndex > -1) {
+          updatedProject = update(updatedProject, {
+            invites: { $splice: [[userIndex, 1]] },
+          })
+        }
+
+        // update project
         return update(state, {
           projects: { $splice: [[projectIndex, 1, updatedProject]] }
         })