Skip to content

Commit

Permalink
Fix Home page and preview panel still show the HTML tags for abstract (
Browse files Browse the repository at this point in the history
  • Loading branch information
allyoucanmap authored Mar 8, 2021
1 parent 55c145d commit 42d4a93
Show file tree
Hide file tree
Showing 201 changed files with 58 additions and 44 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import React, { useRef, useState, useEffect } from 'react';
import { Button, Spinner, Tooltip, OverlayTrigger } from 'react-bootstrap-v1';
import DOMPurify from 'dompurify';
import FaIcon from '@js/components/home/FaIcon';
import Message from '@mapstore/framework/components/I18N/Message';
import moment from 'moment';
Expand Down Expand Up @@ -214,7 +215,11 @@ function DetailsPanel({
&& <>{' '}/{' '}{ moment(resource.date).format('MMMM Do YYYY')}</>}
</p>
<p>
<div className="gn-details-panel-description">{resource?.abstract}</div>
<div className="gn-details-panel-description">{
resource?.abstract ?
<div dangerouslySetInnerHTML={{ __html: DOMPurify.sanitize(resource.abstract) }} />
: null
}</div>
</p>
<p>
{resource?.category?.identifier && <div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ const ResourceCard = forwardRef(({
<Card.Text
className="gn-card-description"
>
{res.abstract ? res.abstract : '...'}
{res.raw_abstract ? res.raw_abstract : '...'}
</Card.Text>
<Card.Text
lassName="gn-card-user"
Expand Down
1 change: 1 addition & 0 deletions geonode_mapstore_client/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
"dependencies": {
"@fortawesome/fontawesome-free": "5.15.1",
"bootstrap-v4": "npm:[email protected]",
"dompurify": "2.2.6",
"js-cookie": "2.2.1",
"mapstore": "file:MapStore2",
"react-bootstrap-v1": "npm:[email protected]"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,4 +71,9 @@
font-size: 0.9rem;
text-align: justify;
word-break: break-word;
// force styles of html coming from WYSIWYG
img {
width: 100% !important;
height: auto !important;
}
}
2 changes: 1 addition & 1 deletion geonode_mapstore_client/client/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
geonode-mapstore-client-v2.0.9-7575885e53bcde0fb44198390ba688e74df90274
geonode-mapstore-client-v2.0.9-809b0ff2e1be0e83ccbc8312ae2d31b628fab8f5

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Loading

0 comments on commit 42d4a93

Please sign in to comment.