From 6ce7eb3467ceceaef826508661339169f6809a42 Mon Sep 17 00:00:00 2001
From: Mingfei Shao <2475897+mfshao@users.noreply.github.com>
Date: Fri, 1 Jul 2022 15:56:44 -0500
Subject: [PATCH 1/2] fix: permalink (#1028)

---
 src/Discovery/DiscoveryDetails.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/Discovery/DiscoveryDetails.tsx b/src/Discovery/DiscoveryDetails.tsx
index 6745307567..117fb0f6c7 100644
--- a/src/Discovery/DiscoveryDetails.tsx
+++ b/src/Discovery/DiscoveryDetails.tsx
@@ -169,6 +169,9 @@ const fieldGrouping = (group: TabFieldGroup, discoveryConfig: DiscoveryConfig, r
 };
 
 const DiscoveryDetails = (props: Props) => {
+  const pagePath = `/discovery/${encodeURIComponent(props.modalData[props.config.minimalFieldMapping.uid])}/`;
+  const permalink = `${(basename === '/' ? '' : basename)}${pagePath}`;
+
   const headerField = props.config.detailView?.headerField || props.config.studyPageFields.header?.field;
   const header = (
     <Space align='baseline'>
@@ -196,8 +199,7 @@ const DiscoveryDetails = (props: Props) => {
         <Button
           type='text'
           onClick={() => {
-            const cleanBasename = basename.replace(/^\/+/g, '');
-            navigator.clipboard.writeText(`${hostname}${cleanBasename}/discovery/${encodeURIComponent(props.modalData[props.config.minimalFieldMapping.uid])}/`)
+            navigator.clipboard.writeText(`${hostname}${permalink.replace(/^\/+/g, '')}`)
               .then(() => {
                 props.setPermalinkCopied(true);
               });

From 7f362f6943c938ab26f7a80e33b3447398041054 Mon Sep 17 00:00:00 2001
From: Shawn O'Connor <ocshawn@ocshawn.com>
Date: Mon, 14 Aug 2023 14:19:55 -0500
Subject: [PATCH 2/2] study viewer check for data before running parse replace
 (#1387) (#1388)

---
 src/StudyViewer/StudyDetails.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/StudyViewer/StudyDetails.jsx b/src/StudyViewer/StudyDetails.jsx
index ae0400ffc2..fc98ab2411 100644
--- a/src/StudyViewer/StudyDetails.jsx
+++ b/src/StudyViewer/StudyDetails.jsx
@@ -405,7 +405,7 @@ class StudyDetails extends React.Component {
                      <div className='h3-typo'>{this.getLabel(k)}</div>
                      <Paragraph>
                        {/* strips out all html tags except br, strong, table, tr, td, th */}
-                       {parse(v.replace(/(<(?!(br\/?>)|(\/?strong>)|(\/?table.*>)|(\/?tr>)|(\/?td>|(\/?th>)))[^>]+>)/ig, ''))}
+                       {v && parse(v.replace(/(<(?!(br\/?>)|(\/?strong>)|(\/?table.*>)|(\/?tr>)|(\/?td>|(\/?th>)))[^>]+>)/ig, ''))}
                      </Paragraph>
                    </div>
                  )))}