Merge pull request #2625 from appirio-tech/hotfix/error_while_expanding_the_topic

Added check for empty phase topics

Author: RishiRajSahu

src/projects/detail/containers/ProjectInfoContainer.js

@@ -61,7 +61,7 @@ class ProjectInfoContainer extends React.Component {
 
     // load phases feeds if they are not loaded yet
     // note: old projects doesn't have phases, so we check if there are any phases at all first
-    phases && phases.forEach((phase) => {
+    phases && phasesTopics && phases.forEach((phase) => {
       if (!phasesTopics[phase.id]) {
         loadPhaseFeed(project.id, phase.id)
       }
@@ -122,7 +122,7 @@ class ProjectInfoContainer extends React.Component {
     const { duration } = this.state
     const { project, currentMemberRole, isSuperUser, phases, feeds,
       hideInfo, hideLinks, hideMembers, onChannelClick, activeChannelId, productsTimelines,
-      isManageUser, phasesTopics } = this.props
+      isManageUser, phasesTopics, isProjectPlan } = this.props
     let directLinks = null
     // check if direct links need to be added
     const isMemberOrCopilot = _.indexOf([PROJECT_ROLE_COPILOT, PROJECT_ROLE_MANAGER], currentMemberRole) > -1
@@ -191,7 +191,8 @@ class ProjectInfoContainer extends React.Component {
       title: `${feed.title}`,
       address: feed.tag === PROJECT_FEED_TYPE_PRIMARY ? `/projects/${project.id}#feed-${feed.id}` : `/projects/${project.id}/plan#phase-${feed.phaseId}-posts`,
       noNewPage: true,
-      onClick: feed.tag !== PROJECT_FEED_TYPE_PRIMARY && onChannelClick ? () => onChannelClick(feed) : null,
+      //if PRIMARY discussion is to be loaded for project-plan page we won't attach the callback, for smoother transition to dashboard page
+      onClick: !(isProjectPlan && feed.tag === PROJECT_FEED_TYPE_PRIMARY) && onChannelClick ? () => onChannelClick(feed) : null,
       allowDefaultOnClick: true,
       isActive: feed.id === activeChannelId,
     }))
@@ -261,6 +262,7 @@ ProjectInfoContainer.PropTypes = {
   isSuperUser: PropTypes.bool,
   isManageUser: PropTypes.bool,
   productsTimelines : PropTypes.object.isRequired,
+  isProjectPlan: PropTypes.bool,
 }
 
 const mapDispatchToProps = { updateProject, deleteProject, addProjectAttachment, loadDashboardFeeds, loadPhaseFeed }

src/projects/detail/containers/ProjectPlanContainer.jsx

@@ -88,6 +88,7 @@ class ProjectPlanContainer extends React.Component {
     ))
 
     const isProjectLive = project.status !== PROJECT_STATUS_COMPLETED && project.status !== PROJECT_STATUS_CANCELLED
+    const isProjectPlan = true
 
     const leftArea = (
       <ProjectInfoContainer
@@ -101,6 +102,7 @@ class ProjectPlanContainer extends React.Component {
         productsTimelines={productsTimelines}
         phasesTopics={phasesTopics}
         onChannelClick={this.onChannelClick}
+        isProjectPlan={isProjectPlan}
       />
     )