From 468761715f48e4ac8488c1d08ffbe2de26b37eca Mon Sep 17 00:00:00 2001
From: lingyun1010 <zhaolingyun1010@gmail.com>
Date: Fri, 3 Feb 2023 11:37:13 +0000
Subject: [PATCH 1/5] Add anndata icon to result card

---
 .../html/fetch-loader/ExperimentCard.js       | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js b/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
index 301033c4..e4d28d5c 100644
--- a/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
+++ b/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
@@ -21,6 +21,12 @@ const CardContainerDiv = styled.div`
   }
 `
 
+const SmallIconDiv = styled.div`
+  width: 5%;
+  text-align: center;
+  font-size: 3rem;
+`
+
 const IconDiv = styled.div`
   width: 15%;
   text-align: center;
@@ -48,6 +54,8 @@ const CountDiv = styled.div`
   text-align: center;
 `
 
+const ANNDATA = `E-ANND`
+
 class ExperimentCard extends React.Component {
   constructor(props) {
     super(props)
@@ -58,7 +66,7 @@ class ExperimentCard extends React.Component {
   }
 
   render() {
-    const {url, species, experimentDescription, markerGenes, numberOfAssays, factors} = this.props
+    const {url, species, experimentDescription, markerGenes, numberOfAssays, experimentAccession, type, factors} = this.props
 
     const markerGeneLinks = markerGenes ? markerGenes.map((markerGene) =>
       <li key={`marker-gene-${markerGene.k}`}>
@@ -68,6 +76,16 @@ class ExperimentCard extends React.Component {
 
     return (
       <CardContainerDiv onClick={this._goToExperiment.bind(this, url)}>
+          <SmallIconDiv>
+              <span data-tip={`${type}`} data-html={true} className={`icon icon-functional`}>
+                  {
+                      experimentAccession.substring(0,6) === ANNDATA ?
+                          //tbc
+                          <img src={`https://user-images.githubusercontent.com/33519183/203308460-aee477fa-c8ab-4561-be46-34254bfa1731.png`} /> :
+                          <img src={`https://www.ebi.ac.uk/gxa/resources/images/expression-atlas.png`)}`} />
+                  }
+              </span>
+          </SmallIconDiv>
         <IconDiv>
           <EbiSpeciesIcon species={species}/>
           <h6>{species}</h6>

From 6326339c220e89b58b92d420f1d33b951f16c7c3 Mon Sep 17 00:00:00 2001
From: lingyun1010 <zhaolingyun1010@gmail.com>
Date: Fri, 3 Feb 2023 11:37:49 +0000
Subject: [PATCH 2/5] Add experiment type to result header

---
 .../html/fetch-loader/ExperimentsHeader.js        | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentsHeader.js b/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentsHeader.js
index 6209e9f2..aef96e86 100644
--- a/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentsHeader.js
+++ b/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentsHeader.js
@@ -13,6 +13,15 @@ const CardContainerDiv = styled.div`
   font-size: 0.9rem;
 `
 
+const SmallIconDiv = styled.div`
+  width: 5%;
+  text-align: center;
+  cursor: pointer;
+  opacity: 0.6;
+  transition: 0.3s;
+  :hover {opacity: 1};
+`
+
 const IconDiv = styled.div`
   width: 15%;
   text-align: center;
@@ -57,9 +66,9 @@ const CountDiv = styled.div`
 
 const ExperimentTableHeaderBasic = () =>
   ({
-    'titles': [`Species`, `Marker genes`, `Title`, `Experimental variables`, `Number of assays`],
-    'styles': [IconDiv, MarkerDiv, TitleDiv, VariableDiv, CountDiv],
-    'attributes': [`species`, `markerGenes`, `experimentDescription`, null, `numberOfAssays`]
+    'titles': [`Experiment type`, `Species`, `Marker genes`, `Title`, `Experimental variables`, `Number of assays`],
+    'styles': [SmallIconDiv, IconDiv, MarkerDiv, TitleDiv, VariableDiv, CountDiv],
+    'attributes': [`experimentAccession`, `species`, `markerGenes`, `experimentDescription`, null, `numberOfAssays`]
   })
 
 

From 23d619cdf0156cfcc4ddeb5e1f8782d2f284bf28 Mon Sep 17 00:00:00 2001
From: lingyun1010 <zhaolingyun1010@gmail.com>
Date: Fri, 3 Feb 2023 12:01:14 +0000
Subject: [PATCH 3/5] Fix typos

---
 .../html/fetch-loader/ExperimentCard.js                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js b/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
index e4d28d5c..3baa0805 100644
--- a/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
+++ b/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
@@ -82,7 +82,7 @@ class ExperimentCard extends React.Component {
                       experimentAccession.substring(0,6) === ANNDATA ?
                           //tbc
                           <img src={`https://user-images.githubusercontent.com/33519183/203308460-aee477fa-c8ab-4561-be46-34254bfa1731.png`} /> :
-                          <img src={`https://www.ebi.ac.uk/gxa/resources/images/expression-atlas.png`)}`} />
+                          <img src={`https://www.ebi.ac.uk/gxa/resources/images/expression-atlas.png`} />
                   }
               </span>
           </SmallIconDiv>

From 0fc73a77d828d5e325a7f81c2d308f838ce87969 Mon Sep 17 00:00:00 2001
From: lingyun1010 <zhaolingyun1010@gmail.com>
Date: Fri, 3 Feb 2023 14:35:33 +0000
Subject: [PATCH 4/5] Reformat jsx code

---
 .../html/fetch-loader/ExperimentCard.js                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js b/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
index 3baa0805..6fe38159 100644
--- a/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
+++ b/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
@@ -77,7 +77,7 @@ class ExperimentCard extends React.Component {
     return (
       <CardContainerDiv onClick={this._goToExperiment.bind(this, url)}>
           <SmallIconDiv>
-              <span data-tip={`${type}`} data-html={true} className={`icon icon-functional`}>
+              <span data-tip={type} data-html={true} className={`icon icon-functional`}>
                   {
                       experimentAccession.substring(0,6) === ANNDATA ?
                           //tbc

From 8fec03c8daee11ffd41c7d37503455ac494542d5 Mon Sep 17 00:00:00 2001
From: lingyun1010 <zhaolingyun1010@gmail.com>
Date: Wed, 8 Feb 2023 11:44:54 +0000
Subject: [PATCH 5/5] Add propTypes

---
 .../html/fetch-loader/ExperimentCard.js                       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js b/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
index 6fe38159..6545c0c5 100644
--- a/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
+++ b/packages/scxa-faceted-search-results/html/fetch-loader/ExperimentCard.js
@@ -128,7 +128,9 @@ ExperimentCard.propTypes = {
     url: PropTypes.string.isRequired
   })),
   numberOfAssays: PropTypes.number.isRequired,
-  factors: PropTypes.array.isRequired
+  factors: PropTypes.array.isRequired,
+  experimentAccession: PropTypes.string.isRequired
+  type: PropTypes.string.isRequired
 }
 
 export default ExperimentCard