Merge pull request #3394 from appirio-tech/revert-3393-fix-source-data

Revert "fix-source-data"

Author: maxceem

src/api/projectMembers.js

@@ -66,33 +66,3 @@ export function removeProjectMember(projectId, memberId) {
       return memberId
     })
 }
-
-export function getProjectMembers(projectId) {
-  const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,firstName,lastName,photoURL,workingHoursStart,workingHoursEnd,timeZone'
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/?fields=`
-    + encodeURIComponent(fields)
-  return axios.get(url)
-    .then( resp => {
-      return resp.data.result.content
-    })
-}
-
-export function getProjectMemberInvites(projectId) {
-  const fields = 'id,projectId,userId,email,role,status,createdAt,updatedAt,createdBy,updatedBy,handle,firstName,lastName,photoURL'
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/invites/?fields=`
-    + encodeURIComponent(fields)
-  return axios.get(url)
-    .then( resp => {
-      return resp.data.result.content
-    })
-}
-
-export function getProjectMember(projectId, memberId) {
-  const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,firstName,lastName,photoURL,workingHoursStart,workingHoursEnd,timeZone'
-  const url = `${PROJECTS_API_URL}/v4/projects/${projectId}/members/${memberId}?fields=`
-    + encodeURIComponent(fields)
-  return axios.get(url)
-    .then( resp => {
-      return resp.data.result.content
-    })
-}

src/config/constants.js

@@ -386,20 +386,6 @@ export const UPDATE_PROJECT_MEMBER_FAILURE     = 'UPDATE_PROJECT_MEMBER_FAILURE'
 
 export const CLEAR_LOADED_PROJECT     = 'CLEAR_LOADED_PROJECT'
 
-export const LOAD_PROJECT_MEMBERS         = 'LOAD_PROJECT_MEMBERS'
-export const LOAD_PROJECT_MEMBERS_PENDING = 'LOAD_PROJECT_MEMBERS_PENDING'
-export const LOAD_PROJECT_MEMBERS_SUCCESS = 'LOAD_PROJECT_MEMBERS_SUCCESS'
-export const LOAD_PROJECT_MEMBERS_FAILURE = 'LOAD_PROJECT_MEMBERS_FAILURE'
-
-export const LOAD_PROJECT_MEMBER_INVITES         = 'LOAD_PROJECT_MEMBER_INVITES'
-export const LOAD_PROJECT_MEMBER_INVITES_PENDING = 'LOAD_PROJECT_MEMBER_INVITES_PENDING'
-export const LOAD_PROJECT_MEMBER_INVITES_SUCCESS = 'LOAD_PROJECT_MEMBER_INVITES_SUCCESS'
-export const LOAD_PROJECT_MEMBER_INVITES_FAILURE = 'LOAD_PROJECT_MEMBER_INVITES_FAILURE'
-
-export const LOAD_PROJECT_MEMBER         = 'LOAD_PROJECT_MEMBER'
-export const LOAD_PROJECT_MEMBER_PENDING = 'LOAD_PROJECT_MEMBER_PENDING'
-export const LOAD_PROJECT_MEMBER_SUCCESS = 'LOAD_PROJECT_MEMBER_SUCCESS'
-export const LOAD_PROJECT_MEMBER_FAILURE = 'LOAD_PROJECT_MEMBER_FAILURE'
 
 // Project attachments
 export const ADD_PROJECT_ATTACHMENT          = 'ADD_PROJECT_ATTACHMENT'

src/projects/actions/project.js

@@ -21,9 +21,6 @@ import {
 import {
   createTimeline,
 } from '../../api/timelines'
-import {
-  getProjectMembers, getProjectMemberInvites, getProjectMember
-} from '../../api/projectMembers'
 // import { loadProductTimelineWithMilestones } from './productsTimelines'
 import {
   LOAD_PROJECT,
@@ -64,9 +61,6 @@ import {
   SCOPE_CHANGE_REQ_STATUS_REJECTED,
   SCOPE_CHANGE_REQ_STATUS_CANCELED,
   PHASE_STATUS_DRAFT,
-  LOAD_PROJECT_MEMBERS,
-  LOAD_PROJECT_MEMBER_INVITES,
-  LOAD_PROJECT_MEMBER
 } from '../../config/constants'
 import {
   updateProductMilestone,
@@ -613,30 +607,3 @@ export function fireProductDirtyUndo() {
     })
   }
 }
