Merge pull request #246 from CBIIT/EVSSIP-317

Evssip 317
CBIIT · Sep 5, 2023 · 4c0ca75 · 4c0ca75
2 parents a4c4428 + 9f31129
commit 4c0ca75
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 20 deletions.
diff --git a/server/components/elasticsearch.js b/server/components/elasticsearch.js
@@ -154,18 +154,6 @@ const helper_gdc = (fileJson, syns) => {
       values_ncit_mapping[v.toLowerCase()] = [];
     });
 
-    /*
-    for(let key in entry.enumDef){
-      let obj = entry.enumDef[key];
-      let v = key.toLowerCase();
-      if(v in values_ncit_mapping){
-        if(obj && obj.termDef && obj.termDef.term_id && values_ncit_mapping[v].indexOf(obj.termDef.term_id.trim()) == -1){
-          values_ncit_mapping[v].push(obj.termDef.term_id.trim());
-        }
-      }
-    }
-    */
-
     // 2. work on conceptCode to further combind the ncit code
     // depracted as data mappings in conceptCode.js file have already been included in gdc_values.js file
 
@@ -209,10 +197,6 @@ const helper_gdc = (fileJson, syns) => {
       });
     }
 
-    // if (entry.deprecated_enum) {
-    //   values = _.differenceWith(values, entry.deprecated_enum, _.isEqual);
-    // }
-
     //generate p.enum
     if(values.length > 0){
       p.enum = [];

diff --git a/server/data_files/GDC/gdc_props.js b/server/data_files/GDC/gdc_props.js
diff --git a/server/data_files/GDC/gdc_values.js b/server/data_files/GDC/gdc_values.js
diff --git a/server/data_files/GDC/ncit_details.js b/server/data_files/GDC/ncit_details.js
diff --git a/server/lib/Property.js b/server/lib/Property.js
@@ -48,6 +48,7 @@ const Property = class {
         if (schema.deprecated_enum) {
           this._values = schema.enum.filter(value => !schema.deprecated_enum.includes(value));
         }
+        this._values = this._values.map(item => String(item).replace(/\n/g, ' '));
       } else if (schema.hasOwnProperty('oneOf')) {
         const types = [];
 

diff --git a/server/service/search/controller.js b/server/service/search/controller.js
@@ -8,7 +8,7 @@ const fs = require("fs");
 const path = require("path");
 const shared = require("./shared");
 // const git = require('nodegit');
-const Excel = require("exceljs");
+// const Excel = require("exceljs");
 const export_excel = require('node-excel-export');
 const dataFilesPath = path.join(__dirname, "..", "..", "data_files");
 var syns = {};