Merge branch 'master' into like-button

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

@@ -5,7 +5,8 @@ import {
   FETCH_COMMENTERS_SUCCESS,
   FETCH_COMMENTERS_FAILURE,
   SORT_UPDATE,
-  COMMENTERS_NEW_PAGE
+  COMMENTERS_NEW_PAGE,
+  SET_ROLE
 } from '../constants/community';
 
 import {base, getInit, handleResp} from '../helpers/response';
@@ -40,3 +41,9 @@ export const newPage = () => ({
   type: COMMENTERS_NEW_PAGE
 });
 
+export const setRole = (id, role) => dispatch => {
+  return fetch(`${base}/user/${id}/role`, getInit('POST', {role}))
+  .then(() => {
+    return dispatch({type: SET_ROLE, id, role});
+  });
+};

client/coral-admin/src/constants/community.js

@@ -3,3 +3,4 @@ export const FETCH_COMMENTERS_SUCCESS = 'FETCH_COMMENTERS_SUCCESS';
 export const FETCH_COMMENTERS_FAILURE = 'FETCH_COMMENTERS_FAILURE';
 export const SORT_UPDATE = 'SORT_UPDATE';
 export const COMMENTERS_NEW_PAGE = 'COMMENTERS_NEW_PAGE';
+export const SET_ROLE = 'SET_ROLE';

client/coral-admin/src/containers/Community/Community.js

@@ -19,6 +19,10 @@ const tableHeaders = [
   {
     title: lang.t('community.account_creation_date'),
     field: 'created_at'
+  },
+  {
+    title: lang.t('community.newsroom_role'),
+    field: 'role'
   }
 ];
 

client/coral-admin/src/containers/Community/Table.js

@@ -1,34 +1,66 @@
-import React from 'react';
+import React, {Component} from 'react';
+import {connect} from 'react-redux';
+import {SelectField, Option} from 'react-mdl-selectfield';
 import styles from './Community.css';
+import I18n from 'coral-framework/i18n/i18n';
+import translations from '../../translations';
+import {setRole} from '../../actions/community';
 
-const Table = ({headers, data, onHeaderClickHandler}) => (
-  <table className={`mdl-data-table ${styles.dataTable}`}>
-    <thead>
-      <tr>
-        {headers.map((header, i) =>(
-          <th
-          key={i}
-          className="mdl-data-table__cell--non-numeric"
-          onClick={() => onHeaderClickHandler({field: header.field})}>
-            {header.title}
-          </th>
-        ))}
-      </tr>
-    </thead>
-    <tbody>
-      {data.map((row, i)=> (
-        <tr key={i}>
-          <td className="mdl-data-table__cell--non-numeric">
-            {row.displayName}
-            <span className={styles.email}>{row.profiles.map(({id}) => id)}</span>
-          </td>
-          <td className="mdl-data-table__cell--non-numeric">
-            {row.created_at}
-          </td>
-        </tr>
-      ))}
-    </tbody>
-  </table>
-);
+const lang = new I18n(translations);
 
-export default Table;
+class Table extends Component {
+
+  constructor (props) {
+    super(props);
+    this.onRoleChange = this.onRoleChange.bind(this);
+  }
+
+  onRoleChange (id, role) {
+    this.props.dispatch(setRole(id, role));
+  }
+
+  render () {
+    const {headers, commenters, onHeaderClickHandler} = this.props;
+
+    return (
+      <table className={`mdl-data-table ${styles.dataTable}`}>
+        <thead>
+          <tr>
+            {headers.map((header, i) =>(
+              <th
+              key={i}
+              className="mdl-data-table__cell--non-numeric"
+              onClick={() => onHeaderClickHandler({field: header.field})}>
+                {header.title}
+              </th>
+            ))}
+          </tr>
+        </thead>
+        <tbody>
+          {commenters.map((row, i)=> (
+            <tr key={i}>
+              <td className="mdl-data-table__cell--non-numeric">
+                {row.displayName}
+                <span className={styles.email}>{row.profiles.map(({id}) => id)}</span>
+              </td>
+              <td className="mdl-data-table__cell--non-numeric">
+                {row.created_at}
+              </td>
+              <td className="mdl-data-table__cell--non-numeric">
+                <SelectField label={'Select me'} value={row.roles[0] || ''}
+                  label={lang.t('community.role')}
+                  onChange={role => this.onRoleChange(row.id, role)}>
+                  <Option value={''}>.</Option>
+                  <Option value={'moderator'}>{lang.t('community.moderator')}</Option>
+                  <Option value={'admin'}>{lang.t('community.admin')}</Option>
+                </SelectField>
+              </td>
+            </tr>
+          ))}
+        </tbody>
+      </table>
+    );
+  }
+}
+
+export default connect(state => ({commenters: state.community.get('commenters')}))(Table);

