wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-09-09 11:38:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into design-pass-adm

Browse Source
This commit is contained in:
Belén Curcio
2017-01-18 14:40:09 -03:00
committed by GitHub
parent b5afd9cbeb b4ca90a05d
commit 7140723570
3 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/coral-framework/actions/user.js
+8 -3
View File
@@ -37,10 +37,15 @@ export const fetchCommentsByUserId = userId => {
const state = getState();
comments.forEach(comment => dispatch(addItem(comment, 'comments')));
assets.forEach(asset => {
const prevAsset = state.items.getIn(['assets', asset.id]);
// Include data such as hydrated comments from assets already in the system.
const prevAsset = state.items.getIn(['assets', asset.id]).toJS();
dispatch(addItem({...prevAsset, ...asset}, 'assets'));
if (prevAsset) {
// Include data such as hydrated comments from assets already in the system.
dispatch(addItem({...prevAsset.toJS(), ...asset}, 'assets'));
} else {
dispatch(addItem(asset, 'assets'));
}
});
dispatch({type: actions.COMMENTS_BY_USER_SUCCESS, comments: comments.map(comment => comment.id)});