Merge pull request #3830 from appirio-tech/dev

Prod release 2.8

Author: vikasrohit

package-lock.json

@@ -146,8 +146,14 @@ export function loadUserFailure(dispatch) {
 function loadGroups(dispatch, userId) {
   if (userId) {
     getUserGroups(userId, 'user').then((groups) => {
-      const groupIds = _.map(groups, group => group.id)
-      loadOrganizationConfigSuccess(dispatch, _.join(groupIds, ','))
+      const groupIds = _.compact(_.uniq([
+        // get old and new ids as organizations may refer to any of them
+        ..._.map(groups, 'oldId'),
+        ..._.map(groups, 'id')
+      ]))
+      if (groupIds.length > 0) {
+        loadOrganizationConfigSuccess(dispatch, _.join(groupIds, ','))
+      }
     })
       .catch((err) => {
       // if we fail to load groups

src/actions/loadUser.js

@@ -1,4 +1,3 @@
-import _ from 'lodash'
 import { axiosInstance as axios } from './requestInterceptor'
 import { TC_API_URL } from '../config/constants'
 
@@ -12,8 +11,6 @@ import { TC_API_URL } from '../config/constants'
  * @returns {Promise<Object>} user groups data
  */
 export function getUserGroups(memberId, membershipType) {
-  return axios.get(`${TC_API_URL}/v3/groups?memberId=${memberId}&membershipType=${membershipType}`)
-    .then(resp => {
-      return _.get(resp.data, 'result.content', {})
-    })
+  return axios.get(`${TC_API_URL}/v5/groups?memberId=${memberId}&membershipType=${membershipType}`)
+    .then(resp => resp.data)
 }

src/api/groups.js

@@ -1,10 +1,19 @@
 import { axiosInstance as axios } from './requestInterceptor'
-import { PROJECTS_API_URL, FILE_PICKER_SUBMISSION_CONTAINER_NAME } from '../config/constants'
+import { PROJECTS_API_URL, FILE_PICKER_SUBMISSION_CONTAINER_NAME, ATTACHMENT_TYPE_FILE } from '../config/constants'
 
-export function addProjectAttachment(projectId, fileData) {
-  // add s3 bucket prop
-  fileData.s3Bucket = FILE_PICKER_SUBMISSION_CONTAINER_NAME
-  return axios.post(`${PROJECTS_API_URL}/v5/projects/${projectId}/attachments`, fileData)
+export function addProjectAttachment(projectId, attachment) {
+
+  if (attachment.type === ATTACHMENT_TYPE_FILE) {
+    // add s3 bucket prop
+    attachment.s3Bucket = FILE_PICKER_SUBMISSION_CONTAINER_NAME
+  }
+
+  // The api takes only arrays
+  if (!attachment.tags) {
+    attachment.tags = []
+  }
+
+  return axios.post(`${PROJECTS_API_URL}/v5/projects/${projectId}/attachments`, attachment)
     .then( resp => {
       resp.data.downloadUrl = `/projects/${projectId}/attachments/${resp.data.id}`
       return resp.data
@@ -19,6 +28,14 @@ export function updateProjectAttachment(projectId, attachmentId, attachment) {
     }
   }
 
+  // The api takes only arrays
+  if (attachment && !attachment.tags) {
+    attachment = {
+      ...attachment,
+      tags: []
+    }
+  }
+
   return axios.patch(
     `${PROJECTS_API_URL}/v5/projects/${projectId}/attachments/${attachmentId}`, attachment)
     .then ( resp => {

src/api/projectAttachments.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)
 }