client/coral-admin/src/reducers/community.js

@@ -4,7 +4,8 @@ import {
   FETCH_COMMENTERS_REQUEST,
   FETCH_COMMENTERS_FAILURE,
   FETCH_COMMENTERS_SUCCESS,
-  SORT_UPDATE
+  SORT_UPDATE,
+  SET_ROLE
 } from '../constants/community';
 
 const initialState = Map({
@@ -37,6 +38,13 @@ export default function community (state = initialState, action) {
       })
       .set('commenters', commenters); // Sets to normal array
   }
+  case SET_ROLE : {
+    const commenters = state.get('commenters');
+    const idx = commenters.findIndex(el => el.id === action.id);
+
+    commenters[idx].roles[0] = action.role;
+    return state.set('commenters', commenters.map(id => id));
+  }
   case SORT_UPDATE :
     return state
       .set('field', action.sort.field)

client/coral-admin/src/translations.js

@@ -2,7 +2,11 @@ export default {
   en: {
     'community': {
       username_and_email: 'Username and Email',
-      account_creation_date: 'Account Creation Date'
+      account_creation_date: 'Account Creation Date',
+      newsroom_role: 'Newsroom Role',
+      admin: 'Administrator',
+      moderator: 'Moderator',
+      role: 'Select role...'
     },
     'modqueue': {
       'pending': 'pending',
@@ -30,7 +34,11 @@ export default {
   es: {
     'community': {
       username_and_email: 'Usuario y E-mail',
-      account_creation_date: 'Fecha de creación de la cuenta'
+      account_creation_date: 'Fecha de creación de la cuenta',
+      newsroom_role: 'Rol en la redacción',
+      admin: 'Administrador',
+      moderator: 'Moderador',
+      role: 'Select role...'
     },
     'modqueue': {
       'pending': 'pendiente',

models/user.js

@@ -24,7 +24,9 @@ const UserSchema = new mongoose.Schema({
       required: true
     }
   }],
-  roles: [String]
+  roles: {
+    type: [{type: String, enum: ['admin', 'moderator']}]
+  }
 }, {
   timestamps: {
     createdAt: 'created_at',

package.json

@@ -54,6 +54,7 @@
     "mongoose": "^4.6.5",
     "morgan": "^1.7.0",
     "prompt": "^1.0.0",
+    "react-mdl-selectfield": "^0.2.0",
     "uuid": "^2.0.3"
   },
   "devDependencies": {

routes/api/user/index.js

@@ -40,11 +40,13 @@ router.get('/', (req, res, next) => {
   ])
   .then(([data, count]) => {
     const users = data.map((user) => {
-      const {displayName, created_at} = user;
+      const {id, displayName, created_at} = user;
       return {
+        id,
         displayName,
         created_at,
-        profiles: user.toObject().profiles
+        profiles: user.toObject().profiles,
+        roles: user.toObject().roles
       };
     });
 
@@ -60,4 +62,12 @@ router.get('/', (req, res, next) => {
   .catch(next);
 });
 
+router.post('/:user_id/role', (req, res, next) => {
+  User.addRoleToUser(req.params.user_id, req.body.role)
+  .then(role => {
+    res.send(role);
+  })
+  .catch(next);
+});
+
 module.exports = router;