From 1d3f81b37f6ce6db056bb0ae2aa9ee4e76464f86 Mon Sep 17 00:00:00 2001
From: Alexandru Munteanu <alexandru.munt@gmail.com>
Date: Tue, 5 Jun 2018 12:39:13 +0300
Subject: [PATCH] chore(various): remove unused code
---
.../src/components/Dashboard/AbstractModal.js | 64 -------------------
.../src/components/Dashboard/Dashboard.js | 13 +---
.../src/components/Dashboard/DashboardCard.js | 1 -
.../components/Dashboard/DashboardFilters.js | 2 +-
.../components/Dashboard/DashboardItems.js | 8 +--
.../components/Dashboard/DeleteManuscript.js | 12 ++--
.../components/Dashboard/ReviewerDecision.js | 8 ++-
.../src/components/Dashboard/index.js | 1 -
.../src/components/utils.js | 14 ----
packages/xpub-faraday/config/default.js | 2 +-
10 files changed, 15 insertions(+), 110 deletions(-)
delete mode 100644 packages/components-faraday/src/components/Dashboard/AbstractModal.js
diff --git a/packages/components-faraday/src/components/Dashboard/AbstractModal.js b/packages/components-faraday/src/components/Dashboard/AbstractModal.js
deleted file mode 100644
index e4a6eb11b..000000000
--- a/packages/components-faraday/src/components/Dashboard/AbstractModal.js
+++ /dev/null
@@ -1,64 +0,0 @@
-import React from 'react'
-import { get } from 'lodash'
-import { Icon, th } from '@pubsweet/ui'
-import styled, { css } from 'styled-components'
-
-const AbstractModal = ({ metadata, hideModal }) => (
- <Root>
- <CloseIcon onClick={hideModal}>
- <Icon primary>x</Icon>
- </CloseIcon>
- <Title dangerouslySetInnerHTML={{ __html: get(metadata, 'title') }} />
- <Subtitle>Abstract</Subtitle>
- <Content dangerouslySetInnerHTML={{ __html: get(metadata, 'abstract') }} />
- </Root>
-)
-
-export default AbstractModal
-
-// #region styled-components
-const defaultText = css`
- color: ${th('colorText')};
- font-family: ${th('fontReading')};
- font-size: ${th('fontSizeBaseSmall')};
-`
-
-const Root = styled.div`
- background-color: ${th('backgroundColor')};
- border: ${th('borderDefault')};
- max-height: 500px;
- padding: ${th('gridUnit')};
- padding-top: calc(${th('gridUnit')} * 2);
- position: relative;
- overflow-y: scroll;
- width: 600px;
-`
-
-const Title = styled.div`
- ${defaultText};
- font-size: ${th('fontSizeBase')};
- text-align: left;
-`
-
-const Subtitle = styled.div`
- ${defaultText};
- font-weight: bold;
- line-height: 1.57;
- margin-bottom: ${th('subGridUnit')};
- text-align: left;
-`
-
-const Content = styled.div`
- ${defaultText};
- line-height: 1.57;
- margin-top: calc(${th('subGridUnit')} * 2);
- text-align: left;
-`
-
-const CloseIcon = styled.div`
- cursor: pointer;
- position: absolute;
- top: ${th('subGridUnit')};
- right: ${th('subGridUnit')};
-`
-// #endregion
diff --git a/packages/components-faraday/src/components/Dashboard/Dashboard.js b/packages/components-faraday/src/components/Dashboard/Dashboard.js
index c0d8486c6..c740018ba 100644
--- a/packages/components-faraday/src/components/Dashboard/Dashboard.js
+++ b/packages/components-faraday/src/components/Dashboard/Dashboard.js
@@ -15,7 +15,6 @@ const Dashboard = ({
deleteProject,
getFilterOptions,
changeFilterValue,
- showAbstractModal,
createDraftSubmission,
...rest
}) => (
@@ -36,22 +35,12 @@ const Dashboard = ({
changeFilterValue={changeFilterValue}
getFilterOptions={getFilterOptions}
/>
- <DashboardItems
- deleteProject={deleteProject}
- list={getItems()}
- showAbstractModal={showAbstractModal}
- />
+ <DashboardItems deleteProject={deleteProject} list={getItems()} />
</Root>
)
export default compose(
withHandlers({
- showAbstractModal: ({ showModal }) => metadata => () => {
- showModal({
- metadata,
- dismissable: true,
- })
- },
getItems: ({
filters,
dashboard,
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardCard.js b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
index 8022eea61..23d37ac8e 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardCard.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardCard.js
@@ -34,7 +34,6 @@ const DashboardCard = ({
currentUser,
deleteProject,
canMakeDecision,
- showAbstractModal,
canInviteReviewers,
canMakeRecommendation,
...rest
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardFilters.js b/packages/components-faraday/src/components/Dashboard/DashboardFilters.js
index 88f5737f4..0d0cfbd37 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardFilters.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardFilters.js
@@ -4,7 +4,7 @@ import { Menu, th } from '@pubsweet/ui'
import { compose, withHandlers } from 'recompose'
const DashboardFilters = ({
- view,
+ // view,
status,
listView,
createdAt,
diff --git a/packages/components-faraday/src/components/Dashboard/DashboardItems.js b/packages/components-faraday/src/components/Dashboard/DashboardItems.js
index 8e898b79a..172ad3461 100644
--- a/packages/components-faraday/src/components/Dashboard/DashboardItems.js
+++ b/packages/components-faraday/src/components/Dashboard/DashboardItems.js
@@ -6,12 +6,7 @@ import withVersion from './withVersion'
const DashboardItem = withVersion(Item)
-const DashboardItems = ({
- list,
- deleteProject,
- listView = true,
- showAbstractModal,
-}) => (
+const DashboardItems = ({ list, deleteProject, listView = true }) => (
<div>
{!list.length && (
<Empty>Nothing to do at the moment. Please upload a manuscript.</Empty>
@@ -25,7 +20,6 @@ const DashboardItems = ({
key={p.id}
listView={listView}
project={p}
- showAbstractModal={showAbstractModal}
/>
))}
</Section>
diff --git a/packages/components-faraday/src/components/Dashboard/DeleteManuscript.js b/packages/components-faraday/src/components/Dashboard/DeleteManuscript.js
index bb401928e..7f53c759e 100644
--- a/packages/components-faraday/src/components/Dashboard/DeleteManuscript.js
+++ b/packages/components-faraday/src/components/Dashboard/DeleteManuscript.js
@@ -1,5 +1,4 @@
import React from 'react'
-import { get } from 'lodash'
import { th } from '@pubsweet/ui'
import styled from 'styled-components'
import { compose, withHandlers, setDisplayName } from 'recompose'
@@ -8,6 +7,8 @@ import {
ConfirmationModal,
} from 'pubsweet-component-modal/src/components'
+import { handleError } from '../utils'
+
const DeleteManuscript = ({ confirmDelete }) => (
<Details onClick={confirmDelete}>Delete</Details>
)
@@ -20,20 +21,15 @@ export default compose(
withHandlers({
confirmDelete: ({
showModal,
+ hideModal,
deleteProject,
setModalError,
- hideModal,
}) => () => {
showModal({
confirmText: 'Delete',
title: 'Are you sure you want to delete this submission?',
onConfirm: () => {
- deleteProject().then(hideModal, e => {
- setModalError(
- get(JSON.parse(e.response), 'error') ||
- 'Oops! Something went wrong!',
- )
- })
+ deleteProject().then(hideModal, handleError(setModalError))
},
})
},
diff --git a/packages/components-faraday/src/components/Dashboard/ReviewerDecision.js b/packages/components-faraday/src/components/Dashboard/ReviewerDecision.js
index 2636b09b5..6dece3361 100644
--- a/packages/components-faraday/src/components/Dashboard/ReviewerDecision.js
+++ b/packages/components-faraday/src/components/Dashboard/ReviewerDecision.js
@@ -8,6 +8,8 @@ import {
withModal,
ConfirmationModal,
} from 'pubsweet-component-modal/src/components'
+
+import { handleError } from '../utils'
import { selectFetchingDecision, reviewerDecision } from '../../redux/reviewers'
const ReviewerDecision = ({ showAcceptModal, showDeclineModal, ...rest }) => (
@@ -44,6 +46,7 @@ export default compose(
project,
showModal,
invitation,
+ setModalError,
decisionSuccess,
reviewerDecision,
}) => () => {
@@ -53,6 +56,7 @@ export default compose(
onConfirm: () => {
reviewerDecision(invitation.id, project.id, true).then(
decisionSuccess,
+ handleError(setModalError),
)
},
})
@@ -61,6 +65,7 @@ export default compose(
project,
showModal,
invitation,
+ setModalError,
decisionSuccess,
reviewerDecision,
}) => () => {
@@ -70,6 +75,7 @@ export default compose(
onConfirm: () => {
reviewerDecision(invitation.id, project.id, false).then(
decisionSuccess,
+ handleError(setModalError),
)
},
})
@@ -85,7 +91,7 @@ const defaultText = css`
const DecisionButton = styled(Button)`
${defaultText};
- align-items: center;
+ align-items: center;
background-color: ${({ primary }) =>
primary ? th('colorPrimary') : th('backgroundColorReverse')};
color: ${({ primary }) =>
diff --git a/packages/components-faraday/src/components/Dashboard/index.js b/packages/components-faraday/src/components/Dashboard/index.js
index 365a49a2c..a0b4c9cd8 100644
--- a/packages/components-faraday/src/components/Dashboard/index.js
+++ b/packages/components-faraday/src/components/Dashboard/index.js
@@ -1,7 +1,6 @@
import DashboardPage from './DashboardPage'
export { default as Dashboard } from './Dashboard'
-export { default as AbstractModal } from './AbstractModal'
export { default as AuthorTooltip } from './AuthorTooltip'
export { default as DashboardCard } from './DashboardCard'
export { default as DashboardItems } from './DashboardItems'
diff --git a/packages/components-faraday/src/components/utils.js b/packages/components-faraday/src/components/utils.js
index e4734a369..1780bd7a3 100644
--- a/packages/components-faraday/src/components/utils.js
+++ b/packages/components-faraday/src/components/utils.js
@@ -1,4 +1,3 @@
-import moment from 'moment'
import { get, find, capitalize } from 'lodash'
export const parseTitle = version => {
@@ -19,22 +18,9 @@ export const parseType = version => {
return type ? type.replace('-', ' ') : 'N/A'
}
-export const parseSubmissionDate = version => {
- const submitted = get(version, 'submitted')
- const submittedDate = moment(submitted)
- const today = moment()
- const daysAgo = moment.duration(today - moment(submitted)).days()
- return submitted
- ? `${submittedDate.format('DD.MM.YYYY')} ${
- daysAgo > 0 ? `(${daysAgo} days)` : ''
- }`
- : 'N/A'
-}
-
export const parseVersion = version => ({
author: parseAuthor(version),
title: parseTitle(version),
- submitted: parseSubmissionDate(version),
type: parseType(version),
abstract: get(version, 'metadata.abstract'),
version: get(version, 'version'),
diff --git a/packages/xpub-faraday/config/default.js b/packages/xpub-faraday/config/default.js
index 70c2472c5..4ee45fea3 100644
--- a/packages/xpub-faraday/config/default.js
+++ b/packages/xpub-faraday/config/default.js
@@ -44,7 +44,7 @@ module.exports = {
'pubsweet-client': {
API_ENDPOINT: '/api',
'login-redirect': '/',
- 'redux-log': true,
+ 'redux-log': false,
theme: process.env.PUBSWEET_THEME,
},
'mail-transport': {
--
GitLab