KPMP-5366: change graphQL endpoints

KPMP · Oct 30, 2024 · b6a9889 · b6a9889
1 parent bbbc76c
commit b6a9889
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 23 deletions.
diff --git a/data/schema.graphql b/data/schema.graphql
@@ -1,15 +1,15 @@
 type Query {
   autocomplete(searchTerm: String): [AutoCompleteResult]
   cellTypeHierarchy: CellTypeHierarchy
-  geneExpressionSummary(dataType: String, geneSymbol: String, cellType: String, tissueType: String) : [GeneExpressionSummary]
+  geneExpressionSummary(dataType: String, geneSymbol: String, cellType: String, enrollmentCategory: String) : [GeneExpressionSummary]
   getClusterHieararchies(cellType: String!): [ClusterHierarchy]
-  getUmapPlotData(dataType: String!, geneSymbol: String!, tissueType: String): PlotData
+  getUmapPlotData(dataType: String!, geneSymbol: String!, enrollmentCategory: String): PlotData
   dataTypesForConcept(geneSymbol: String, clusterName: String): [String]
   getDataTypeSummaryInformation: [getDataTypeSummaryInformation]
   getRTGeneExpressionByTissue(comparisonType: String, geneSymbol: String): RTGeneExpressionByTissue
   getRTGeneExpressionByStructure(structure: String): [RTGeneExpression]
   getDataSummary(dataType: String): [SummaryData]
-  getTissueTypeSummaryData: [getTissueTypeSummaryData]
+  getEnrollmentCategorySummaryData: [getEnrollmentCategorySummaryData]
   getAtlasSummaryRows: [getAtlasSummaryRows]
 }
 
@@ -32,7 +32,7 @@ type LinkInformation{
   linkValue: String
 }
 
-type getTissueTypeSummaryData{
+type getEnrollmentCategorySummaryData{
   akiCount: Long,
   ckdCount: Long,
   hrtCount: Long,
@@ -78,7 +78,7 @@ type CellType {
 
 type GeneExpressionSummary {
     id: ID
-    tissueType: String
+    enrollmentCategory: String
     gene: String
     pVal: Float
     pValAdj: Float
@@ -134,7 +134,7 @@ type RTGeneExpression {
     pVal: Float
     stdDev: Float
     pValLog10: Float
-    tissueType: String
+    enrollmentCategory: String
     sampleCount: Int
 }
 

diff --git a/src/helpers/ApolloClient.js b/src/helpers/ApolloClient.js
@@ -20,7 +20,7 @@ const getBaseURL = () => {
 
 const typePolicies = {
     GeneExpressionSummary: {
-        keyFields: ["gene", "tissueType", "cluster", "dataType"]
+        keyFields: ["gene", "enrollmentCategory", "cluster", "dataType"]
     }
 };
 
@@ -167,11 +167,11 @@ export const fetchDataTypeSummaryInformation = async (fetchPolicy = 'no-cache')
     return undefined;
 }
 
-export const fetchPlotlyData = async (dataType, geneSymbol, tissueType, fetchPolicy = 'cache-first') => {
+export const fetchPlotlyData = async (dataType, geneSymbol, enrollmentCategory, fetchPolicy = 'cache-first') => {
 
     const query = gql`
         query {
-            getUmapPlotData(dataType: "${dataType}", geneSymbol: "${geneSymbol}", tissueType: "${tissueType}") {
+            getUmapPlotData(dataType: "${dataType}", geneSymbol: "${geneSymbol}", enrollmentCategory: "${enrollmentCategory}") {
                 referenceData {
                     xValues
                     yValues
@@ -214,7 +214,7 @@ export const fetchDataTypesForConcept = async (geneSymbol, clusterName) => {
     }
 }
 
-export const fetchGeneExpression = async (dataType, geneSymbol, cellType, tissueType) => {
+export const fetchGeneExpression = async (dataType, geneSymbol, cellType, enrollmentCategory) => {
 	const response = await axios({
 		url: getBaseURL() + '/graphql',
 		method: 'post',
@@ -226,10 +226,10 @@ export const fetchGeneExpression = async (dataType, geneSymbol, cellType, tissue
 				dataType: "${dataType}"
 				geneSymbol: "${geneSymbol}"
 				cellType: "${cellType}"
-				tissueType: "${tissueType}"
+				enrollmentCategory: "${enrollmentCategory}"
 				) {
 					id
-					tissueType
+					enrollmentCategory
 					gene
 					pVal
 					pValAdj
@@ -267,7 +267,7 @@ export const fetchRegionalTranscriptomics = async (comparisonType, geneSymbol) =
                     pValLog10
                     stdDev
                     sampleCount
-                    tissueType
+                    enrollmentCategory
                     pValAdj: adjPVal
 
                 }
@@ -281,7 +281,7 @@ export const fetchRegionalTranscriptomics = async (comparisonType, geneSymbol) =
                     pValLog10
                     stdDev
                     sampleCount
-                    tissueType
+                    enrollmentCategory
                     pValAdj: adjPVal
                 }
                 all {
@@ -294,7 +294,7 @@ export const fetchRegionalTranscriptomics = async (comparisonType, geneSymbol) =
                     pValLog10
                     stdDev
                     sampleCount
-                    tissueType
+                    enrollmentCategory
                     pValAdj: adjPVal
                 }
                 hrt {
@@ -307,7 +307,7 @@ export const fetchRegionalTranscriptomics = async (comparisonType, geneSymbol) =
                     pValLog10
                     stdDev
                     sampleCount
-                    tissueType
+                    enrollmentCategory
                     pValAdj: adjPVal
                 }
             }
@@ -331,7 +331,7 @@ export const fetchRegionalProteomics = async (geneSymbol) => {
         query {
             getRPGeneExpressionByTissue(geneSymbol: "${geneSymbol}") {
                 accession
-                rpExpressionByTissueType {
+                rpExpressionByEnrollmentCategory {
                   all {
                         id
                         geneSymbol
@@ -345,7 +345,7 @@ export const fetchRegionalProteomics = async (geneSymbol) => {
                         segment: region
                         foldChange
                         pValLog10: adjPVal
-                        tissueType
+                        enrollmentCategory
                         sampleCount
                   }
                 }
@@ -378,7 +378,7 @@ export const fetchRegionalTranscriptomicsByStructure = async (structure) => {
                 pValLog10
                 stdDev
                 sampleCount
-                tissueType
+                enrollmentCategory
                 pValAdj: adjPVal
             }
         }`;
@@ -411,7 +411,7 @@ export const fetchRegionalProteomicsByStructure = async (structure) => {
                 segment: region
                 foldChange
                 pValAdj: adjPVal
-                tissueType
+                enrollmentCategory
                 sampleCount
             }
         }`;
@@ -459,7 +459,7 @@ export const fetchSummaryData = async (dataType) => {
 export const fetchTissueTypeSummaryCounts = async () => {
     let query = gql`
         query {
-            getTissueTypeSummaryData {
+            getEnrollmentCategorySummaryData {
                 akiCount
                 ckdCount
                 hrtCount
@@ -470,8 +470,8 @@ export const fetchTissueTypeSummaryCounts = async () => {
         query: query,
         fetchPolicy: 'cache-first'
     });
-    if (response.data && response.data.getTissueTypeSummaryData) {
-        return response.data.getTissueTypeSummaryData[0];
+    if (response.data && response.data.getEnrollmentCategorySummaryData) {
+        return response.data.getEnrollmentCategorySummaryData[0];
     }else {
         store.dispatch(sendMessageToBackend("Could not retrieve tissue summary: " + response.error));
     }