From aecb4bd19a6b497277de631ca33399d28a834a74 Mon Sep 17 00:00:00 2001 From: Alexandru Munteanu <alexandru.munt@gmail.com> Date: Tue, 4 Sep 2018 11:18:04 +0300 Subject: [PATCH] fix(submission-flow): fix manuscript files step --- packages/component-faraday-ui/src/FileSection.js | 8 +++++++- packages/component-faraday-ui/src/ManuscriptCard.js | 2 +- packages/component-faraday-ui/src/WizardFiles.js | 1 - .../src/components/Dashboard/Dashboard.js | 5 ++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/component-faraday-ui/src/FileSection.js b/packages/component-faraday-ui/src/FileSection.js index 59382b1ff..27ba4f96a 100644 --- a/packages/component-faraday-ui/src/FileSection.js +++ b/packages/component-faraday-ui/src/FileSection.js @@ -32,6 +32,7 @@ const FileSection = ({ isFirst, required, moveItem, + maxFiles, isFileItemOver, canDropFileItem, connectFileDrop, @@ -58,9 +59,14 @@ const FileSection = ({ <Label required={required}>{title}</Label> <FilePicker allowedFileExtensions={allowedFileExtensions} + disabled={files.length >= maxFiles} onUpload={onFilePick} > - <ActionLink icon="plus" size="small"> + <ActionLink + disabled={files.length >= maxFiles} + icon="plus" + size="small" + > UPLOAD FILE </ActionLink> </FilePicker> diff --git a/packages/component-faraday-ui/src/ManuscriptCard.js b/packages/component-faraday-ui/src/ManuscriptCard.js index 56ba7e152..c7c238687 100644 --- a/packages/component-faraday-ui/src/ManuscriptCard.js +++ b/packages/component-faraday-ui/src/ManuscriptCard.js @@ -152,7 +152,7 @@ const Root = styled.div` box-shadow: ${th('boxShadow')}; cursor: pointer; display: flex; - margin: ${th('gridUnit')}; + margin-bottom: ${th('gridUnit')}; &:hover { box-shadow: ${th('dashboardCard.hoverShadow')}; diff --git a/packages/component-faraday-ui/src/WizardFiles.js b/packages/component-faraday-ui/src/WizardFiles.js index c7d2b2d57..5880849e2 100644 --- a/packages/component-faraday-ui/src/WizardFiles.js +++ b/packages/component-faraday-ui/src/WizardFiles.js @@ -42,7 +42,6 @@ const WizardFiles = ({ onFileDrop={addFile('coverLetter')} onFilePick={addFile('coverLetter')} onPreview={previewFile} - required title="Cover Letter" /> <FileSection diff --git a/packages/components-faraday/src/components/Dashboard/Dashboard.js b/packages/components-faraday/src/components/Dashboard/Dashboard.js index 259aad9b5..7fa751167 100644 --- a/packages/components-faraday/src/components/Dashboard/Dashboard.js +++ b/packages/components-faraday/src/components/Dashboard/Dashboard.js @@ -1,5 +1,5 @@ import React, { Fragment } from 'react' -import { Button, H1 } from '@pubsweet/ui' +import { Button } from '@pubsweet/ui' import { compose, withProps } from 'recompose' import { Row } from 'pubsweet-component-faraday-ui' @@ -15,8 +15,7 @@ const Dashboard = ({ getDefaultFilterValue, }) => ( <Fragment> - <Row alignItems="center" justify="space-between"> - <H1 mb={1}>Dashboard</H1> + <Row alignItems="center" justify="flex-end"> <Button data-test="new-manuscript" disabled={!canCreateDraft} -- GitLab