From ca808274efcfc1bcd4cbf869c0552eacdb9f2d86 Mon Sep 17 00:00:00 2001 From: yannis <yannisbarlas@gmail.com> Date: Sun, 21 Jan 2018 20:20:24 +0200 Subject: [PATCH] fix number of tabs showing in review and decision pages --- .../component-dashboard/src/components/sections/EditorItem.js | 2 -- .../component-review/src/components/decision/DecisionLayout.js | 2 +- packages/component-review/src/components/review/ReviewLayout.js | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/component-dashboard/src/components/sections/EditorItem.js b/packages/component-dashboard/src/components/sections/EditorItem.js index e2072aa1e..6e1a6ea65 100644 --- a/packages/component-dashboard/src/components/sections/EditorItem.js +++ b/packages/component-dashboard/src/components/sections/EditorItem.js @@ -12,8 +12,6 @@ import Reviews from '../Reviews' import VersionTitle from './VersionTitle' const Actions = ({ project, version }) => { - if (project.status === 'revising') return null - return ( <div className={classes.links}> <div className={classes.link}> diff --git a/packages/component-review/src/components/decision/DecisionLayout.js b/packages/component-review/src/components/decision/DecisionLayout.js index 41915feb7..4203bf0c6 100644 --- a/packages/component-review/src/components/decision/DecisionLayout.js +++ b/packages/component-review/src/components/decision/DecisionLayout.js @@ -64,7 +64,7 @@ const DecisionLayout = ({ const { decision } = currentVersion - if (!decision || !decision.submitted) { + if (currentVersion.submitted && (!decision || !decision.submitted)) { const submittedMoment = moment() const key = submittedMoment.format('x') const label = submittedMoment.format('YYYY-MM-DD') diff --git a/packages/component-review/src/components/review/ReviewLayout.js b/packages/component-review/src/components/review/ReviewLayout.js index 2840aca8d..6eae08e98 100644 --- a/packages/component-review/src/components/review/ReviewLayout.js +++ b/packages/component-review/src/components/review/ReviewLayout.js @@ -68,7 +68,7 @@ const ReviewLayout = ({ review => review.reviewer === reviewer.id, ) - if (!review || !review.submitted) { + if (currentVersion.submitted && (!review || !review.submitted)) { const submittedMoment = moment() const key = submittedMoment.format('x') const label = submittedMoment.format('YYYY-MM-DD') -- GitLab