Merge branches 'dev' and 'feature/link-attachments' of github.com:appirio-tech/connect-app into feature/link-attachments

# Conflicts:
#	src/components/AssetsLibrary/FilterColHeader.jsx

Author: maxceem

src/api/projectMemberInvites.js

@@ -4,15 +4,27 @@ import { PROJECTS_API_URL } from '../config/constants'
 /**
  * Update project member invite based on project's id & given member
  * @param  {integer} projectId unique identifier of the project
- * @param  {object}  member invite to update
+ * @param  {integer} inviteId unique identifier of the invite
+ * @param  {string}  status the new status for invitation
  * @return {object}  project member invite returned by api
  */
-export function updateProjectMemberInvite(projectId, member) {
-  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/invite/`
-  return axios.put(url, member)
+export function updateProjectMemberInvite(projectId, inviteId, status) {
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/invites/${inviteId}`
+  return axios.patch(url, { status })
     .then(resp => resp.data)
 }
 
+/**
+ * Delete project member invite based on project's id & given invite's id
+ * @param  {integer} projectId unique identifier of the project
+ * @param  {integer}  inviteId unique identifier of the invite
+ * @return {object}  project member invite returned by api
+ */
+export function deleteProjectMemberInvite(projectId, inviteId) {
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/invites/${inviteId}`
+  return axios.delete(url)
+}
+
 /**
  * Create a project member invite based on project's id & given member
  * @param  {integer} projectId unique identifier of the project
@@ -21,7 +33,7 @@ export function updateProjectMemberInvite(projectId, member) {
  */
 export function createProjectMemberInvite(projectId, member) {
   const fields = 'id,projectId,userId,email,role,status,createdAt,updatedAt,createdBy,updatedBy,handle'
-  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/invite/?fields=` + encodeURIComponent(fields)
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/invites/?fields=` + encodeURIComponent(fields)
   return axios({
     method: 'post',
     url,
@@ -35,7 +47,7 @@ export function createProjectMemberInvite(projectId, member) {
 
 export function getProjectMemberInvites(projectId) {
   const fields = 'id,projectId,userId,email,role,status,createdAt,updatedAt,createdBy,updatedBy,handle'
-  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/invites/?fields=`
+  const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/invites/?fields=`
     + encodeURIComponent(fields)
   return axios.get(url)
     .then( resp => {
@@ -49,6 +61,6 @@ export function getProjectMemberInvites(projectId) {
  * @return {object}  project member invite returned by api
  */
 export function getProjectInviteById(projectId) {
-  return axios.get(`${PROJECTS_API_URL}/v5/projects/${projectId}/members/invite/`)
+  return axios.get(`${PROJECTS_API_URL}/v5/projects/${projectId}/invites`)
     .then(resp => resp.data)
 }

src/api/projectMembers.js

@@ -5,7 +5,7 @@ import { TC_API_URL, PROJECTS_API_URL } from '../config/constants'
 export function getMembersById (userIds) {
   const _userIdArr = _.map(userIds, _id => `userId:${_id}`)
   // only requesting certain member attributes
-  const fields = 'userId,handle,photoURL,firstName,lastName,details,email'
+  const fields = 'userId,handle,photoURL,details'
   const query = _userIdArr.join(' OR ')
   const url = `${TC_API_URL}/v3/members/_search/?fields=`
     + encodeURIComponent(fields)
@@ -20,7 +20,7 @@ export function getMembersById (userIds) {
 export function getMembersByHandle (handles) {
   const _handlesArr = _.map(handles, _handle => `handleLower:${_handle.toLowerCase()}`)
   // only requesting certain member attributes
-  const fields = 'userId,handle,photoURL,firstName,lastName,details,email'
+  const fields = 'userId,handle,photoURL,details'
   const query = _handlesArr.join(' OR ')
   const url = `${TC_API_URL}/v3/members/_search/?fields=`
     + encodeURIComponent(fields)
@@ -49,7 +49,7 @@ export function addProjectMember(projectId, newMember) {
 
 
 export function updateProjectMember(projectId, memberId, updatedProps) {
-  const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,firstName,lastName,photoURL,workingHourStart,workingHourEnd,timeZone'
+  const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,photoURL,workingHourStart,workingHourEnd,timeZone'
   const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/${memberId}/?fields=`
     + encodeURIComponent(fields)
   return axios.patch(url, updatedProps)
@@ -68,7 +68,7 @@ export function removeProjectMember(projectId, memberId) {
 }
 
 export function getProjectMembers(projectId) {
-  const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,firstName,lastName,email,photoURL,workingHourStart,workingHourEnd,timeZone'
+  const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,photoURL,workingHourStart,workingHourEnd,timeZone'
   const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/?fields=`
     + encodeURIComponent(fields)
   return axios.get(url)
@@ -78,7 +78,7 @@ export function getProjectMembers(projectId) {
 }
 
 export function getProjectMember(projectId, memberId) {
-  const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,firstName,lastName,email,photoURL,workingHourStart,workingHourEnd,timeZone'
+  const fields = 'id,userId,role,isPrimary,deletedAt,createdAt,updatedAt,deletedBy,createdBy,updatedBy,handle,photoURL,workingHourStart,workingHourEnd,timeZone'
   const url = `${PROJECTS_API_URL}/v5/projects/${projectId}/members/${memberId}?fields=`
     + encodeURIComponent(fields)
   return axios.get(url)