Merge branch 'master' into view-char-count

client/coral-configure/translations.json

@@ -3,7 +3,7 @@
     "configureCommentStream": {
       "apply": "Apply",
       "title": "Configure Comment Stream",
-      "description": "As an admin you may customize the settings for the comment stream for this article",
+      "description": "As an admin you may customize the settings for the comment stream for this asset",
       "enablePremod": "Enable Premoderation",
       "enablePremodDescription": "Moderators must approve any comment before its published.",
       "enablePremodLinks": "Pre-Moderate Comments Containing Links",

client/coral-framework/actions/config.js

@@ -6,14 +6,6 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from './../translations';
 const lang = new I18n(translations);
 
-export const updateOpenStatus = status => (dispatch, getState) => {
-  const assetId = getState().items.get('assets')
-    .keySeq()
-    .toArray()[0];
-  return coralApi(`/asset/${assetId}/status?status=${status}`, {method: 'PUT'})
-    .then(() => dispatch({type: status === 'open' ? actions.OPEN_COMMENTS : actions.CLOSE_COMMENTS}));
-};
-
 const updateConfigRequest = () => ({type: actions.UPDATE_CONFIG_REQUEST});
 const updateConfigSuccess = config => ({type: actions.UPDATE_CONFIG_SUCCESS, config});
 const updateConfigFailure = () => ({type: actions.UPDATE_CONFIG_FAILURE});
@@ -31,3 +23,31 @@ export const updateConfiguration = newConfig => (dispatch, getState) => {
     })
     .catch(error => dispatch(updateConfigFailure(error)));
 };
+
+export const updateOpenStream = closedBody => (dispatch, getState) => {
+  const assetId = getState().items.get('assets')
+    .keySeq()
+    .toArray()[0];
+
+  dispatch(updateConfigRequest());
+
+  coralApi(`/asset/${assetId}/status`, {method: 'PUT', body: closedBody})
+    .then(() => {
+      dispatch(addNotification('success', lang.t('successUpdateSettings')));
+      dispatch(updateConfigSuccess(closedBody));
+    })
+    .catch(error => dispatch(updateConfigFailure(error)));
+};
+
+const openStream = () => ({type: actions.OPEN_COMMENTS});
+const closeStream = () => ({type: actions.CLOSE_COMMENTS});
+
+export const updateOpenStatus = status => dispatch => {
+  if (status === 'open') {
+    dispatch(openStream());
+    dispatch(updateOpenStream({closedAt: null}));
+  } else {
+    dispatch(closeStream());
+    dispatch(updateOpenStream({closedAt: new Date().getTime()}));
+  }
+};

client/coral-framework/reducers/config.js

@@ -22,7 +22,7 @@ export default (state = initialState, action) => {
     return state
       .set('status', 'closed');
   case actions.ADD_ITEM:
-    return action.item_type === 'assets' ? state.set('status', action.item.status) : state;
+    return action.item_type === 'assets' ? state.set('status', (action.item && action.item.closedAt && new Date(action.item.closedAt).getTime() <= new Date().getTime()) ? 'closed' : 'open') : state;
   default:
     return state;
   }