From 3de6275ce1e878fc79013767bed332c970f81a93 Mon Sep 17 00:00:00 2001
From: HaneenT <haneen@umich.edu>
Date: Wed, 30 Oct 2024 08:46:08 -0400
Subject: [PATCH] KPMP-5366: change tissueType variables

---
 .../enrollmentCategoryActions.js              |  8 +++++
 src/actions/TissueType/tissueTypeActions.js   |  8 -----
 src/actions/actionNames.js                    |  2 +-
 src/components/DataViz/DataTypeSelector.js    | 32 +++++++++----------
 .../DataViz/DataTypeSelectorContainer.js      |  8 ++---
 src/components/DataViz/RNASeqViz.js           | 32 +++++++++----------
 src/components/DataViz/RNASeqVizContainer.js  |  8 ++---
 src/components/DataViz/RegionalProteomics.js  | 24 +++++++-------
 .../DataViz/RegionalProteomicsContainer.js    |  8 ++---
 src/components/DataViz/RegionalViz.js         | 22 ++++++-------
 .../DataViz/RegionalVizContainer.js           |  8 ++---
 src/components/DataViz/UMAPContainer.js       |  2 +-
 src/components/DataViz/UMAPViz.js             |  6 ++--
 ...educer.js => enrollmentCategoryReducer.js} |  4 +--
 src/components/Explorer/Explorer.js           |  8 ++---
 .../Explorer/NephronSchemaCardContainer.js    |  4 +--
 .../DiffexByClusterContainer.js               |  2 +-
 .../ExpressionTables/ExpressionXCellType.js   | 30 ++++++++---------
 ...pe.js => ExpressionXEnrollmentCategory.js} |  4 +--
 src/components/Home/AvailableDatasetsTable.js | 14 ++++----
 src/components/Home/ParticipantSummary.js     |  4 +--
 .../Home/ParticipantSummaryContainer.js       |  8 ++---
 src/components/Plots/FeaturePlot.js           |  6 ++--
 src/components/Plots/LMDDotPlot.js            |  8 ++---
 .../Summary/CellTypeSummaryContainer.js       |  4 +--
 .../Summary/GeneSummaryContainer.js           |  4 +--
 src/helpers/ApolloClient.js                   |  2 +-
 src/helpers/Utils.js                          | 16 +++++-----
 src/initialState.json                         |  2 +-
 src/reducers.js                               |  4 +--
 30 files changed, 146 insertions(+), 146 deletions(-)
 create mode 100644 src/actions/EnrollmentCategory/enrollmentCategoryActions.js
 delete mode 100644 src/actions/TissueType/tissueTypeActions.js
 rename src/components/DataViz/{tissueTypeReducer.js => enrollmentCategoryReducer.js} (57%)
 rename src/components/ExpressionTables/{ExpressionXTissueType.js => ExpressionXEnrollmentCategory.js} (93%)

