From c984edf33401503a8a1f552ac1c5472c7208ec18 Mon Sep 17 00:00:00 2001
From: rlreamy <34109594+rlreamy@users.noreply.github.com>
Date: Mon, 1 Apr 2024 10:11:53 -0400
Subject: [PATCH 01/24] Increase version numbers

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 817c01f1..438eb0ec 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pegasus-web",
-  "version": "1.7.0",
+  "version": "2.4.0",
   "private": true,
   "homepage": "/",
   "dependencies": {

From 9cee038d595d23791c4970eda0caf6b085142ea1 Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Tue, 9 Apr 2024 14:53:09 -0400
Subject: [PATCH 02/24] added target to citation link in explorer page

---
 src/components/Home/DataSummary.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Home/DataSummary.js b/src/components/Home/DataSummary.js
index 5fd57765..7a2ecc43 100644
--- a/src/components/Home/DataSummary.js
+++ b/src/components/Home/DataSummary.js
@@ -20,7 +20,7 @@ class DataSummary extends Component {
         return (
             <Container className="landing mt-3 mb-4 rounded border p-3 shadow-sm">
                 <Row><h2 className="data-summary">Atlas Data Summary</h2></Row>
-                <Row><p>IMPORTANT: Please follow this <a href="https://www.kpmp.org/help-docs/study-overview?tabname=citingkpmpdata">citation guideline</a> when presenting or publishing data from the Kidney Tissue Atlas.</p></Row>
+                <Row><p>IMPORTANT: Please follow this <a href="https://www.kpmp.org/help-docs/study-overview?tabname=citingkpmpdata" target="_blank">citation guideline</a> when presenting or publishing data from the Kidney Tissue Atlas.</p></Row>
 
                 <h3 className="centered kpmp-color-dark"><span><FontAwesomeIcon className='kpmp-color-dark pe-2' icon={faPerson} /></span>PARTICIPANTS</h3>
                 <ParticipantSummary/>

From a9279809c59156ea367623c585d558dc9711db9d Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Tue, 9 Apr 2024 14:58:53 -0400
Subject: [PATCH 03/24] KPMP-5226: adjusted search box to match other box

---
 src/index.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/index.scss b/src/index.scss
index c77babaf..04938ebf 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -440,7 +440,7 @@ tr.MuiTableRow-root:nth-child(even) {
 }
 
 .expanded-search-container {
-  height: 94%;
+  height: 97.5%;
 }
 
 .buttonhref {

From 232e407e5d02bc89bbd90293c3cce1a819a00324 Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Tue, 9 Apr 2024 15:01:34 -0400
Subject: [PATCH 04/24] added rel noreferrer attribute

---
 src/components/Home/DataSummary.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Home/DataSummary.js b/src/components/Home/DataSummary.js
index 7a2ecc43..09daa734 100644
--- a/src/components/Home/DataSummary.js
+++ b/src/components/Home/DataSummary.js
@@ -20,7 +20,7 @@ class DataSummary extends Component {
         return (
             <Container className="landing mt-3 mb-4 rounded border p-3 shadow-sm">
                 <Row><h2 className="data-summary">Atlas Data Summary</h2></Row>
-                <Row><p>IMPORTANT: Please follow this <a href="https://www.kpmp.org/help-docs/study-overview?tabname=citingkpmpdata" target="_blank">citation guideline</a> when presenting or publishing data from the Kidney Tissue Atlas.</p></Row>
+                <Row><p>IMPORTANT: Please follow this <a href="https://www.kpmp.org/help-docs/study-overview?tabname=citingkpmpdata" target="_blank" rel='noreferrer'>citation guideline</a> when presenting or publishing data from the Kidney Tissue Atlas.</p></Row>
 
                 <h3 className="centered kpmp-color-dark"><span><FontAwesomeIcon className='kpmp-color-dark pe-2' icon={faPerson} /></span>PARTICIPANTS</h3>
                 <ParticipantSummary/>

From d8ac8d89e113fd2da6fc2ea202ef91238b049300 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Mon, 15 Apr 2024 15:09:08 -0400
Subject: [PATCH 05/24] logging

---
 src/components/Home/SamplesByDataTypeTable.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/Home/SamplesByDataTypeTable.js b/src/components/Home/SamplesByDataTypeTable.js
index 87d64bac..39e4b611 100644
--- a/src/components/Home/SamplesByDataTypeTable.js
+++ b/src/components/Home/SamplesByDataTypeTable.js
@@ -18,6 +18,7 @@ class SamplesByDataTypeTable extends Component {
     async componentDidMount(){
 
         let spatialSummary = await fetchSummaryData("spatialViewerSummary");
+        console.log(spatialSummary)
         spatialSummary = spatialSummary.sort(this.compare)
         spatialSummary = spatialSummary.filter(availableDataVisibilityFilter)
 
@@ -56,7 +57,8 @@ class SamplesByDataTypeTable extends Component {
             'Spatial Metabolomics': 'sm',
             'Spatial Lipidomics': 'sl',
             'Spatial N-glycomics': 'sng',
-            'Spatial Transcriptomics': 'st'
+            'Spatial Transcriptomics': 'st',
+            'Imaging Mass Cytometry': 'imc'
         };
         if (dataLinkageMapping[dataType]) {
             this.props.setDataType(dataLinkageMapping[dataType], this.props);
@@ -67,6 +69,7 @@ class SamplesByDataTypeTable extends Component {
     }
 
     formatDataTypeCell(row) {
+        console.log(row)
         let value = row.dataType;
         if (value === 'Explorer' || value === 'Spatial Viewer') {
             return (

From 9e55eb7fbe8dc46d7816762acd707ec3c24f67b3 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Mon, 15 Apr 2024 15:19:47 -0400
Subject: [PATCH 06/24] use getDataTypeSummaryInformation for getSummaryData
 endpoint

---
 data/schema.graphql | 1 +
 1 file changed, 1 insertion(+)

diff --git a/data/schema.graphql b/data/schema.graphql
index a86d4e61..8c5262f6 100644
--- a/data/schema.graphql
+++ b/data/schema.graphql
@@ -11,6 +11,7 @@ type Query {
   getDataSummary(dataType: String): [SummaryData]
   getTissueTypeSummaryData: [getTissueTypeSummaryData]
   getAtlasSummaryRows: [getAtlasSummaryRows]
+  getSummaryData: [getDataTypeSummaryInformation]
 }
 
 type getAtlasSummaryRows{

From 8ec38be97547dc9a3bfec9e936aea8f52bf013b5 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Mon, 15 Apr 2024 15:34:20 -0400
Subject: [PATCH 07/24] log state

---
 src/components/Home/SamplesByDataTypeTable.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/Home/SamplesByDataTypeTable.js b/src/components/Home/SamplesByDataTypeTable.js
index 39e4b611..bc8467f9 100644
--- a/src/components/Home/SamplesByDataTypeTable.js
+++ b/src/components/Home/SamplesByDataTypeTable.js
@@ -32,6 +32,7 @@ class SamplesByDataTypeTable extends Component {
 
         const summaryData = explorerSummary.concat(spatialSummary)
         this.setState({dataTable: summaryData});
+        console.log(this.state.dataTable)
     }
 
     compare( a, b ) {

From 91eec07da3b85f195dcd12f739739323b67c63b0 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Mon, 15 Apr 2024 15:37:48 -0400
Subject: [PATCH 08/24] log spatial summary after manipulation and log
 explorerSummary

---
 src/components/Home/SamplesByDataTypeTable.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Home/SamplesByDataTypeTable.js b/src/components/Home/SamplesByDataTypeTable.js
index bc8467f9..8927592c 100644
--- a/src/components/Home/SamplesByDataTypeTable.js
+++ b/src/components/Home/SamplesByDataTypeTable.js
@@ -18,13 +18,14 @@ class SamplesByDataTypeTable extends Component {
     async componentDidMount(){
 
         let spatialSummary = await fetchSummaryData("spatialViewerSummary");
-        console.log(spatialSummary)
         spatialSummary = spatialSummary.sort(this.compare)
         spatialSummary = spatialSummary.filter(availableDataVisibilityFilter)
+        console.log(spatialSummary)
 
         let explorerSummary = await fetchDataTypeSummaryInformation();
         explorerSummary = explorerSummary.sort(this.compare)
         explorerSummary = explorerSummary.filter(availableDataVisibilityFilter)
+        console.log(explorerSummary)
 
         // adding lines to separate the sections in the table
         explorerSummary.unshift({dataType: "Explorer"})

From fc0de422b31e01da953e60cc07ed4eb3d6a71dc7 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Mon, 15 Apr 2024 15:41:33 -0400
Subject: [PATCH 09/24] disable filter to see what happens

---
 src/components/Home/SamplesByDataTypeTable.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Home/SamplesByDataTypeTable.js b/src/components/Home/SamplesByDataTypeTable.js
index 8927592c..98592058 100644
--- a/src/components/Home/SamplesByDataTypeTable.js
+++ b/src/components/Home/SamplesByDataTypeTable.js
@@ -19,7 +19,7 @@ class SamplesByDataTypeTable extends Component {
 
         let spatialSummary = await fetchSummaryData("spatialViewerSummary");
         spatialSummary = spatialSummary.sort(this.compare)
-        spatialSummary = spatialSummary.filter(availableDataVisibilityFilter)
+        // spatialSummary = spatialSummary.filter(availableDataVisibilityFilter)
         console.log(spatialSummary)
 
         let explorerSummary = await fetchDataTypeSummaryInformation();

From 6865c34029826f7fa1f326a059e082484bb0541c Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Tue, 16 Apr 2024 09:43:58 -0400
Subject: [PATCH 10/24] redirect to spatial viewer when clicking on imc

---
 src/actions/DataType/dataTypeActions.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/actions/DataType/dataTypeActions.js b/src/actions/DataType/dataTypeActions.js
index 68b35e3e..0edaa1c2 100644
--- a/src/actions/DataType/dataTypeActions.js
+++ b/src/actions/DataType/dataTypeActions.js
@@ -57,6 +57,9 @@ export const setDataTypeAndRedirect = (dataType, props) => {
             case "st":
                 window.open('/spatial-viewer/?size=n_20_n&filters[0][field]=datatype&filters[0][values][0]=Spatial Transcriptomics&filters[0][type]=any', '_self')
                 break
+            case "imc":
+                window.open("https://dev-atlas.kpmp.org/spatial-viewer/?size=n_20_n&filters%5B0%5D%5Bfield%5D=datatype&filters%5B0%5D%5Bvalues%5D%5B0%5D=Imaging%20Mass%20Cytometry&filters%5B0%5D%5Btype%5D=any", "_self")
+                break;
             case "sm":
                 window.open('https://metaspace2020.eu/datasets?prj=0d9a6710-8389-11eb-96db-73c89a357a89&q=_SM_', '_blank');
                 break

From ff5a830190862f80dfee77a6bdb6ad94146a7843 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Tue, 16 Apr 2024 09:48:19 -0400
Subject: [PATCH 11/24] remove dev-atlas portion of the link

---
 src/actions/DataType/dataTypeActions.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/actions/DataType/dataTypeActions.js b/src/actions/DataType/dataTypeActions.js
index 0edaa1c2..91ad1897 100644
--- a/src/actions/DataType/dataTypeActions.js
+++ b/src/actions/DataType/dataTypeActions.js
@@ -58,7 +58,7 @@ export const setDataTypeAndRedirect = (dataType, props) => {
                 window.open('/spatial-viewer/?size=n_20_n&filters[0][field]=datatype&filters[0][values][0]=Spatial Transcriptomics&filters[0][type]=any', '_self')
                 break
             case "imc":
-                window.open("https://dev-atlas.kpmp.org/spatial-viewer/?size=n_20_n&filters%5B0%5D%5Bfield%5D=datatype&filters%5B0%5D%5Bvalues%5D%5B0%5D=Imaging%20Mass%20Cytometry&filters%5B0%5D%5Btype%5D=any", "_self")
+                window.open("/spatial-viewer/?size=n_20_n&filters%5B0%5D%5Bfield%5D=datatype&filters%5B0%5D%5Bvalues%5D%5B0%5D=Imaging%20Mass%20Cytometry&filters%5B0%5D%5Btype%5D=any", "_self")
                 break;
             case "sm":
                 window.open('https://metaspace2020.eu/datasets?prj=0d9a6710-8389-11eb-96db-73c89a357a89&q=_SM_', '_blank');

From ff860bbd1a559bf1722fc7b3437bcfab4d687156 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Tue, 16 Apr 2024 11:00:24 -0400
Subject: [PATCH 12/24] remove console logging

---
 src/components/Home/SamplesByDataTypeTable.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/Home/SamplesByDataTypeTable.js b/src/components/Home/SamplesByDataTypeTable.js
index 98592058..5a5189f9 100644
--- a/src/components/Home/SamplesByDataTypeTable.js
+++ b/src/components/Home/SamplesByDataTypeTable.js
@@ -19,13 +19,11 @@ class SamplesByDataTypeTable extends Component {
 
         let spatialSummary = await fetchSummaryData("spatialViewerSummary");
         spatialSummary = spatialSummary.sort(this.compare)
-        // spatialSummary = spatialSummary.filter(availableDataVisibilityFilter)
-        console.log(spatialSummary)
+        spatialSummary = spatialSummary.filter(availableDataVisibilityFilter)
 
         let explorerSummary = await fetchDataTypeSummaryInformation();
         explorerSummary = explorerSummary.sort(this.compare)
         explorerSummary = explorerSummary.filter(availableDataVisibilityFilter)
-        console.log(explorerSummary)
 
         // adding lines to separate the sections in the table
         explorerSummary.unshift({dataType: "Explorer"})
@@ -33,7 +31,6 @@ class SamplesByDataTypeTable extends Component {
 
         const summaryData = explorerSummary.concat(spatialSummary)
         this.setState({dataTable: summaryData});
-        console.log(this.state.dataTable)
     }
 
     compare( a, b ) {

From 2fd37b1814022ea8dee55b956d980c6a97fd25f5 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Tue, 16 Apr 2024 11:23:29 -0400
Subject: [PATCH 13/24] remove endpoint to see what happens

---
 data/schema.graphql | 1 -
 1 file changed, 1 deletion(-)

diff --git a/data/schema.graphql b/data/schema.graphql
index 8c5262f6..a86d4e61 100644
--- a/data/schema.graphql
+++ b/data/schema.graphql
@@ -11,7 +11,6 @@ type Query {
   getDataSummary(dataType: String): [SummaryData]
   getTissueTypeSummaryData: [getTissueTypeSummaryData]
   getAtlasSummaryRows: [getAtlasSummaryRows]
-  getSummaryData: [getDataTypeSummaryInformation]
 }
 
 type getAtlasSummaryRows{

From 0cf99a6fac40131689aacc08ac49b3fa41408f7d Mon Sep 17 00:00:00 2001
From: rlreamy <34109594+rlreamy@users.noreply.github.com>
Date: Tue, 16 Apr 2024 14:35:54 -0400
Subject: [PATCH 14/24] Update SamplesByDataTypeTable.js

---
 src/components/Home/SamplesByDataTypeTable.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/Home/SamplesByDataTypeTable.js b/src/components/Home/SamplesByDataTypeTable.js
index 5a5189f9..9b59b3fe 100644
--- a/src/components/Home/SamplesByDataTypeTable.js
+++ b/src/components/Home/SamplesByDataTypeTable.js
@@ -68,7 +68,7 @@ class SamplesByDataTypeTable extends Component {
     }
 
     formatDataTypeCell(row) {
-        console.log(row)
+        
         let value = row.dataType;
         if (value === 'Explorer' || value === 'Spatial Viewer') {
             return (
@@ -186,4 +186,4 @@ class SamplesByDataTypeTable extends Component {
     }
 }
 
-export default SamplesByDataTypeTable;
\ No newline at end of file
+export default SamplesByDataTypeTable;

From b9a2ed4e871ff1caa557c24bb75991f5fb292b0b Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Wed, 17 Apr 2024 11:54:49 -0400
Subject: [PATCH 15/24] add imc to handleDataTypeClick event

---
 src/components/Explorer/SamplesByDataTypeTable.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Explorer/SamplesByDataTypeTable.js b/src/components/Explorer/SamplesByDataTypeTable.js
index fd4f4404..2b2bb00c 100644
--- a/src/components/Explorer/SamplesByDataTypeTable.js
+++ b/src/components/Explorer/SamplesByDataTypeTable.js
@@ -54,7 +54,8 @@ class SamplesByDataTypeTable extends Component {
             'Spatial Metabolomics': 'sm',
             'Spatial Lipidomics': 'sl',
             'Spatial N-glycomics': 'sng',
-            'Spatial Transcriptomics': 'st'
+            'Spatial Transcriptomics': 'st',
+            "Imaging Mass Cytometry": 'imc',
         };
         if (dataLinkageMapping[dataType]) {
             this.props.setSelectedConcept(dataLinkageMapping[dataType], this.props);

From a9ea05cff92973769d0a7b30812d75d7cf8d34f4 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Wed, 17 Apr 2024 13:45:08 -0400
Subject: [PATCH 16/24] increment kpmp-common-components

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 438eb0ec..83df7b20 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "history": "5.0.0",
     "html-react-parser": "1.4.0",
     "isomorphic-unfetch": "3.1.0",
-    "kpmp-common-components": "1.2.13",
+    "kpmp-common-components": "1.2.14",
     "kpmp-common-styles": "1.0.13",
     "material-table": "1.69.3",
     "npm-run-all": "4.1.5",

From 12d74aac7440e2e826bc00e135c2ab585dc3ec61 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Wed, 17 Apr 2024 13:45:27 -0400
Subject: [PATCH 17/24] Revert "increment kpmp-common-components"

This reverts commit a9ea05cff92973769d0a7b30812d75d7cf8d34f4.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 83df7b20..438eb0ec 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "history": "5.0.0",
     "html-react-parser": "1.4.0",
     "isomorphic-unfetch": "3.1.0",
-    "kpmp-common-components": "1.2.14",
+    "kpmp-common-components": "1.2.13",
     "kpmp-common-styles": "1.0.13",
     "material-table": "1.69.3",
     "npm-run-all": "4.1.5",

From 6f29a74324f8cc42638afdd9d0373b41d9491392 Mon Sep 17 00:00:00 2001
From: Nathan Creger <nathancreger1111@gmail.com>
Date: Wed, 17 Apr 2024 13:47:03 -0400
Subject: [PATCH 18/24] upgrae kpmp-common-components

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 438eb0ec..83df7b20 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "history": "5.0.0",
     "html-react-parser": "1.4.0",
     "isomorphic-unfetch": "3.1.0",
-    "kpmp-common-components": "1.2.13",
+    "kpmp-common-components": "1.2.14",
     "kpmp-common-styles": "1.0.13",
     "material-table": "1.69.3",
     "npm-run-all": "4.1.5",

From 7b56b3c0cf5bbc9644c22aaf3df3ad6f39abf8f4 Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Wed, 24 Apr 2024 11:33:03 -0400
Subject: [PATCH 19/24] KPMP-5224: adjusted homepage containers to align their
 edges

---
 src/components/Home/Home.js        | 2 ++
 src/components/Home/LeftContent.js | 4 ++--
 src/index.scss                     | 5 ++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/Home/Home.js b/src/components/Home/Home.js
index 38e0482c..603db7d3 100644
--- a/src/components/Home/Home.js
+++ b/src/components/Home/Home.js
@@ -13,6 +13,8 @@ class Home extends Component {
           <Col md='12' lg='12'>
             <TopContent/>
           </Col>
+        </Row>
+        <Row>
           <Col md='12' lg='4'>
             <LeftContent />
           </Col>
diff --git a/src/components/Home/LeftContent.js b/src/components/Home/LeftContent.js
index 7d01bbd8..1a5d7a22 100644
--- a/src/components/Home/LeftContent.js
+++ b/src/components/Home/LeftContent.js
@@ -13,7 +13,7 @@ class LeftContent extends Component {
   }
   render() {
     return (
-      <Row>
+      <div style={{marginRight: '15px'}}>
         <Container className="mt-3 rounded border p-3 shadow-sm">
           <h5>Explorer</h5>
           <div>
@@ -60,7 +60,7 @@ class LeftContent extends Component {
             <Button className="w-100" color='primary' href='https://www.kpmp.org/collaboration' size='lg' block onClick={() => { this.handleGoogleAnalyticsEvent('Atlas Home', 'Navigation', 'collaborate') }}>Collaborate with us</Button>
           </div>
         </Container>
-      </Row>
+      </div>
     );
   }
 }
diff --git a/src/index.scss b/src/index.scss
index 04938ebf..dfeb730f 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -457,9 +457,8 @@ tr.MuiTableRow-root:nth-child(even) {
 
 #homepage {
   @media (min-width: 990px) {
-    .container-expanded {
-      max-width: 98.75%;
-      margin-left: 15px;
+    .container {
+      max-width: 100%;
     }
   }
   @media (max-width: 635px) {

From 273cabeed5fe398175398592561cabe00b7ba2e0 Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Wed, 24 Apr 2024 11:37:43 -0400
Subject: [PATCH 20/24] remove unused import

---
 src/components/Home/LeftContent.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Home/LeftContent.js b/src/components/Home/LeftContent.js
index 1a5d7a22..821b28a4 100644
--- a/src/components/Home/LeftContent.js
+++ b/src/components/Home/LeftContent.js
@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import { Container, Row, Button } from 'reactstrap';
+import { Container, Button } from 'reactstrap';
 import { handleGoogleAnalyticsEvent } from '../../helpers/googleAnalyticsHelper';
 
 class LeftContent extends Component {

From 77775c37f558befc4e48d3cc0e95db0d3ae77b4a Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Fri, 3 May 2024 15:41:04 -0400
Subject: [PATCH 21/24] KPMP-5224: adjusted styling based on screen width

---
 src/components/Home/LeftContent.js | 2 +-
 src/index.scss                     | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/components/Home/LeftContent.js b/src/components/Home/LeftContent.js
index 821b28a4..16107d71 100644
--- a/src/components/Home/LeftContent.js
+++ b/src/components/Home/LeftContent.js
@@ -13,7 +13,7 @@ class LeftContent extends Component {
   }
   render() {
     return (
-      <div style={{marginRight: '15px'}}>
+      <div id="leftcontent">
         <Container className="mt-3 rounded border p-3 shadow-sm">
           <h5>Explorer</h5>
           <div>
diff --git a/src/index.scss b/src/index.scss
index dfeb730f..f1a87175 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -957,4 +957,10 @@ tr.MuiTableRow-root:nth-child(even) {
 
 .cellxgene-dropdown {
   margin-top: -21px;
+}
+
+#leftcontent {
+  @media (min-width: 992px) {
+    margin-right: 15px;
+  }
 }
\ No newline at end of file

From 59fe932b9c3c4637bd10de32e645101f34aceceb Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Tue, 14 May 2024 13:08:16 -0400
Subject: [PATCH 22/24] KMPP-5253: added cellxgene v1.5 link

---
 src/components/DataViz/CellXGeneDropdown.js       | 6 +++---
 src/components/DataViz/DataTypeSelector.js        | 6 ++++--
 src/components/Explorer/SamplesByDataTypeTable.js | 2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/DataViz/CellXGeneDropdown.js b/src/components/DataViz/CellXGeneDropdown.js
index b8e5f326..984380c9 100644
--- a/src/components/DataViz/CellXGeneDropdown.js
+++ b/src/components/DataViz/CellXGeneDropdown.js
@@ -19,12 +19,12 @@ class CellXGeneDropdown extends Component {
             <Dropdown isOpen={this.state.dropdownOpen} toggle={this.toggle} direction="down" className="cellxgene-dropdown">
                 <DropdownToggle caret className='float-end' color='primary'>View DiffEx in CellXGene</DropdownToggle>
                 <DropdownMenu>
+                    <DropdownItem tag="a" target="_blank" rel="noopener noreferrer" href={this.props.v1_5}>
+                        Version 1.5
+                    </DropdownItem>
                     <DropdownItem tag="a" target="_blank" rel="noopener noreferrer" href={this.props.v1}>
                         Version 1.0 (Nature 2023)
                     </DropdownItem>
-                    <DropdownItem disabled>
-                        Version 1.5 (Coming Soon)
-                    </DropdownItem>
                 </DropdownMenu>
             </Dropdown>
         )
diff --git a/src/components/DataViz/DataTypeSelector.js b/src/components/DataViz/DataTypeSelector.js
index a57c41d2..7dff9338 100644
--- a/src/components/DataViz/DataTypeSelector.js
+++ b/src/components/DataViz/DataTypeSelector.js
@@ -263,10 +263,12 @@ class DataTypeSelector extends Component {
                                     : <span className="a-button" onClick={this.toggleDataset}>Hide dataset details <FontAwesomeIcon icon={faChevronUp} /></span>
                                 }
                                 {(this.props.dataType === 'sc' ) &&
-                                    <CellXGeneDropdown v1="https://cellxgene.cziscience.com/e/32b9bdce-2481-4c85-ba1b-6ad5fcea844c.cxg/"/>
+                                    <CellXGeneDropdown v1="https://cellxgene.cziscience.com/e/32b9bdce-2481-4c85-ba1b-6ad5fcea844c.cxg/"
+                                                       v1_5="https://cellxgene.cziscience.com/e/dea717d4-7bc0-4e46-950f-fd7e1cc8df7d.cxg/"/>
                                 }
                                 { (this.props.dataType === 'sn') &&
-                                    <CellXGeneDropdown v1="https://cellxgene.cziscience.com/e/07854d9c-5375-4a9b-ac34-fa919d3c3686.cxg/"/>
+                                    <CellXGeneDropdown v1="https://cellxgene.cziscience.com/e/07854d9c-5375-4a9b-ac34-fa919d3c3686.cxg/"
+                                                       v1_5="https://cellxgene.cziscience.com/e/dea717d4-7bc0-4e46-950f-fd7e1cc8df7d.cxg/"/>
                                 }
                             </div>
                             }
diff --git a/src/components/Explorer/SamplesByDataTypeTable.js b/src/components/Explorer/SamplesByDataTypeTable.js
index 2b2bb00c..ed25d570 100644
--- a/src/components/Explorer/SamplesByDataTypeTable.js
+++ b/src/components/Explorer/SamplesByDataTypeTable.js
@@ -159,7 +159,7 @@ class SamplesByDataTypeTable extends Component {
                 </Row>
                 <Row>
                     <Col xs='12'>
-                        <small><span style={{color: 'red'}}>*</span> Additional information available in <a rel='noreferrer' target='_blank' href='https://cellxgene.cziscience.com/collections/bcb61471-2a44-4d00-a0af-ff085512674c'>cellxgene</a></small>
+                        <small><span style={{color: 'red'}}>*</span> Additional information available in <a rel='noreferrer' target='_blank' href='https://cellxgene.cziscience.com/collections/0f528c8a-a25c-4840-8fa3-d156fa11086f?utm_campaign=partner&utm_source=publisher'>cellxgene</a></small>
                     </Col>
                 </Row>
             </article>

From da22dc961d84feaa3160a4e34e4d57c4656ac86c Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Tue, 14 May 2024 13:10:01 -0400
Subject: [PATCH 23/24] update link

---
 src/components/DataViz/DataTypeSelector.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/DataViz/DataTypeSelector.js b/src/components/DataViz/DataTypeSelector.js
index 7dff9338..993a3003 100644
--- a/src/components/DataViz/DataTypeSelector.js
+++ b/src/components/DataViz/DataTypeSelector.js
@@ -268,7 +268,7 @@ class DataTypeSelector extends Component {
                                 }
                                 { (this.props.dataType === 'sn') &&
                                     <CellXGeneDropdown v1="https://cellxgene.cziscience.com/e/07854d9c-5375-4a9b-ac34-fa919d3c3686.cxg/"
-                                                       v1_5="https://cellxgene.cziscience.com/e/dea717d4-7bc0-4e46-950f-fd7e1cc8df7d.cxg/"/>
+                                                       v1_5="https://cellxgene.cziscience.com/e/a12ccb9b-4fbe-457d-8590-ac78053259ef.cxg/"/>
                                 }
                             </div>
                             }

From 541767a43b6bc164463b41dcba68c434a607ebe5 Mon Sep 17 00:00:00 2001
From: rlreamy <34109594+rlreamy@users.noreply.github.com>
Date: Fri, 17 May 2024 14:25:30 -0400
Subject: [PATCH 24/24] Update package.json to reflect release version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 83df7b20..aa1f4c51 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "pegasus-web",
-  "version": "2.4.0",
+  "version": "2.3.1",
   "private": true,
   "homepage": "/",
   "dependencies": {