Merge branch 'master' into fix-embed-pathing

client/coral-framework/actions/user.js

@@ -32,7 +32,7 @@ export const saveBio = (user_id, formData) => dispatch => {
 export const fetchCommentsByUserId = userId => {
   return (dispatch) => {
     dispatch({type: actions.COMMENTS_BY_USER_REQUEST});
-    return coralApi(`/comments?user_id${userId}`)
+    return coralApi(`/comments?user_id=${userId}`)
       .then(({comments, assets}) => {
         comments.forEach(comment => dispatch(addItem(comment, 'comments')));
 

client/coral-framework/reducers/user.js

@@ -1,4 +1,4 @@
-import {Map, fromJS} from 'immutable';
+import {Map} from 'immutable';
 import * as authActions from '../constants/auth';
 import * as actions from '../constants/user';
 import * as assetActions from '../constants/assets';
@@ -34,9 +34,9 @@ export default function user (state = initialState, action) {
     return state
       .set('settings', action.settings);
   case actions.COMMENTS_BY_USER_SUCCESS:
-    return state.set('myComments', fromJS(action.comments));
+    return state.set('myComments', action.comments);
   case assetActions.MULTIPLE_ASSETS_SUCCESS:
-    return state.set('myAssets', fromJS(action.assets));
+    return state.set('myAssets', action.assets);
   default :
     return state;
   }

client/coral-plugin-history/Comment.js

@@ -6,7 +6,7 @@ const Comment = props => {
   return (
     <div>
       <p className="myCommentAsset">
-        <a className={`${styles.assetURL} myCommentAnchor`} href={props.asset.url}>{props.asset.url}</a>
+        <a className={`${styles.assetURL} myCommentAnchor`} href={`${props.asset.url}#${props.comment.id}`}>{`${props.asset.url}#${props.comment.id}`}</a>
       </p>
       <p className={`${styles.commentBody} myCommentBody`}>{props.comment.body}</p>
     </div>