From 6a2949316c6db68423b6aee8aa0c7984ac178cac Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Fri, 1 Nov 2024 15:26:20 -0400
Subject: [PATCH 1/2] KPMP-5366: replace tissueType with enrollmentCategory

---
 src/App.js                                       |  6 +++---
 src/components/SpatialViewer/Facets/AllFacets.js |  2 +-
 src/components/SpatialViewer/SpatialViewer.js    |  2 +-
 src/helpers/ApolloClient.js                      |  2 +-
 src/helpers/dataHelper.js                        |  4 ++--
 src/helpers/dataHelper.test.js                   | 10 +++++-----
 src/index.scss                                   |  4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/App.js b/src/App.js
index ffe5889d..3dd7111d 100755
--- a/src/App.js
+++ b/src/App.js
@@ -53,19 +53,19 @@ store.subscribe(saveState);
 const connector = new AppSearchAPIConnector({
   searchKey: process.env.REACT_APP_SEARCH_KEY,
   engineName: "spatial-viewer",
-  endpointBase: "/spatial-viewer/search",
+  endpointBase: "https://qa-atlas.kpmp.org/spatial-viewer/search",
   cacheResponses: false
 })
 
 const searchConfig = {
   apiConnector: connector,
   searchQuery: {
-      disjunctiveFacets: ["sex", "age", "redcapid", "tissuetype", "imagetype", "datatype", "configtype", "level", "releaseversion"],
+      disjunctiveFacets: ["sex", "age", "redcapid", "enrollmentcategory", "imagetype", "datatype", "configtype", "level", "releaseversion"],
       facets: {
         sex: { type: "value", size: 100},
         age: { type: "value", size: 100},
         redcapid: { type: "value", size: 500 },
-        tissuetype: { type: "value", size: 100},
+        enrollmentcategory: { type: "value", size: 100},
         imagetype: { type: "value", size: 100},
         datatype: { type: "value", size: 100 },
         configtype: { type: "value", size: 100},
diff --git a/src/components/SpatialViewer/Facets/AllFacets.js b/src/components/SpatialViewer/Facets/AllFacets.js
index a5f1ceb8..27cdeaa4 100644
--- a/src/components/SpatialViewer/Facets/AllFacets.js
+++ b/src/components/SpatialViewer/Facets/AllFacets.js
@@ -89,7 +89,7 @@ class AllFacets extends Component {
                         <AccordionBody accordionId="6">
                             <Row className="mb-2">
                                 <Col>
-                                    <Facet field="tissuetype" label="" filterType="any" show="10" view={MultiCheckboxFacet}/>
+                                    <Facet field="enrollmentcategory" label="" filterType="any" show="10" view={MultiCheckboxFacet}/>
                                 </Col>
                             </Row>
                         </AccordionBody>
diff --git a/src/components/SpatialViewer/SpatialViewer.js b/src/components/SpatialViewer/SpatialViewer.js
index 8755b5bb..01d38f75 100644
--- a/src/components/SpatialViewer/SpatialViewer.js
+++ b/src/components/SpatialViewer/SpatialViewer.js
@@ -73,7 +73,7 @@ class SpatialViewer extends Component {
                         <Col xs='8'>
                             <h5>
                                 {`${this.props.selectedImageDataset["datatype"]} 
-                                for ${this.props.selectedImageDataset["tissuetype"]} 
+                                for ${this.props.selectedImageDataset["enrollmentcategory"]} 
                                 sample ${this.props.selectedImageDataset["spectracksampleid"]} 
                                 (participant `} 
                                 <button
diff --git a/src/helpers/ApolloClient.js b/src/helpers/ApolloClient.js
index d4c9cf72..fb1694c1 100644
--- a/src/helpers/ApolloClient.js
+++ b/src/helpers/ApolloClient.js
@@ -38,7 +38,7 @@ const typePolicies = {
   participantClinicalDataset: {
       keyFields: [
         "redcap_id",
-        "tissue_type",
+        "enrollment_category",
       ]
   }
 };
diff --git a/src/helpers/dataHelper.js b/src/helpers/dataHelper.js
index 384bafb0..81d9a48a 100644
--- a/src/helpers/dataHelper.js
+++ b/src/helpers/dataHelper.js
@@ -48,8 +48,8 @@ export const mapSummaryKeysToPresentationStyle = (data) => {
     if (data['redcapId']) {
         result['Participant ID'] = data['redcapId'] ? data['redcapId'] : "";
     }
-    if (data['tissueType']) {
-        result['Enrollment Category'] = data['tissueType'] ? data['tissueType'] : "";
+    if (data['enrollmentCategory']) {
+        result['Enrollment Category'] = data['enrollmentCategory'] ? data['enrollmentCategory'] : "";
     }
     return result;
 };
diff --git a/src/helpers/dataHelper.test.js b/src/helpers/dataHelper.test.js
index 55f2393a..b3c00c43 100644
--- a/src/helpers/dataHelper.test.js
+++ b/src/helpers/dataHelper.test.js
@@ -5,19 +5,19 @@ describe('dataHelper', () => {
         it('should return remapped values when object params given', () => {
             let summaryUnmapped = {
                 redcapId: "test-redcapId",
-                tissueType: "test-tissueType"
+                enrollmentCategory: "test-enrollmentCategory"
             };
             let summaryMappingResult = mapSummaryKeysToPresentationStyle(summaryUnmapped);
             let expectedSummaryMapping = {
                 'Participant ID': "test-redcapId",
-                'Enrollment Category': "test-tissueType"
+                'Enrollment Category': "test-enrollmentCategory"
             }
             expect(summaryMappingResult).toEqual(expectedSummaryMapping);
         }),
         it('should return remapped values when some values from object params given', () => {
             let summaryUnmapped = {
                 redcapId: "test-redcapId",
-                tissueType: ""
+                enrollmentCategory: ""
             };
             let summaryMappingResult = mapSummaryKeysToPresentationStyle(summaryUnmapped);
             let expectedSummaryMapping = {
@@ -29,12 +29,12 @@ describe('dataHelper', () => {
         it('should return remapped values when some values from object params given', () => {
             let summaryUnmapped = {
                 redcapId: "",
-                tissueType: "test-tissueType"
+                enrollmentCategory: "test-enrollmentCategory"
             };
             let summaryMappingResult = mapSummaryKeysToPresentationStyle(summaryUnmapped);
             let expectedSummaryMapping = {
                 'Participant ID': "",
-                'Enrollment Category': "test-tissueType"
+                'Enrollment Category': "test-enrollmentCategory"
             }
             expect(summaryMappingResult).toEqual(expectedSummaryMapping);
         }),
diff --git a/src/index.scss b/src/index.scss
index f17fcfeb..b6b9fc60 100755
--- a/src/index.scss
+++ b/src/index.scss
@@ -220,7 +220,7 @@ th[title='Pixels Type'], th[title='Pixels Type'] + td {
     max-width: 155px;
 }
 
-.tissue-type {
+.enrollment-category {
     min-width: 100px;
     width: 100px;
     max-width: 100px;
@@ -260,7 +260,7 @@ th[title='Pixels Type'], th[title='Pixels Type'] + td {
         max-width: 200px;
     }
 
-    .tissue-type {
+    .enrollment-category {
         min-width: 100px;
         width: 100px;
         max-width: 100px;

From c6ec11c9a222f73db1990d0ae64149c34e922d03 Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Fri, 1 Nov 2024 15:27:11 -0400
Subject: [PATCH 2/2] fix app.js

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

diff --git a/src/App.js b/src/App.js
index 3dd7111d..66afac7b 100755
--- a/src/App.js
+++ b/src/App.js
@@ -53,7 +53,7 @@ store.subscribe(saveState);
 const connector = new AppSearchAPIConnector({
   searchKey: process.env.REACT_APP_SEARCH_KEY,
   engineName: "spatial-viewer",
-  endpointBase: "https://qa-atlas.kpmp.org/spatial-viewer/search",
+  endpointBase: "/spatial-viewer/search",
   cacheResponses: false
 })