Merge branch 'master' into email-verification

client/coral-admin/src/components/UserDetail.js

@@ -44,7 +44,6 @@ export default class UserDetail extends React.Component {
       this.props.data.refetch();
     } catch (err) {
 
-      // TODO: handle error.
       console.error(err);
       this.props.notify('error', getErrorMessages(err));
     }
@@ -56,7 +55,6 @@ export default class UserDetail extends React.Component {
       this.props.data.refetch();
     } catch (err) {
 
-      // TODO: handle error.
       console.error(err);
       this.props.notify('error', getErrorMessages(err));
     }
@@ -68,7 +66,6 @@ export default class UserDetail extends React.Component {
       this.props.data.refetch();
     } catch (err) {
 
-      // TODO: handle error.
       console.error(err);
       this.props.notify('error', getErrorMessages(err));
     }
@@ -80,7 +77,6 @@ export default class UserDetail extends React.Component {
       this.props.data.refetch();
     } catch (err) {
 
-      // TODO: handle error.
       console.error(err);
       this.props.notify('error', getErrorMessages(err));
     }

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

@@ -43,22 +43,16 @@ class UserDetailContainer extends React.Component {
       return this.props.setCommentStatus({commentId, status});
     });
 
-    try {
-      await Promise.all(changes);
-      this.props.clearUserDetailSelections(); // un-select everything
-    } catch (err) {
-
-      // TODO: handle error.
-      console.error(err);
-    }
+    await Promise.all(changes);
+    this.props.clearUserDetailSelections(); // un-select everything
   }
 
   bulkReject = () => {
-    this.bulkSetCommentStatus('REJECTED');
+    return this.bulkSetCommentStatus('REJECTED');
   }
 
   bulkAccept = () => {
-    this.bulkSetCommentStatus('ACCEPTED');
+    return this.bulkSetCommentStatus('ACCEPTED');
   }
 
   acceptComment = ({commentId}) => {
@@ -171,7 +165,8 @@ export const withUserDetailQuery = withQuery(gql`
 `, {
   options: ({userId, statuses}) => {
     return {
-      variables: {author_id: userId, statuses}
+      variables: {author_id: userId, statuses},
+      fetchPolicy: 'network-only',
     };
   },
   skip: (ownProps) => !ownProps.userId,

docs/_docs/03-02-product-guide-commenter-features.md

@@ -7,9 +7,9 @@ permalink: /commenter-features/
 
 There are 2 ways that newsrooms can support signup/login functionality with Talk:
 
-*Use Talk’s auth plugin out of the box (supports account registration with username and password, as well as features like forgot password)
+* Use Talk’s auth plugin out of the box (supports account registration with username and password, as well as features like forgot password)
 
-*Create their own auth plugin to integrate with your own auth systems
+* Create their own auth plugin to integrate with your own auth systems
 
 We also provide a Facebook auth plugin that supports logging in with Facebook (you must provide your own Facebook App ID and Secret, which you can read more about here: [https://developers.facebook.com](https://developers.facebook.com){:target="_blank"})