Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
parthshah merged 2 commits into from
Dec 14, 2016
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
96a3b87
Github issue #568, Dashboard: status update thread is too "sticky"
Dec 13, 2016
f20de04
Fixed lint error
Dec 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions src/projects/detail/Dashboard.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand All @@ -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)
2 changes: 1 addition & 1 deletion src/projects/detail/containers/ProjectInfoContainer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 3 additions & 1 deletion src/projects/reducers/project.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -50,6 +51,7 @@ export const projectState = function (state=initialState, action) {
})

case CLEAR_LOADED_PROJECT:
case GET_PROJECTS_SUCCESS:
return Object.assign({}, state, {
project: {}
})
Expand Down