From 9833fec900bf2620228a213c6c58b429d22bf6bb Mon Sep 17 00:00:00 2001 From: Giannis Kopanas <jkopanas@gmail.com> Date: Tue, 23 Jan 2018 15:34:31 +0200 Subject: [PATCH] rename Submission , move assign reviewers link to decision Page , title changes --- .../src/components/sections/EditorItem.js | 6 +++--- .../src/components/sections/OwnerItem.js | 2 +- .../src/components/decision/DecisionLayout.js | 9 ++++++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/packages/component-dashboard/src/components/sections/EditorItem.js b/packages/component-dashboard/src/components/sections/EditorItem.js index 2e4b8f8e9..6983c73df 100644 --- a/packages/component-dashboard/src/components/sections/EditorItem.js +++ b/packages/component-dashboard/src/components/sections/EditorItem.js @@ -14,7 +14,7 @@ import VersionTitle from './VersionTitle' const Actions = ({ project, version }) => ( <div className={classes.links}> <div className={classes.link}> - {(!version.decision || + {/* {(!version.decision || version.decision.status !== 'revising' || version.decision.status !== 'submitted') && ( <span> @@ -24,7 +24,7 @@ const Actions = ({ project, version }) => ( <Divider separator="|" /> </span> - )} + )} */} <ProjectLink id={project.id} @@ -34,7 +34,7 @@ const Actions = ({ project, version }) => ( > {version.decision && version.decision.status === 'submitted' ? `Decision: ${version.decision.recommendation}` - : 'Make decision'} + : 'Control Panel'} </ProjectLink> </div> </div> diff --git a/packages/component-dashboard/src/components/sections/OwnerItem.js b/packages/component-dashboard/src/components/sections/OwnerItem.js index d122fccc2..6e9fd7450 100644 --- a/packages/component-dashboard/src/components/sections/OwnerItem.js +++ b/packages/component-dashboard/src/components/sections/OwnerItem.js @@ -17,7 +17,7 @@ const OwnerItem = ({ project, version, deleteProject }) => ( <div className={classes.links}> <div className={classes.link}> <ProjectLink page="submit" project={project} version={version}> - Submission + Summary info </ProjectLink> </div> diff --git a/packages/component-review/src/components/decision/DecisionLayout.js b/packages/component-review/src/components/decision/DecisionLayout.js index 4203bf0c6..5d64f3f85 100644 --- a/packages/component-review/src/components/decision/DecisionLayout.js +++ b/packages/component-review/src/components/decision/DecisionLayout.js @@ -1,6 +1,7 @@ import React from 'react' import moment from 'moment' // import classnames from 'classnames' +import { Link } from 'react-router-dom' import SimpleEditor from 'wax-editor-react' import classes from './DecisionLayout.local.scss' import DecisionForm from './DecisionForm' @@ -68,12 +69,18 @@ const DecisionLayout = ({ const submittedMoment = moment() const key = submittedMoment.format('x') const label = submittedMoment.format('YYYY-MM-DD') - decisionSections.push({ content: ( <div> <ReviewMetadata version={currentVersion} /> <DecisionReviews version={currentVersion} /> + <Link + to={`/projects/${project.id}/versions/${ + currentVersion.id + }/reviewers`} + > + Assign Reviewers + </Link> <DecisionForm decision={decision} handleSubmit={handleSubmit} -- GitLab