Fix beadplot not shown when clicking a cluster after an accn search PoonLab#134

Author: horaciobam

js/drawtree.js

@@ -52,6 +52,14 @@ function create_clusterH(obj, obj_2) {
       .raise();
 }
 
+/**
+ * Returns true if the string is an accession number
+ */
+function is_accn(string) {
+  const accn_pat = /^EPI_ISL_[0-9]+$/i;  // case-insensitive
+  return accn_pat.test(string);
+}
+
 /**
  * Rectangular layout of tree, update nodes in place with x,y coordinates
  * @param {object} root
@@ -275,6 +283,11 @@ function draw_clusters(tips) {
       d3.selectAll("rect.clickedH").remove();
 
       beadplot(d.cluster_idx);
+
+      if (is_accn($('#search-input').val())) {
+        $('#search-input').val('');
+      }
+
       search(beaddata);
 
       // reset all rectangles to high transparency

js/search.js

@@ -151,7 +151,7 @@ function select_bead_by_accession(accn, reset_clusters_tree = true) {
     if (reset_clusters_tree === true) {
       d3.selectAll("#svg-timetree > svg > g > rect:not(.clickedH)").attr("class", "not_SelectedCluster");
     }
-    
+
     var rect = d3.selectAll("#svg-timetree > svg > g > rect:not(.clickedH)")
       .filter(function(d) { return(d.cluster_idx === cid); })
       .attr("class", "clicked");
@@ -237,12 +237,12 @@ function get_autocomplete_source_fn(accn_to_cid) {
 
 function search(beaddata) {
 	var query = $('#search-input').val();
-	const accn_pat = /^EPI_ISL_[0-9]+$/i;  // case-insensitive
+
   // FIX ME: Accn search returning 0 beads
   const points = find_beads_points(beaddata)
     .filter(point => point.labels.some(label => label.includes(query)));
   // TODO: Make select_bead_by_* use find_beads_points result
-  accn_pat.test(query) ? select_bead_by_accession(query) : select_beads_by_substring(query);
+  is_accn(query) ? select_bead_by_accession(query) : select_beads_by_substring(query);
   const stats = search_stats.update({
     query,
     current_point: 1,