gramene-search 1.7.2 → 1.7.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gramene-search",
-  "version": "1.7.2",
+  "version": "1.7.4",
   "description": "search wrapper for gramene",
   "source": "src/index.js",
   "main": "dist/index.js",

package/src/bundles/filters.js

@@ -266,7 +266,9 @@ const grameneFilters = {
         case 'GRAMENE_SEARCH_FETCH_FINISHED':
           return Object.assign({}, state, {status: 'finished'});
         case 'GRAMENE_GENOMES_UPDATED':
-          return Object.assign({}, state, {status: 'search'});
+          if (!(state.status === 'ready')) {
+            return Object.assign({}, state, {status: 'search'});
+          }
         case 'URL_UPDATED':
           if (state.status === 'ready') {
             return Object.assign({}, initialState, {children:[]})

package/src/components/results/TaxDist.js

@@ -9,7 +9,8 @@ class TaxDist extends React.Component {
     super(props);
     this.state = {
       collapseEmpties: true,
-      comparaOnly: true
+      comparaOnly: true,
+      showCompara: props.configuration.hasOwnProperty('partialCompara')
     };
   }
   handleSelection(selections) {
@@ -42,7 +43,7 @@ class TaxDist extends React.Component {
         selectedTaxa = this.props.grameneGenomes.active
       }
     }
-    if (this.state.comparaOnly && this.props.grameneMaps) {
+    if (this.state.showCompara && this.state.comparaOnly && this.props.grameneMaps) {
       Object.keys(selectedTaxa).forEach(tid => {
         if (!this.props.grameneMaps[tid].in_compara) {
           delete selectedTaxa[tid];
@@ -57,11 +58,12 @@ class TaxDist extends React.Component {
                   onClick={this.toggleEmpties.bind(this)}>
           {this.state.collapseEmpties ? 'Expand' : 'Collapse'} empty branches
           </button>
-          <button type="button"
+          {this.state.showCompara && <button type="button"
                   className="btn btn-outline-success btn-sm"
                   onClick={this.toggleCompara.bind(this)}>
             Show {this.state.comparaOnly ? 'all genomes' : 'only genomes in gene trees'}
           </button>
+          }
         </span>}
         {this.props.grameneTaxDist && <Vis taxonomy={this.props.grameneTaxDist}
                                            selectedTaxa={selectedTaxa}
@@ -83,6 +85,7 @@ class TaxDist extends React.Component {
 }
 
 export default connect(
+  'selectConfiguration',
   'selectGrameneTaxDist',
   'selectGrameneGenomes',
   'selectGrameneSearch',

package/src/demo.js

@@ -143,6 +143,7 @@ const panSites = [
     targetTaxonId: 4558001,
     alertText: 'Click the search icon in the menu bar or type /',
     showViews: true,
+    partialCompara: true,
     details: {
       sequences: true,
       VEP: true,