Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
X
xpub-faraday
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
2
Issues
2
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Schedules
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
xpub
xpub-faraday
Commits
ee616fbd
Commit
ee616fbd
authored
Feb 02, 2019
by
Adi Onofrei
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'automation' into 'develop'
Automation See merge request
!235
parents
d4907a35
4a6a8777
Pipeline
#11177
passed with stages
in 10 minutes and 17 seconds
Changes
125
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
125 changed files
with
8067 additions
and
471 deletions
+8067
-471
.envrc
.envrc
+1
-1
.gitlab-ci.yml
.gitlab-ci.yml
+42
-0
AuthorReply.js
packages/component-faraday-ui/src/AuthorReply.js
+1
-1
EditorialReportCard.js
packages/component-faraday-ui/src/EditorialReportCard.js
+1
-1
File.js
packages/component-faraday-ui/src/File.js
+1
-0
FileSection.js
packages/component-faraday-ui/src/FileSection.js
+2
-0
PersonInvitation.js
packages/component-faraday-ui/src/PersonInvitation.js
+3
-0
ReviewerReportAuthor.js
packages/component-faraday-ui/src/ReviewerReportAuthor.js
+1
-1
UserProfile.js
packages/component-faraday-ui/src/UserProfile.js
+2
-2
WizardFiles.js
packages/component-faraday-ui/src/WizardFiles.js
+3
-0
AssignHE.js
...ages/component-faraday-ui/src/contextualBoxes/AssignHE.js
+1
-1
HERecommendation.js
...ponent-faraday-ui/src/contextualBoxes/HERecommendation.js
+12
-17
ResponseToRevisionRequest.js
...raday-ui/src/contextualBoxes/ResponseToRevisionRequest.js
+1
-0
ReviewerDetails.js
...mponent-faraday-ui/src/contextualBoxes/ReviewerDetails.js
+2
-1
ReviewerReportForm.js
...nent-faraday-ui/src/contextualBoxes/ReviewerReportForm.js
+2
-1
DeleteManuscriptModal.js
...faraday-ui/src/manuscriptDetails/DeleteManuscriptModal.js
+1
-1
ManuscriptDetailsTop.js
...-faraday-ui/src/manuscriptDetails/ManuscriptDetailsTop.js
+6
-1
ManuscriptEicDecision.js
...faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js
+11
-8
ManuscriptMetadata.js
...nt-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.js
+15
-3
ResponseToInvitation.js
...-faraday-ui/src/manuscriptDetails/ResponseToInvitation.js
+2
-1
ManuscriptFiles.js
...nent-faraday-ui/src/submissionRevision/ManuscriptFiles.js
+6
-1
ResponseToReviewer.js
...t-faraday-ui/src/submissionRevision/ResponseToReviewer.js
+2
-0
SubmitRevision.js
...onent-faraday-ui/src/submissionRevision/SubmitRevision.js
+7
-2
EditorialCommentCard.js
...mponent-manuscript/src/components/EditorialCommentCard.js
+1
-0
ManuscriptLayout.js
...s/component-manuscript/src/components/ManuscriptLayout.js
+1
-0
Modal.js
packages/component-modal/src/components/Modal.js
+1
-0
AdminUserForm.js
packages/component-user/app/components/AdminUserForm.js
+3
-3
.gitignore
packages/hindawi-e2e/.gitignore
+2
-1
combine.js
packages/hindawi-e2e/combineReports/combine.js
+133
-0
generateReport.js
packages/hindawi-e2e/combineReports/generateReport.js
+21
-0
marge
packages/hindawi-e2e/combineReports/marge
+1
-0
sample.json
packages/hindawi-e2e/combineReports/sample.json
+40
-0
file2.pdf
packages/hindawi-e2e/cypress/fixtures/file2.pdf
+0
-0
globalVariables.json
packages/hindawi-e2e/cypress/fixtures/globalVariables.json
+6
-0
statuses.json
...es/hindawi-e2e/cypress/fixtures/manuscripts/statuses.json
+105
-0
updatedFragment.json
.../hindawi-e2e/cypress/fixtures/models/updatedFragment.json
+14
-0
admin.json
packages/hindawi-e2e/cypress/fixtures/users/admin.json
+8
-1
allUsers.json
packages/hindawi-e2e/cypress/fixtures/users/allUsers.json
+9
-0
author.json
packages/hindawi-e2e/cypress/fixtures/users/author.json
+4
-2
eic.json
packages/hindawi-e2e/cypress/fixtures/users/eic.json
+11
-5
he.json
packages/hindawi-e2e/cypress/fixtures/users/he.json
+7
-5
reviewer.json
packages/hindawi-e2e/cypress/fixtures/users/reviewer.json
+1
-1
EiCRevokesHeAfterHeAccepted.spec.js
...ress/integration/bugs/EiCRevokesHeAfterHeAccepted.spec.js
+157
-0
LoggedUserSignUp.spec.js
...awi-e2e/cypress/integration/bugs/LoggedUserSignUp.spec.js
+22
-0
MainFlow.spec.js
...ges/hindawi-e2e/cypress/integration/bugs/MainFlow.spec.js
+322
-0
NoneCanAccessDeletedManuscripts.spec.js
.../integration/bugs/NoneCanAccessDeletedManuscripts.spec.js
+105
-0
ReviewerShouldNotSeeCurrentStatusAfterMinor.spec.js
.../bugs/ReviewerShouldNotSeeCurrentStatusAfterMinor.spec.js
+202
-0
submitManuscriptWithConflictsOfInterests.spec.js
...ion/bugs/submitManuscriptWithConflictsOfInterests.spec.js
+290
-0
AdminArchiveManuscript.spec.js
...ess/integration/peerReview/AdminArchiveManuscript.spec.js
+80
-0
AdminCannotEditOnAcceptedManuscript.spec.js
...on/peerReview/AdminCannotEditOnAcceptedManuscript.spec.js
+99
-0
AdminCannotEditOnRejectedManuscript.spec.js
...on/peerReview/AdminCannotEditOnRejectedManuscript.spec.js
+64
-0
AdminEditsBeforeEQS.spec.js
...ypress/integration/peerReview/AdminEditsBeforeEQS.spec.js
+121
-0
AdminEditsDuringEQA.spec.js
...ypress/integration/peerReview/AdminEditsDuringEQA.spec.js
+101
-0
AdminReturnsManuscriptAfterEicDecision.spec.js
...peerReview/AdminReturnsManuscriptAfterEicDecision.spec.js
+159
-0
AuthorEditsBeforeEQS.spec.js
...press/integration/peerReview/AuthorEditsBeforeEQS.spec.js
+121
-0
AuthorSendRevision.spec.js
...cypress/integration/peerReview/AuthorSendRevision.spec.js
+58
-0
EICRejectsAfterHERecommendsToPublish.spec.js
...n/peerReview/EICRejectsAfterHERecommendsToPublish.spec.js
+96
-0
EICResendInviteToHE.spec.js
...ypress/integration/peerReview/EICResendInviteToHE.spec.js
+59
-0
EiCPublishesAfterHERejects.spec.js
...integration/peerReview/EiCPublishesAfterHERejects.spec.js
+175
-0
EiCRejectManuscript.spec.js
...ypress/integration/peerReview/EiCRejectManuscript.spec.js
+49
-0
EiCReturnsToHEAfterRecommendation.spec.js
...tion/peerReview/EiCReturnsToHEAfterRecommendation.spec.js
+117
-0
EiCRevokesHeAfterHeAccepted.spec.js
...ntegration/peerReview/EiCRevokesHeAfterHeAccepted.spec.js
+70
-0
EiCRevokesHeAfterReviewersSubmit.spec.js
...ation/peerReview/EiCRevokesHeAfterReviewersSubmit.spec.js
+157
-0
EiCRevokesHeBeforeHeResponds.spec.js
...tegration/peerReview/EiCRevokesHeBeforeHeResponds.spec.js
+65
-0
EiCrequestManuscriptRevision.spec.js
...tegration/peerReview/EiCrequestManuscriptRevision.spec.js
+57
-0
HEAsksForMajorRevBeforeInvitingRev.spec.js
...ion/peerReview/HEAsksForMajorRevBeforeInvitingRev.spec.js
+105
-0
HEAsksForMinorRevBeforeInvitingRev.spec.js
...ion/peerReview/HEAsksForMinorRevBeforeInvitingRev.spec.js
+86
-0
HErejectManuscriptBeforeInvitingReviewers.spec.js
...rReview/HErejectManuscriptBeforeInvitingReviewers.spec.js
+78
-0
HErejectManuscriptReviewerPending.spec.js
...tion/peerReview/HErejectManuscriptReviewerPending.spec.js
+154
-0
HErejectsManuscriptAfterReviewerSubmitsReport.spec.js
...iew/HErejectsManuscriptAfterReviewerSubmitsReport.spec.js
+108
-0
HErejectsManuscriptBeforeReviewerSubmitsReport.spec.js
...ew/HErejectsManuscriptBeforeReviewerSubmitsReport.spec.js
+106
-0
HeInvitesNewReviewerOnVersion2.spec.js
...gration/peerReview/HeInvitesNewReviewerOnVersion2.spec.js
+174
-0
HeRevokesReviewerInvitationWhileInPending.spec.js
...rReview/HeRevokesReviewerInvitationWhileInPending.spec.js
+149
-0
MainFlow.spec.js
...ndawi-e2e/cypress/integration/peerReview/MainFlow.spec.js
+304
-0
adminEditsDuringEQS.spec.js
...ypress/integration/peerReview/adminEditsDuringEQS.spec.js
+74
-0
deleteDraft.spec.js
...wi-e2e/cypress/integration/peerReview/deleteDraft.spec.js
+62
-0
rejectByEQS.spec.js
...wi-e2e/cypress/integration/peerReview/rejectByEQS.spec.js
+34
-0
reviewerDeclinesInvitation.spec.js
...integration/peerReview/reviewerDeclinesInvitation.spec.js
+87
-0
changePassword.spec.js
...-e2e/cypress/integration/user-flow/changePassword.spec.js
+30
-0
createManuscript.spec.js
...2e/cypress/integration/user-flow/createManuscript.spec.js
+0
-298
createUsers.spec.js
...awi-e2e/cypress/integration/user-flow/createUsers.spec.js
+29
-0
deactivateUser.spec.js
...-e2e/cypress/integration/user-flow/deactivateUser.spec.js
+24
-0
editUserProfile.spec.js
...e2e/cypress/integration/user-flow/editUserProfile.spec.js
+33
-0
editUserProfileAsAdmin.spec.js
...ress/integration/user-flow/editUserProfileAsAdmin.spec.js
+41
-0
login.spec.js
...s/hindawi-e2e/cypress/integration/user-flow/login.spec.js
+1
-5
orcidId.spec.js
...hindawi-e2e/cypress/integration/user-flow/orcidId.spec.js
+19
-0
register.spec.js
...indawi-e2e/cypress/integration/user-flow/register.spec.js
+1
-68
resubscribeEmailNotifications.spec.js
...tegration/user-flow/resubscribeEmailNotifications.spec.js
+28
-0
unsubscribeEmailNotifications.spec.js
...tegration/user-flow/unsubscribeEmailNotifications.spec.js
+29
-0
index.js
packages/hindawi-e2e/cypress/plugins/index.js
+6
-0
commands.js
packages/hindawi-e2e/cypress/support/commands.js
+186
-9
index.js
packages/hindawi-e2e/cypress/support/index.js
+2
-0
EiCRevokesHE.js
...es/hindawi-e2e/cypress/support/manuscript/EiCRevokesHE.js
+19
-0
approveManuscriptByEQA.js
...-e2e/cypress/support/manuscript/approveManuscriptByEQA.js
+21
-0
approveManuscriptByEQS.js
...-e2e/cypress/support/manuscript/approveManuscriptByEQS.js
+33
-0
authorSubmitRevision.js
...wi-e2e/cypress/support/manuscript/authorSubmitRevision.js
+99
-0
checkStatus.js
...ges/hindawi-e2e/cypress/support/manuscript/checkStatus.js
+5
-0
createDraft.js
...ges/hindawi-e2e/cypress/support/manuscript/createDraft.js
+23
-0
editManuscript.js
.../hindawi-e2e/cypress/support/manuscript/editManuscript.js
+70
-0
eicMakesDecision.js
...indawi-e2e/cypress/support/manuscript/eicMakesDecision.js
+72
-0
heMakesRecommendation.js
...i-e2e/cypress/support/manuscript/heMakesRecommendation.js
+142
-0
index.js
packages/hindawi-e2e/cypress/support/manuscript/index.js
+21
-0
inviteHE.js
packages/hindawi-e2e/cypress/support/manuscript/inviteHE.js
+27
-0
inviteReviewer.js
.../hindawi-e2e/cypress/support/manuscript/inviteReviewer.js
+27
-0
rejectManuscriptByEQA.js
...i-e2e/cypress/support/manuscript/rejectManuscriptByEQA.js
+27
-0
rejectManuscriptByEQS.js
...i-e2e/cypress/support/manuscript/rejectManuscriptByEQS.js
+17
-0
resendHEinvite.js
.../hindawi-e2e/cypress/support/manuscript/resendHEinvite.js
+18
-0
resendHEinviteApi.js
...ndawi-e2e/cypress/support/manuscript/resendHEinviteApi.js
+21
-0
respondToInvitationAsHE.js
...e2e/cypress/support/manuscript/respondToInvitationAsHE.js
+16
-0
respondToInvitationAsReviewer.js
...press/support/manuscript/respondToInvitationAsReviewer.js
+21
-0
submitManuscript.js
...indawi-e2e/cypress/support/manuscript/submitManuscript.js
+128
-0
submitReview.js
...es/hindawi-e2e/cypress/support/manuscript/submitReview.js
+49
-0
createUser.js
packages/hindawi-e2e/cypress/support/user/createUser.js
+77
-0
index.js
packages/hindawi-e2e/cypress/support/user/index.js
+1
-0
package-lock.json
packages/hindawi-e2e/package-lock.json
+1647
-0
package.json
packages/hindawi-e2e/package.json
+6
-1
tests.sh
packages/hindawi-e2e/tests.sh
+88
-0
authsome-helpers.js
packages/xpub-faraday/config/authsome-helpers.js
+18
-14
authsome-mode.js
packages/xpub-faraday/config/authsome-mode.js
+19
-6
default.js
packages/xpub-faraday/config/default.js
+2
-0
.gitkeep
packages/xpub-faraday/migrations-1657TioJzS4M6VaB/.gitkeep
+0
-0
1524494862-entities.sql
...raday/migrations-1657TioJzS4M6VaB/1524494862-entities.sql
+1
-0
.gitkeep
packages/xpub-faraday/migrations-19267Y6TZXctjDrTd/.gitkeep
+0
-0
1524494862-entities.sql
...aday/migrations-19267Y6TZXctjDrTd/1524494862-entities.sql
+1
-0
yarn.lock
yarn.lock
+162
-9
No files found.
.envrc
View file @
ee616fbd
#https://github.com/direnv/direnv/wiki/Node#load-nodejs-version-from-a-node-version-or-nvmrc-file
set -e
use node 8
use node 8
\ No newline at end of file
.gitlab-ci.yml
View file @
ee616fbd
...
...
@@ -71,6 +71,30 @@ push:qa:
-
docker tag ${CI_PROJECT_NAME}:$CI_COMMIT_SHA $DOCKER_REPO:latest
-
docker push $DOCKER_REPO:latest
push:automation
:
image
:
docker:latest
stage
:
push
only
:
-
automation
when
:
manual
variables
:
NODE_ENV
:
test
script
:
# Setup
-
export AWS_REGION="eu-west-1"
-
export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID
-
export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY
-
apk update
-
apk --no-cache add --update curl python python-dev py-pip
-
pip install awscli --upgrade --user
-
export PATH=~/.local/bin:/usr/bin/:$PATH
# AUTH
-
CERT=`aws ecr get-login --no-include-email --region ${AWS_REGION}`
-
${CERT}
# Tag
-
docker tag ${CI_PROJECT_NAME}:$CI_COMMIT_SHA $DOCKER_REPO:automation
-
docker push $DOCKER_REPO:automation
push:staging
:
image
:
docker:latest
when
:
manual
...
...
@@ -137,6 +161,24 @@ deploy:qa:
-
source deploy.sh
-
create_deployment
deploy:automation
:
image
:
pubsweet/deployer:latest
stage
:
deploy
when
:
manual
only
:
-
automation
variables
:
PACKAGE_NAME
:
xpub-faraday
IMAGE_REPO
:
$CI_ECR_URL
IMAGE_TAG
:
automation
NODE_ENV
:
test
environment
:
name
:
qa
url
:
http://qa.review.hindawi.com
script
:
-
source deploy.sh
-
create_deployment
deploy:styleguide
:
image
:
pubsweet/deployer:latest
stage
:
deploy
...
...
packages/component-faraday-ui/src/AuthorReply.js
View file @
ee616fbd
...
...
@@ -21,7 +21,7 @@ const AuthorReply = ({
onDownload
,
onPreview
,
})
=>
(
<
Root
>
<
Root
data
-
test
-
id
=
"author-reply"
>
<
Row
justify
=
"space-between"
mb
=
{
2
}
>
<
Item
justify
=
"flex-end"
>
<
Row
mb
=
{
1
}
>
...
...
packages/component-faraday-ui/src/EditorialReportCard.js
View file @
ee616fbd
...
...
@@ -22,7 +22,7 @@ const EditorialReportCard = ({
collection
,
report
:
{
createdOn
,
reviewer
},
})
=>
(
<
Root
>
<
Root
data
-
test
-
id
=
"editorial-report-card"
>
<
Row
justify
=
"space-between"
mb
=
{
2
}
>
<
Item
vertical
>
<
Label
mb
=
{
1
/
2
}
>
...
...
packages/component-faraday-ui/src/File.js
View file @
ee616fbd
...
...
@@ -71,6 +71,7 @@ const FileItem = ({
/>
{
hasDelete
&&
(
<
IconButton
data
-
test
-
id
=
"delete-file"
fontIcon
=
"deleteIcon"
iconSize
=
{
1.8
}
mr
=
{
1
}
...
...
packages/component-faraday-ui/src/FileSection.js
View file @
ee616fbd
...
...
@@ -49,8 +49,10 @@ const FileSection = ({
onPreview
,
onDownload
,
onDelete
,
testId
,
})
=>
(
<
Root
data
-
test
-
id
=
{
testId
}
isFileItemOver
=
{
isFileItemOver
&&
canDropFileItem
}
isFirst
=
{
isFirst
}
isLast
=
{
isLast
}
...
...
packages/component-faraday-ui/src/PersonInvitation.js
View file @
ee616fbd
...
...
@@ -33,6 +33,7 @@ const PersonInvitation = ({
>
{
showModal
=>
(
<
IconButton
data
-
test
-
id
=
"resend-invitation-to-HE"
fontIcon
=
"resendIcon"
mb
=
{
1
}
ml
=
{
2
}
...
...
@@ -52,6 +53,7 @@ const PersonInvitation = ({
>
{
showModal
=>
(
<
IconButton
data
-
test
-
id
=
"revoke-button"
fontIcon
=
"removeIcon"
mb
=
{
1
}
ml
=
{
2
}
...
...
@@ -75,6 +77,7 @@ const PersonInvitation = ({
>
{
showModal
=>
(
<
IconButton
data
-
test
-
id
=
"revoke-button"
fontIcon
=
"removeIcon"
mb
=
{
1
}
ml
=
{
2
}
...
...
packages/component-faraday-ui/src/ReviewerReportAuthor.js
View file @
ee616fbd
...
...
@@ -28,7 +28,7 @@ const ReviewerReportAuthor = ({
recommendation
,
report
:
{
submittedOn
},
})
=>
(
<
Root
>
<
Root
data
-
test
-
id
=
"reviewer-reports-for-author"
>
<
Row
justify
=
"space-between"
mb
=
{
2
}
>
<
Item
justify
=
"flex-end"
>
{
publicReport
&&
(
...
...
packages/component-faraday-ui/src/UserProfile.js
View file @
ee616fbd
...
...
@@ -171,7 +171,7 @@ const EditUserProfile = compose(
<
/Row
>
<
RowOverrideAlert
alignItems
=
"baseline"
mt
=
{
2
}
>
<
Item
mr
=
{
1
}
vertical
>
<
Item
data
-
test
-
id
=
"title"
mr
=
{
1
}
vertical
>
<
Label
required
>
Title
<
/Label
>
<
ValidatedField
component
=
{
input
=>
<
Menu
{...
input
}
options
=
{
title
}
/>
}
...
...
@@ -179,7 +179,7 @@ const EditUserProfile = compose(
validate
=
{[
requiredValidator
]}
/
>
<
/Item
>
<
Item
ml
=
{
1
}
vertical
>
<
Item
data
-
test
-
id
=
"country"
ml
=
{
1
}
vertical
>
<
Label
required
>
Country
<
/Label
>
<
ValidatedField
component
=
{
MenuCountry
}
...
...
packages/component-faraday-ui/src/WizardFiles.js
View file @
ee616fbd
...
...
@@ -39,6 +39,7 @@ const WizardFiles = ({
onFilePick
=
{
addFile
(
'manuscripts'
)}
onPreview
=
{
previewFile
}
required
testId
=
"main-manuscript"
title
=
"Main Manuscript"
/>
<
FileSection
...
...
@@ -54,6 +55,7 @@ const WizardFiles = ({
onFileDrop
=
{
addFile
(
'coverLetter'
)}
onFilePick
=
{
addFile
(
'coverLetter'
)}
onPreview
=
{
previewFile
}
testId
=
"cover-letter"
title
=
"Cover Letter"
/>
<
FileSection
...
...
@@ -68,6 +70,7 @@ const WizardFiles = ({
onFileDrop
=
{
addFile
(
'supplementary'
)}
onFilePick
=
{
addFile
(
'supplementary'
)}
onPreview
=
{
previewFile
}
testId
=
"supplemental-files"
title
=
"Supplemental Files"
/>
<
/Fragment
>
...
...
packages/component-faraday-ui/src/contextualBoxes/AssignHE.js
View file @
ee616fbd
...
...
@@ -30,7 +30,7 @@ const AssignHE = ({
handlingEditors
,
inviteHandlingEditor
,
})
=>
(
<
Root
pb
=
{
2
}
>
<
Root
data
-
test
-
id
=
"assign-handling-editor"
pb
=
{
2
}
>
<
TextContainer
>
<
TextField
data
-
test
-
id
=
"manuscript-assign-he-filter"
...
...
packages/component-faraday-ui/src/contextualBoxes/HERecommendation.js
View file @
ee616fbd
...
...
@@ -88,6 +88,7 @@ const HERecommendation = ({
...
rest
})
=>
(
<
ContextualBox
data
-
test
-
id
=
"contextual-box-he-recommendation"
expanded
=
{
expanded
}
highlight
=
{
highlight
}
label
=
"Your Editorial Recommendation"
...
...
@@ -95,7 +96,7 @@ const HERecommendation = ({
toggle
=
{
toggle
}
{...
rest
}
>
<
Root
>
<
Root
data
-
test
-
id
=
"contextual-box-he-recommendation-response"
>
<
Row
justify
=
"flex-start"
>
<
ItemOverrideAlert
data
-
test
-
id
=
"editorial-recommendation-choose-options"
...
...
@@ -120,14 +121,11 @@ const HERecommendation = ({
<
/Row
>
{(
minorRevisionRecommendation
||
majorRevisionRecommendation
)
&&
(
<
Row
mt
=
{
2
}
>
<
ResponsiveItem
data
-
test
-
id
=
"editorial-recommendation-message-for-author"
mr
=
{
1
}
vertical
>
<
ResponsiveItem
mr
=
{
1
}
vertical
>
<
Label
required
>
Message
for
Author
<
/Label
>
<
ValidatedField
component
=
{
Textarea
}
data
-
test
-
id
=
"editorial-recommendation-message-for-author"
name
=
"public"
validate
=
{[
required
]}
/
>
...
...
@@ -136,31 +134,28 @@ const HERecommendation = ({
)}
{(
publishRecommendation
||
rejectRecommendation
)
&&
(
<
ResponsiveRow
mt
=
{
2
}
>
<
ResponsiveItem
data
-
test
-
id
=
"editorial-recommendation-message-for-author"
mr
=
{
1
}
vertical
>
<
ResponsiveItem
mr
=
{
1
}
vertical
>
<
Label
required
=
{
!!
rejectRecommendation
}
>
Message
for
Author
{
' '
}
{
publishRecommendation
?
<
Text
secondary
>
Optional
<
/Text> : ''
}
<
/Label
>
<
ValidatedField
component
=
{
Textarea
}
data
-
test
-
id
=
"editorial-recommendation-message-for-author"
name
=
"public"
validate
=
{
rejectRecommendation
?
[
required
]
:
false
}
/
>
<
/ResponsiveItem
>
<
ResponsiveItem
data
-
test
-
id
=
"editorial-recommendation-message-for-eic"
ml
=
{
1
}
vertical
>
<
ResponsiveItem
ml
=
{
1
}
vertical
>
<
Label
>
Message
for
Editor
in
Chief
<
Text
secondary
>
Optional
<
/Text
>
<
/Label
>
<
ValidatedField
component
=
{
Textarea
}
name
=
"private"
/>
<
ValidatedField
component
=
{
Textarea
}
data
-
test
-
id
=
"editorial-recommendation-message-for-eic"
name
=
"private"
/>
<
/ResponsiveItem
>
<
/ResponsiveRow
>
)}
...
...
packages/component-faraday-ui/src/contextualBoxes/ResponseToRevisionRequest.js
View file @
ee616fbd
...
...
@@ -19,6 +19,7 @@ const ResponseToRevisionRequest = ({
...
rest
})
=>
(
<
ContextualBox
data
-
test
-
id
=
"response-to-revision-request"
expanded
=
{
expanded
}
label
=
"Response to Revision Request"
mb
=
{
2
}
...
...
packages/component-faraday-ui/src/contextualBoxes/ReviewerDetails.js
View file @
ee616fbd
...
...
@@ -48,6 +48,7 @@ const ReviewerDetails = ({
...
rest
})
=>
(
<
ContextualBox
data
-
test
-
id
=
"reviewer-details-and-reports-box"
expanded
=
{
expanded
}
highlight
=
{
highlight
}
label
=
"Reviewer Details & Reports"
...
...
@@ -58,7 +59,7 @@ const ReviewerDetails = ({
<
Tabs
selectedTab
=
{
reports
.
length
?
1
:
0
}
>
{({
selectedTab
,
changeTab
})
=>
(
<
Fragment
>
<
TabsHeader
>
<
TabsHeader
data
-
test
-
id
=
"reviewer-details-and-reports-tabs"
>
<
TabButton
ml
=
{
1
}
mr
=
{
1
}
...
...
packages/component-faraday-ui/src/contextualBoxes/ReviewerReportForm.js
View file @
ee616fbd
...
...
@@ -38,13 +38,14 @@ const ReviewerReportForm = ({
isFetchingFromAutosave
,
})
=>
(
<
ContextualBox
data
-
test
-
id
=
"submit-report-box"
expanded
=
{
expanded
}
highlight
label
=
"Your report"
scrollIntoView
toggle
=
{
toggle
}
>
<
Root
>
<
Root
data
-
test
-
id
=
"report-box-response"
>
<
Row
justify
=
"flex-start"
>
<
ItemOverrideAlert
data
-
test
-
id
=
"form-report-recommendation"
...
...
packages/component-faraday-ui/src/manuscriptDetails/DeleteManuscriptModal.js
View file @
ee616fbd
...
...
@@ -22,7 +22,7 @@ const Form = compose(
form
:
'deleteManuscript'
,
}),
)(({
fetchingError
,
hideModal
,
handleSubmit
,
isFetching
})
=>
(
<
Root
>
<
Root
data
-
test
-
id
=
"delete-manuscript-modal"
>
<
IconButton
icon
=
"x"
iconSize
=
{
2
}
...
...
packages/component-faraday-ui/src/manuscriptDetails/ManuscriptDetailsTop.js
View file @
ee616fbd
...
...
@@ -39,7 +39,11 @@ const ManuscriptDetailsTop = ({
Dashboard
<
/ActionLink
>
<
/Item
>
<
Item
alignItems
=
"baseline"
justify
=
"flex-end"
>
<
Item
alignItems
=
"baseline"
data
-
test
-
id
=
"item-details-top"
justify
=
"flex-end"
>
{
canOverrideTechChecks
&&
(
<
ActionLink
data
-
test
-
id
=
"button-qa-manuscript-technical-checks"
...
...
@@ -86,6 +90,7 @@ const ManuscriptDetailsTop = ({
<
/DateParser
>
<
ManuscriptVersion
collection
=
{
collection
}
data
-
test
-
id
=
"versions-dropdown"
fragment
=
{
fragment
}
history
=
{
history
}
versions
=
{
versions
}
...
...
packages/component-faraday-ui/src/manuscriptDetails/ManuscriptEicDecision.js
View file @
ee616fbd
...
...
@@ -65,14 +65,10 @@ const ManuscriptEicDecision = ({
lastHeRecommendation
,
...
rest
})
=>
(
<
ContextualBox
data
-
test
-
id
=
"your-editorial-decision-id"
label
=
"Your Editorial Decision"
{...
rest
}
>
<
Root
>
<
ContextualBox
label
=
"Your Editorial Decision"
{...
rest
}
>
<
Root
data
-
test
-
id
=
"contextual-box-manuscript-eic-response"
>
<
Row
justify
=
"flex-start"
pl
=
{
1
}
pt
=
{
1
}
>
<
ItemOverrideAlert
flex
=
{
0
}
vertical
>
<
ItemOverrideAlert
data
-
test
-
id
=
"form-eic-decision"
flex
=
{
0
}
vertical
>
<
Label
required
>
Decision
<
/Label
>
<
ValidatedField
component
=
{
input
=>
<
Menu
{...
input
}
options
=
{
options
}
/>
}
...
...
@@ -91,6 +87,7 @@ const ManuscriptEicDecision = ({
<
/Label
>
<
ValidatedField
component
=
{
ValidatedTextArea
}
data
-
test
-
id
=
"eic-decision-message"
name
=
"message"
validate
=
{
decision
!==
'reject'
?
[
required
]
:
undefined
}
/
>
...
...
@@ -105,6 +102,7 @@ const ManuscriptEicDecision = ({
<
/Label
>
<
ValidatedField
component
=
{
ValidatedTextArea
}
data
-
test
-
id
=
"eic-decision-message"
name
=
"message"
validate
=
{
lastHeRecommendation
!==
'reject'
?
[
required
]
:
undefined
...
...
@@ -115,7 +113,12 @@ const ManuscriptEicDecision = ({
)}
<
Row
justify
=
"flex-end"
mt
=
{
1
}
pr
=
{
1
}
>
<
Button
onClick
=
{
handleSubmit
}
primary
size
=
"medium"
>
<
Button
data
-
test
-
id
=
"submit-decision-eic"
onClick
=
{
handleSubmit
}
primary
size
=
"medium"
>
SUBMIT
DECISION
<
/Button
>
<
/Row
>
...
...
packages/component-faraday-ui/src/manuscriptDetails/ManuscriptMetadata.js
View file @
ee616fbd
...
...
@@ -49,14 +49,22 @@ const ManuscriptMetadata = ({
toggle
=
{
toggleConflictsOfInterest
}
transparent
>
<
Row
alignItems
=
"center"
justify
=
"flex-start"
>
<
Row
alignItems
=
"center"
data
-
test
-
id
=
"conflict-of-interest-text"
justify
=
"flex-start"
>
<
Text
mb
=
{
1
}
mt
=
{
1
}
>
Conflicts
of
interest
:
<
/Text
>
<
Text
ml
=
{
1
/
2
}
>
{
get
(
conflicts
,
'message'
,
''
)}
<
/Text
>
<
/Row
>
{
get
(
conflicts
,
'dataAvailabilityMessage'
,
''
)
&&
(
<
Row
alignItems
=
"center"
justify
=
"flex-start"
>
<
Row
alignItems
=
"center"
data
-
test
-
id
=
"data-availability-message"
justify
=
"flex-start"
>
<
Text
mb
=
{
1
}
mt
=
{
1
}
>
Data
availability
statment
:
<
/Text
>
...
...
@@ -66,7 +74,11 @@ const ManuscriptMetadata = ({
<
/Row
>
)}
{
get
(
conflicts
,
'fundingMessage'
,
''
)
&&
(
<
Row
alignItems
=
"center"
justify
=
"flex-start"
>
<
Row
alignItems
=
"center"
data
-
test
-
id
=
"funding-message"
justify
=
"flex-start"
>
<
Text
mb
=
{
1
}
mt
=
{
1
}
>
Funding
statment
:
<
/Text
>
...
...
packages/component-faraday-ui/src/manuscriptDetails/ResponseToInvitation.js
View file @
ee616fbd
...
...
@@ -36,6 +36,7 @@ const ResponseToInvitation = ({
buttonLabel
=
'RESPOND TO INVITATION'
,
})
=>
(
<
ContextualBox
data
-
test
-
id
=
"respond-to-invitation-he-box"
expanded
=
{
expanded
}
highlight
label
=
{
title
}
...
...
@@ -44,7 +45,7 @@ const ResponseToInvitation = ({
toggle
=
{
toggle
}
>
<
RowOverrideAlert
justify
=
"flex-start"
ml
=
{
1
}
mt
=
{
1
}
>
<
Item
vertical
>
<
Item
data
-
test
-
id
=
"respond-to-editorial-invitation"
vertical
>
<
Label
required
>
{
label
}
<
/Label
>
<
ValidatedField
component
=
{
input
=>
(
...
...
packages/component-faraday-ui/src/submissionRevision/ManuscriptFiles.js
View file @
ee616fbd
...
...
@@ -23,7 +23,12 @@ const ManuscriptFiles = ({
getSignedUrl
,
formErrors
,
})
=>
(
<
ContextualBox
label
=
"Manuscript Files"
startExpanded
transparent
>
<
ContextualBox
data
-
test
-
id
=
"manuscript-files"
label
=
"Manuscript Files"
startExpanded
transparent
>
<
Root
>
<
Row
justify
=
"flex-start"
mb
=
{
2
}
>
<
Text
secondary
>
...
...
packages/component-faraday-ui/src/submissionRevision/ResponseToReviewer.js
View file @
ee616fbd
...
...
@@ -29,6 +29,7 @@ const ResponseToReviewer = ({
downloadFile
,
})
=>
(
<
ContextualBox
data
-
test
-
id
=
"response-to-reviewer-comments"
label
=
"Response to Reviewer Comments"
startExpanded
transparent
...
...
@@ -42,6 +43,7 @@ const ResponseToReviewer = ({
)
:
(
<
FilePicker
allowedFileExtensions
=
{
allowedFileExtensions
}
data
-
test
-
id
=
"submit-revision-reply-file"
disabled
=
{
!
isEmpty
(
file
)}
onUpload
=
{
onUpload
}
>
...
...
packages/component-faraday-ui/src/submissionRevision/SubmitRevision.js
View file @
ee616fbd
...
...
@@ -33,8 +33,13 @@ const SubmitRevision = ({
formErrors
,
formName
,
})
=>
(
<
ContextualBox
highlight
label
=
"Submit Revision"
mb
=
{
2
}
>
<
Root
>
<
ContextualBox
data
-
test
-
id
=
"submit-revision"
highlight
label
=
"Submit Revision"
mb
=
{
2
}
>
<
Root
data
-
test
-
id
=
"submit-revision-details"
>
<
DetailsAndAuthors
addAuthor
=
{
addAuthor
}
changeForm
=
{
changeForm
}
...
...
packages/component-manuscript/src/components/EditorialCommentCard.js
View file @
ee616fbd
...
...
@@ -14,6 +14,7 @@ const EditorialCommentCard = ({
collection
,
})
=>
(
<
ContextualBox
data
-
test
-
id
=
"contextual-box-editorial-comments"
expanded
=
{
expanded
}
label
=
"Editorial Comments"
mb
=
{
2
}
...
...
packages/component-manuscript/src/components/ManuscriptLayout.js
View file @
ee616fbd
...
...
@@ -285,6 +285,7 @@ const ManuscriptLayout = ({
get
(
currentUser
,
'permissions.canMakeDecision'
,
false
)
&&
(
<
ManuscriptEicDecision
collection
=
{
collection
}
data
-
test
-
id
=
"contextual-box-manuscript-eic-decision"
expanded
=
{
eicDecisionExpanded
}
formValues
=
{
get
(
formValues
,
'eicDecision'
)}
fragment
=
{
fragment
}
...
...
packages/component-modal/src/components/Modal.js
View file @
ee616fbd
...
...
@@ -18,6 +18,7 @@ class Modal extends React.Component {
const
{
component
:
Component
,
overlayColor
,
...
rest
}
=
this
.
props
return
ReactDOM
.
createPortal
(
<
ModalRoot
data
-
test
-
id
=
"modal-root"
onClick
=
{
rest
.
dismissable
?
rest
.
hideModal
:
null
}
overlayColor
=
{
overlayColor
}
>
...
...
packages/component-user/app/components/AdminUserForm.js
View file @
ee616fbd
...
...
@@ -121,7 +121,7 @@ const FormModal = ({
<
/Row
>
<
RowOverrideAlert
alignItems
=
"center"
mb
=
{
2
}
>
<
ItemOverrideAlert
mr
=
{
1
}
vertical
>
<
ItemOverrideAlert
data
-
test
-
id
=
"title"
mr
=
{
1
}
vertical
>
<
Label
>
Title
<
/Label
>
<
ValidatedFormField
component
=
{
Menu
}
...
...
@@ -130,7 +130,7 @@ const FormModal = ({
/
>
<
/ItemOverrideAlert
>
<
ItemOverrideAlert
ml
=
{
1
}
vertical
>
<
ItemOverrideAlert
data
-
test
-
id
=
"country"
ml
=
{
1
}
vertical
>
<
Label
>
Country
<
/Label
>
<
ValidatedFormField
component
=
{
MenuCountry
}
name
=
"country"
/>
<
/ItemOverrideAlert
>
...
...
@@ -138,7 +138,7 @@ const FormModal = ({
<
Row
mb
=
{
3
}
>
{
edit
&&
(
<
ItemOverrideAlert
mr
=
{
1
}
vertical
>
<
ItemOverrideAlert
data
-
test
-
id
=
"role"
mr
=
{
1
}
vertical
>
<
Label
required
>
Role
<
/Label
>
<
ValidatedFormField
component
=
{
Menu
}
...
...
packages/hindawi-e2e/.gitignore
View file @
ee616fbd
cypress/screenshots
cypress/videos
cypress.json
\ No newline at end of file
cypress.json
cypress/Reports
\ No newline at end of file
packages/hindawi-e2e/combineReports/combine.js
0 → 100644
View file @
ee616fbd
const
fs
=
require
(
'fs'
)
const
path
=
require
(
'path'
)
function
getFiles
(
dir
,
ext
,
fileList
=
[])
{
const
files
=
fs
.
readdirSync
(
dir
)
files
.
forEach
(
file
=>
{
const
filePath
=
`
${
dir
}
/
${
file
}
`
if
(
fs
.
statSync
(
filePath
).
isDirectory
())
{
getFiles
(
filePath
,
fileList
)
}
else
if
(
path
.
extname
(
file
)
===
ext
)
{
fileList
.
push
(
filePath
)
}
})
return
fileList
}
function
traverseAndModifyTimedOut
(
target
,
deep
)
{
if
(
target
.
tests
&&
target
.
tests
.
length
)
{
target
.
tests
.
forEach
(
test
=>
{
test
.
timedOut
=
false
})
}
if
(
target
.
suites
)
{
target
.
suites
.
forEach
(
suite
=>
{
traverseAndModifyTimedOut
(
suite
,
deep
+
1
)
})
}
}
function
combineMochaAwesomeReports
(
reportFolderName
=
'mochawesome-report'
)
{
const
reportDir
=
path
.
join
(
__dirname
,
'..'
,
reportFolderName
)
const
reports
=
getFiles
(
reportDir
,
'.json'
,
[])
const
suites
=
[]
let
totalSuites
=
0
let
totalTests
=
0
let
totalPasses
=
0
let
totalFailures
=
0
let
totalPending
=
0
let
startTime
let
endTime
let
totalskipped
=
0
reports
.
forEach
((
report
,
idx
)
=>
{
const
rawdata
=
fs
.
readFileSync
(
report
)
const
parsedData
=
JSON
.
parse
(
rawdata
)
if
(
idx
===
0
)
{
startTime
=
parsedData
.
stats
.
start
}
if
(
idx
===
reports
.
length
-
1
)
{
endTime
=
parsedData
.
stats
.
end
}
totalSuites
+=
parseInt
(
parsedData
.
stats
.
suites
,
10
)
totalskipped
+=
parseInt
(
parsedData
.
stats
.
skipped
,
10
)
totalPasses
+=
parseInt
(
parsedData
.
stats
.
passes
,
10
)
totalFailures
+=
parseInt
(
parsedData
.
stats
.
failures
,
10
)
totalPending
+=
parseInt
(
parsedData
.
stats
.
pending
,
10
)
totalTests
+=
parseInt
(
parsedData
.
stats
.
tests
,
10
)
if
(
parsedData
&&
parsedData
.
suites
&&
parsedData
.
suites
.
suites
)
{
parsedData
.
suites
.
suites
.
forEach
(
suite
=>
{
suites
.
push
(
suite
)
})
}
})
return
{
totalSuites
,
totalTests
,
totalPasses
,
totalFailures
,
totalPending
,
startTime
,
endTime
,
totalskipped
,
suites
,
}
}
function
getPercentClass
(
pct
)
{
if
(
pct
<=
50
)
{
return
'danger'
}
else
if
(
pct
>
50
&&
pct
<
80
)
{
return
'warning'
}
return
'success'
}
function
writeReport
(
obj
,
uuid
)
{
const
sampleFile
=
path
.
join
(
__dirname
,
'sample.json'
)
const
outFile
=
path
.
join
(
__dirname
,
'..'
,
`
${
uuid
}
.json`
)
fs
.
readFile
(
sampleFile
,
'utf8'
,
(
err
,
data
)
=>
{
if
(
err
)
throw
err
const
parsedSampleFile
=
JSON
.
parse
(
data
)