From d2618cb51e579f69833b105e80501bceb492cb8a Mon Sep 17 00:00:00 2001
From: Giannis Kopanas <jkopanas@gmail.com>
Date: Thu, 8 Feb 2018 18:39:07 +0200
Subject: [PATCH] add COmpleted status fot the reviewers
---
packages/component-dashboard/src/components/Reviews.js | 2 +-
.../src/components/sections/ReviewerItem.js | 8 ++++----
packages/component-review/src/components/ReviewPage.js | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/packages/component-dashboard/src/components/Reviews.js b/packages/component-dashboard/src/components/Reviews.js
index 7ab111cfd..dde994ec2 100644
--- a/packages/component-dashboard/src/components/Reviews.js
+++ b/packages/component-dashboard/src/components/Reviews.js
@@ -6,7 +6,7 @@ import classes from './Reviews.local.scss'
const Reviews = ({ reviews }) => (
<div className={classes.root}>
- {Object.keys(reviews).map(status => (
+ {['invited', 'accepted', 'rejected', 'completed'].map(status => (
<span className={classes.badge} key={status}>
<Badge count={reviews[status].length} label={status} />
</span>
diff --git a/packages/component-dashboard/src/components/sections/ReviewerItem.js b/packages/component-dashboard/src/components/sections/ReviewerItem.js
index 8ec3b7869..b9381c616 100644
--- a/packages/component-dashboard/src/components/sections/ReviewerItem.js
+++ b/packages/component-dashboard/src/components/sections/ReviewerItem.js
@@ -7,7 +7,7 @@ import Divider from './Divider'
import VersionTitle from './VersionTitle'
// TODO: only return links if version id is in reviewer.accepted array
-// TODO: only return actions if not accepted or declined
+// TODO: only return actions if not accepted or rejected
// TODO: review id in link
const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => {
@@ -29,7 +29,7 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => {
project={project}
version={version}
>
- {reviewer.submitted ? 'Reviewed' : 'Do Review'}
+ {reviewer.submitted ? 'Completed' : 'Do Review'}
</ProjectLink>
</div>
</div>
@@ -52,7 +52,7 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => {
<div className={classes.action}>
<Button
onClick={() =>
- reviewerResponse(project, version, reviewer, 'declined')
+ reviewerResponse(project, version, reviewer, 'rejected')
}
>
reject
@@ -61,7 +61,7 @@ const ReviewerItem = ({ project, version, currentUser, reviewerResponse }) => {
</div>
)}
- {reviewer.status === 'declined' && <div>declined</div>}
+ {reviewer.status === 'rejected' && <div>rejected</div>}
</div>
)}
</div>
diff --git a/packages/component-review/src/components/ReviewPage.js b/packages/component-review/src/components/ReviewPage.js
index 880a86d37..337231247 100644
--- a/packages/component-review/src/components/ReviewPage.js
+++ b/packages/component-review/src/components/ReviewPage.js
@@ -23,9 +23,9 @@ const onSubmit = (
{ history, project, version, reviewer },
) => {
Object.assign(reviewer, {
- status: 'reviewed',
- submitted: new Date(),
...values,
+ status: 'completed',
+ submitted: new Date(),
})
return dispatch(
--
GitLab