Merge branch 'master' into talk-product-guide-features

client/coral-admin/src/index.js

@@ -23,6 +23,7 @@ function init({store, storage}) {
 async function main() {
   const notification = createNotificationService(toast);
   const context = await createContext({reducers, graphqlExtension, pluginsConfig, notification, init});
+
   render(
     <TalkProvider {...context}>
       <App />

client/coral-framework/hocs/withMutation.js

@@ -108,7 +108,7 @@ export default (document, config = {}) => hoistStatics((WrappedComponent) => {
                   res[key] = (prev, result) => {
                     if (getResponseErrors(result.mutationResult)) {
 
-                    // Do not run updates when we have mutation errors.
+                      // Do not run updates when we have mutation errors.
                       return prev;
                     }
                     return map[key](prev, result) || prev;
@@ -116,6 +116,11 @@ export default (document, config = {}) => hoistStatics((WrappedComponent) => {
                 } else {
                   const existing = res[key];
                   res[key] = (prev, result) => {
+                    if (getResponseErrors(result.mutationResult)) {
+
+                      // Do not run updates when we have mutation errors.
+                      return prev;
+                    }
                     const next = existing(prev, result);
                     return map[key](next, result) || next;
                   };

client/coral-framework/services/bootstrap.js

@@ -7,6 +7,7 @@ import {createRestClient} from './rest';
 import thunk from 'redux-thunk';
 import {loadTranslations} from './i18n';
 import bowser from 'bowser';
+import noop from 'lodash/noop';
 import {BASE_PATH} from 'coral-framework/constants/url';
 import {createPluginsService} from './plugins';
 import {createNotificationService} from './notification';
@@ -77,7 +78,7 @@ export async function createContext({
   graphqlExtension = {},
   notification,
   preInit,
-  init,
+  init = noop,
 } = {}) {
   const eventEmitter = new EventEmitter({wildcard: true});
   const storage = createStorage();
@@ -179,6 +180,6 @@ export async function createContext({
   }
 
   // Run initialization.
-  await Promise.all([init, plugins.executeInit(context)]);
+  await Promise.all([init(context), plugins.executeInit(context)]);
   return context;
 }

errors.js

@@ -195,6 +195,12 @@ const ErrAssetURLAlreadyExists = new APIError('Asset URL already exists, cannot
   status: 409
 });
 
+// ErrCannotIgnoreStaff is returned when a user tries to ignore a staff member.
+const ErrCannotIgnoreStaff = new APIError('Cannot ignore staff members.', {
+  translation_key: 'CANNOT_IGNORE_STAFF',
+  status: 400
+});
+
 module.exports = {
   ExtendableError,
   APIError,
@@ -221,5 +227,6 @@ module.exports = {
   ErrLoginAttemptMaximumExceeded,
   ErrEditWindowHasEnded,
   ErrCommentTooShort,
-  ErrAssetURLAlreadyExists
+  ErrAssetURLAlreadyExists,
+  ErrCannotIgnoreStaff
 };

locales/en.yml

@@ -206,6 +206,7 @@ en:
     NOT_FOUND: "Resource not found"
     ALREADY_EXISTS: "Resource already exists"
     INVALID_ASSET_URL: "Assert URL is invalid"
+    CANNOT_IGNORE_STAFF: "Cannot ignore Staff members."
     email: "Not a valid E-Mail"
     confirm_password: "Passwords don't match. Please check again"
     network_error: "Failed to connect to server. Check your internet connection and try again."

services/users.js

@@ -2,6 +2,7 @@ const assert = require('assert');
 const uuid = require('uuid');
 const bcrypt = require('bcryptjs');
 const errors = require('../errors');
+const some = require('lodash/some');
 
 const {
   ROOT_URL
@@ -885,13 +886,18 @@ module.exports = class UsersService {
    * @param  {String} id the id of the user that is ignoring another users
    * @param  {Array<String>} usersToIgnore Array of user IDs to ignore
    */
-  static ignoreUsers(id, usersToIgnore) {
+  static async ignoreUsers(id, usersToIgnore) {
     assert(Array.isArray(usersToIgnore), 'usersToIgnore is an array');
     assert(usersToIgnore.every((u) => typeof u === 'string'), 'usersToIgnore is an array of string user IDs');
     if (usersToIgnore.includes(id)) {
       throw new Error('Users cannot ignore themselves');
     }
 
+    const users = await UsersService.findByIdArray(usersToIgnore);
+    if (some(users, (user) => user.isStaff())) {
+      throw errors.ErrCannotIgnoreStaff;
+    }
+
     // TODO: For each usersToIgnore, make sure they exist?
     return UserModel.update({id}, {
       $addToSet:  {

test/server/services/users.js

@@ -164,6 +164,19 @@ describe('services.UsersService', () => {
       const userAfterIgnoring2 = await UsersService.findById(user.id);
       expect(userAfterIgnoring2.ignoresUsers.length).to.equal(2);
     });
+
+    it('should not ignore a staff member', async () => {
+      const user = mockUsers[0];
+      const usersToIgnore = [mockUsers[1]];
+      await UsersService.addRoleToUser(usersToIgnore[0].id, 'STAFF');
+
+      try {
+        await UsersService.ignoreUsers(user.id, usersToIgnore.map((u) => u.id));
+      } catch (err) {
+        expect(err.status).to.equal(400);
+        expect(err.translation_key).to.equal('CANNOT_IGNORE_STAFF');
+      }
+    });
   });
 
   describe('#ban', () => {