Merge pull request #246 from eweitz/refine-ensembl-resiliency

Refine handling of Ensembl outages in related genes kit
eweitz · Oct 15, 2020 · a5ae488 · a5ae488
2 parents 94be519 + 8c257dc
commit a5ae488
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 0 deletions.
diff --git a/examples/vanilla/related-genes.html b/examples/vanilla/related-genes.html
@@ -51,6 +51,10 @@
     #ideogram .annot path {
       cursor: pointer;
     }
+
+    #ideogram-container #_ideogramInnerWrap {
+      visibility: hidden;
+    }
   </style>
   <script type="text/javascript" src="../../dist/js/ideogram.min.js"></script>
 <link rel="icon" type="image/x-icon" href="img/ideogram_favicon.ico">
@@ -215,9 +219,17 @@ <h1>Related genes | Ideogram</h1>
       document.querySelector('#search-genes').value = annot.name;
       urlParams['q'] = annot.name;
       updateUrl();
+
+      const selector = '#ideogram-container #_ideogramInnerWrap'
+      document.querySelector(selector).style.visibility = 'hidden';
       ideogram.plotRelatedGenes(annot.name);
     }
 
+    function showIdeogram() {
+      const selector = '#ideogram-container #_ideogramInnerWrap'
+      document.querySelector(selector).style.visibility = 'visible';
+    }
+
     config = {
       organism: organism,
       container: '#ideogram-container',
@@ -227,6 +239,7 @@ <h1>Related genes | Ideogram</h1>
       annotationHeight: 7,
       onClickAnnot: onClickAnnot,
       onLoad: plotGeneFromUrl,
+      onFindRelatedGenes: showIdeogram,
       onPlotRelatedGenes: reportRelatedGenes
     }
 

diff --git a/src/js/ideogram.js b/src/js/ideogram.js
@@ -207,9 +207,20 @@ export default class Ideogram {
       // Method is POST, so content-type must be defined in header
       init.headers = {'Content-Type': 'application/json'};
     }
+
+    // const random = Math.random();
+    // console.log(random)
+    // if (random < 0.5) {
     const response = await fetch(`https://rest.ensembl.org${path}`, init);
     const json = await response.json();
     return json;
+    // } else {
+    //   // Mock error
+    //   init.headers = {'Content-Type': 'application/json'};
+    //   const response = await fetch('https://httpstat.us/500/cors', init);
+    //   const json = await response.json();
+    //   return json;
+    // }
   }
 
   /**

diff --git a/src/js/kit/related-genes.js b/src/js/kit/related-genes.js
@@ -379,6 +379,9 @@ function finishPlotRelatedGenes(ideoInnerDom, ideo) {
     if (b.color === 'purple' && a.color === 'pink') return -1;
     return b.name.length - a.name.length;
   });
+  if (annots.length > 1 && ideo.onFindRelatedGenesCallback) {
+    ideo.onFindRelatedGenesCallback();
+  }
   ideo.drawAnnots(annots);
   moveLegend(ideoInnerDom);
 }
@@ -596,6 +599,10 @@ function _initRelatedGenes(config, annotsInList) {
     ideogram.onPlotRelatedGenesCallback = config.onPlotRelatedGenes;
   }
 
+  if (config.onFindRelatedGenes) {
+    ideogram.onFindRelatedGenesCallback = config.onFindRelatedGenes;
+  }
+
   return ideogram;
 }