Merge branch 'master' into 'dev-nico'

Master

See merge request astron-sdc/esap-gui!59

src/components/services/query_results/ZenodoResults.js

@@ -8,6 +8,7 @@ import AddToBasket from "../../basket/AddToBasketCheckBox";
 export default function ZenodoResults({ catalog }) {
   const context = useContext(QueryContext);
   const { queryMap, page, setPage } = context;
+  const regex = /(<([^>]+)>)/ig;
 
   if (!context.queryMap) return null;
 
@@ -15,14 +16,14 @@ export default function ZenodoResults({ catalog }) {
     if (context.queryMap.get(catalog).results.results.length === 0)
       return <Alert variant="warning">No matching results found!</Alert>;
     else if (catalog === "zenodo") {
-      const zenodoResults = queryMap.get("zenodo").results.results[0]['hits']['hits'].map((hits, counter) => (
+      const zenodoResults = queryMap.get("zenodo").results.results.map((hits, counter) => (
         <>
         <br/>
         <br/>
-        <h4><a href={hits.links.latest_html} target="_blank"> {hits.metadata.title.replaceAll("<p>","").replaceAll("</p>","")} </a></h4>
-        DOI: {hits.metadata.doi}
+        <h4><a href={hits.links.latest_html} target="_blank"> {hits.metadata.title.replaceAll(regex, '')} </a></h4>
+        <a href={hits.links.conceptdoi} target="_blank"> <img src={hits.links.badge} alt="DOI"/> </a>
         <br/>
-        {hits.metadata.description.replaceAll("<p>","").replaceAll("</p>","").substring(0,200)}...
+        {hits.metadata.description.replaceAll(regex, '').substring(0,200)}...
         </>
       ));