Merge branch 'HIN-1131' into 'develop'

Hin 1131

See merge request !151

packages/component-faraday-ui/src/AuthorReply.js

-import React from 'react'
+import React, { Fragment } from 'react'
 import { get } from 'lodash'
 import { withProps } from 'recompose'
 import styled from 'styled-components'
 import { th } from '@pubsweet/ui-toolkit'
 import { DateParser } from '@pubsweet/ui'
 
-import { Label, Item, Row, Text } from './'
+import { Label, Item, Row, Text, FileItem } from './'
 
 const submittingAuthor = authors => {
   const thisAuthor = authors.filter(e => e.isSubmitting)
   return thisAuthor[0]
 }
 
-const AuthorReply = ({ reply, authorName, submittedOn }) => (
+const AuthorReply = ({
+  authorName,
+  submittedOn,
+  replyContent,
+  replyFile,
+  onDownload,
+  onPreview,
+}) => (
   <Root>
     <Row justify="space-between" mb={2}>
       <Item justify="flex-end">
         <Row mb={1}>
           <Item vertical>
             <Label mb={1 / 2}>Author Reply</Label>
-            <Text>{reply}</Text>
+            <Text>{replyContent}</Text>
           </Item>
         </Row>
         <Text ml={1} mr={1} whiteSpace="nowrap">
@@ -30,17 +37,36 @@ const AuthorReply = ({ reply, authorName, submittedOn }) => (
         </DateParser>
       </Item>
     </Row>
+
+    {replyFile && (
+      <Fragment>
+        <Label mb={1 / 2}>File</Label>
+        <Row justify="flex-start" mb={2}>
+          <Item flex={0} mr={1}>
+            <FileItem
+              item={replyFile}
+              onDownload={onDownload}
+              onPreview={onPreview}
+            />
+          </Item>
+        </Row>
+      </Fragment>
+    )}
   </Root>
 )
 
-export default withProps(({ fragment: { authors, submitted } }) => ({
-  submittedOn: submitted,
-  authorName: `${get(submittingAuthor(authors), 'firstName', '')} ${get(
-    submittingAuthor(authors),
-    'lastName',
-    '',
-  )}`,
-}))(AuthorReply)
+export default withProps(
+  ({ fragment: { authors, submitted }, authorReply }) => ({
+    submittedOn: submitted,
+    authorName: `${get(submittingAuthor(authors), 'firstName', '')} ${get(
+      submittingAuthor(authors),
+      'lastName',
+      '',
+    )}`,
+    replyContent: get(authorReply, 'content', ''),
+    replyFile: get(authorReply, 'file', ''),
+  }),
+)(AuthorReply)
 
 // #region styles
 const Root = styled.div`

packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js

 import React from 'react'
+import { compose } from 'recompose'
 
-import { ContextualBox, AuthorReply } from '../'
+import {
+  ContextualBox,
+  AuthorReply,
+  withFilePreview,
+  withFileDownload,
+} from '../'
 
 const ResponseToRevisionRequest = ({
   fragment,
   authorReply,
   toggle,
   expanded,
+  downloadFile,
+  previewFile,
+  ...rest
 }) => (
   <ContextualBox
     expanded={expanded}
     label="Response to Revision Request"
     mb={2}
     toggle={toggle}
+    {...rest}
   >
-    <AuthorReply fragment={fragment} reply={authorReply} />
+    <AuthorReply
+      authorReply={authorReply}
+      fragment={fragment}
+      onDownload={downloadFile}
+      onPreview={previewFile}
+    />
   </ContextualBox>
 )
 
-export default ResponseToRevisionRequest
+export default compose(withFilePreview, withFileDownload)(
+  ResponseToRevisionRequest,
+)

packages/component-manuscript/src/components/ManuscriptLayout.js

@@ -50,7 +50,7 @@ const ManuscriptLayout = ({
   heResponseExpanded,
   toggleReviewerResponse,
   invitationsWithReviewers,
-  responseToRevisionRequest,
+  responseToRevisionRequestExpanded,
   publonReviewers,
   reviewerResponseExpanded,
   pendingOwnRecommendation,
@@ -58,7 +58,6 @@ const ManuscriptLayout = ({
   reviewerRecommendationExpanded,
   authorResponseToRevisonRequest,
   toggleResponeToRevisionRequest,
-  responseToRevisionRequestExpanded,
   shouldReview,
   submittedOwnRecommendation,
   reviewerReports,
@@ -139,10 +138,12 @@ const ManuscriptLayout = ({
 
         {get(currentUser, 'permissions.canViewResponseFromAuthor', false) && (
           <ResponseToRevisionRequest
-            authorReply={get(authorResponseToRevisonRequest, 'content', '')}
-            expanded={responseToRevisionRequest}
+            authorReply={get(fragment, 'responseToReviewers', {})}
+            expanded={responseToRevisionRequestExpanded}
             fragment={fragment}
+            getSignedUrl={getSignedUrl}
             toggle={toggleResponseToRevisionRequest}
+            token={get(currentUser, 'token')}
           />
         )}
 

packages/component-manuscript/src/components/ManuscriptPage.js

@@ -290,7 +290,7 @@ export default compose(
   })),
   fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
     toggleResponseToRevisionRequest: toggle,
-    responseToRevisionRequest: expanded,
+    responseToRevisionRequestExpanded: expanded,
   })),
   fromRenderProps(RemoteOpener, ({ toggle, expanded }) => ({
     toggleReviewerDetails: toggle,
@@ -385,7 +385,8 @@ export default compose(
 
       if (
         get(fragment, 'responseToReviewers.content', false) &&
-        !editorialRecommendations.length
+        !editorialRecommendations.length &&
+        !reviewerReports.length
       ) {
         this.props.toggleResponseToRevisionRequest()
       }