Merge branch 'master' into profanity-verbiage

Dockerfile

@@ -13,7 +13,8 @@ EXPOSE 5000
 COPY . /usr/src/app
 
 # Install app dependencies and build static assets.
-RUN yarn install --frozen-lockfile && \
+RUN yarn global add node-gyp && \
+    yarn install --frozen-lockfile && \
     cli plugins reconcile && \
     yarn build && \
     yarn install --production && \

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

@@ -28,6 +28,8 @@ const shortcuts = [
 export default class ModerationKeysModal extends React.Component {
 
   static propTypes = {
+    open: PropTypes.bool.isRequired,
+    onClose: PropTypes.func.isRequired,
     hideShortcutsNote: PropTypes.func.isRequired,
     shortcutsNoteVisible: PropTypes.string.isRequired
   }

client/coral-admin/src/components/ui/Header.js

@@ -6,7 +6,7 @@ import I18n from 'coral-framework/modules/i18n/i18n';
 import translations from '../../translations.json';
 import {Logo} from './Logo';
 
-const CoralHeader = ({handleLogout, restricted = false}) => (
+const CoralHeader = ({handleLogout, showShortcuts = () => {}, restricted = false}) => (
   <Header className={styles.header}>
     <Logo className={styles.logo} />
     {
@@ -55,7 +55,8 @@ const CoralHeader = ({handleLogout, restricted = false}) => (
               <div>
                 <IconButton name="settings" id="menu-settings"/>
                 <Menu target="menu-settings" align="right">
-                  <MenuItem onClick={handleLogout}>Sign Out</MenuItem>
+                  <MenuItem onClick={() => showShortcuts(true)}>{lang.t('configure.shortcuts')}</MenuItem>
+                  <MenuItem onClick={handleLogout}>{lang.t('configure.sign-out')}</MenuItem>
                 </Menu>
               </div>
             </li>
@@ -72,6 +73,7 @@ const CoralHeader = ({handleLogout, restricted = false}) => (
 );
 
 CoralHeader.propTypes = {
+  showShortcuts: PropTypes.func,
   handleLogout: PropTypes.func.isRequired,
   restricted: PropTypes.bool // hide elemnts from a user that's logged out
 };

client/coral-admin/src/components/ui/Layout.js

@@ -4,9 +4,13 @@ import Header from './Header';
 import Drawer from './Drawer';
 import styles from './Layout.css';
 
-const Layout = ({children, handleLogout = () => {}, restricted = false, ...props}) => (
+const Layout = ({children, handleLogout = () => {}, toggleShortcutModal, restricted = false, ...props}) => (
   <LayoutMDL fixedDrawer>
-    <Header handleLogout={handleLogout} restricted={restricted} {...props} />
+    <Header
+      handleLogout={handleLogout}
+      showShortcuts={toggleShortcutModal}
+      restricted={restricted}
+      {...props} />
     <Drawer handleLogout={handleLogout} restricted={restricted} {...props} />
     <div className={styles.layout}>
       {children}
@@ -16,6 +20,7 @@ const Layout = ({children, handleLogout = () => {}, restricted = false, ...props
 
 Layout.propTypes = {
   handleLogout: PropTypes.func,
+  toggleShortcutModal: PropTypes.func,
   restricted: PropTypes.bool // hide elements from a user that's logged out
 };
 

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

@@ -2,6 +2,7 @@ import React, {Component} from 'react';
 import {connect} from 'react-redux';
 import Layout from '../components/ui/Layout';
 import {checkLogin, handleLogin, logout, requestPasswordReset} from '../actions/auth';
+import {toggleModal as toggleShortcutModal} from '../actions/moderation';
 import {fetchConfig} from '../actions/config';
 import {FullLoading} from '../components/FullLoading';
 import AdminLogin from '../components/AdminLogin';
@@ -23,7 +24,7 @@ class LayoutContainer extends Component {
       passwordRequestSuccess
     } = this.props.auth;
 
-    const {handleLogout, TALK_RECAPTCHA_PUBLIC} = this.props;
+    const {handleLogout, toggleShortcutModal, TALK_RECAPTCHA_PUBLIC} = this.props;
     if (loadingUser) { return <FullLoading />; }
     if (!isAdmin) {
       return <AdminLogin
@@ -34,7 +35,9 @@ class LayoutContainer extends Component {
         recaptchaPublic={TALK_RECAPTCHA_PUBLIC}
         errorMessage={loginError} />;
     }
-    if (isAdmin && loggedIn) { return <Layout handleLogout={handleLogout} {...this.props} />; }
+    if (isAdmin && loggedIn) {
+      return <Layout handleLogout={handleLogout} toggleShortcutModal={toggleShortcutModal} {...this.props} />;
+    }
     return <FullLoading />;
   }
 }
@@ -49,6 +52,7 @@ const mapDispatchToProps = dispatch => ({
   fetchConfig: () => dispatch(fetchConfig()),
   handleLogin: (username, password, recaptchaResponse) => dispatch(handleLogin(username, password, recaptchaResponse)),
   requestPasswordReset: email => dispatch(requestPasswordReset(email)),
+  toggleShortcutModal: toggle => dispatch(toggleShortcutModal(toggle)),
   handleLogout: () => dispatch(logout())
 });
 

client/coral-admin/src/services/fragmentMatcher.js

@@ -7,6 +7,32 @@ const fm = new IntrospectionFragmentMatcher({
   introspectionQueryResultData: {
     __schema: {
       types: [
+        {
+          kind: 'INTERFACE',
+          name: 'UserError',
+          possibleTypes: [
+            {name: 'GenericUserError'},
+            {name: 'ValidationUserError'}
+          ]
+        },
+        {
+          kind: 'INTERFACE',
+          name: 'Response',
+          possibleTypes: [
+            {name: 'CreateCommentResponse'},
+            {name: 'CreateLikeResponse'},
+            {name: 'CreateFlagResponse'},
+            {name: 'CreateDontAgreeResponse'},
+            {name: 'DeleteActionResponse'},
+            {name: 'SetUserStatusResponse'},
+            {name: 'SuspendUserResponse'},
+            {name: 'SetCommentStatusResponse'},
+            {name: 'AddCommentTagResponse'},
+            {name: 'RemoveCommentTagResponse'},
+            {name: 'IgnoreUserResponse'},
+            {name: 'StopIgnoringUserResponse'}
+          ]
+        },
         {
           kind: 'INTERFACE',
           name: 'Action',
@@ -24,6 +50,15 @@ const fm = new IntrospectionFragmentMatcher({
             {name: 'LikeActionSummary'},
             {name: 'DontAgreeActionSummary'}
           ],
+        },
+        {
+          kind: 'INTERFACE',
+          name: 'AssetActionSummary',
+          possibleTypes: [
+            {name: 'DefaultAssetActionSummary'},
+            {name: 'FlagAssetActionSummary'},
+            {name: 'LikeAssetActionSummary'}
+          ]
         }
       ],
     },

client/coral-admin/src/translations.json

@@ -79,6 +79,8 @@
       "copy": "Copy to Clipboard"
     },
     "configure": {
+      "sign-out": "Sign Out",
+      "shortcuts": "Shortcuts",
       "closed-stream-settings": "Closed Stream Message",
       "open-stream-configuration": "This comment stream is currently open. By closing this comment stream, no new comments may be submitted and all previous comments will still be displayed.",
       "close-stream-configuration": "This comment stream is currently closed. By opening this comment stream, new comments may be submitted and displayed",
@@ -257,6 +259,8 @@
       "username_flags": "marcas para este nombre de usuario"
     },
     "configure": {
+      "sign-out": "Desconectar",
+      "shortcuts": "Atajos",
       "closed-stream-settings": "Mensaje a enviar cuando los comentarios están cerrados en el artículo",
       "open-stream-configuration": "Este hilo de comentarios esta abierto. Al cerrarlo, ningún nuevo comentario será publicado y todos los comentarios anteriores serán mostrados.",
       "close-stream-configuration": "Este hilo de comentario está en este momento cerrado. Al abrirlo, nuevos comentarios serán publicaods y mostrados.",

client/coral-framework/actions/auth.js

@@ -39,10 +39,21 @@ export const showSignInDialog = () => dispatch => {
     'menubar=0,resizable=0,width=500,height=550,top=200,left=500'
   );
 
-  signInPopUp.onbeforeunload = () => {
-    dispatch(checkLogin());
-    fetchMe();
+  // Workaround odd behavior in older WebKit versions, where
+  // onunload is called twice. (Encountered in IOS 8.3)
+  let loaded = false;
+  signInPopUp.onload = () => {
+    loaded = true;
   };
+
+  // Use `onunload` instead of `onbeforeunload` which is not supported in IOS Safari.
+  signInPopUp.onunload = () => {
+    if (loaded) {
+      dispatch(checkLogin());
+      fetchMe();
+    }
+  };
+
   dispatch({type: actions.SHOW_SIGNIN_DIALOG});
 };
 export const hideSignInDialog = () => dispatch => {