From 35d9022df73bff523ba4b0a65f0943b958fb1c15 Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Fri, 22 Jun 2018 14:23:29 +0300
Subject: [PATCH] FE hot fix
---
.../src/components/SideBarActions.js | 2 +-
.../src/molecules/AuthorsWithTooltip.js | 4 +--
.../src/components/Dashboard/DashboardCard.js | 25 +++++++++----------
.../src/components/Files/Files.js | 1 +
packages/xpub-faraday/package.json | 5 ++--
yarn.lock | 6 ++---
6 files changed, 22 insertions(+), 21 deletions(-)
diff --git a/packages/component-manuscript/src/components/SideBarActions.js b/packages/component-manuscript/src/components/SideBarActions.js
index c85422bad..619ef5146 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 79532b138..65e3645df 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 7709aa341..f126eca8a 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 3055f5a4f..f99ea6586 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 04202a736..246048289 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 b164542ac..efc87c5ed 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"
--
GitLab