-
-export function loadProjectMembers(projectId) {
-  return (dispatch) => {
-    return dispatch({
-      type: LOAD_PROJECT_MEMBERS,
-      payload: getProjectMembers(projectId)
-    })
-  }
-}
-
-export function loadProjectMemberInvites(projectId) {
-  return (dispatch) => {
-    return dispatch({
-      type: LOAD_PROJECT_MEMBER_INVITES,
-      payload: getProjectMemberInvites(projectId)
-    })
-  }
-}
-
-export function loadProjectMember(projectId, memberId) {
-  return (dispatch) => {
-    return dispatch({
-      type: LOAD_PROJECT_MEMBER,
-      payload: getProjectMember(projectId, memberId)
-    })
-  }
-}

src/projects/actions/projectDashboard.js

@@ -1,5 +1,6 @@
 import _ from 'lodash'
-import { loadProject, loadProjectInvite, loadDirectProjectData, loadProjectMembers, loadProjectMemberInvites } from './project'
+import { loadMembers } from '../../actions/members'
+import { loadProject, loadProjectInvite, loadDirectProjectData } from './project'
 import { loadProjectPlan } from './projectPlan'
 import { loadProjectsMetadata } from '../../actions/templates'
 import { LOAD_PROJECT_DASHBOARD, LOAD_ADDITIONAL_PROJECT_DATA } from '../../config/constants'
@@ -24,9 +25,7 @@ const getDashboardData = (dispatch, getState, projectId, isOnlyLoadProjectInfo)
       _.remove(userIds, i => !i)
       // load additional data in parallel
       let promises = [
-        //dispatch(loadMembers(userIds)),
-        dispatch(loadProjectMembers(projectId)),
-        dispatch(loadProjectMemberInvites(projectId))
+        dispatch(loadMembers(userIds))
       ]
       if (isOnlyLoadProjectInfo) {
         promises = []

src/projects/actions/projectMember.js

@@ -7,8 +7,7 @@ import { createProjectMemberInvite as createProjectMemberInvite,
   updateProjectMemberInvite as updateProjectMemberInvite
 } from '../../api/projectMemberInvites'
 import { getProjectById } from '../../api/projects'
-import { loadProjectMember } from './project'
-import { loadMembersByHandle } from '../../actions/members'
+import { loadMembers, loadMembersByHandle } from '../../actions/members'
 
 import {ADD_PROJECT_MEMBER, REMOVE_PROJECT_MEMBER, UPDATE_PROJECT_MEMBER,
   LOAD_MEMBER_SUGGESTIONS,
@@ -55,8 +54,8 @@ function addProjectMemberWithData(dispatch, projectId, member) {
       type: ADD_PROJECT_MEMBER,
       payload: addMember(projectId, {role: member.role})
     })
-      .then(({value: newMember}) => {
-        return resolve(dispatch(loadProjectMember(projectId, newMember.id)))
+      .then((/*{value, action}*/) => {
+        return resolve(dispatch(loadMembers([member.userId])))
       })
       .catch(err => reject(err))
   })

src/projects/reducers/project.js

@@ -23,7 +23,6 @@ import {
   ACCEPT_OR_REFUSE_INVITE_SUCCESS, ACCEPT_OR_REFUSE_INVITE_FAILURE, ACCEPT_OR_REFUSE_INVITE_PENDING, RELOAD_PROJECT_MEMBERS_SUCCESS,
   UPLOAD_PROJECT_ATTACHMENT_FILES, DISCARD_PROJECT_ATTACHMENT, CHANGE_ATTACHMENT_PERMISSION,
   CREATE_SCOPE_CHANGE_REQUEST_SUCCESS, APPROVE_SCOPE_CHANGE_SUCCESS, REJECT_SCOPE_CHANGE_SUCCESS, CANCEL_SCOPE_CHANGE_SUCCESS, ACTIVATE_SCOPE_CHANGE_SUCCESS,
-  LOAD_PROJECT_MEMBERS_SUCCESS, LOAD_PROJECT_MEMBER_INVITES_SUCCESS, LOAD_PROJECT_MEMBER_SUCCESS
 } from '../../config/constants'
 import _ from 'lodash'
 import update from 'react-addons-update'
@@ -40,7 +39,6 @@ const initialState = {
   error: false,
   inviteError: false,
   project: {
-    members: [],
     invites: [] // invites are pushed directly into it hence need to declare first
   },
   assetsMembers: {},
@@ -221,38 +219,6 @@ export const projectState = function (state=initialState, action) {
     })
   }
 