diff --git a/src/actions/EnrollmentCategory/enrollmentCategoryActions.js b/src/actions/EnrollmentCategory/enrollmentCategoryActions.js
new file mode 100644
index 00000000..c9a48457
--- /dev/null
+++ b/src/actions/EnrollmentCategory/enrollmentCategoryActions.js
@@ -0,0 +1,8 @@
+import actionNames from '../actionNames'
+
+export const setEnrollmentCategory = (enrollmentCategory) => {
+    return {
+        type: actionNames.SET_ENROLLMENT_CATEGORY,
+        payload: enrollmentCategory
+    }
+};
diff --git a/src/actions/TissueType/tissueTypeActions.js b/src/actions/TissueType/tissueTypeActions.js
deleted file mode 100644
index 33992802..00000000
--- a/src/actions/TissueType/tissueTypeActions.js
+++ /dev/null
@@ -1,8 +0,0 @@
-import actionNames from '../actionNames'
-
-export const setTissueType = (tissueType) => {
-    return {
-        type: actionNames.SET_TISSUE_TYPE,
-        payload: tissueType
-    }
-};
diff --git a/src/actions/actionNames.js b/src/actions/actionNames.js
index c23869fc..277e5727 100644
--- a/src/actions/actionNames.js
+++ b/src/actions/actionNames.js
@@ -3,7 +3,7 @@ const actionNames = {
   RESET_STATE: 'RESET_STATE',
   SET_SELECTED_CONCEPT: 'SET_SELECTED_CONCEPT',
   SET_DATA_TYPE: 'SET_DATA_TYPE',
-  SET_TISSUE_TYPE: 'SET_TISSUE_TYPE',
+  SET_ENROLLMENT_CATEGORY: 'SET_ENROLLMENT_CATEGORY',
   SET_CLUSTER: 'SET_CLUSTER',
   SET_CELL_TYPE: 'SET_CELL_TYPE',
   SET_GENE: 'SET_GENE',
diff --git a/src/components/DataViz/DataTypeSelector.js b/src/components/DataViz/DataTypeSelector.js
index 3be0bedc..b05e2787 100644
--- a/src/components/DataViz/DataTypeSelector.js
+++ b/src/components/DataViz/DataTypeSelector.js
@@ -2,7 +2,7 @@ import React, { Component } from "react";
 import Select from "react-select";
 import { Row, Col, Container} from 'reactstrap';
 import ConceptSelectContainer from '../ConceptSelect/ConceptSelectContainer';
-import { getTissueTypeOptions, getAllDataTypeOptions, getDataTypeOptionsWithTissueType } from "../../helpers/Utils";
+import { getEnrollmentCategoryOptions, getAllDataTypeOptions, getDataTypeOptionsWithEnrollmentCategory } from "../../helpers/Utils";
 import { fetchDataTypeSummaryInformation } from '../../helpers/ApolloClient';
 import { handleGoogleAnalyticsEvent } from '../../helpers/googleAnalyticsHelper';
 import { faChevronDown, faChevronUp } from "@fortawesome/free-solid-svg-icons";
@@ -13,7 +13,7 @@ class DataTypeSelector extends Component {
     constructor(props) {
         super(props);
         this.state = {
-            tissueInputValue: this.props.tissueType ? this.props.tissueType : "all",
+            tissueInputValue: this.props.enrollmentCategory ? this.props.enrollmentCategory : "all",
             isDatasetSummaryLoading: false,
             tissueValue: null,
             dataTypeInputValue: null,
@@ -33,7 +33,7 @@ class DataTypeSelector extends Component {
     componentDidUpdate(prevProps) {
         if ((this.props.gene.symbol !== prevProps.gene.symbol
             || this.props.dataType !== prevProps.dataType
-            || this.props.tissueType !== prevProps.tissueType)) {
+            || this.props.enrollmentCategory !== prevProps.enrollmentCategory)) {
             if (this.props.gene.symbol) {
                 this.reloadPageData(this.props.gene.symbol);
             } else {
@@ -44,11 +44,11 @@ class DataTypeSelector extends Component {
 
     componentDidMount() {
         let options = getAllDataTypeOptions()
-        let tissueTypeOptions = getTissueTypeOptions(this.state.selectedDataset, this.props.gene.symbol);
+        let enrollmentCategoryOptions = getEnrollmentCategoryOptions(this.state.selectedDataset, this.props.gene.symbol);
 
         let selectedOption = options.find(item => this.props.dataType === item.value);
-        let selectedTissueType = tissueTypeOptions.find(item => this.state.tissueInputValue === item.value)
-        this.setState({ dataTypeOptions: options, dataTypeInputValue: selectedOption, tissueValue: selectedTissueType })
+        let selectedEnrollmentCategory = enrollmentCategoryOptions.find(item => this.state.tissueInputValue === item.value)
+        this.setState({ dataTypeOptions: options, dataTypeInputValue: selectedOption, tissueValue: selectedEnrollmentCategory })
 
         if (this.props.gene.symbol) {
             this.reloadPageData(this.props.gene.symbol);
@@ -61,14 +61,14 @@ class DataTypeSelector extends Component {
         // Coming from homepage search (no datatype yet)
         if (!dataTypeShort && availableData && availableData.length > 0) {
             this.props.setDataType(availableData[0].dataTypeShort);
-            this.props.setTissueType(this.props.tissueType ? this.props.tissueType : "all");
+            this.props.setEnrollmentCategory(this.props.enrollmentCategory ? this.props.enrollmentCategory : "all");
             this.setState({ selectedDataset: availableData[0], tissueInputValue: "all"})
             return
         }
         // Coming from search on viz page (has datatype)
         for (const [, dataset] of availableData.entries()) {
             if (dataset["dataTypeShort"] === dataTypeShort) {
-                this.props.setTissueType(this.props.tissueType ? this.props.tissueType : "all");
+                this.props.setEnrollmentCategory(this.props.enrollmentCategory ? this.props.enrollmentCategory : "all");
                 this.setState({ selectedDataset: dataset, })
                 return
             }
@@ -117,13 +117,13 @@ class DataTypeSelector extends Component {
                 if (datasetSummary) {
                     datasetSummary = this.formatGeneDataset(datasetSummary)
                     this.setSelectedDatasetSummary(this.props.dataType, datasetSummary)
-                    getDataTypeOptionsWithTissueType(this.props.gene.symbol, "", datasetSummary, this.props.tissueType).then(
+                    getDataTypeOptionsWithEnrollmentCategory(this.props.gene.symbol, "", datasetSummary, this.props.enrollmentCategory).then(
                         (options) => {
                             let selectedOption = options.find(item => this.props.dataType === item.value);
-                            let tissueTypeOptions = getTissueTypeOptions(this.state.selectedDataset, this.props.gene.symbol);
+                            let enrollmentCategoryOptions = getEnrollmentCategoryOptions(this.state.selectedDataset, this.props.gene.symbol);
 
-                            let selectedTissueType = tissueTypeOptions.find(item => this.state.tissueInputValue === item.value)
-                            this.setState({ dataTypeOptions: options, dataTypeInputValue: selectedOption, availableData: datasetSummary, tissueValue: selectedTissueType })
+                            let selectedEnrollmentCategory = enrollmentCategoryOptions.find(item => this.state.tissueInputValue === item.value)
+                            this.setState({ dataTypeOptions: options, dataTypeInputValue: selectedOption, availableData: datasetSummary, tissueValue: selectedEnrollmentCategory })
                         },
                         (error) => {
                             this.setState({ dataTypeOptions: [] });
@@ -149,8 +149,8 @@ class DataTypeSelector extends Component {
 
 
     handleTissueSelect = (selected, actionMeta) => {
-        handleGoogleAnalyticsEvent('Explorer', 'Filter', `tissueType: ${selected.value}`);
-        this.props.setTissueType(selected.value);
+        handleGoogleAnalyticsEvent('Explorer', 'Filter', `enrollmentCategory: ${selected.value}`);
+        this.props.setEnrollmentCategory(selected.value);
         this.setState({ tissueValue: selected });
     };
 
@@ -163,7 +163,7 @@ class DataTypeSelector extends Component {
     };
 
     getInputValue = () => {
-        let options = getTissueTypeOptions(this.state.selectedDataset, this.props.gene.symbol);
+        let options = getEnrollmentCategoryOptions(this.state.selectedDataset, this.props.gene.symbol);
         try {
             return options.find(element => element.value === this.state.tissueInputValue).label
         } catch (e) {
@@ -222,7 +222,7 @@ class DataTypeSelector extends Component {
                             <span className='d-table-cell text-bigger pe-2'>in:</span>
                             <Select
                                 allowClear
-                                options={getTissueTypeOptions(this.state.selectedDataset, this.props.gene.symbol, this.props.dataType)}
+                                options={getEnrollmentCategoryOptions(this.state.selectedDataset, this.props.gene.symbol, this.props.dataType)}
                                 onChange={this.handleTissueSelect}
                                 value={this.state.tissueValue}
                                 inputValue={this.getInputValue()}
diff --git a/src/components/DataViz/DataTypeSelectorContainer.js b/src/components/DataViz/DataTypeSelectorContainer.js
index 29d6fca6..513d7440 100644
--- a/src/components/DataViz/DataTypeSelectorContainer.js
+++ b/src/components/DataViz/DataTypeSelectorContainer.js
@@ -1,12 +1,12 @@
 import { connect } from 'react-redux';
 import DataTypeSelector from './DataTypeSelector';
 import { withRouter } from 'react-router';
-import { setTissueType } from '../../actions/TissueType/tissueTypeActions'
+import { setEnrollmentCategory } from '../../actions/EnrollmentCategory/enrollmentCategoryActions'
 import { setDataType } from "../../actions/DataType/dataTypeActions";
 
 const mapStateToProps = (state, props) =>
 ({
-    tissueType: state.tissueType,
+    enrollmentCategory: state.enrollmentCategory,
     dataType: state.dataType,
     gene: state.gene,
     isLoadingUmap: props.isLoadingUmap
@@ -14,8 +14,8 @@ const mapStateToProps = (state, props) =>
 
 const mapDispatchToProps = (dispatch, props) =>
 ({
-    setTissueType(tissueType) {
-        dispatch(setTissueType(tissueType));
+    setEnrollmentCategory(enrollmentCategory) {
+        dispatch(setEnrollmentCategory(enrollmentCategory));
     },
     setDataType(dataType) {
         dispatch(setDataType(dataType));
diff --git a/src/components/DataViz/RNASeqViz.js b/src/components/DataViz/RNASeqViz.js
index f236f52a..41b4dcc8 100644
--- a/src/components/DataViz/RNASeqViz.js
+++ b/src/components/DataViz/RNASeqViz.js
@@ -31,12 +31,12 @@ class RNASeqViz extends Component {
         const queryParam = queryString.parse(this.props.location.search);
         if (this.props.gene.symbol !== undefined && this.props.gene.symbol !== '' && (!queryParam || !queryParam.dataType)) {
             await this.fetchDataType(this.props.gene.symbol)
-            if (!this.props.tissueType) {
-                this.props.setTissueType('all')
+            if (!this.props.enrollmentCategory) {
+                this.props.setEnrollmentCategory('all')
             }
             if (this.props.dataType) {
-                this.getGeneExpression(this.props.dataType, this.props.gene.symbol, "", this.props.tissueType, 'network-only');
-                this.getUmapPoints(this.props.dataType, this.props.gene.symbol, this.props.tissueType, 'network-only');
+                this.getGeneExpression(this.props.dataType, this.props.gene.symbol, "", this.props.enrollmentCategory, 'network-only');
+                this.getUmapPoints(this.props.dataType, this.props.gene.symbol, this.props.enrollmentCategory, 'network-only');
             }
         } else {
             this.setState({ isLoading: false, isLoadingUmap: false })
@@ -44,16 +44,16 @@ class RNASeqViz extends Component {
     }
 
     async componentDidUpdate(prevProps) {
-        if (this.props.tissueType !== prevProps.tissueType
+        if (this.props.enrollmentCategory !== prevProps.enrollmentCategory
             || this.props.dataType !== prevProps.dataType
             || this.props.gene.symbol !== prevProps.gene.symbol) {
             if (this.props.gene.symbol && this.props.dataType) {
                 this.setState({ plotData: [], geneExpressionData: [], isLoading: true, isLoadingUmap: true });
-                if (!this.props.tissueType) {
-                    this.props.setTissueType('all')
+                if (!this.props.enrollmentCategory) {
+                    this.props.setEnrollmentCategory('all')
                 }
-                this.getGeneExpression(this.props.dataType, this.props.gene.symbol, "", this.props.tissueType);
-                this.getUmapPoints(this.props.dataType, this.props.gene.symbol, this.props.tissueType);
+                this.getGeneExpression(this.props.dataType, this.props.gene.symbol, "", this.props.enrollmentCategory);
+                this.getUmapPoints(this.props.dataType, this.props.gene.symbol, this.props.enrollmentCategory);
             }
         }
     }
@@ -79,14 +79,14 @@ class RNASeqViz extends Component {
         }
     }
 
-    getGeneExpression = async (dataType, gene, cellType, tissueType, fetchPolicy) => {
-        const results = await fetchGeneExpression(dataType, gene, cellType, tissueType, fetchPolicy);
+    getGeneExpression = async (dataType, gene, cellType, enrollmentCategory, fetchPolicy) => {
+        const results = await fetchGeneExpression(dataType, gene, cellType, enrollmentCategory, fetchPolicy);
         const cleanResults = this.cleanResults(results);
         this.setState({ geneExpressionData: cleanResults, isLoading: false });
     }
 
-    getUmapPoints = async (dataType, gene, tissueType, fetchPolicy) => {
-        const results = await fetchPlotlyData(dataType, gene, tissueType, fetchPolicy);
+    getUmapPoints = async (dataType, gene, enrollmentCategory, fetchPolicy) => {
+        const results = await fetchPlotlyData(dataType, gene, enrollmentCategory, fetchPolicy);
         this.setState({ plotData: results, isLoadingUmap: false });
     };
 
@@ -107,7 +107,7 @@ class RNASeqViz extends Component {
                             </Row>
                             <Row>
                                 <Col lg='6' className="umapPlot-container">
-                                    <UMAPPlot data={this.state.plotData} dataType={this.props.dataType ? this.props.dataType : 'sc'} tissueType={this.props.tissueType} />
+                                    <UMAPPlot data={this.state.plotData} dataType={this.props.dataType ? this.props.dataType : 'sc'} enrollmentCategory={this.props.enrollmentCategory} />
                                 </Col>
                             </Row>
                         </Col>
@@ -120,7 +120,7 @@ class RNASeqViz extends Component {
                             </Row>
                             <Row className={(!this.state.isLoadingUmap && !this.props.gene.symbol && this.state.plotData.length >= 0) ? 'featurePlot-loader-background' : ''}>
                                 <Col lg='12' className="featurePlot-container">
-                                    <FeaturePlot data={this.state.plotData} dataType={this.props.dataType} isLoading={this.state.isLoadingUmap} gene={this.props.gene.symbol} tissueType={this.props.tissueType} />
+                                    <FeaturePlot data={this.state.plotData} dataType={this.props.dataType} isLoading={this.state.isLoadingUmap} gene={this.props.gene.symbol} enrollmentCategory={this.props.enrollmentCategory} />
                                 </Col>
                             </Row>
                         </Col>
@@ -130,7 +130,7 @@ class RNASeqViz extends Component {
                             {(!this.state.isLoading && this.state.geneExpressionData.length > 0) && <hr />}
                         </Col>
                     </Row>
-                    <ExpressionXCellType dataType={this.props.dataType} data={this.state.geneExpressionData} isLoading={this.state.isLoading} gene={this.props.gene.symbol} tissueType={this.props.tissueType} />
+                    <ExpressionXCellType dataType={this.props.dataType} data={this.state.geneExpressionData} isLoading={this.state.isLoading} gene={this.props.gene.symbol} enrollmentCategory={this.props.enrollmentCategory} />
                 </Container>
             </Container>
             </div>
diff --git a/src/components/DataViz/RNASeqVizContainer.js b/src/components/DataViz/RNASeqVizContainer.js
index abf0b703..1125a4d9 100644
--- a/src/components/DataViz/RNASeqVizContainer.js
+++ b/src/components/DataViz/RNASeqVizContainer.js
@@ -1,6 +1,6 @@
 import { connect } from "react-redux";
 import RNASeqViz from "./RNASeqViz";
-import { setTissueType } from '../../actions/TissueType/tissueTypeActions'
+import { setEnrollmentCategory } from '../../actions/EnrollmentCategory/enrollmentCategoryActions'
 import { setDataType } from "../../actions/DataType/dataTypeActions";
 import { resetState } from "../../actions/resetAction";
 
@@ -9,7 +9,7 @@ const mapStateToProps = (state, props) =>
     conceptSummary: state.conceptSummary,
     gene: state.gene,
     dataType: state.dataType,
-    tissueType: state.tissueType
+    enrollmentCategory: state.enrollmentCategory
 });
 
 const mapDispatchToProps = (dispatch, props) =>
@@ -17,8 +17,8 @@ const mapDispatchToProps = (dispatch, props) =>
     setDataType(dataType) {
         dispatch(setDataType(dataType));
     },
-    setTissueType(tissueType) {
-        dispatch(setTissueType(tissueType));
+    setEnrollmentCategory(enrollmentCategory) {
+        dispatch(setEnrollmentCategory(enrollmentCategory));
     },
     resetState() {
         dispatch(resetState());
diff --git a/src/components/DataViz/RegionalProteomics.js b/src/components/DataViz/RegionalProteomics.js
index dfb5f152..b73d7fbd 100644
--- a/src/components/DataViz/RegionalProteomics.js
+++ b/src/components/DataViz/RegionalProteomics.js
@@ -7,7 +7,7 @@ import queryString from 'query-string';
 import {fetchRegionalProteomics} from "../../helpers/ApolloClient";
 import LMDDotPlot from "../Plots/LMDDotPlot";
 import RegionalProteomicsTable from "../ExpressionTables/RegionalProteomicsTable";
-import {formatTissueType, formatNumberToPrecision} from "../../helpers/Utils";
+import {formatEnrollmentCategory, formatNumberToPrecision} from "../../helpers/Utils";
 import { CSVLink } from "react-csv";
 import { handleGoogleAnalyticsEvent } from '../../helpers/googleAnalyticsHelper';
 
@@ -16,8 +16,8 @@ class RegionalProteomics extends Component {
         super(props);
         this.state = { allData: {}, accessionNums: [], selectedAccession: "", tableData: [], plotData: {}};
         const queryParam = queryString.parse(props.location.search);
-        if (!this.props.tissueType) {
-          this.props.setTissueType('all')
+        if (!this.props.enrollmentCategory) {
+          this.props.setEnrollmentCategory('all')
         }
         if (queryParam && queryParam.dataType) {
             this.props.resetState();
@@ -37,8 +37,8 @@ class RegionalProteomics extends Component {
         if (this.props.gene !== prevProps.gene) {
             this.getRPData();
         }
-        if (this.props.tissueType !== prevProps.tissueType) {
-            this.setState({ tableData: this.state.plotData[this.props.tissueType] });
+        if (this.props.enrollmentCategory !== prevProps.enrollmentCategory) {
+            this.setState({ tableData: this.state.plotData[this.props.enrollmentCategory] });
         }
     };
 
@@ -57,22 +57,22 @@ class RegionalProteomics extends Component {
     mapPlotData = (result) => {
         let allData = {};
         let accessionNums = [];
-        for (let {accession, rpExpressionByTissueType} of result) {
-            allData[accession] = rpExpressionByTissueType;
+        for (let {accession, rpExpressionByEnrollmentCategory} of result) {
+            allData[accession] = rpExpressionByEnrollmentCategory;
             accessionNums.push(accession);
         }
         this.setState({ allData: allData });
         this.setState({ accessionNums: accessionNums })
         let plotData = allData[this.state.selectedAccession];
         this.setState({ plotData: plotData})
-        this.setState({ tableData: plotData[this.props.tissueType]})
+        this.setState({ tableData: plotData[this.props.enrollmentCategory]})
     }
 
     handleAccessionChange = (accession) => {
         this.props.setAccession(accession)
         this.setState({ selectedAccession: accession })
         this.setState({ plotData: this.state.allData[accession]})
-        this.setState({ tableData: this.state.allData[accession][this.props.tissueType]})
+        this.setState({ tableData: this.state.allData[accession][this.props.enrollmentCategory]})
     }
 
     getTabGroup = (accessionNums) => {
@@ -86,8 +86,8 @@ class RegionalProteomics extends Component {
     }
 
     getExportFilename = () => {
-      const tissueType = formatTissueType(this.props.tissueType).toLowerCase().replace(" ", "-");
-      return "KPMP_Regional_proteomics_gene-comparison_" + this.props.gene.symbol + '_' + this.state.selectedAccession + '_' + tissueType + '.csv';
+      const enrollmentCategory = formatEnrollmentCategory(this.props.enrollmentCategory).toLowerCase().replace(" ", "-");
+      return "KPMP_Regional_proteomics_gene-comparison_" + this.props.gene.symbol + '_' + this.state.selectedAccession + '_' + enrollmentCategory + '.csv';
   };
 
     cleanResults = (results) => {
@@ -159,7 +159,7 @@ class RegionalProteomics extends Component {
                           <Row cs='12' className='mt-3 mb-4 footnote'/>
                           <Row xs='12'>
                               <Col lg='11'>
-                                  <h5>{this.props.gene.symbol} expression comparison between Glomerulus and Tubulo-interstitium in {formatTissueType(this.props.tissueType)}</h5>
+                                  <h5>{this.props.gene.symbol} expression comparison between Glomerulus and Tubulo-interstitium in {formatEnrollmentCategory(this.props.enrollmentCategory)}</h5>
                                   <h6>NS = Not Significant</h6>
                               </Col>
                               <Col xs='1' className='text-end'>
diff --git a/src/components/DataViz/RegionalProteomicsContainer.js b/src/components/DataViz/RegionalProteomicsContainer.js
index c8a6af84..dc52e36e 100644
--- a/src/components/DataViz/RegionalProteomicsContainer.js
+++ b/src/components/DataViz/RegionalProteomicsContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
 import RegionalProteomics from "./RegionalProteomics";
-import { setTissueType } from '../../actions/TissueType/tissueTypeActions'
+import { setEnrollmentCategory } from '../../actions/EnrollmentCategory/enrollmentCategoryActions'
 import { setDataType } from "../../actions/DataType/dataTypeActions";
 import { resetState } from "../../actions/resetAction";
 import { setAccession } from "../../actions/Accession/accessionActions";
@@ -10,14 +10,14 @@ const mapStateToProps = (state, props) =>
         conceptSummary: state.conceptSummary,
         gene: state.gene,
         dataType: state.dataType,
-        tissueType: state.tissueType,
+        enrollmentCategory: state.enrollmentCategory,
         accession: state.accession
     });
 
 const mapDispatchToProps = (dispatch, props) =>
     ({
-        setTissueType(tissueType) {
-            dispatch(setTissueType(tissueType));
+        setEnrollmentCategory(enrollmentCategory) {
+            dispatch(setEnrollmentCategory(enrollmentCategory));
         },
         setDataType(dataType) {
             dispatch(setDataType(dataType));
diff --git a/src/components/DataViz/RegionalViz.js b/src/components/DataViz/RegionalViz.js
index 52c4bb77..e3bcd35d 100644
--- a/src/components/DataViz/RegionalViz.js
+++ b/src/components/DataViz/RegionalViz.js
@@ -1,7 +1,7 @@
 import React, { Component } from 'react';
 import { Container, Row, Col, Button, ButtonGroup } from 'reactstrap';
 import DataTypeSelectorContainer from './DataTypeSelectorContainer';
-import { formatTissueType, formatNumberToPrecision } from "../../helpers/Utils";
+import { formatEnrollmentCategory, formatNumberToPrecision } from "../../helpers/Utils";
 import LMDDotPlot from "../Plots/LMDDotPlot";
 import { fetchRegionalTranscriptomics } from "../../helpers/ApolloClient";
 import RegionalTranscriptomicsTable from "../ExpressionTables/RegionalTranscriptomicsTable";
@@ -16,8 +16,8 @@ class RegionalViz extends Component {
     constructor(props) {
         super(props);
         this.state = { rtAllPlotData: [], rtAllTableData: [], rtGTPlotData: [], rtGTTableData: [], selectedComparison: 'all_segments', selectedPlot: 'box' };
-        if (!this.props.tissueType) {
-            this.props.setTissueType('all')
+        if (!this.props.enrollmentCategory) {
+            this.props.setEnrollmentCategory('all')
         }
         const queryParam = queryString.parse(props.location.search);
         if (queryParam && queryParam.dataType) {
@@ -34,9 +34,9 @@ class RegionalViz extends Component {
     };
 
     componentDidUpdate(prevProps, prevState, snapShot) {
-        if (this.props.tissueType !== prevProps.tissueType) {
-            this.setState({ rtAllTableData: this.state.rtAllPlotData[this.props.tissueType] });
-            this.setState({ rtGTTableData: this.state.rtGTPlotData[this.props.tissueType] });
+        if (this.props.enrollmentCategory !== prevProps.enrollmentCategory) {
+            this.setState({ rtAllTableData: this.state.rtAllPlotData[this.props.enrollmentCategory] });
+            this.setState({ rtGTTableData: this.state.rtGTPlotData[this.props.enrollmentCategory] });
         }
         if (this.props.gene !== prevProps.gene) {
             this.getRTData();
@@ -46,20 +46,20 @@ class RegionalViz extends Component {
     getRTData = () => {
         fetchRegionalTranscriptomics('all_segments', this.props.gene.symbol).then((result) => {
             this.setState({ rtAllPlotData: result });
-            this.setState({ rtAllTableData: result[this.props.tissueType] });
+            this.setState({ rtAllTableData: result[this.props.enrollmentCategory] });
         }
         );
         fetchRegionalTranscriptomics('glom_tub', this.props.gene.symbol).then((result) => {
             this.setState({ rtGTPlotData: result })
-            this.setState({ rtGTTableData: result[this.props.tissueType] });
+            this.setState({ rtGTTableData: result[this.props.enrollmentCategory] });
         }
         );
     };
 
     getExportFilename = () => {
         const grouping = this.state.selectedComparison === 'glom_tub' ? 'GlomVsTI' : 'Regions';
-        const tissueType = formatTissueType(this.props.tissueType).toLowerCase().replace(" ", "-");
-        return "KPMP_" + formatDataType(this.props.dataType) + '_gene-comparison_' + this.props.gene.symbol + '_' + tissueType + '_' + grouping + '.csv';
+        const enrollmentCategory = formatEnrollmentCategory(this.props.enrollmentCategory).toLowerCase().replace(" ", "-");
+        return "KPMP_" + formatDataType(this.props.dataType) + '_gene-comparison_' + this.props.gene.symbol + '_' + enrollmentCategory + '_' + grouping + '.csv';
     };
 
     cleanResults = (results) => {
@@ -146,7 +146,7 @@ class RegionalViz extends Component {
                             </Row>
                             <Row xs='12'>
                                 <Col lg='11'>
-                                    <h5>{this.props.gene.symbol} expression comparison across regions in {formatTissueType(this.props.tissueType)}</h5>
+                                    <h5>{this.props.gene.symbol} expression comparison across regions in {formatEnrollmentCategory(this.props.enrollmentCategory)}</h5>
                                     <h6>NS = Not Significant</h6>
                                 </Col>
                                 <Col xs='1' className='text-end'>
diff --git a/src/components/DataViz/RegionalVizContainer.js b/src/components/DataViz/RegionalVizContainer.js
index d7ca688b..8321363b 100644
--- a/src/components/DataViz/RegionalVizContainer.js
+++ b/src/components/DataViz/RegionalVizContainer.js
@@ -1,6 +1,6 @@
 import {connect} from "react-redux";
 import RegionalViz from "./RegionalViz";
-import { setTissueType } from '../../actions/TissueType/tissueTypeActions'
+import { setEnrollmentCategory } from '../../actions/EnrollmentCategory/enrollmentCategoryActions'
 import { setDataType } from "../../actions/DataType/dataTypeActions";
 import { resetState } from "../../actions/resetAction";
 
@@ -9,13 +9,13 @@ const mapStateToProps = (state, props) =>
         conceptSummary: state.conceptSummary,
         gene: state.gene,
         dataType: state.dataType,
-        tissueType: state.tissueType
+        enrollmentCategory: state.enrollmentCategory
     });
 
 const mapDispatchToProps = (dispatch, props) =>
     ({
-        setTissueType(tissueType) {
-            dispatch(setTissueType(tissueType));
+        setEnrollmentCategory(enrollmentCategory) {
+            dispatch(setEnrollmentCategory(enrollmentCategory));
         },
         setDataType(dataType) {
             dispatch(setDataType(dataType));
diff --git a/src/components/DataViz/UMAPContainer.js b/src/components/DataViz/UMAPContainer.js
index 2f58ebef..24274a3c 100644
--- a/src/components/DataViz/UMAPContainer.js
+++ b/src/components/DataViz/UMAPContainer.js
@@ -6,7 +6,7 @@ const mapStateToProps = (state, props) =>
     conceptSummary: state.conceptSummary,
     gene: state.gene,
     dataType: state.dataType,
-    tissueType: state.tissueType
+    enrollmentCategory: state.enrollmentCategory
 });
 
 const mapDispatchToProps = (dispatch, props) =>
diff --git a/src/components/DataViz/UMAPViz.js b/src/components/DataViz/UMAPViz.js
index cafbd76f..e2c225c2 100644
--- a/src/components/DataViz/UMAPViz.js
+++ b/src/components/DataViz/UMAPViz.js
@@ -22,7 +22,7 @@ class UMAP extends Component {
 
     componentDidMount() {
         window.addEventListener("resize", this.setPlotSize);
-        this.getUmapPoints(this.props.dataType, this.props.gene.symbol, this.props.tissueType, 'network-only');
+        this.getUmapPoints(this.props.dataType, this.props.gene.symbol, this.props.enrollmentCategory, 'network-only');
     
     }
 
@@ -63,8 +63,8 @@ class UMAP extends Component {
         this.setState({ plotData: clusterData, plotAnnotations: annotations, isLoading: false });
     };
 
-    getUmapPoints = async (dataType, gene, tissueType, fetchPolicy) => {
-        const results = await fetchPlotlyData(dataType, gene, tissueType, fetchPolicy);
+    getUmapPoints = async (dataType, gene, enrollmentCategory, fetchPolicy) => {
+        const results = await fetchPlotlyData(dataType, gene, enrollmentCategory, fetchPolicy);
         this.setData(results);
     };
 
diff --git a/src/components/DataViz/tissueTypeReducer.js b/src/components/DataViz/enrollmentCategoryReducer.js
similarity index 57%
rename from src/components/DataViz/tissueTypeReducer.js
rename to src/components/DataViz/enrollmentCategoryReducer.js
index 2ab1b3f0..13dfe331 100644
--- a/src/components/DataViz/tissueTypeReducer.js
+++ b/src/components/DataViz/enrollmentCategoryReducer.js
@@ -1,8 +1,8 @@
 import actionNames from '../../actions/actionNames';
 
-export const tissueType = ( state = "", action ) => {
+export const enrollmentCategory = ( state = "", action ) => {
     switch(action.type) {
-        case actionNames.SET_TISSUE_TYPE:
+        case actionNames.SET_ENROLLMENT_CATEGORY:
             return action.payload;
         default:
             return state;
diff --git a/src/components/Explorer/Explorer.js b/src/components/Explorer/Explorer.js
index 62b4de75..f99e014b 100644
--- a/src/components/Explorer/Explorer.js
+++ b/src/components/Explorer/Explorer.js
@@ -4,7 +4,7 @@ import DataSelectorContainer from './DataSelectorContainer';
 import NephronSchemaCardContainer from './NephronSchemaCardContainer';
 import { setSelectedConcept } from '../../actions/Concepts/conceptActions';
 import { setGene } from '../../actions/Gene/geneActions';
-import { setTissueType } from '../../actions/TissueType/tissueTypeActions';
+import { setEnrollmentCategory } from '../../actions/EnrollmentCategory/enrollmentCategoryActions';
 import { setDataType } from '../../actions/DataType/dataTypeActions';
 import { setAccession } from '../../actions/Accession/accessionActions';
 
@@ -15,7 +15,7 @@ class Explorer extends Component {
     render() {
         this.props.setAccession(initialState.accession)
         this.props.setGene("");
-        this.props.setTissueType("");
+        this.props.setEnrollmentCategory("");
         this.props.setDataType("");
         this.props.setSelectedConcept(initialState.selectedConcept);
         return (
@@ -33,8 +33,8 @@ const mapDispatchToProps = (dispatch, props) =>
     setGene(gene) {
         dispatch(setGene(gene));
     },
-    setTissueType(tissueType) {
-        dispatch(setTissueType(tissueType));
+    setEnrollmentCategory(enrollmentCategory) {
+        dispatch(setEnrollmentCategory(enrollmentCategory));
     },
     setDataType(dataType) {
         dispatch(setDataType(dataType));
diff --git a/src/components/Explorer/NephronSchemaCardContainer.js b/src/components/Explorer/NephronSchemaCardContainer.js
index 65e29a45..e598cd12 100644
--- a/src/components/Explorer/NephronSchemaCardContainer.js
+++ b/src/components/Explorer/NephronSchemaCardContainer.js
@@ -2,7 +2,7 @@ import { connect } from 'react-redux';
 import NephronSchemaCard from './NephronSchemaCard';
 import { setSelectedConceptAndRedirect } from '../../actions/Concepts/conceptActions'
 import { withRouter } from 'react-router';
-import { setTissueType } from '../../actions/TissueType/tissueTypeActions'
+import { setEnrollmentCategory } from '../../actions/EnrollmentCategory/enrollmentCategoryActions'
 
 const mapStateToProps = (state, props) =>
 ({
@@ -12,7 +12,7 @@ const mapStateToProps = (state, props) =>
 const mapDispatchToProps = (dispatch, props) =>
 ({
     setSelectedConcept(concept) {
-        dispatch(setTissueType('all'))
+        dispatch(setEnrollmentCategory('all'))
         dispatch(setSelectedConceptAndRedirect(concept, props));
     }
 });
diff --git a/src/components/ExpressionTables/DiffexByClusterContainer.js b/src/components/ExpressionTables/DiffexByClusterContainer.js
index a8084cc3..4c9521a2 100644
--- a/src/components/ExpressionTables/DiffexByClusterContainer.js
+++ b/src/components/ExpressionTables/DiffexByClusterContainer.js
@@ -9,7 +9,7 @@ const mapStateToProps = (state, props) =>
 ({
     dataType: state.dataType,
     cluster: state.cluster,
-    tissueType: state.tissueType,
+    enrollmentCategory: state.enrollmentCategory,
 });
 
 const mapDispatchToProps = (dispatch, props) =>
diff --git a/src/components/ExpressionTables/ExpressionXCellType.js b/src/components/ExpressionTables/ExpressionXCellType.js
index 94a29af7..f37a493c 100644
--- a/src/components/ExpressionTables/ExpressionXCellType.js
+++ b/src/components/ExpressionTables/ExpressionXCellType.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import { Grid, TableColumnResizing, TableHeaderRow, 
     Table, TableSummaryRow, TableBandHeader} from '@devexpress/dx-react-grid-bootstrap4';
 import { Col, Row, UncontrolledTooltip, Spinner } from "reactstrap";
-import { formatTissueType, formatNumberToPrecision } from "../../helpers/Utils"
+import { formatEnrollmentCategory, formatNumberToPrecision } from "../../helpers/Utils"
 import { CSVLink } from "react-csv";
 import { faDownload, faInfoCircle } from "@fortawesome/free-solid-svg-icons";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
@@ -19,8 +19,8 @@ import {
 class ExpressionXCellType extends Component {
 
     getExportFilename = () => {
-        const tissueType = formatTissueType(this.props.tissueType).toLowerCase().replace(" ", "-");
-        return "KPMP_" + formatDataType(this.props.dataType) + '-seq_gene-comparison_' + this.props.gene + '_' + tissueType + '.csv';
+        const enrollmentCategory = formatEnrollmentCategory(this.props.enrollmentCategory).toLowerCase().replace(" ", "-");
+        return "KPMP_" + formatDataType(this.props.dataType) + '-seq_gene-comparison_' + this.props.gene + '_' + enrollmentCategory + '.csv';
     };
 
     cleanResults = (results) => {
@@ -31,11 +31,11 @@ class ExpressionXCellType extends Component {
                     clusterAbbrev: cluster,
                     clusterName: clusterName,
                     cellCount: cellCount ? cellCount : 0,
-                    meanExp: formatNumberToPrecision(avgExp, 3, false, this.props.dataType, this.props.tissueType),
-                    pctCellsExpressing: formatNumberToPrecision(pct1Value, 3, false, this.props.dataType, this.props.tissueType),
-                    foldChange: formatNumberToPrecision(foldChange, 3, false, this.props.dataType, this.props.tissueType),
-                    pVal: formatNumberToPrecision(pVal, 3, false, this.props.dataType, this.props.tissueType),
-                    pValAdj: formatNumberToPrecision(pValAdj, 3, false, this.props.dataType, this.props.tissueType)
+                    meanExp: formatNumberToPrecision(avgExp, 3, false, this.props.dataType, this.props.enrollmentCategory),
+                    pctCellsExpressing: formatNumberToPrecision(pct1Value, 3, false, this.props.dataType, this.props.enrollmentCategory),
+                    foldChange: formatNumberToPrecision(foldChange, 3, false, this.props.dataType, this.props.enrollmentCategory),
+                    pVal: formatNumberToPrecision(pVal, 3, false, this.props.dataType, this.props.enrollmentCategory),
+                    pValAdj: formatNumberToPrecision(pValAdj, 3, false, this.props.dataType, this.props.enrollmentCategory)
                 }
             });
     };
@@ -85,14 +85,14 @@ class ExpressionXCellType extends Component {
                         Averaged expression values (logarithmic) for each cell cluster
                     </UncontrolledTooltip></span>,
                 name: 'avgExp',
-                getCellValue: row => formatNumberToPrecision(row.avgExp, 3, false, this.props.dataType, this.props.tissueType)
+                getCellValue: row => formatNumberToPrecision(row.avgExp, 3, false, this.props.dataType, this.props.enrollmentCategory)
             },
             {
                 title: <span>% CELLS<br />EXPRESSING</span>,
                 name: 'pct1',
                 getCellValue: row => {
                     let newValue = (row.pct1 > 0) ? (row.pct1 * 100) : row.pct1;
-                    return formatNumberToPrecision(newValue, 3, false, this.props.dataType, this.props.tissueType);
+                    return formatNumberToPrecision(newValue, 3, false, this.props.dataType, this.props.enrollmentCategory);
                 }
             },
             {
@@ -101,7 +101,7 @@ class ExpressionXCellType extends Component {
                         Log fold-change of the average expression between this cell cluster and all others. Positive values indicate that the feature is more highly expressed in this cell cluster.
                     </UncontrolledTooltip></span>,
                 name: 'foldChange',
-                getCellValue: row => formatNumberToPrecision(row.foldChange, 3, false, this.props.dataType, this.props.tissueType)
+                getCellValue: row => formatNumberToPrecision(row.foldChange, 3, false, this.props.dataType, this.props.enrollmentCategory)
             },
             {
                 title: <span>P VALUE <span className="icon-info"><FontAwesomeIcon className='kpmp-light-blue' id='pvalue-info' icon={faInfoCircle} /></span>
@@ -109,7 +109,7 @@ class ExpressionXCellType extends Component {
                         p-value (unadjusted)
                     </UncontrolledTooltip></span>,
                 name: 'pVal',
-                getCellValue: row => formatNumberToPrecision(row.pVal, 3, false, this.props.dataType, this.props.tissueType)
+                getCellValue: row => formatNumberToPrecision(row.pVal, 3, false, this.props.dataType, this.props.enrollmentCategory)
             },
             {
                 title: <span>ADJ<br />P VALUE <span className="icon-info"><FontAwesomeIcon id='pvalue-adj-info' className='kpmp-light-blue' icon={faInfoCircle} /></span>
@@ -117,7 +117,7 @@ class ExpressionXCellType extends Component {
                         Adjusted p-value, based on bonferroni correction using all features in the dataset.
                     </UncontrolledTooltip></span>,
                 name: 'pValAdj',
-                getCellValue: row => formatNumberToPrecision(row.pValAdj, 3, false, this.props.dataType, this.props.tissueType)
+                getCellValue: row => formatNumberToPrecision(row.pValAdj, 3, false, this.props.dataType, this.props.enrollmentCategory)
             }
         ]
     };
@@ -188,8 +188,8 @@ class ExpressionXCellType extends Component {
                 <React.Fragment>
                     <Row xs='12' className='mt-5'>
                         <Col xs='11'>
-                            <h5><span>{this.props.gene}</span> Expression Comparison across Cell Clusters in {formatTissueType(this.props.tissueType)}</h5>
-                            <h6>NS = Not Significant { (this.props.dataType === "sn" && this.props.tissueType === "dmr") && "|  - = Not Calculated" }</h6>
+                            <h5><span>{this.props.gene}</span> Expression Comparison across Cell Clusters in {formatEnrollmentCategory(this.props.enrollmentCategory)}</h5>
+                            <h6>NS = Not Significant { (this.props.dataType === "sn" && this.props.enrollmentCategory === "dmr") && "|  - = Not Calculated" }</h6>
                         </Col>
                         <Col xs='1' className='text-end'>
                             <CSVLink
diff --git a/src/components/ExpressionTables/ExpressionXTissueType.js b/src/components/ExpressionTables/ExpressionXEnrollmentCategory.js
similarity index 93%
rename from src/components/ExpressionTables/ExpressionXTissueType.js
rename to src/components/ExpressionTables/ExpressionXEnrollmentCategory.js
index 89783afd..c24f4e9c 100644
--- a/src/components/ExpressionTables/ExpressionXTissueType.js
+++ b/src/components/ExpressionTables/ExpressionXEnrollmentCategory.js
@@ -3,7 +3,7 @@ import { Grid, TableFixedColumns, TableHeaderRow, Table} from '@devexpress/dx-re
 import initialState from "../../initialState";
 import {Col, Row} from "reactstrap";
 
-class ExpressionXTissueType extends Component {
+class ExpressionXEnrollmentCategory extends Component {
     constructor(props) {
         super(props);
         this.getColumns = this.getColumns.bind(this);
@@ -86,4 +86,4 @@ class ExpressionXTissueType extends Component {
     }
 }
 
-export default ExpressionXTissueType;
\ No newline at end of file
+export default ExpressionXEnrollmentCategory;
\ No newline at end of file
diff --git a/src/components/Home/AvailableDatasetsTable.js b/src/components/Home/AvailableDatasetsTable.js
index 20c7cb0d..e290a7b3 100644
--- a/src/components/Home/AvailableDatasetsTable.js
+++ b/src/components/Home/AvailableDatasetsTable.js
@@ -25,16 +25,16 @@ class AvailableDatasetsTable extends Component {
 
     }
 
-    handleEmptyCounts(count, row, tissueType){
-        return count === 0 ? "" : this.formatDataTypeValueCell(count, row, tissueType)
+    handleEmptyCounts(count, row, enrollmentCategory){
+        return count === 0 ? "" : this.formatDataTypeValueCell(count, row, enrollmentCategory)
     }
 
-    handleDataTypeValueClick(row, tissueType) {
+    handleDataTypeValueClick(row, enrollmentCategory) {
         let linkType = row.linkInformation.linkType;
         let linkValue = row.linkInformation.linkValue.replace('&', '%26');
         let mapping = `/repository/?size=n_20_n&filters[0][field]=${linkType}&filters[0][values][0]=${linkValue}&filters[0][type]=any`
-        if(tissueType){
-            mapping += `&filters[1][field]=tissue_type&filters[1][values][0]=${tissueType}&filters[1][type]=any`
+        if(enrollmentCategory){
+            mapping += `&filters[1][field]=enrollment_category&filters[1][values][0]=${enrollmentCategory}&filters[1][type]=any`
         }
         if(linkType && linkValue){
             return encodeURI(mapping).replace('%2526', '%26');
@@ -44,9 +44,9 @@ class AvailableDatasetsTable extends Component {
         }
     }
 
-    formatDataTypeValueCell(value, row, tissueType) {
+    formatDataTypeValueCell(value, row, enrollmentCategory) {
         return (
-            <a href={`${this.handleDataTypeValueClick(row, tissueType)}`}>
+            <a href={`${this.handleDataTypeValueClick(row, enrollmentCategory)}`}>
                 <span className="buttonhref">
                     {value}
                 </span>
diff --git a/src/components/Home/ParticipantSummary.js b/src/components/Home/ParticipantSummary.js
index 76ba4a17..18f116e1 100644
--- a/src/components/Home/ParticipantSummary.js
+++ b/src/components/Home/ParticipantSummary.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react';
 import {Row, Col, UncontrolledTooltip } from 'reactstrap';
-import { fetchTissueTypeSummaryCounts } from '../../helpers/ApolloClient';
+import { fetchEnrollmentCategorySummaryCounts } from '../../helpers/ApolloClient';
 class ParticipantSummary extends Component {
   constructor(props) {
       super(props);
@@ -11,7 +11,7 @@ class ParticipantSummary extends Component {
   };
 
   getTissueCounts = () => {
-    fetchTissueTypeSummaryCounts().then((result) => {
+    fetchEnrollmentCategorySummaryCounts().then((result) => {
       this.setState({akiCount: result.akiCount})
       this.setState({ckdCount: result.ckdCount})
       this.setState({hrtCount: result.hrtCount})
diff --git a/src/components/Home/ParticipantSummaryContainer.js b/src/components/Home/ParticipantSummaryContainer.js
index 7ad94ac1..5b9efeb4 100644
--- a/src/components/Home/ParticipantSummaryContainer.js
+++ b/src/components/Home/ParticipantSummaryContainer.js
@@ -1,16 +1,16 @@
 import {connect} from "react-redux";
 import ParticipantSummary from "./ParticipantSummary";
-import { setTissueType } from '../../actions/TissueType/tissueTypeActions'
+import { setEnrollmentCategory } from '../../actions/EnrollmentCategory/enrollmentCategoryActions'
 
 const mapStateToProps = (state, props) =>
     ({
-        tissueType: state.tissueType
+        enrollmentCategory: state.enrollmentCategory
     });
 
 const mapDispatchToProps = (dispatch, props) =>
     ({
-        setTissueType(tissueType) {
-            dispatch(setTissueType(tissueType));
+        setEnrollmentCategory(enrollmentCategory) {
+            dispatch(setEnrollmentCategory(enrollmentCategory));
         },
     });
 
diff --git a/src/components/Plots/FeaturePlot.js b/src/components/Plots/FeaturePlot.js
index e2434888..aff08fb5 100644
--- a/src/components/Plots/FeaturePlot.js
+++ b/src/components/Plots/FeaturePlot.js
@@ -2,7 +2,7 @@ import React, { Component } from 'react';
 import Plotly from '../../helpers/Plotly';
 import createPlotlyComponent from 'react-plotly.js/factory';
 import { Spinner } from "reactstrap";
-import { formatDataType, formatTissueType } from "../../helpers/Utils";
+import { formatDataType, formatEnrollmentCategory } from "../../helpers/Utils";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faShare } from "@fortawesome/free-solid-svg-icons";
 
@@ -95,8 +95,8 @@ class FeaturePlot extends Component {
     };
 
     getExportFilename = () => {
-        const tissueType = formatTissueType(this.props.tissueType).toLowerCase().replace(" ", "-");
-        return "KPMP_" + formatDataType(this.props.dataType) + '_feature-plot_' + this.props.gene + '_' + tissueType;
+        const enrollmentCategory = formatEnrollmentCategory(this.props.enrollmentCategory).toLowerCase().replace(" ", "-");
+        return "KPMP_" + formatDataType(this.props.dataType) + '_feature-plot_' + this.props.gene + '_' + enrollmentCategory;
     };
 
     render() {
diff --git a/src/components/Plots/LMDDotPlot.js b/src/components/Plots/LMDDotPlot.js
index 23ae0076..850100ca 100644
--- a/src/components/Plots/LMDDotPlot.js
+++ b/src/components/Plots/LMDDotPlot.js
@@ -42,7 +42,7 @@ class LMDDotPlot extends Component {
 
     sortByTissueFunc = (resultA, resultB) => {
         let tissueMap = new Map([['all', 4], ['hrt', 3], ['aki', 2], ['ckd', 1]]);
-        return (tissueMap.get(resultA.tissueType) - tissueMap.get(resultB.tissueType));
+        return (tissueMap.get(resultA.enrollmentCategory) - tissueMap.get(resultB.enrollmentCategory));
     };
 
     getSizeLegendPlot = (bubbles) => {
@@ -70,8 +70,8 @@ class LMDDotPlot extends Component {
 
     };
 
-    abbreviate = (tissueType) => {
-        return tissueType === 'Healthy Reference'?'hrt':tissueType;
+    abbreviate = (enrollmentCategory) => {
+        return enrollmentCategory === 'Healthy Reference'?'hrt':enrollmentCategory;
     };
 
     setData = (data) => {
@@ -87,7 +87,7 @@ class LMDDotPlot extends Component {
         if (data) {
             resultArr.forEach((row) => {
                 xValues.push(row.segment);
-                yValues.push(this.abbreviate(row.tissueType).toUpperCase());
+                yValues.push(this.abbreviate(row.enrollmentCategory).toUpperCase());
                 let pValLog10 = row.pValLog10
                 if(this.props.calcLog10) {
                     pValLog10 = -1 * Math.log10(row.pValLog10);
diff --git a/src/components/Summary/CellTypeSummaryContainer.js b/src/components/Summary/CellTypeSummaryContainer.js
index 6a73e5a0..e37b4607 100644
--- a/src/components/Summary/CellTypeSummaryContainer.js
+++ b/src/components/Summary/CellTypeSummaryContainer.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import CellTypeSummary from './CellTypeSummary';
 import { setDataType } from "../../actions/DataType/dataTypeActions";
-import { setTissueType } from "../../actions/TissueType/tissueTypeActions";
+import { setEnrollmentCategory } from "../../actions/EnrollmentCategory/enrollmentCategoryActions";
 import { setCluster } from "../../actions/Cluster/clusterActions"
 import { withRouter } from 'react-router';
 
@@ -16,7 +16,7 @@ const mapDispatchToProps = (dispatch, props) =>
     ({
         setDataTypeAndCluster(dataType, cluster) {
             dispatch(setDataType(dataType));
-            dispatch(setTissueType("all"));
+            dispatch(setEnrollmentCategory("all"));
             dispatch(setCluster(cluster));
             dispatch((dispatch) => window.open("/explorer/diffex", '_self'));
         }
diff --git a/src/components/Summary/GeneSummaryContainer.js b/src/components/Summary/GeneSummaryContainer.js
index 65090311..16e8c43e 100644
--- a/src/components/Summary/GeneSummaryContainer.js
+++ b/src/components/Summary/GeneSummaryContainer.js
@@ -1,7 +1,7 @@
 import { connect } from 'react-redux';
 import GeneSummary from './GeneSummary';
 import { setDataTypeAndRedirect } from '../../actions/DataType/dataTypeActions'
-import { setTissueType } from "../../actions/TissueType/tissueTypeActions";
+import { setEnrollmentCategory } from "../../actions/EnrollmentCategory/enrollmentCategoryActions";
 import { withRouter } from 'react-router';
 
 const mapStateToProps = (state, props) =>
@@ -13,7 +13,7 @@ const mapStateToProps = (state, props) =>
 const mapDispatchToProps = (dispatch, props) =>
     ({
         setDataType(dataType) {
-            dispatch(setTissueType("all"));
+            dispatch(setEnrollmentCategory("all"));
             dispatch(setDataTypeAndRedirect(dataType, props));
         }
 
diff --git a/src/helpers/ApolloClient.js b/src/helpers/ApolloClient.js
index f099012d..17ac1401 100644
--- a/src/helpers/ApolloClient.js
+++ b/src/helpers/ApolloClient.js
@@ -456,7 +456,7 @@ export const fetchSummaryData = async (dataType) => {
     }
 }
 
-export const fetchTissueTypeSummaryCounts = async () => {
+export const fetchEnrollmentCategorySummaryCounts = async () => {
     let query = gql`
         query {
             getEnrollmentCategorySummaryData {
diff --git a/src/helpers/Utils.js b/src/helpers/Utils.js
index e6de33be..48af1760 100644
--- a/src/helpers/Utils.js
+++ b/src/helpers/Utils.js
@@ -1,19 +1,19 @@
 import { fetchDataTypesForConcept } from './ApolloClient';
 
-export const formatNumberToPrecision = (number, precision, keepAsInt = false, dataType = "", tissueType = "") => {
+export const formatNumberToPrecision = (number, precision, keepAsInt = false, dataType = "", enrollmentCategory = "") => {
     if (number) {
         return number.toPrecision(precision)
     } else if (number === 0) {
         return 0
     } else {
-        if (dataType === "sn" && tissueType === "dmr") {
+        if (dataType === "sn" && enrollmentCategory === "dmr") {
             return "-"
         }
         return "NS"
     }
 };
-export const formatTissueType = (tissueType) => {
-    switch (tissueType) {
+export const formatEnrollmentCategory = (enrollmentCategory) => {
+    switch (enrollmentCategory) {
         case "all":
             return "All samples";
         case "hrt":
@@ -25,7 +25,7 @@ export const formatTissueType = (tissueType) => {
         case "dmr":
             return "DM-R";
         default:
-            return tissueType
+            return enrollmentCategory
 
     }
 };
@@ -60,7 +60,7 @@ export const sum = (array, property) => {
     return array.reduce((finalSum, item) => finalSum + item[property], 0);
 };
 
-export const getTissueTypeOptions = (datasetSummary, geneSymbol, dataType) => {
+export const getEnrollmentCategoryOptions = (datasetSummary, geneSymbol, dataType) => {
     const options = [
         {
             label: "All samples",
@@ -149,7 +149,7 @@ export const getDataTypeOptions = async (geneSymbol, cluster) => {
     return options;
 };
 
-export const getDataTypeOptionsWithTissueType = async (geneSymbol, cluster, datasetSummary, currentTissueType) => {
+export const getDataTypeOptionsWithEnrollmentCategory = async (geneSymbol, cluster, datasetSummary, currentEnrollmentCategory) => {
     let options = await getDataTypeOptions(geneSymbol, cluster, datasetSummary);
     for (let index in options) {
         for (let indexDS in datasetSummary) {
@@ -159,7 +159,7 @@ export const getDataTypeOptionsWithTissueType = async (geneSymbol, cluster, data
                 "hrt": datasetSummary[indexDS].hrtCount,
                 "dmr": datasetSummary[indexDS].dmrCount
             }
-            if (options[index].value === datasetSummary[indexDS].dataTypeShort && tissues[currentTissueType] === 0) {
+            if (options[index].value === datasetSummary[indexDS].dataTypeShort && tissues[currentEnrollmentCategory] === 0) {
                 options[index].isDisabled = true
             }
         }
diff --git a/src/initialState.json b/src/initialState.json
index 6f4674f7..c6e4ce13 100644
--- a/src/initialState.json
+++ b/src/initialState.json
@@ -1,7 +1,7 @@
 {
   "selectedConcept": {},
   "dataType": "",
-  "tissueType": "",
+  "enrollmentCategory": "",
   "recreateUmaps": false,
   "gene": {},
   "cluster": "",
diff --git a/src/reducers.js b/src/reducers.js
index eba0c401..d0723441 100644
--- a/src/reducers.js
+++ b/src/reducers.js
@@ -1,14 +1,14 @@
 import { combineReducers } from 'redux';
 import { selectedConcept, gene, cluster, cellType } from "./components/ConceptSelect/conceptReducer";
 import { dataType } from "./components/DataViz/dataTypeReducer"
-import { tissueType } from "./components/DataViz/tissueTypeReducer"
+import { enrollmentCategory } from "./components/DataViz/enrollmentCategoryReducer"
 import { accession } from "./components/DataViz/accessionReducer";
 
 
 const appReducer = combineReducers({
   selectedConcept,
   dataType,
-  tissueType,
+  enrollmentCategory,
   gene,
   cluster,
   cellType,