Merge branch 'master' into ban-user

client/coral-admin/src/actions/settings.js

@@ -1,3 +1,5 @@
+import {base, handleResp, getInit} from '../helpers/response';
+
 export const SETTINGS_LOADING = 'SETTINGS_LOADING';
 export const SETTINGS_RECEIVED = 'SETTINGS_RECEIVED';
 export const SETTINGS_FETCH_ERROR = 'SETTINGS_FETCH_ERROR';
@@ -8,34 +10,6 @@ export const SAVE_SETTINGS_LOADING = 'SAVE_SETTINGS_LOADING';
 export const SAVE_SETTINGS_SUCCESS = 'SAVE_SETTINGS_SUCCESS';
 export const SAVE_SETTINGS_FAILED = 'SAVE_SETTINGS_FAILED';
 
-const base = '/api/v1';
-
-const getInit = (method, body) => {
-  const headers = new Headers({
-    'Content-Type': 'application/json',
-    'Accept': 'application/json'
-  });
-
-  const init = {method, headers};
-  if (method.toLowerCase() !== 'get') {
-    init.body = JSON.stringify(body);
-  }
-
-  return init;
-};
-
-const handleResp = res => {
-  if (res.status === 401) {
-    throw new Error('Not Authorized to make this request');
-  } else if (res.status > 399) {
-    throw new Error('Error! Status ', res.status);
-  } else if (res.status === 204) {
-    return res.text();
-  } else {
-    return res.json();
-  }
-};
-
 export const fetchSettings = () => dispatch => {
   dispatch({type: SETTINGS_LOADING});
   fetch(`${base}/settings`, getInit('GET'))

client/coral-admin/src/services/talk-adapter.js

@@ -1,3 +1,4 @@
+import {base, handleResp, getInit} from '../helpers/response';
 
 /**
  * The adapter is a redux middleware that interecepts the actions that need
@@ -7,9 +8,6 @@
  * for the coral but also for wordpress comments, disqus and many more.
  */
 
-// Default headers for json payloads.
-const jsonHeader = new Headers({'Content-Type': 'application/json'});
-
 // Intercept redux actions and act over the ones we are interested
 export default store => next => action => {
 
@@ -35,11 +33,11 @@ export default store => next => action => {
 const fetchModerationQueueComments = store =>
 
 Promise.all([
-  fetch('/api/v1/queue/comments/pending'),
-  fetch('/api/v1/comments?status=rejected'),
-  fetch('/api/v1/comments?action_type=flag')
+  fetch(`${base}/queue/comments/pending`, getInit('GET')),
+  fetch(`${base}/comments?status=rejected`, getInit('GET')),
+  fetch(`${base}/comments?action_type=flag`, getInit('GET'))
 ])
-.then(res => Promise.all(res.map(r => r.json())))
+.then(res => Promise.all(res.map(handleResp)))
 .then(res => {
   res[2] = res[2].map(comment => { comment.flagged = true; return comment; });
   return res.reduce((prev, curr) => prev.concat(curr), []);
@@ -51,26 +49,22 @@ Promise.all([
 // Update a comment. Now to update a comment we need to send back the whole object
 
 const updateComment = (store, comment) => {
-  fetch(`/api/v1/comments/${comment.get('id')}/status`, {
-    method: 'PUT',
-    headers: jsonHeader,
-    body: JSON.stringify({status: comment.get('status')})
-  })
-  .then(res => res.json())
+  fetch(`${base}/comments/${comment.get('id')}/status`, getInit('PUT', {status: comment.get('status')}))
+  .then(handleResp)
   .then(res => store.dispatch({type: 'COMMENT_UPDATE_SUCCESS', res}))
   .catch(error => store.dispatch({type: 'COMMENT_UPDATE_FAILED', error}));
 };
 
 // Create a new comment
-const createComment = (store, name, comment) =>
-fetch('/api/v1/comments', {
-  method: 'POST',
-  body: JSON.stringify({
+const createComment = (store, name, comment) => {
+  const body = {
     status: 'Untouched',
     body: comment,
     name: name,
     createdAt: Date.now()
-  })
-}).then(res => res.json())
-.then(res => store.dispatch({type: 'COMMENT_CREATE_SUCCESS', comment: res}))
-.catch(error => store.dispatch({type: 'COMMENT_CREATE_FAILED', error}));
+  };
+  return fetch(`${base}/comments`, getInit('POST', body))
+    .then(handleResp)
+    .then(res => store.dispatch({type: 'COMMENT_CREATE_SUCCESS', comment: res}))
+    .catch(error => store.dispatch({type: 'COMMENT_CREATE_FAILED', error}));
+};

client/coral-framework/actions/items.js

@@ -104,20 +104,18 @@ export function getStream (assetUrl) {
       .then((json) => {
 
         /* Add items to the store */
-        const itemTypes = Object.keys(json);
-        for (let i = 0; i < itemTypes.length; i++ ) {
-          if (itemTypes[i] === 'actions') {
-            for (let j = 0; j < json[itemTypes[i]].length; j++ ) {
-              let action = json[itemTypes[i]][j];
+        Object.keys(json).forEach(type => {
+          if (type === 'actions') {
+            json[type].forEach(action => {
               action.id = `${action.action_type}_${action.item_id}`;
               dispatch(addItem(action, 'actions'));
-            }
+            });
           } else {
-            for (let j = 0; j < json[itemTypes[i]].length; j++ ) {
-              dispatch(addItem(json[itemTypes[i]][j], itemTypes[i]));
-            }
+            json[type].forEach(item => {
+              dispatch(addItem(item, type));
+            });
           }
-        }
+        });
 
         const assetId = json.assets[0].id;
 
@@ -140,15 +138,14 @@ export function getStream (assetUrl) {
 
         dispatch(updateItem(assetId, 'comments', rels.rootComments, 'assets'));
 
-        const childKeys = Object.keys(rels.childComments);
-        for (let i = 0; i < childKeys.length; i++ ) {
-          dispatch(updateItem(childKeys[i], 'children', rels.childComments[childKeys[i]].reverse(), 'comments'));
-        }
+        Object.keys(rels.childComments).forEach(key => {
+          dispatch(updateItem(key, 'children', rels.childComments[key].reverse(), 'comments'));
+        });
 
         /* Hydrate actions on comments */
-        for (let i = 0; i < json.actions.length; i++ ) {
-          dispatch(updateItem(json.actions[i].item_id, json.actions[i].action_type, json.actions[i].id, 'comments'));
-        }
+        json.actions.forEach(action => {
+          dispatch(updateItem(action.item_id, action.action_type, action.id, 'comments'));
+        });
 
         return (json);
       });