Merge branch 'master' into CORE-5072-license-typo

oacore · Jan 14, 2025 · 461caa9 · 461caa9
2 parents 6ae9144 + 95969a1
commit 461caa9
Showing 1 changed file with 17 additions and 14 deletions.
diff --git a/templates/search/results.jsx b/templates/search/results.jsx
@@ -51,12 +51,7 @@ const Results = ({ works, searchId }) =>
         searchId: innerSearchId,
         id: innerId,
       }) => {
-        if (
-          innerFullTextLink == null &&
-          innerDownloadLink == null &&
-          innerModifiedReaderLink == null
-        )
-          return null
+        if (innerFullTextLink) return innerFullTextLink
         if (
           (innerFullTextLink && innerFullTextLink.includes('core')) ||
           (innerDownloadLink && innerDownloadLink.includes('core')) ||
@@ -70,9 +65,23 @@ const Results = ({ works, searchId }) =>
           )
         }
         if (innerDownloadLink) return innerDownloadLink
-        return innerFullTextLink
+        if (
+          innerFullTextLink == null &&
+          innerDownloadLink == null &&
+          innerModifiedReaderLink == null
+        )
+          return null
+        return null
       }
 
+      const fullTextLinkResolved = renderFullTextLink({
+        fullTextLink,
+        downloadLink,
+        modifiedReaderLink,
+        searchId,
+        id,
+      })
+
       return (
         <SearchResult
           id={`search-output-${id}`}
@@ -92,13 +101,7 @@ const Results = ({ works, searchId }) =>
             metadataLink:
               generateMetadataLink(metadataLink, searchId, id) ||
               generateMetadataLink(displayLink, searchId, id),
-            fullTextLink: renderFullTextLink({
-              fullTextLink,
-              downloadLink,
-              modifiedReaderLink,
-              searchId,
-              id,
-            }),
+            fullTextLink: fullTextLinkResolved,
             dataProviders: dataProviders || [],
             isRecommended: memberType?.billing_type === 'sustaining',
           }}