-  case LOAD_PROJECT_MEMBERS_SUCCESS: {
-    return Object.assign({}, state, {
-      project: {
-        ...state.project,
-        members: action.payload
-      }
-    })
-  }
-
-  case LOAD_PROJECT_MEMBER_INVITES_SUCCESS: {
-    return Object.assign({}, state, {
-      project: {
-        ...state.project,
-        invites: action.payload
-      }
-    })
-  }
-
-  case LOAD_PROJECT_MEMBER_SUCCESS: {
-    const member = action.payload
-    const index = _.findIndex(state.project.members, (o) =>  o.userId === parseInt(member.userId))
-    return Object.assign({}, state, {
-      project: {
-        ...state.project,
-        members: index >=0 ? [...state.project.members.slice(0, index),
-          member,
-          ...state.project.members.slice(index+1)
-        ] : state.project.members.concat([action.payload])
-      }
-    })
-  }
-
   case RELOAD_PROJECT_MEMBERS_SUCCESS: {
     return Object.assign({}, state, {
       project:{

src/reducers/members.js

@@ -5,10 +5,7 @@ import { LOAD_MEMBERS_PENDING, LOAD_MEMBERS_SUCCESS, LOAD_MEMBERS_FAILURE,
   CONNECT_USER,
   CONNECT_USER_HANDLE,
   LOAD_USER_SUCCESS,
-  CLEAR_MEMBER_SUGGESTIONS,
-  LOAD_PROJECT_MEMBERS_SUCCESS,
-  LOAD_PROJECT_MEMBER_INVITES_SUCCESS,
-  LOAD_PROJECT_MEMBER_SUCCESS
+  CLEAR_MEMBER_SUGGESTIONS
 } from '../config/constants'
 
 
@@ -56,31 +53,6 @@ export default function(state = initialState, action) {
   case LOAD_MEMBERS_PENDING:
   case LOAD_MEMBERS_FAILURE:
     return state
-
-  case LOAD_PROJECT_MEMBERS_SUCCESS:
-  case LOAD_PROJECT_MEMBER_INVITES_SUCCESS: {
-    const members = action.payload
-    const _members = []
-    _.forEach(members, (item) => _members.push(_.pick(item, 'userId', 'handle', 'firstName', 'lastName', 'photoURL')))
-    const userMap = _.keyBy(_members, 'userId')
-    return Object.assign({}, state, {
-      members: update(state.members, {$merge: userMap})
-    })
-  }
-
-  case LOAD_PROJECT_MEMBER_SUCCESS: {
-    const _member = {
-      userId: action.payload.userId,
-      handle: action.payload.handle,
-      firstName: action.payload.firstName,
-      lastName: action.payload.lastName,
-      photoURL: action.payload.photoURL
-    }
-    return Object.assign({}, state, {
-      members: update(state.members, {$merge: {[_member.userId]: _member}})
-    })
-  }
-
   default:
     return state
   }