fix(merge): fix merge

packages/component-manuscript/src/components/ResponseToReviewers.js

@@ -3,7 +3,6 @@ import { get, isEmpty } from 'lodash'
 import { withProps } from 'recompose'
 import { th } from '@pubsweet/ui-toolkit'
 import styled, { css } from 'styled-components'
-import { FileItem } from 'pubsweet-components-faraday/src/components/Files'
 
 import { Expandable } from '../molecules'
 
@@ -21,9 +20,6 @@ const ResponseToReviewers = ({
       {!isEmpty(files) && (
         <Fragment>
           <Label>Files</Label>
-          {files.map(file => (
-            <FileItem compact id={file.id} key={file.id} {...file} />
-          ))}
         </Fragment>
       )}
     </Expandable>

packages/component-manuscript/src/components/ReviewReportCard.js

@@ -5,7 +5,6 @@ import { th } from '@pubsweet/ui-toolkit'
 import { withJournal } from 'xpub-journal'
 import styled, { css } from 'styled-components'
 import { DateParser } from 'pubsweet-components-faraday/src/components'
-import { FileItem } from 'pubsweet-components-faraday/src/components/Files'
 
 import { ShowMore } from './'
 
@@ -71,11 +70,6 @@ const ReviewReportCard = ({
             <Row left>
               <Label>Files</Label>
             </Row>
-            <Row left>
-              {publicComment.files.map(file => (
-                <FileItem compact id={file.id} key={file.id} {...file} />
-              ))}
-            </Row>
           </Fragment>
         )}
 

packages/component-manuscript/src/components/SideBarActions.js

-import React from 'react'
-import { compose, withHandlers } from 'recompose'
-import { Icon } from '@pubsweet/ui'
-import { connect } from 'react-redux'
-import styled from 'styled-components'
-import { th } from '@pubsweet/ui-toolkit'
-import { withRouter } from 'react-router-dom'
-import ZipFiles from 'pubsweet-components-faraday/src/components/Files/ZipFiles'
-import {
-  Decision,
-  Recommendation,
-} from 'pubsweet-components-faraday/src/components'
-
-import {
-  canMakeDecision,
-  canMakeRecommendation,
-  canEditManuscript,
-  canOverrideTechnicalChecks,
-} from 'pubsweet-component-faraday-selectors/src'
-
-const SideBarActions = ({
-  project,
-  version,
-  goToEdit,
-  canMakeDecision,
-  canEditManuscript,
-  goToTechnicalCheck,
-  canOverrideTechChecks,
-  canMakeRecommendation,
-}) => (
-  <Root>
-    {canMakeDecision && (
-      <Decision
-        collectionId={project.id}
-        fragmentId={version.id}
-        modalKey={`decide-${version.id}`}
-        status={project.status}
-      />
-    )}
-    {canMakeRecommendation && (
-      <Recommendation
-        collectionId={project.id}
-        fragmentId={version.id}
-        modalKey={`recommend-${version.id}`}
-      />
-    )}
-    {canOverrideTechChecks && (
-      <ClickableIcon
-        data-test="button-technical-checks"
-        onClick={goToTechnicalCheck(project)}
-        title="Technical Checks"
-      >
-        <Icon>check-square</Icon>
-      </ClickableIcon>
-    )}
-    {canEditManuscript && (
-      <ClickableIcon
-        data-test="button-edit-manuscript"
-        onClick={goToEdit(project, version)}
-        title="Edit Manuscript"
-      >
-        <Icon>edit</Icon>
-      </ClickableIcon>
-    )}
-    <ZipFiles
-      archiveName={`ID-${project.customId}`}
-      collectionId={project.id}
-      fragmentId={version.id}
-    >
-      <ClickableIcon>
-        <Icon>download</Icon>
-      </ClickableIcon>
-    </ZipFiles>
-  </Root>
-)
-
-export default compose(
-  withRouter,
-  connect((state, { project, version }) => ({
-    canMakeDecision: canMakeDecision(state, project, version),
-    canMakeRecommendation: canMakeRecommendation(state, project, version),
-    canEditManuscript: canEditManuscript(state, project, version),
-    canOverrideTechChecks: canOverrideTechnicalChecks(state, project),
-  })),
-  withHandlers({
-    goToEdit: ({ history }) => (project, version) => () => {
-      history.push(`/projects/${project.id}/versions/${version.id}/submit`, {
-        editMode: true,
-      })
-    },
-    goToTechnicalCheck: ({ history }) => project => () => {
-      const { status, id, customId, technicalChecks: { token = '' } } = project
-      const stage = status === 'technicalChecks' ? 'eqs' : 'eqa'
-      history.push({
-        pathname: `/${stage}-decision`,
-        search: `?collectionId=${id}&customId=${customId}&token=${token}`,
-      })
-    },
-  }),
-)(SideBarActions)
-
-// #region styled-components
-const Root = styled.div`
-  border-bottom: ${th('borderDefault')};
-  display: flex;
-  justify-content: flex-end;
-  padding: ${th('subGridUnit')};
-`
-
-const ClickableIcon = styled.div`
-  margin: 0 ${th('subGridUnit')};
-  &:hover {
-    opacity: 0.7;
-  }
-`
-// #endregion

packages/component-manuscript/src/components/index.js

-export { default as Files } from './Files'
 export { default as Authors } from './Authors'
 export { default as ShowMore } from './ShowMore'
 export { default as SideBarRoles } from './SideBarRoles'
 export { default as ManuscriptPage } from './ManuscriptPage'
-export { default as SideBarActions } from './SideBarActions'
 export { default as SubmitRevision } from './SubmitRevision'
 export { default as EditorialComment } from './EditorialComment'
 export { default as ReviewReportCard } from './ReviewReportCard'