diff --git a/packages/component-manuscript/src/components/SideBarActions.js b/packages/component-manuscript/src/components/SideBarActions.js index c85422badd0f82227aef0f2b234819eccdfbc0f2..619ef5146736ab369ea84dd74f532cba19aee790 100644 --- a/packages/component-manuscript/src/components/SideBarActions.js +++ b/packages/component-manuscript/src/components/SideBarActions.js @@ -28,7 +28,7 @@ const SideBarActions = ({ canMakeRecommendation, }) => ( <Root> - {canMakeRevision && ( + {true && ( <DecisionButton onClick={createRevision}>Submit revision</DecisionButton> )} {canMakeDecision && ( diff --git a/packages/component-manuscript/src/molecules/AuthorsWithTooltip.js b/packages/component-manuscript/src/molecules/AuthorsWithTooltip.js index 79532b138eb7b9aefda592ea107e58b6273a0b22..65e3645df6b138f53668f496428c4e0c50347160 100644 --- a/packages/component-manuscript/src/molecules/AuthorsWithTooltip.js +++ b/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} diff --git a/packages/components-faraday/src/components/Dashboard/DashboardCard.js b/packages/components-faraday/src/components/Dashboard/DashboardCard.js index 7709aa3418c42aee34cc782d7231e91d97499a4f..f126eca8ac1d52f65f8912729a3a4da95e0caa9b 100644 --- a/packages/components-faraday/src/components/Dashboard/DashboardCard.js +++ b/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> diff --git a/packages/components-faraday/src/components/Files/Files.js b/packages/components-faraday/src/components/Files/Files.js index 3055f5a4f0c48093552b4ef43752181d413015f3..f99ea6586e41b6af2ac0cabfefb960a3c9f48e8d 100644 --- a/packages/components-faraday/src/components/Files/Files.js +++ b/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( diff --git a/packages/xpub-faraday/package.json b/packages/xpub-faraday/package.json index 04202a73693802c91fbd6b50deb6d3f3be345eda..2460482894ba362cf6d2356471ae669c9c9c71b8 100644 --- a/packages/xpub-faraday/package.json +++ b/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" } diff --git a/yarn.lock b/yarn.lock index b164542ac0453b3b4f320ee8df9784014cbda154..efc87c5ed07ef412dee8ed8bb153ba68180c55ab 100644 --- a/yarn.lock +++ b/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"