Merge pull request #2211 from appirio-tech/hotfix/adding_capability_of_product_attachments

Hotfix/adding capability of product attachments

Author: vikasrohit

src/projects/actions/projectAttachment.js

@@ -2,9 +2,9 @@ import {
   addProjectAttachment as addProjectAttachmentAPI,
   removeProjectAttachment as removeProjectAttachmentAPI,
   updateProjectAttachment as updateProjectAttachmentAPI,
-  addProductAttachment as addProductAttachmentAPI,
-  removeProductAttachment as removeProductAttachmentAPI,
-  updateProductAttachment as updateProductAttachmentAPI,
+  // addProductAttachment as addProductAttachmentAPI,
+  // removeProductAttachment as removeProductAttachmentAPI,
+  // updateProductAttachment as updateProductAttachmentAPI,
 } from '../../api/projectAttachments'
 
 import {
@@ -47,7 +47,7 @@ export function addProductAttachment(projectId, phaseId, productId, attachment)
   return (dispatch) => {
     return dispatch({
       type: ADD_PRODUCT_ATTACHMENT,
-      payload: addProductAttachmentAPI(projectId, phaseId, productId, attachment)
+      payload: addProjectAttachmentAPI(projectId, attachment)
         .then((uploadedAttachment) => ({
           phaseId,
           productId,
@@ -61,7 +61,7 @@ export function updateProductAttachment(projectId, phaseId, productId, attachmen
   return (dispatch) => {
     return dispatch({
       type: UPDATE_PRODUCT_ATTACHMENT,
-      payload: updateProductAttachmentAPI(projectId, phaseId, productId, attachmentId, attachment)
+      payload: updateProjectAttachmentAPI(projectId, attachmentId, attachment)
         .then((uploadedAttachment) => ({
           phaseId,
           productId,
@@ -75,7 +75,7 @@ export function removeProductAttachment(projectId, phaseId, productId, attachmen
   return (dispatch) => {
     return dispatch({
       type: REMOVE_PRODUCT_ATTACHMENT,
-      payload: removeProductAttachmentAPI(projectId, phaseId, productId, attachmentId)
+      payload: removeProjectAttachmentAPI(projectId, attachmentId)
         .then((removedAttachmentId) => ({
           phaseId,
           productId,

src/projects/detail/components/FileListContainer.jsx

@@ -36,6 +36,7 @@ class FileListContainer extends Component {
   render() {
     const {
       files,
+      category,
       allMembers,
       attachmentsStorePath,
       canManageAttachments,
@@ -56,7 +57,7 @@ class FileListContainer extends Component {
     return (
       <div>
         <FileList files={files} onDelete={removeAttachment} onSave={updateAttachment} canModify={canManageAttachments}/>
-        <AddFiles successHandler={this.processUploadedFiles} storePath={attachmentsStorePath} category={'appDefinition'} />
+        <AddFiles successHandler={this.processUploadedFiles} storePath={attachmentsStorePath} category={category} />
       </div>
     )
   }

src/projects/detail/components/SpecSection.jsx

@@ -159,10 +159,16 @@ const SpecSection = props => {
     case 'files': {
       const projectLatest = isProjectDirty ? dirtyProject : project
       const files = _.get(projectLatest, props.fieldName, [])
+      // NOTE using category to differentiate between project and product attachments is a workaround to give ability
+      // to upload attachments for products. We need to come up with a better way to handle this.
+      // defaults to appDefinition to be backward compatible
+      let category = _.get(props, 'category', 'appDefinition')
+      category = 'product' === category ? `${category}#${projectLatest.id}` : category
       return (
         <FileListContainer
           project={projectLatest}
           files={files}
+          category={category}
           addAttachment={addAttachment}
           updateAttachment={updateAttachment}
           removeAttachment={removeAttachment}

src/projects/detail/containers/DashboardContainer.jsx

@@ -85,6 +85,7 @@ class DashboardContainer extends React.Component {
       <ProjectInfoContainer
         currentMemberRole={currentMemberRole}
         project={project}
+        phases={phases}
         isSuperUser={isSuperUser}
       />
     )

src/projects/detail/containers/ProjectInfoContainer.js

@@ -82,7 +82,7 @@ class ProjectInfoContainer extends React.Component {
 
   render() {
     const { duration } = this.state
-    const { project, currentMemberRole, isSuperUser } = this.props
+    const { project, phases, currentMemberRole, isSuperUser } = this.props
     let directLinks = null
     // check if direct links need to be added
     const isMemberOrCopilot = _.indexOf([PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER], currentMemberRole) > -1
@@ -107,7 +107,20 @@ class ProjectInfoContainer extends React.Component {
       devices = _.get(project, 'details.devices', [])
     }
 
-    const attachments = _.sortBy(project.attachments, attachment => -new Date(attachment.updatedAt).getTime())
+    let attachments = project.attachments
+    // merges the product attachments to show in the links menu
+    if (phases && phases.length > 0) {
+      phases.forEach(phase => {
+        if (phase.products && phase.products.length > 0) {
+          phase.products.forEach(product => {
+            if (product.attachments && product.attachments.length > 0) {
+              attachments = attachments.concat(product.attachments)
+            }
+          })
+        }
+      })
+    }
+    attachments = _.sortBy(attachments, attachment => -new Date(attachment.updatedAt).getTime())
       .map(attachment => ({
         title: attachment.title,
         address: attachment.downloadUrl,
@@ -148,7 +161,8 @@ class ProjectInfoContainer extends React.Component {
 
 ProjectInfoContainer.PropTypes = {
   currentMemberRole: PropTypes.string,
-  project: PropTypes.object.isRequired
+  project: PropTypes.object.isRequired,
+  phases: PropTypes.arrayOf(PropTypes.object)
 }
 
 const mapDispatchToProps = { updateProject, deleteProject }

src/projects/detail/containers/ProjectPlanContainer.jsx

@@ -46,6 +46,7 @@ const ProjectPlanContainer = (props) => {
     <ProjectInfoContainer
       currentMemberRole={currentMemberRole}
       project={project}
+      phases={phases}
       isSuperUser={isSuperUser}
     />
   )

src/projects/reducers/project.js

@@ -191,12 +191,38 @@ export const projectState = function (state=initialState, action) {
       isLoadingPhases: true
     })
 
-  case LOAD_PROJECT_PHASES_SUCCESS:
+  case LOAD_PROJECT_PHASES_SUCCESS: {
+    // loops through the phases to update the attachments field in the products of each phase
+    // NOTE it might not be needed after we get a proper implementation for supporting product attachments
+    const phases = _.map(action.payload, p => {
+      p.products = _.map(p.products, prd => {
+        const attachments = []
+        if (state.project.attachments && state.project.attachments.length) {
+          state.project.attachments.forEach(a => {
+            if (a.category === `product#${prd.id}`) {
+              attachments.push(a)
+            }
+          })
+        }
+        return { ...prd, attachments }
+      })
+      return p
+    })
+    // updates projects' attachments which are not coupled with any product/phase
+    const projectAttachments = []
+    state.project.attachments.forEach(a => {
+      if (!a.category || a.category.indexOf('product') !== 0) {
+        projectAttachments.push(a)
+      }
+    })
     return update(state, {
-      phases: { $set: action.payload },
+      project: { attachments : { $set : projectAttachments } },
+      projectNonDirty: { attachments: { $set: projectAttachments } },
+      phases: { $set:phases },
       phasesNonDirty: { $set: action.payload },
       isLoadingPhases: { $set: false}
     })
+  }
 
   // Create & Edit project
   case CREATE_PROJECT_STAGE_PENDING: