diff --git a/CHANGELOG.rst b/CHANGELOG.rst index cd8283502f..d9e63eaed0 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,14 @@ fourfront Change Log ---------- +6.4.1 +===== + +`Markdown image links in static sections and pages `_ + +* 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 index b36dd1adfb..cc638a93bd 100644 --- 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 "] license = "MIT" diff --git a/src/encoded/static/components/static-pages/StaticPage.js b/src/encoded/static/components/static-pages/StaticPage.js index b5b6422ee6..cb98048b4d 100644 --- 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;