Skip to content
Snippets Groups Projects
Commit 8ab0c3e6 authored by Bogdan Cochior's avatar Bogdan Cochior
Browse files

fix: fix issues from demo rehearsal

header title, delete manuscript, spinner on wizard
parent ea4a89d3
No related branches found
No related tags found
1 merge request!43Sprint #19
...@@ -16,7 +16,6 @@ const AppBar = ({ ...@@ -16,7 +16,6 @@ const AppBar = ({
<LogoContainer> <LogoContainer>
<Logo /> <Logo />
</LogoContainer> </LogoContainer>
<H2>{nameText}</H2>
<RightContainer> <RightContainer>
<Autosave /> <Autosave />
<Menu /> <Menu />
......
...@@ -51,7 +51,7 @@ const ManuscriptCard = ({ ...@@ -51,7 +51,7 @@ const ManuscriptCard = ({
<Row alignItems="center" justify="flex-start" mb={1}> <Row alignItems="center" justify="flex-start" mb={1}>
<Text customId mr={1}>{`ID ${customId}`}</Text> <Text customId mr={1}>{`ID ${customId}`}</Text>
{submitted && ( {submitted && (
<DateParser durationThreshold={0} timestamp={submitted}> <DateParser humanizeThreshold={0} timestamp={submitted}>
{timestamp => ( {timestamp => (
<Text mr={3} secondary> <Text mr={3} secondary>
Submitted on {timestamp} Submitted on {timestamp}
...@@ -75,9 +75,9 @@ const ManuscriptCard = ({ ...@@ -75,9 +75,9 @@ const ManuscriptCard = ({
{canDelete && ( {canDelete && (
<Item justify="flex-end" onClick={e => e.stopPropagation()}> <Item justify="flex-end" onClick={e => e.stopPropagation()}>
<OpenModal <OpenModal
confirmAction={onDelete}
confirmText="Delete" confirmText="Delete"
modalKey={`delete-${customId}`} modalKey={`delete-${customId}`}
onConfirm={onDelete}
title="Are you sure you want to delete this submission?" title="Are you sure you want to delete this submission?"
> >
{onClickEvent => ( {onClickEvent => (
......
...@@ -111,6 +111,7 @@ export default compose( ...@@ -111,6 +111,7 @@ export default compose(
revokeInvitation, revokeInvitation,
pendingInvitation, pendingInvitation,
handlingEditors = [], handlingEditors = [],
currentUser: { canAssignHE },
collection: { handlingEditor, invitations = [] }, collection: { handlingEditor, invitations = [] },
}) => () => { }) => () => {
if (pendingInvitation) { if (pendingInvitation) {
...@@ -134,11 +135,14 @@ export default compose( ...@@ -134,11 +135,14 @@ export default compose(
if (heInvitation) { if (heInvitation) {
return <Text ml={1}>{handlingEditor.name}</Text> return <Text ml={1}>{handlingEditor.name}</Text>
} }
return ( if (canAssignHE) {
<Button ml={1} onClick={inviteHE} primary size="small"> return (
Invite <Button ml={1} onClick={inviteHE} primary size="small">
</Button> Invite
) </Button>
)
}
return <Text ml={1}>Unassigned</Text>
}, },
}), }),
setDisplayName('ManuscriptHeader'), setDisplayName('ManuscriptHeader'),
......
...@@ -57,6 +57,7 @@ const ManuscriptLayout = ({ ...@@ -57,6 +57,7 @@ const ManuscriptLayout = ({
<ManuscriptHeader <ManuscriptHeader
collection={collection} collection={collection}
currentUser={currentUser}
editorInChief={editorInChief} editorInChief={editorInChief}
fragment={fragment} fragment={fragment}
handlingEditors={handlingEditors} handlingEditors={handlingEditors}
......
...@@ -44,7 +44,7 @@ const StepThree = ({ ...@@ -44,7 +44,7 @@ const StepThree = ({
version={version} version={version}
/> />
{filesError && ( {filesError && (
<Row mt={1}> <Row justify="flex-start" mt={1}>
<Text error>{filesError}</Text> <Text error>{filesError}</Text>
</Row> </Row>
)} )}
......
...@@ -70,7 +70,7 @@ const Wizard = ({ ...@@ -70,7 +70,7 @@ const Wizard = ({
<StepRoot className="wizard-step"> <StepRoot className="wizard-step">
{wizardSteps[step].component({ manuscriptTypes, ...rest })} {wizardSteps[step].component({ manuscriptTypes, ...rest })}
<Row justify="center" mt={2}> <Row justify="center" mt={2}>
{isAuthorsFetching || isFilesFetching ? ( {(isAuthorsFetching || isFilesFetching) && isLastStep ? (
<Spinner /> <Spinner />
) : ( ) : (
<Fragment> <Fragment>
......
...@@ -27,7 +27,7 @@ const App = ({ ...@@ -27,7 +27,7 @@ const App = ({
autosave={() => ( autosave={() => (
<AutosaveIndicator <AutosaveIndicator
autosave={autosave} autosave={autosave}
delay={10000} delay={5000}
successText="Progress Saved" successText="Progress Saved"
/> />
)} )}
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment