Merge remote-tracking branch 'origin/shared-data-model' into shared-data-model

app/components/App.jsx

@@ -251,14 +251,14 @@ const RightComponent = ({ user, loginLink, onLogoutClick }) => (
             }
             to="/manage-users"
           >
-            Manage Users
+            Manage users
           </Link>
         ) : (
           <Link
             className={window.location.pathname === '/user-guide' && 'current'}
             to="/user-guide"
           >
-            User Guide
+            User guide
           </Link>
         )}
       </Section>

app/components/activity/ActivityPage.jsx

@@ -19,7 +19,11 @@ const ActivityPage = props => (
 const ActivityPageWithHeader = SubmissionHeader(ActivityPage)
 
 const ActivityPageContainer = ({ currentUser, history, match, ...props }) => (
-  <Query query={QUERY_ACTIVITY_INFO} variables={{ id: match.params.id }}>
+  <Query
+    fetchPolicy="cache-and-network"
+    query={QUERY_ACTIVITY_INFO}
+    variables={{ id: match.params.id }}
+  >
     {({ data, loading }) => {
       if (loading || !data || !data.activities) {
         return (

app/components/review-wizard/Review.jsx

@@ -79,16 +79,24 @@ class Review extends React.Component {
     showAll: false,
   }
   componentDidMount() {
-    if (!this.props.manuscript.files.find(f => f.type === 'PMC')) {
-      this.setState({ showAll: true })
-    }
-    if (
-      ['xml-triage', 'tagging'].includes(this.props.manuscript.status) &&
-      this.props.currentUser.admin
-    ) {
-      this.setState({ pane: 'files' })
+    if (this.page && this.props.manuscript) {
+      if (
+        this.props.manuscript.files &&
+        !this.props.manuscript.files.find(f => f.type === 'PMC')
+      ) {
+        this.setState({ showAll: true })
+      }
+      if (
+        ['xml-triage', 'tagging'].includes(this.props.manuscript.status) &&
+        this.props.currentUser.admin
+      ) {
+        this.setState({ pane: 'files' })
+      }
     }
   }
+  setRef = page => {
+    this.page = page
+  }
   render() {
     const { manuscript, currentUser, review } = this.props
     const { pane, showManuscript, showAll } = this.state
@@ -122,7 +130,7 @@ class Review extends React.Component {
       }
       return (
         <React.Fragment>
-          <PreviewPageDiv>
+          <PreviewPageDiv ref={this.setRef}>
             <PreviewPanel
               style={{
                 flex: showManuscript && '1 1 750px',
@@ -323,6 +331,7 @@ class Review extends React.Component {
         </React.Fragment>
       )
     }
+    return null
   }
 }
 

app/components/review-wizard/ReviewForm.jsx

@@ -28,8 +28,8 @@ const ReviewFormDisplay = ({
   if (status === 'tagging') {
     return (
       <React.Fragment>
-        <H3>Tagging complete?</H3>
         <Content>
+          <H3>Tagging complete?</H3>
           <p>
             {`When all files have been uploaded and both the Web and PDF previews have been generated, please click the button below to move the manuscript to XML QA.`}
           </p>

app/components/upload-files/uploadtypes.js

@@ -9,12 +9,10 @@ export const FileTypes = [
   'application/rtf',
   'application/msword',
   'application/pdf',
-  'application/xml',
   'application/zip',
   'application/x-zip-compressed',
   'application/x-compressed',
   'multipart/x-zip',
-  'application/rtf',
   'application/ogg',
   'application/postscript', // ai, eps
   'application/vnd.oasis.opendocument.text',
@@ -44,7 +42,6 @@ export const FileTypes = [
   'text/csv',
   'text/rtf',
   'text/plain',
-  'text/rtf',
   'text/html',
 
   'video/mpeg',

app/components/user-guide/user-guide-pages/AllowedFiles.jsx

@@ -18,22 +18,21 @@ export const AllowedFiles = () => {
       <H3>Manuscript text file</H3>
       <p>This file can be either a PDF or Microsoft Word file.</p>
       <H3>Figures and supplemental files</H3>
-      <H4>Application</H4>
       {mimetypes.map(type => (
         <div key={type}>
-          <H2>{type.charAt(0).toUpperCase() + type.slice(1)}</H2>
+          <H4>{type.charAt(0).toUpperCase() + type.slice(1)}</H4>
           <Table>
             <tbody>
               <tr>
-                <th>File extension</th>
                 <th>MIME type</th>
+                <th>Default file extension</th>
               </tr>
               {FileTypes.filter(subtype => subtype.startsWith(type)).map(
                 subtype =>
                   mime.extension(subtype) && (
                     <tr key={subtype}>
-                      <td>.{mime.extension(subtype)}</td>
                       <td>{subtype}</td>
+                      <td>.{mime.extension(subtype)}</td>
                     </tr>
                   ),
               )}