Merge branch '2.0.0' of https://github.com/CBIIT/bento-cds-frontend i…

…nto 2.0.0
CBIIT · Feb 16, 2023 · ba38b22 · ba38b22
2 parents 2400c5c + 3ed57b4
commit ba38b22
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 2 deletions.
diff --git a/graphql/cds-doc.graphql b/graphql/cds-doc.graphql
@@ -27,8 +27,12 @@ type file {
   file_size: Int
   md5sum: String
   file_url_in_cds: String
+  experimental_strategy_and_data_subtypes: String
+  study: study 
   samples: [sample] 
   genomic_info: genomic_info 
+  methylation: methylation 
+  NONE: [methylation] 
 }
 
 type genomic_info {
@@ -52,6 +56,14 @@ type genomic_info {
   file: file 
 }
 
+type methylation {
+  reporter_label: String
+  methylation_platform: String
+  file: file 
+  files: [file] 
+  samples: [sample] 
+}
+
 type participant {
   participant_id: String
   race: String
@@ -82,10 +94,12 @@ type sample {
   sample_age_at_collection: Int
   derived_from_specimen: String
   biosample_accession: String
+  experimental_strategy_and_data_subtypes: String
   participant: participant 
   specimen: specimen 
   files: [file] 
   genomic_info: [genomic_info] 
+  NONE: [methylation] 
 }
 
 type specimen {
@@ -125,14 +139,15 @@ type study {
   number_of_participants: Float
   number_of_samples: Float
   study_data_types: String
-  experimental_strategy_and_data_subtypes: String
   file_types_and_format: String
   size_of_data_being_uploaded: Float
   size_of_data_being_uploaded_unit: String
   size_of_data_being_uploaded_original: Float
   size_of_data_being_uploaded_original_unit: String
+  acl: String
   program: program 
   participants: [participant] 
+  files: [file] 
 }
 
 type treatment {
@@ -173,6 +188,7 @@ type StudyDetail {
     study_acronym: String
     study_description: String
     data_types: String
+    study_external_url: String
     numberOfSubjects: Int
     numberOfSamples: Int
     numberOfDiseaseSites: Int

diff --git a/graphql/cds-queries.graphql b/graphql/cds-queries.graphql
@@ -28,6 +28,7 @@ type StudyDetail {
     study_acronym: String
     study_description: String
     data_types: String
+    study_external_url: String
     numberOfSubjects: Int
     numberOfSamples: Int
     numberOfDiseaseSites: Int
@@ -119,6 +120,7 @@ type QueryType {
             study_acronym: s.study_acronym,
             study_description: s.study_description,
             data_types: s.study_data_types,
+            study_external_url: s.study_external_url,
             numberOfSubjects: COUNT(DISTINCT p),
             numberOfSamples: COUNT(DISTINCT samp),
             numberOfDiseaseSites: COUNT(DISTINCT diag.primary_site),

diff --git a/graphql/cds.graphql b/graphql/cds.graphql
@@ -27,8 +27,12 @@ type file {
   file_size: Int
   md5sum: String
   file_url_in_cds: String
+  experimental_strategy_and_data_subtypes: String
+  study: study @relation(name:"of_study", direction:OUT)
   samples: [sample] @relation(name:"from_sample", direction:OUT)
   genomic_info: genomic_info @relation(name:"of_file", direction:IN)
+  methylation: methylation @relation(name:"of_file", direction:IN)
+  NONE: [methylation] @relation(name:"from_methylation", direction:OUT)
 }
 
 type genomic_info {
@@ -52,6 +56,14 @@ type genomic_info {
   file: file @relation(name:"of_file", direction:OUT)
 }
 
+type methylation {
+  reporter_label: String
+  methylation_platform: String
+  file: file @relation(name:"of_file", direction:OUT)
+  files: [file] @relation(name:"from_methylation", direction:IN)
+  samples: [sample] @relation(name:"in_methylation", direction:IN)
+}
+
 type participant {
   participant_id: String
   race: String
@@ -82,10 +94,12 @@ type sample {
   sample_age_at_collection: Int
   derived_from_specimen: String
   biosample_accession: String
+  experimental_strategy_and_data_subtypes: String
   participant: participant @relation(name:"of_participant", direction:OUT)
   specimen: specimen @relation(name:"of_specimen", direction:OUT)
   files: [file] @relation(name:"from_sample", direction:IN)
   genomic_info: [genomic_info] @relation(name:"in_genomic_info", direction:OUT)
+  NONE: [methylation] @relation(name:"in_methylation", direction:OUT)
 }
 
 type specimen {
@@ -125,14 +139,15 @@ type study {
   number_of_participants: Float
   number_of_samples: Float
   study_data_types: String
-  experimental_strategy_and_data_subtypes: String
   file_types_and_format: String
   size_of_data_being_uploaded: Float
   size_of_data_being_uploaded_unit: String
   size_of_data_being_uploaded_original: Float
   size_of_data_being_uploaded_original_unit: String
+  acl: String
   program: program @relation(name:"of_program", direction:OUT)
   participants: [participant] @relation(name:"of_study", direction:IN)
+  files: [file] @relation(name:"of_study", direction:IN)
 }
 
 type treatment {
@@ -173,6 +188,7 @@ type StudyDetail {
     study_acronym: String
     study_description: String
     data_types: String
+    study_external_url: String
     numberOfSubjects: Int
     numberOfSamples: Int
     numberOfDiseaseSites: Int
@@ -264,6 +280,7 @@ type QueryType {
             study_acronym: s.study_acronym,
             study_description: s.study_description,
             data_types: s.study_data_types,
+            study_external_url: s.study_external_url,
             numberOfSubjects: COUNT(DISTINCT p),
             numberOfSamples: COUNT(DISTINCT samp),
             numberOfDiseaseSites: COUNT(DISTINCT diag.primary_site),