diff --git a/app/components/component-manuscripts/src/Manuscript.js b/app/components/component-manuscripts/src/Manuscript.js index 618d468ed66444a325f476381f5d76ecd4ded103..3b49b4ef58a52011367cf2b4b8c9fb152d62f715 100644 --- a/app/components/component-manuscripts/src/Manuscript.js +++ b/app/components/component-manuscripts/src/Manuscript.js @@ -61,7 +61,12 @@ const User = ({ manuscriptId, manuscript, submitter }) => { return ( <Row> - <Cell>{manuscript.meta && manuscript.meta.title}</Cell> + {process.env.INSTANCE_NAME === 'coko' && ( + <Cell>{manuscript.meta && manuscript.meta.title}</Cell> + )} + {process.env.INSTANCE_NAME === 'elife' && ( + <Cell>{manuscript.submission && manuscript.submission.articleId}</Cell> + )} <Cell>{convertTimestampToDate(manuscript.created)}</Cell> <Cell>{convertTimestampToDate(manuscript.updated)}</Cell> <Cell> @@ -81,16 +86,19 @@ const User = ({ manuscriptId, manuscript, submitter }) => { )} </Cell> <LastCell> - {process.env.INSTANCE_NAME === 'elife' && [articleStatuses.submitted, articleStatuses.evaluated].includes(manuscript.status) && - <Action to={`${urlFrag}/versions/${manuscriptId}/evaluation`}> - Evaluation - </Action> - } - {process.env.INSTANCE_NAME === 'coko' && + {process.env.INSTANCE_NAME === 'elife' && + [articleStatuses.submitted, articleStatuses.evaluated].includes( + manuscript.status, + ) && ( + <Action to={`${urlFrag}/versions/${manuscriptId}/evaluation`}> + Evaluation + </Action> + )} + {process.env.INSTANCE_NAME === 'coko' && ( <Action to={`${urlFrag}/versions/${manuscriptId}/decision`}> Control </Action> - } + )} <Action to={`${urlFrag}/versions/${manuscriptId}/manuscript`}> View </Action> @@ -118,8 +126,12 @@ User.propTypes = { title: PropTypes.string.isRequired, }).isRequired, created: PropTypes.string.isRequired, + id: PropTypes.string, updated: PropTypes.string, status: PropTypes.string.isRequired, + // Disabled because submission can have different fields + // eslint-disable-next-line + submission: PropTypes.object, }).isRequired, submitter: PropTypes.shape({ defaultIdentity: PropTypes.shape({ diff --git a/app/components/component-manuscripts/src/Manuscripts.jsx b/app/components/component-manuscripts/src/Manuscripts.jsx index cfcc93e5ff77aaa99867bf651032fac047a7dc3f..d0da026487c42cdc9a272ce584dafb68eba6d499 100644 --- a/app/components/component-manuscripts/src/Manuscripts.jsx +++ b/app/components/component-manuscripts/src/Manuscripts.jsx @@ -41,6 +41,7 @@ const GET_MANUSCRIPTS = gql` manuscriptId title } + submission created updated status @@ -127,8 +128,12 @@ const Manuscripts = ({ history, ...props }) => { if (loading) return <Spinner /> if (error) return `Error! ${error.message}` - - const { manuscripts, totalCount } = data.paginatedManuscripts + + const manuscripts = data.paginatedManuscripts.manuscripts.map(el => { + return { ...el, submission: JSON.parse(el.submission) } + }) + + const { totalCount } = data.paginatedManuscripts return ( <Container> @@ -154,7 +159,7 @@ const Manuscripts = ({ history, ...props }) => { <SortHeader thisSortName="meta:title">Title</SortHeader> )} {process.env.INSTANCE_NAME === 'elife' && ( - <SortHeader thisSortName="meta:title">Article URL</SortHeader> + <SortHeader thisSortName="submission:articleId">Article Id</SortHeader> )} <SortHeader thisSortName="created">Created</SortHeader> <SortHeader thisSortName="updated">Updated</SortHeader> @@ -165,9 +170,6 @@ const Manuscripts = ({ history, ...props }) => { </Header> <tbody> {manuscripts.map((manuscript, key) => { - console.log('manuscript') - console.log(manuscript) - const latestVersion = manuscript.manuscriptVersions?.[0] || manuscript