Merge branch 'master' into reCAPTCHA-docs

PLUGINS.md

@@ -149,7 +149,7 @@ This will merge with the existing resolvers in core and from previous plugins.
 {
   RootMutation: {
     createPerson: {
-      post: async (obj, args, {plugins: {Slack}}, person) {
+      post: async (obj, args, {plugins: {Slack}}, info, person) {
         if (!person) {
           return person;
         }
@@ -248,7 +248,7 @@ module.exports = {
   hooks: {
     RootMutation: {
       createPerson: {
-        post: async (obj, args, {plugins: {Slack}}, person) => {
+        post: async (obj, args, {plugins: {Slack}}, info, person) => {
           if (!person) {
             return person;
           }

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

@@ -2,13 +2,14 @@ import React, {Component} from 'react';
 import styles from './Stories.css';
 import {connect} from 'react-redux';
 import I18n from 'coral-framework/modules/i18n/i18n';
-import {fetchAssets, updateAssetState} from '../../actions/assets';
-import translations from '../../translations.json';
+import {fetchAssets, updateAssetState} from 'coral-admin/src/actions/assets';
+import translations from 'coral-admin/src/translations.json';
 import {Link} from 'react-router';
 
 import {Pager, Icon} from 'coral-ui';
 import {DataTable, TableHeader, RadioGroup, Radio} from 'react-mdl';
 import EmptyCard from 'coral-admin/src/components/EmptyCard';
+import sortBy from 'lodash/sortBy';
 
 const limit = 25;
 
@@ -104,7 +105,11 @@ class Stories extends Component {
     const {search, sort, filter} = this.state;
     const {assets} = this.props;
 
-    const assetsIds = assets.ids.map((id) => assets.byId[id]);
+    const assetsIds = sortBy(assets.ids.map((id) => assets.byId[id]), 'publication_date');
+
+    if (this.state.sort === 'desc') {
+      assetsIds.reverse();
+    }
 
     return (
       <div className={styles.container}>

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

@@ -23,8 +23,13 @@ export default function assets (state = initialState, action) {
 }
 
 const replaceAssets = (action, state) => {
-  const assets = fromJS(action.assets.reduce((prev, curr) => { prev[curr.id] = curr; return prev; }, {}));
-  return state.set('byId', assets)
-  .set('count', action.count)
-  .set('ids', List(assets.keys()));
+  const assets = fromJS(action.assets.reduce((prev, curr) => {
+    prev[curr.id] = curr;
+    return prev;
+  }, {}));
+
+  return state
+    .set('byId', assets)
+    .set('count', action.count)
+    .set('ids', List(assets.keys()));
 };

client/coral-framework/graphql/queries/index.js

@@ -39,7 +39,7 @@ export const getCounts = (data) => ({asset_id, limit, sort}) => {
   });
 };
 
-export const loadMore = (data) => ({limit, cursor, parent_id, asset_id, sort}, newComments) => {
+export const loadMore = (data) => ({limit, cursor, parent_id = null, asset_id, sort}, newComments) => {
   return data.fetchMore({
     query: LOAD_MORE,
     variables: {