Skip to content
Snippets Groups Projects
Commit 1d3f81b3 authored by Alexandru Munteanu's avatar Alexandru Munteanu
Browse files

chore(various): remove unused code

parent 1de913f9
No related branches found
No related tags found
1 merge request!10Sprint #12
Showing
with 15 additions and 110 deletions
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
...@@ -15,7 +15,6 @@ const Dashboard = ({ ...@@ -15,7 +15,6 @@ const Dashboard = ({
deleteProject, deleteProject,
getFilterOptions, getFilterOptions,
changeFilterValue, changeFilterValue,
showAbstractModal,
createDraftSubmission, createDraftSubmission,
...rest ...rest
}) => ( }) => (
...@@ -36,22 +35,12 @@ const Dashboard = ({ ...@@ -36,22 +35,12 @@ const Dashboard = ({
changeFilterValue={changeFilterValue} changeFilterValue={changeFilterValue}
getFilterOptions={getFilterOptions} getFilterOptions={getFilterOptions}
/> />
<DashboardItems <DashboardItems deleteProject={deleteProject} list={getItems()} />
deleteProject={deleteProject}
list={getItems()}
showAbstractModal={showAbstractModal}
/>
</Root> </Root>
) )
export default compose( export default compose(
withHandlers({ withHandlers({
showAbstractModal: ({ showModal }) => metadata => () => {
showModal({
metadata,
dismissable: true,
})
},
getItems: ({ getItems: ({
filters, filters,
dashboard, dashboard,
......
...@@ -34,7 +34,6 @@ const DashboardCard = ({ ...@@ -34,7 +34,6 @@ const DashboardCard = ({
currentUser, currentUser,
deleteProject, deleteProject,
canMakeDecision, canMakeDecision,
showAbstractModal,
canInviteReviewers, canInviteReviewers,
canMakeRecommendation, canMakeRecommendation,
...rest ...rest
......
...@@ -4,7 +4,7 @@ import { Menu, th } from '@pubsweet/ui' ...@@ -4,7 +4,7 @@ import { Menu, th } from '@pubsweet/ui'
import { compose, withHandlers } from 'recompose' import { compose, withHandlers } from 'recompose'
const DashboardFilters = ({ const DashboardFilters = ({
view, // view,
status, status,
listView, listView,
createdAt, createdAt,
......
...@@ -6,12 +6,7 @@ import withVersion from './withVersion' ...@@ -6,12 +6,7 @@ import withVersion from './withVersion'
const DashboardItem = withVersion(Item) const DashboardItem = withVersion(Item)
const DashboardItems = ({ const DashboardItems = ({ list, deleteProject, listView = true }) => (
list,
deleteProject,
listView = true,
showAbstractModal,
}) => (
<div> <div>
{!list.length && ( {!list.length && (
<Empty>Nothing to do at the moment. Please upload a manuscript.</Empty> <Empty>Nothing to do at the moment. Please upload a manuscript.</Empty>
...@@ -25,7 +20,6 @@ const DashboardItems = ({ ...@@ -25,7 +20,6 @@ const DashboardItems = ({
key={p.id} key={p.id}
listView={listView} listView={listView}
project={p} project={p}
showAbstractModal={showAbstractModal}
/> />
))} ))}
</Section> </Section>
......
import React from 'react' import React from 'react'
import { get } from 'lodash'
import { th } from '@pubsweet/ui' import { th } from '@pubsweet/ui'
import styled from 'styled-components' import styled from 'styled-components'
import { compose, withHandlers, setDisplayName } from 'recompose' import { compose, withHandlers, setDisplayName } from 'recompose'
...@@ -8,6 +7,8 @@ import { ...@@ -8,6 +7,8 @@ import {
ConfirmationModal, ConfirmationModal,
} from 'pubsweet-component-modal/src/components' } from 'pubsweet-component-modal/src/components'
import { handleError } from '../utils'
const DeleteManuscript = ({ confirmDelete }) => ( const DeleteManuscript = ({ confirmDelete }) => (
<Details onClick={confirmDelete}>Delete</Details> <Details onClick={confirmDelete}>Delete</Details>
) )
...@@ -20,20 +21,15 @@ export default compose( ...@@ -20,20 +21,15 @@ export default compose(
withHandlers({ withHandlers({
confirmDelete: ({ confirmDelete: ({
showModal, showModal,
hideModal,
deleteProject, deleteProject,
setModalError, setModalError,
hideModal,
}) => () => { }) => () => {
showModal({ showModal({
confirmText: 'Delete', confirmText: 'Delete',
title: 'Are you sure you want to delete this submission?', title: 'Are you sure you want to delete this submission?',
onConfirm: () => { onConfirm: () => {
deleteProject().then(hideModal, e => { deleteProject().then(hideModal, handleError(setModalError))
setModalError(
get(JSON.parse(e.response), 'error') ||
'Oops! Something went wrong!',
)
})
}, },
}) })
}, },
......
...@@ -8,6 +8,8 @@ import { ...@@ -8,6 +8,8 @@ import {
withModal, withModal,
ConfirmationModal, ConfirmationModal,
} from 'pubsweet-component-modal/src/components' } from 'pubsweet-component-modal/src/components'
import { handleError } from '../utils'
import { selectFetchingDecision, reviewerDecision } from '../../redux/reviewers' import { selectFetchingDecision, reviewerDecision } from '../../redux/reviewers'
const ReviewerDecision = ({ showAcceptModal, showDeclineModal, ...rest }) => ( const ReviewerDecision = ({ showAcceptModal, showDeclineModal, ...rest }) => (
...@@ -44,6 +46,7 @@ export default compose( ...@@ -44,6 +46,7 @@ export default compose(
project, project,
showModal, showModal,
invitation, invitation,
setModalError,
decisionSuccess, decisionSuccess,
reviewerDecision, reviewerDecision,
}) => () => { }) => () => {
...@@ -53,6 +56,7 @@ export default compose( ...@@ -53,6 +56,7 @@ export default compose(
onConfirm: () => { onConfirm: () => {
reviewerDecision(invitation.id, project.id, true).then( reviewerDecision(invitation.id, project.id, true).then(
decisionSuccess, decisionSuccess,
handleError(setModalError),
) )
}, },
}) })
...@@ -61,6 +65,7 @@ export default compose( ...@@ -61,6 +65,7 @@ export default compose(
project, project,
showModal, showModal,
invitation, invitation,
setModalError,
decisionSuccess, decisionSuccess,
reviewerDecision, reviewerDecision,
}) => () => { }) => () => {
...@@ -70,6 +75,7 @@ export default compose( ...@@ -70,6 +75,7 @@ export default compose(
onConfirm: () => { onConfirm: () => {
reviewerDecision(invitation.id, project.id, false).then( reviewerDecision(invitation.id, project.id, false).then(
decisionSuccess, decisionSuccess,
handleError(setModalError),
) )
}, },
}) })
...@@ -85,7 +91,7 @@ const defaultText = css` ...@@ -85,7 +91,7 @@ const defaultText = css`
const DecisionButton = styled(Button)` const DecisionButton = styled(Button)`
${defaultText}; ${defaultText};
align-items: center; align-items: center;
background-color: ${({ primary }) => background-color: ${({ primary }) =>
primary ? th('colorPrimary') : th('backgroundColorReverse')}; primary ? th('colorPrimary') : th('backgroundColorReverse')};
color: ${({ primary }) => color: ${({ primary }) =>
......
import DashboardPage from './DashboardPage' import DashboardPage from './DashboardPage'
export { default as Dashboard } from './Dashboard' export { default as Dashboard } from './Dashboard'
export { default as AbstractModal } from './AbstractModal'
export { default as AuthorTooltip } from './AuthorTooltip' export { default as AuthorTooltip } from './AuthorTooltip'
export { default as DashboardCard } from './DashboardCard' export { default as DashboardCard } from './DashboardCard'
export { default as DashboardItems } from './DashboardItems' export { default as DashboardItems } from './DashboardItems'
......
import moment from 'moment'
import { get, find, capitalize } from 'lodash' import { get, find, capitalize } from 'lodash'
export const parseTitle = version => { export const parseTitle = version => {
...@@ -19,22 +18,9 @@ export const parseType = version => { ...@@ -19,22 +18,9 @@ export const parseType = version => {
return type ? type.replace('-', ' ') : 'N/A' 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 => ({ export const parseVersion = version => ({
author: parseAuthor(version), author: parseAuthor(version),
title: parseTitle(version), title: parseTitle(version),
submitted: parseSubmissionDate(version),
type: parseType(version), type: parseType(version),
abstract: get(version, 'metadata.abstract'), abstract: get(version, 'metadata.abstract'),
version: get(version, 'version'), version: get(version, 'version'),
......
...@@ -44,7 +44,7 @@ module.exports = { ...@@ -44,7 +44,7 @@ module.exports = {
'pubsweet-client': { 'pubsweet-client': {
API_ENDPOINT: '/api', API_ENDPOINT: '/api',
'login-redirect': '/', 'login-redirect': '/',
'redux-log': true, 'redux-log': false,
theme: process.env.PUBSWEET_THEME, theme: process.env.PUBSWEET_THEME,
}, },
'mail-transport': { 'mail-transport': {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment