Merge pull request #1845 from 4dn-dcic/markdown_image

Bug Fix - Pages are not correctly rendering MD image links
4dn-dcic · Sep 12, 2023 · c113db4 · c113db4
2 parents c1fe54a + 9274aa9
commit c113db4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -6,6 +6,14 @@ fourfront
 Change Log
 ----------
 
+6.4.1
+=====
+
+`Markdown image links in static sections and pages <https://github.com/4dn-dcic/fourfront/pull/1845>`_
+
+* Bug fix - Markdown formatted static sections with images in hyperlinks are not correctly rendered if embedded in Pages. If the static section is rendered standalone, it works well.
+
+
 6.4.0
 =====
 

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [tool.poetry]
 # Note: Various modules refer to this system as "encoded", not "fourfront".
 name = "encoded"
-version = "6.4.0"
+version = "6.4.1"
 description = "4DN-DCIC Fourfront"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"

diff --git a/src/encoded/static/components/static-pages/StaticPage.js b/src/encoded/static/components/static-pages/StaticPage.js
@@ -96,7 +96,7 @@ export const StaticEntryContent = React.memo(function StaticEntryContent(props){
     } else if (typeof content === 'string' && filetype === 'txt' && content.slice(0,12) === 'placeholder:'){
         // Deprecated older method - to be removed once data.4dn uses filetype=jsx everywhere w/ placeholder
         renderedContent = replacePlaceholderString(content.slice(12).trim(), _.omit(props, 'className', 'section', 'content'));
-    } else if (content_as_html && typeof content_as_html === 'string' && filetype === 'rst'){
+    } else if (content_as_html && typeof content_as_html === 'string' && (filetype === 'rst' || filetype === 'md')){
         renderedContent = replacePlaceholderString(content_as_html.trim(), _.omit(props, 'className', 'section', 'content', 'content_as_html'));
     } else {
         renderedContent = content;