Merge branch 'develop' of https://gitlab.coko.foundation/xpub/xpub-faraday into develop

.gitlab-ci.yml

@@ -21,6 +21,20 @@ build:
     - echo "Ignore warning! Cannot perform an interactive login from a non TTY device"
     - docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
 
+build-aws:
+  image: docker:stable
+  stage: build
+  services:
+    - docker:dind
+  before_script:
+    - apk add --no-cache curl jq python py-pip
+    - pip install awscli
+  script:
+    - $(aws ecr get-login --no-include-email --region us-east-1)
+    - docker build -t $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA .
+    - docker tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA $REPOSITORY_URL:latest
+    - docker push $REPOSITORY_URL:latest
+
 lint:
   image: $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
   stage: test

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

@@ -50,7 +50,10 @@ const ReviewReportCard = ({
             <Label>Report Text</Label>
           </Row>
           <Row>
-            <ShowMore content={publicComment.content} id="public-content" />
+            <ShowMore
+              content={publicComment.content}
+              id={`public-content-${i}`}
+            />
           </Row>
         </Fragment>
       )}
@@ -77,7 +80,10 @@ const ReviewReportCard = ({
             <Label>Confidential Note</Label>
           </Row>
           <Row>
-            <ShowMore content={privateComment.content} id="private-content" />
+            <ShowMore
+              content={privateComment.content}
+              id={`private-content-${i}`}
+            />
           </Row>
         </Fragment>
       )}

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

 import React, { Fragment } from 'react'
-import { isEmpty } from 'lodash'
+import { isEmpty, merge } from 'lodash'
 import { connect } from 'react-redux'
 import { required } from 'xpub-validators'
 import { withJournal } from 'xpub-journal'
@@ -228,8 +228,8 @@ export default compose(
       getSignedUrl,
     },
   ),
-  withProps(({ review = {} }) => ({
-    initialValues: parseReviewResponseToForm(review),
+  withProps(({ review = {}, formValues = {} }) => ({
+    initialValues: merge(parseReviewResponseToForm(review), formValues),
   })),
   withModal2(props => ({
     modalComponent: ModalWrapper,