Merge pull request #85 from CBIIT/qa-1.3.2

Merge from Qa 1.3.2
CBIIT · Mar 17, 2023 · cd25233 · cd25233
2 parents 7405748 + 873d8cf
commit cd25233
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/Controllers/dataset.controllers.js b/Controllers/dataset.controllers.js
@@ -94,6 +94,10 @@ const export2CSV = async (req, res) => {
       label: 'Resource',
       value: 'data_resource_id'
     },
+    {
+      label: 'Dataset ID',
+      value: 'dataset_id'
+    },
     {
       label: 'Dataset',
       value: 'dataset_name'

diff --git a/Services/dataset.service.js b/Services/dataset.service.js
@@ -66,7 +66,7 @@ const export2CSV = async (searchText, filters, options) => {
   let searchResults = await elasticsearch.search(config.indexDS, query);
   let dataElements = ["case_disease_diagnosis", "case_age_at_diagnosis",
    "case_ethnicity", "case_race", "case_sex", "case_tumor_site",
-    "case_treatment_administered", "case_treatment_outcome", "sample_assay_method", "sample_analyte_type"];
+    "case_treatment_administered", "case_treatment_outcome", "sample_assay_method", "sample_analyte_type", "sample_anatomic_site", "sample_composition_type", "sample_is_normal", "sample_is_xenograft"];
   let datasets = searchResults.hits.map((ds) => {
     let tmp = ds._source;
     dataElements.forEach((de) => {