From 2e56b0196ad95d94de0237af9a990cbf050a86da Mon Sep 17 00:00:00 2001
From: Ben Whitmore <ben.whitmore0@gmail.com>
Date: Thu, 8 Apr 2021 16:40:21 +1200
Subject: [PATCH] fix(review): show rich text not markup in control and review
screens
For #192.
---
.../src/components/metadata/ReviewMetadata.js | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/app/components/component-review/src/components/metadata/ReviewMetadata.js b/app/components/component-review/src/components/metadata/ReviewMetadata.js
index e5ef0471e6..fa67bfb7e5 100644
--- a/app/components/component-review/src/components/metadata/ReviewMetadata.js
+++ b/app/components/component-review/src/components/metadata/ReviewMetadata.js
@@ -3,6 +3,7 @@ import React from 'react'
import styled from 'styled-components'
import { get } from 'lodash'
import { Attachment } from '@pubsweet/ui'
+import { AbstractEditor } from 'xpub-edit'
import { Title, SectionHeader, SectionRowGrid } from '../style'
import { SectionContent } from '../../../../shared'
@@ -19,6 +20,11 @@ const Cell = styled.span`
padding: 0;
`
+const UnadornedEditor = styled(AbstractEditor)`
+ border: none;
+ padding: 0;
+`
+
const getNote = (notes, type) =>
notes.find(note => note.notesType === type) || {}
@@ -28,7 +34,7 @@ const getNote = (notes, type) =>
const getSupplementaryFiles = supplementary =>
(supplementary || []).filter(file => file.fileType === 'supplementary') || []
-const showFieldData = (manuscript, fieldName) => {
+const showFieldData = (manuscript, fieldName, form) => {
const data = get(manuscript, fieldName)
// TODO: Make this generic somehow. Perhaps with an additional fieldType?
@@ -46,6 +52,10 @@ const showFieldData = (manuscript, fieldName) => {
return data.join(', ')
}
+ const fieldDefinition = form.children?.find(field => field.name === fieldName)
+ if (data && fieldDefinition?.component === 'AbstractEditor')
+ return <UnadornedEditor readonly value={data} />
+
return data
}
@@ -73,7 +83,7 @@ const ReviewMetadata = ({ form, manuscript: rawManuscript }) => {
{form.children.map(element => (
<SectionRowGrid key={element.id}>
<Heading>{element.shortDescription || element.title}</Heading>
- <Cell>{showFieldData(manuscript, element.name)}</Cell>
+ <Cell>{showFieldData(manuscript, element.name, form)}</Cell>
</SectionRowGrid>
))}
<SectionRowGrid>
@@ -115,6 +125,7 @@ ReviewMetadata.propTypes = {
PropTypes.shape({
id: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
+ component: PropTypes.string.isRequired,
title: PropTypes.string.isRequired,
shortDescription: PropTypes.string,
}).isRequired,
--
GitLab