From df4bc32ebe56670559c66fa0177e751fd8ece4ad Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Thu, 24 May 2018 16:37:17 +0300
Subject: [PATCH] refactor(date-parser): rename date into date-parser
---
.../src/components/ManuscriptHeader.js | 6 +++---
.../src/components/ReviewReportCard.js | 10 +++++-----
.../src/components/Dashboard/DashboardCard.js | 6 +++---
.../src/components/Reviewers/ReviewerList.js | 6 +++---
.../components/Reviewers/ReviewersDetailsList.js | 14 +++++++++-----
.../UIComponents/{Date.js => DateParser.js} | 5 +++--
.../src/components/UIComponents/index.js | 2 +-
.../components-faraday/src/components/index.js | 2 +-
yarn.lock | 4 ++++
9 files changed, 32 insertions(+), 23 deletions(-)
rename packages/components-faraday/src/components/UIComponents/{Date.js => DateParser.js} (89%)
diff --git a/packages/component-manuscript/src/components/ManuscriptHeader.js b/packages/component-manuscript/src/components/ManuscriptHeader.js
index fbd15b63a..caa38eb70 100644
--- a/packages/component-manuscript/src/components/ManuscriptHeader.js
+++ b/packages/component-manuscript/src/components/ManuscriptHeader.js
@@ -1,6 +1,6 @@
import React from 'react'
import { get } from 'lodash'
-import { Date } from 'pubsweet-components-faraday/src/components'
+import { DateParser } from 'pubsweet-components-faraday/src/components'
// import { AuthorsWithTooltip } from '@pubsweet/ui'
import {
@@ -30,13 +30,13 @@ const ManuscriptDetails = ({ version, project, journal }) => {
<Row>
<LeftDetails flex={3}>
<StatusLabel>{mapStatusToLabel(project)}</StatusLabel>
- <Date timestamp={get(version, 'submitted')}>
+ <DateParser timestamp={get(version, 'submitted')}>
{(timestamp, days) => (
<DateField>
{timestamp} ({days})
</DateField>
)}
- </Date>
+ </DateParser>
</LeftDetails>
<RightDetails flex={4}>
<ManuscriptType title={manuscriptMeta}>
diff --git a/packages/component-manuscript/src/components/ReviewReportCard.js b/packages/component-manuscript/src/components/ReviewReportCard.js
index 1458635b4..ff357bec2 100644
--- a/packages/component-manuscript/src/components/ReviewReportCard.js
+++ b/packages/component-manuscript/src/components/ReviewReportCard.js
@@ -4,7 +4,7 @@ import { compose } from 'recompose'
import { get, isEmpty } from 'lodash'
import { withJournal } from 'xpub-journal'
import styled, { css } from 'styled-components'
-import { Date } from 'pubsweet-components-faraday/src/components'
+import { DateParser } from 'pubsweet-components-faraday/src/components'
import { FileItem } from 'pubsweet-components-faraday/src/components/Files'
import { ShowMore } from './'
@@ -32,17 +32,17 @@ const ReviewReportCard = ({
<Underline>{user.name}</Underline>
<span>{user.email}</span>
</Text>
- <Date timestamp={submittedOn}>
+ <DateParser timestamp={submittedOn}>
{timestamp => <Text>{timestamp}</Text>}
- </Date>
+ </DateParser>
</Row>
)}
<Row>
<Label>Recommendation</Label>
{!hasReviewer && (
- <Date timestamp={submittedOn}>
+ <DateParser timestamp={submittedOn}>
{timestamp => <Text>{timestamp}</Text>}
- </Date>
+ </DateParser>
)}
</Row>
<Row>
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardCard.js b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
index 70d39adfd..9e724a3c4 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardCard.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
@@ -9,7 +9,7 @@ import {
withModal,
ConfirmationModal,
} from 'pubsweet-component-modal/src/components'
-import { Date } from 'pubsweet-components-faraday/src/components'
+import { DateParser } from 'pubsweet-components-faraday/src/components'
import { AuthorsWithTooltip } from 'pubsweet-component-manuscript/src/molecules'
// import { AuthorsWithTooltip } from '@pubsweet/ui'
@@ -96,13 +96,13 @@ const DashboardCard = ({
<Bottom>
<LeftDetails flex={3}>
<Status>{mapStatusToLabel(project)}</Status>
- <Date timestamp={get(version, 'submitted')}>
+ <DateParser timestamp={get(version, 'submitted')}>
{(timestamp, daysAgo) => (
<DateField>
{timestamp} ({daysAgo})
</DateField>
)}
- </Date>
+ </DateParser>
</LeftDetails>
<RightDetails flex={4}>
<ManuscriptType title={manuscriptMeta}>
diff --git a/packages/components-faraday/src/components/Reviewers/ReviewerList.js b/packages/components-faraday/src/components/Reviewers/ReviewerList.js
index 1d270cfe1..5acbf18c4 100644
--- a/packages/components-faraday/src/components/Reviewers/ReviewerList.js
+++ b/packages/components-faraday/src/components/Reviewers/ReviewerList.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
import styled from 'styled-components'
import { th, Icon } from '@pubsweet/ui'
import { compose, withHandlers, withProps } from 'recompose'
-import { Date } from 'pubsweet-components-faraday/src/components'
+import { DateParser } from 'pubsweet-components-faraday/src/components'
import { revokeReviewer, inviteReviewer } from '../../redux/reviewers'
@@ -47,9 +47,9 @@ const ReviewersList = ({
<StatusText>
{r.status === 'accepted' ? 'Agreed' : r.status}
</StatusText>
- <Date timestamp={r.respondedOn}>
+ <DateParser timestamp={r.respondedOn}>
{timestamp => <DateText>{timestamp}</DateText>}
- </Date>
+ </DateParser>
</Column>
{r.status === 'pending' ? (
<ResendRevoke
diff --git a/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js b/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js
index 6d3573dd3..f8aa95193 100644
--- a/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js
+++ b/packages/components-faraday/src/components/Reviewers/ReviewersDetailsList.js
@@ -4,7 +4,7 @@ import { connect } from 'react-redux'
import { th, Icon } from '@pubsweet/ui'
import styled, { css } from 'styled-components'
import { compose, withHandlers, withProps } from 'recompose'
-import { Date } from 'pubsweet-components-faraday/src/components'
+import { DateParser } from 'pubsweet-components-faraday/src/components'
import {
withModal2,
ConfirmationModal,
@@ -47,16 +47,20 @@ const TR = ({
<AcceptedReviewer>{renderAcceptedLabel(index)}</AcceptedReviewer>
)}
</td>
- <Date timestamp={r.invitedOn}>{timestamp => <td>{timestamp}</td>}</Date>
+ <DateParser timestamp={r.invitedOn}>
+ {timestamp => <td>{timestamp}</td>}
+ </DateParser>
<td>
<StatusText>
{`${r.status === 'accepted' ? 'Agreed: ' : r.status}`}
</StatusText>
- <Date timestamp={r.respondedOn}>
+ <DateParser timestamp={r.respondedOn}>
{timestamp => <DateText>{timestamp}</DateText>}
- </Date>
+ </DateParser>
</td>
- <Date timestamp={submittedOn}>{timestamp => <td>{timestamp}</td>}</Date>
+ <DateParser timestamp={submittedOn}>
+ {timestamp => <td>{timestamp}</td>}
+ </DateParser>
<td width={100}>
{r.status === 'pending' && (
<ResendRevoke
diff --git a/packages/components-faraday/src/components/UIComponents/Date.js b/packages/components-faraday/src/components/UIComponents/DateParser.js
similarity index 89%
rename from packages/components-faraday/src/components/UIComponents/Date.js
rename to packages/components-faraday/src/components/UIComponents/DateParser.js
index cb3ea3577..5ff1623f3 100644
--- a/packages/components-faraday/src/components/UIComponents/Date.js
+++ b/packages/components-faraday/src/components/UIComponents/DateParser.js
@@ -7,7 +7,8 @@ const getDuration = timestamp => {
return moment.duration(today.diff(stamp))
}
-const Date = ({ children, timestamp, daysAgo }) => children(timestamp, daysAgo)
+const DateParser = ({ children, timestamp, daysAgo }) =>
+ children(timestamp, daysAgo)
export default compose(
withHandlers({
@@ -30,4 +31,4 @@ export default compose(
daysAgo: renderDaysAgo(),
timestamp: renderTimestamp(),
})),
-)(Date)
+)(DateParser)
diff --git a/packages/components-faraday/src/components/UIComponents/index.js b/packages/components-faraday/src/components/UIComponents/index.js
index e8b4ba57e..7ccd5732e 100644
--- a/packages/components-faraday/src/components/UIComponents/index.js
+++ b/packages/components-faraday/src/components/UIComponents/index.js
@@ -1,9 +1,9 @@
import * as FormItems from './FormItems'
export { FormItems }
-export { default as Date } from './Date'
export { default as Logo } from './Logo'
export { default as Spinner } from './Spinner'
export { default as NotFound } from './NotFound'
export { default as ErrorPage } from './ErrorPage'
+export { default as DateParser } from './DateParser'
export { default as ConfirmationPage } from './ConfirmationPage'
diff --git a/packages/components-faraday/src/components/index.js b/packages/components-faraday/src/components/index.js
index 0b8185024..e01e94e34 100644
--- a/packages/components-faraday/src/components/index.js
+++ b/packages/components-faraday/src/components/index.js
@@ -5,4 +5,4 @@ export { default as AuthorList } from './AuthorList/AuthorList'
export { default as SortableList } from './SortableList/SortableList'
export { DragHandle } from './AuthorList/FormItems'
-export { Dropdown, Date, Logo, Spinner } from './UIComponents'
+export { Dropdown, DateParser, Logo, Spinner } from './UIComponents'
diff --git a/yarn.lock b/yarn.lock
index 064c05a50..e7ef3dd27 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -6259,6 +6259,10 @@ moment@2.x.x, moment@^2.18.1, moment@^2.20.1, moment@^2.6.0:
version "2.20.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"
+moment@^2.22.1:
+ version "2.22.1"
+ resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad"
+
morgan@^1.8.2:
version "1.9.0"
resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051"
--
GitLab