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

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

@@ -28,7 +28,7 @@ const SideBarActions = ({
   canMakeRecommendation,
 }) => (
   <Root>
-    {canMakeRevision && (
+    {true && (
       <DecisionButton onClick={createRevision}>Submit revision</DecisionButton>
     )}
     {canMakeDecision && (

packages/component-manuscript/src/molecules/AuthorsWithTooltip.js

@@ -64,7 +64,7 @@ const AuthorsWithTooltip = ({
     {authors.map(
       (
         {
-          userId,
+          id,
           isSubmitting,
           isCorresponding,
           email = '',
@@ -83,7 +83,7 @@ const AuthorsWithTooltip = ({
           email={email}
           isCorresponding={isCorresponding}
           isSubmitting={isSubmitting}
-          key={userId}
+          key={id}
         >
           <DefaultComponent
             arr={arr}

packages/components-faraday/src/components/Dashboard/DashboardCard.js

@@ -85,19 +85,18 @@ const DashboardCard = ({
                   <Icon>download</Icon>
                 </ClickableIcon>
               </ZipFiles>
-              {!project.status ||
-                (project.status === 'draft' && (
-                  <ActionButtons
-                    data-test="button-resume-submission"
-                    onClick={() =>
-                      history.push(
-                        `/projects/${project.id}/versions/${version.id}/submit`,
-                      )
-                    }
-                  >
-                    RESUME SUBMISSION
-                  </ActionButtons>
-                ))}
+              {(!project.status || project.status === 'draft') && (
+                <ActionButtons
+                  data-test="button-resume-submission"
+                  onClick={() =>
+                    history.push(
+                      `/projects/${project.id}/versions/${version.id}/submit`,
+                    )
+                  }
+                >
+                  RESUME SUBMISSION
+                </ActionButtons>
+              )}
             </RightDetails>
           </LeftDetails>
         </Top>

packages/components-faraday/src/components/Files/Files.js

@@ -96,6 +96,7 @@ const Files = ({
 export default compose(
   getContext({
     project: PropTypes.object,
+    version: PropTypes.object,
   }),
   withRouter,
   connect(

packages/xpub-faraday/package.json

@@ -10,7 +10,7 @@
   "dependencies": {
     "@pubsweet/ui": "4.1.3",
     "@pubsweet/ui-toolkit": "latest",
-    "@pubsweet/component-aws-s3": "^1.0.4",
+    "@pubsweet/component-aws-s3": "^1.1.2",
     "aws-sdk": "^2.197.0",
     "babel-core": "^6.26.0",
     "config": "^1.26.2",
@@ -76,7 +76,8 @@
     "start": "pubsweet start",
     "start:services": "docker-compose up postgres",
     "server": "pubsweet server",
-    "start-now": "echo $secret > config/local-development.json && npm run server",
+    "start-now":
+      "echo $secret > config/local-development.json && npm run server",
     "build": "NODE_ENV=production pubsweet build",
     "clean": "rm -rf node_modules"
   }

yarn.lock

@@ -85,9 +85,9 @@
     lodash "^4.2.0"
     to-fast-properties "^2.0.0"
 
-"@pubsweet/component-aws-s3@^1.0.4":
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/@pubsweet/component-aws-s3/-/component-aws-s3-1.1.0.tgz#115c4f801bef17a214488de6bf586fe3800b1c11"
+"@pubsweet/component-aws-s3@^1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@pubsweet/component-aws-s3/-/component-aws-s3-1.1.2.tgz#ef7c6c7f22a19ce6f547412b73ab8de3fc81c3ee"
   dependencies:
     archiver "^2.1.1"
     aws-sdk "^2.185.0"