Merge pull request #584 from appirio-tech/feature/sticky_dashboard_feeds

Github issue #568, Dashboard: status update thread is too "sticky"

Author: parthshah

src/projects/detail/Dashboard.jsx

@@ -1,11 +1,13 @@
 import React from 'react'
+import { connect } from 'react-redux'
 import ProjectInfoContainer from './containers/ProjectInfoContainer'
 import FeedContainer from './containers/FeedContainer'
 import Sticky from 'react-stickynode'
+import spinnerWhileLoading from '../../components/LoadingSpinner'
 
 require('./Dashboard.scss')
 
-const Dashboard = ({project, currentMemberRole, route}) => (
+const DashboardView = ({project, currentMemberRole, route}) => (
   <div>
     <div className="dashboard-container">
       <div className="left-area">
@@ -22,4 +24,23 @@ const Dashboard = ({project, currentMemberRole, route}) => (
   </div>
 )
 
-export default Dashboard
+const enhance = spinnerWhileLoading(props => !props.isLoading)
+const EnhancedDashboardView = enhance(DashboardView)
+
+class Dashboard extends React.Component {
+  constructor(props) {
+    super(props)
+  }
+
+  render() {
+    return <EnhancedDashboardView {...this.props} />
+  }
+}
+
+const mapStateToProps = ({ projectState }) => {
+  return {
+    isLoading      : projectState.isLoading
+  }
+}
+
+export default connect(mapStateToProps)(Dashboard)

src/projects/detail/containers/ProjectInfoContainer.js

@@ -135,7 +135,7 @@ class ProjectInfoContainer extends React.Component {
           currentMemberRole={currentMemberRole}
           description={project.description}
           type={project.type}
-          devices={project.details.devices || []}
+          devices={ _.get(project, 'details.devices', []) }
           status={project.status} onChangeStatus={this.onChangeStatus}
           duration={duration}
           budget={budget}

src/projects/reducers/project.js

@@ -9,7 +9,8 @@ import {
   REMOVE_PROJECT_ATTACHMENT_PENDING, REMOVE_PROJECT_ATTACHMENT_SUCCESS, REMOVE_PROJECT_ATTACHMENT_FAILURE,
   ADD_PROJECT_MEMBER_PENDING, ADD_PROJECT_MEMBER_SUCCESS, ADD_PROJECT_MEMBER_FAILURE,
   UPDATE_PROJECT_MEMBER_PENDING, UPDATE_PROJECT_MEMBER_SUCCESS, UPDATE_PROJECT_MEMBER_FAILURE,
-  REMOVE_PROJECT_MEMBER_PENDING, REMOVE_PROJECT_MEMBER_SUCCESS, REMOVE_PROJECT_MEMBER_FAILURE
+  REMOVE_PROJECT_MEMBER_PENDING, REMOVE_PROJECT_MEMBER_SUCCESS, REMOVE_PROJECT_MEMBER_FAILURE,
+  GET_PROJECTS_SUCCESS
 } from '../../config/constants'
 import _ from 'lodash'
 import update from 'react-addons-update'
@@ -50,6 +51,7 @@ export const projectState = function (state=initialState, action) {
     })
 
   case CLEAR_LOADED_PROJECT:
+  case GET_PROJECTS_SUCCESS:
     return Object.assign({}, state, {
       project: {}
     })