Merge pull request #1559 from kshefchek/master

switch travis back to dev
monarch-initiative · Mar 23, 2018 · efde3e3 · efde3e3
2 parents 74dae10 + 4300033
commit efde3e3
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -61,7 +61,7 @@ install:
 before_script:
   - "export DISPLAY=:99.0"
   - "ls -lhS dist/"
-  - "USE_LOG_FETCH=1 npm run startprod &"
+  - "USE_LOG_FETCH=1 npm run startbeta &"
   - "sleep 20"
 
 after_success:

diff --git a/lib/monarch/api.js b/lib/monarch/api.js
@@ -667,7 +667,6 @@ bbop.monarch.Engine.prototype.fetchOrthologList = function(ids) {
 
     ids.forEach(function(id) {
         var orthoObj = engine.fetchGeneOrthologFromSciGraph(id,'label',true);
-        //results.orthologs = results.orthologs.concat(orthoObj);
         orthoObj.forEach(function(homolog) {
             if (homolog.orthology_class === 'Paralog'){
                 results.paralogs = results.paralogs.concat(homolog.ortholog.id);
@@ -679,7 +678,7 @@ bbop.monarch.Engine.prototype.fetchOrthologList = function(ids) {
         });
     });
 
-    var filter = "^OMIM|NCBI|MGI|ZFIN|ENSEMBL:ENSG\\d+|ENSEMBL:ENSDARG\\d+|ENSEMBL\:ENSMUSG\\d+";
+    var filter = "^OMIM|HGNC|NCBI|MGI|ZFIN|ENSEMBL:ENSG\\d+|ENSEMBL:ENSDARG\\d+|ENSEMBL\:ENSMUSG\\d+";
     var filtered_regex = new RegExp(filter);
 
     results.paralogs = results.paralogs.filter(function(d){
@@ -2304,13 +2303,6 @@ bbop.monarch.Engine.prototype.getPhenotypeGenotypeDistro = function(id,levels,is
 
     var taxMap = {};
 
-    /*var taxMap = {
-            10090 : "Mouse",
-            7955  : "Zebrafish",
-            6239  : "Nematode",
-            9606  : "Human",
-            7227  : "Fruit Fly"
-    };*/
     if (countFn == 'fetchGenoPhenoAsAssociationsBySpecies'){
         taxMap = {
                 10090 : "Mouse"

diff --git a/lib/monarch/web/webapp.js b/lib/monarch/web/webapp.js
@@ -3421,14 +3421,45 @@ function diseaseByIdHandler(request, id, fmt) {
         }
     }
 
+    const inheritanceClasses = [
+        'HP:0001444',
+        'HP:0001423',
+        'HP:0001417',
+        'HP:0010983',
+        'HP:0010982',
+        'HP:0003743',
+        'HP:0001475',
+        'HP:0001470',
+        'HP:0025352',
+        'HP:0001442',
+        'HP:0012275',
+        'HP:0001419',
+        'HP:0001466',
+        'HP:0000005',
+        'HP:0000006',
+        'HP:0000007',
+        'HP:0012274',
+        'HP:0010985',
+        'HP:0010984',
+        'HP:0003744',
+        'HP:0003745',
+        'HP:0001472',
+        'HP:0001450',
+        'HP:0001452',
+        'HP:0001425',
+        'HP:0001426',
+        'HP:0001427',
+        'HP:0001428',
+    ];
+
     if (inheritanceList.length > 0) {
         info.inheritance = inheritanceList
             .filter(node => node.metadata().types.indexOf('inheritance') > -1)
             .map(node => node.label())
             .join(', ');
 
         info.modifier = inheritanceList
-            .filter(node => node.metadata().types.indexOf('clinical modifier') > -1)
+            .filter(node => inheritanceClasses.indexOf(node.id()) === -1)
             .map(node => node.label())
             .join(', ');
     }

diff --git a/tests/behave/maui_autocomplete.feature b/tests/behave/maui_autocomplete.feature
@@ -37,7 +37,7 @@ Scenario: "ZRS" in the navbar search with a click goes to a gene page
 Scenario: "hyper-be" in the navbar search with a click goes to a disease page
    Given I go to page "/"
     and I type "Hyper-bet" into the navbar search
-    and I wait until "HYPER-BETA-ALANINEMIA" appears in the autocomplete
-    and I click the autocomplete item "HYPER-BETA-ALANINEMIA"
+    and I wait until "Hyper-beta-alaninemia" appears in the autocomplete
+    and I click the autocomplete item "Hyper-beta-alaninemia"
     when I wait for id "monarch-node"
     then the title should be "Monarch Disease: hyper-beta-alaninemia (MONDO:0009378)"