diff --git a/packages/components-faraday/src/components/Dashboard/DashboardItems.js b/packages/components-faraday/src/components/Dashboard/DashboardItems.js index f40111b657f9d73f7da239ad2086c80daf5dd76d..97c067c08aa06b312193e906bdae3bcf11b73485 100644 --- a/packages/components-faraday/src/components/Dashboard/DashboardItems.js +++ b/packages/components-faraday/src/components/Dashboard/DashboardItems.js @@ -5,17 +5,17 @@ import { connect } from 'react-redux' import styled from 'styled-components' import { th } from '@pubsweet/ui-toolkit' import { withRouter } from 'react-router-dom' -import { compose, setDisplayName, withHandlers } from 'recompose' +import { compose, setDisplayName, withHandlers, withProps } from 'recompose' import { ManuscriptCard, Row } from 'pubsweet-component-faraday-ui' import { canViewReports } from 'pubsweet-component-faraday-selectors' -import withVersion from './withVersion' - const DashboardItem = compose( - withVersion, connect((state, { collection }) => ({ canViewReports: canViewReports(state, get(collection, 'id', '')), })), + withProps(({ collection }) => ({ + fragment: get(collection, 'currentVersion', {}), + })), )(ManuscriptCard) const DashboardItems = ({ list, onClick, deleteProject, canViewReports }) => ( diff --git a/packages/components-faraday/src/components/Dashboard/withVersion.js b/packages/components-faraday/src/components/Dashboard/withVersion.js deleted file mode 100644 index 24729730104466065f3e3de3f88bc81e07a97cb6..0000000000000000000000000000000000000000 --- a/packages/components-faraday/src/components/Dashboard/withVersion.js +++ /dev/null @@ -1,15 +0,0 @@ -import { compose } from 'recompose' -import { connect } from 'react-redux' -import { actions } from 'pubsweet-client' -import { ConnectPage } from 'xpub-connect' -import { selectCurrentVersion } from 'xpub-selectors' - -export default Component => - compose( - ConnectPage(({ collection }) => [ - actions.getFragments({ id: collection.id }), - ]), - connect((state, { collection }) => ({ - fragment: selectCurrentVersion(state, collection) || {}, - })), - )(Component) diff --git a/packages/components-faraday/src/components/index.js b/packages/components-faraday/src/components/index.js index eb71acbe38555f901d46dc242c1e83b45b384ee6..6d41e12da705d8e383aa45b691b599df8b4a8040 100644 --- a/packages/components-faraday/src/components/index.js +++ b/packages/components-faraday/src/components/index.js @@ -2,7 +2,6 @@ import { Decision } from './MakeDecision' import * as Components from './UIComponents' export { FormItems } from './UIComponents' -export { default as withVersion } from './Dashboard/withVersion.js' export { default as UserProfilePage } from './UserProfile/UserProfilePage' export { default as ChangePasswordPage } from './UserProfile/ChangePasswordPage' diff --git a/packages/hindawi-theme/src/elements/Accordion.js b/packages/hindawi-theme/src/elements/Accordion.js index f6c4a305aa75621270886ac78bccfa32a59b5e6e..6eb7224de4998780c886f18ef29d03f371b03226 100644 --- a/packages/hindawi-theme/src/elements/Accordion.js +++ b/packages/hindawi-theme/src/elements/Accordion.js @@ -36,7 +36,7 @@ export default { ? th('accordion.headerBackgroundColor') : 'transparent'}; border-radius: ${props => (props.expanded ? 0 : th('borderRadius'))}; - borde-border-top-left-radius: ${th('borderRadius')}; + border-top-left-radius: ${th('borderRadius')}; border-top-right-radius: ${th('borderRadius')}; border-bottom: ${props => props.expanded && !props.transparent ? th('accordion.border') : 'none'};