gramene-search 1.6.36 → 1.6.37

package/package.json

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

package/src/bundles/filters.js

@@ -465,10 +465,13 @@ grameneFilters.reactGrameneFilters = createSelector(
         return { type: 'BATCH_ACTIONS', actions: actions };
       }
       if (queryObject.hasOwnProperty('suggestion')) {
+        const url = new URL(myUrl.href);
+        url.search = '';
         return {
           type: 'BATCH_ACTIONS', actions: [
+            {type: 'URL_UPDATED', payload: {url: url.href, replace:false}},
             {type: 'GRAMENE_SEARCH_CLEARED'},
-            {type: 'GRAMENE_FILTER_ADDED', payload: JSON.parse(queryObject.suggestion)}
+            {type: 'SUGGESTIONS_QUERY_CHANGED', payload: {query: queryObject.suggestion}}
           ]
         };
       }
@@ -507,4 +510,4 @@ grameneFilters.reactGrameneFilters = createSelector(
   }
 );
 
-export default grameneFilters;
+export default grameneFilters;

package/src/components/results/GeneList.js

@@ -52,7 +52,7 @@ const PanLink = (props) => {
   const gene = props.gene;
   const pan = props.pan;
   return <div className="gene-panlink">
-    <a target="_blank" href={pan.url + gene.id}>
+    <a target="_blank" href={pan.url + "?idList=" + gene.id}>
       <img src={pan.svg} title={`View this gene at ${pan.name}`}/>
     </a>
   </div>;

package/src/components/results/genes.css

@@ -79,6 +79,11 @@
     width: auto;
     vertical-align: top;
 }
+.suggestion-panlink img {
+    height: 40px;
+    width: auto;
+    vertical-align: top;
+}
 .gene-curation {
     float:right;
     margin-top: 20px;

package/src/components/suggestions.js

@@ -38,6 +38,30 @@ function getLowestCommonAncestorName(tids, taxonomy) {
   });
   return taxonomy[lca[0]].short_name;
 }
+
+const TryPan = (props) => {
+  const query = props.query;
+  const pan = props.pan;
+  return <div className="suggestion-panlink">
+    <a target="_blank" href={pan.url + "?suggestion=" + query}>
+      <img src={pan.svg} title={`Search at ${pan.name}`}/>
+    </a>
+  </div>;
+};
+
+const TryAnotherSite = props => {
+  const query = props.query;
+  const config = props.config;
+  let sites = Object.keys(config.panSite);
+  if (config.id === 'main') {
+    return <div>
+      <Alert variant={'info'}>Don't see what you're looking for? Search for <b>{query}</b> on one of our sister sites</Alert>
+      {sites.map((p, idx) => <TryPan key={idx} query={query} pan={config.panSite[p]}/>)}
+    </div>
+  }
+  return <></>
+}
+
 const Suggestions = props => {
   let suggestions = props.grameneSuggestions;
   if (suggestions && suggestions.grouped) {
@@ -69,6 +93,7 @@ const Suggestions = props => {
                   onClick={() => {logAction(sugg2); props.doAcceptSuggestion(sugg2); props.doAcceptGrameneSuggestion(sugg2)}}>
             {`All genes that contain a word that starts with "${props.suggestionsQuery}"`}
           </Button>
+          <TryAnotherSite query={props.suggestionsQuery} config={props.configuration}/>
         </div>
       );
     }
@@ -92,6 +117,7 @@ const Suggestions = props => {
                 )}
               </div>
             })}
+          <TryAnotherSite query={props.suggestionsQuery} config={props.configuration}/>
         </div>
       );
     }
@@ -105,6 +131,7 @@ export default connect(
   'selectGrameneSuggestions',
   'selectSuggestionsQuery',
   'selectGrameneTaxonomy',
+  'selectConfiguration',
   'doAcceptSuggestion',
   'doAcceptGrameneSuggestion',
   Suggestions

package/src/demo.js

@@ -40,7 +40,7 @@ const subsitelut = {
 const panSites = [
   {
     id: 'main',
-    name: 'Gramene Main',
+    name: 'Gramene Plants',
     url: 'https://www.gramene.org',
     ensemblURL: 'https://ensembl.gramene.org',
     ensemblSite: 'https://ensembl.gramene.org',
@@ -60,25 +60,25 @@ const panSites = [
       xrefs: true
     },
     panSite : {
-      sorghum_bicolor : {
-        url: "https://sorghumbase.org/genes?idList=",
-        name: "SorghumBase",
-        svg: "./static/images/sorghum_logo.svg"
-      },
-      vitis_vinifera : {
-        url: "https://vitis.gramene.org?idList=",
-        name: "Gramene Grapevine",
-        svg: "./static/images/grapevine_logo.svg"
-      },
       oryza_sativa : {
-        url: "https://oryza.gramene.org?idList=",
+        url: "https://oryza.gramene.org",
         name: "Gramene Oryza",
         svg: "./static/images/oryza_logo.svg"
       },
       zea_mays : {
-        url: "https://maize-pangenome.gramene.org?idList=",
+        url: "https://maize-pangenome.gramene.org",
         name: "Gramene Maize",
         svg: "./static/images/maize_logo.svg"
+      },
+      vitis_vinifera : {
+        url: "https://vitis.gramene.org",
+        name: "Gramene Grapevine",
+        svg: "./static/images/grapevine_logo.svg"
+      },
+      sorghum_bicolor : {
+        url: "https://sorghumbase.org/genes",
+        name: "SorghumBase",
+        svg: "./static/images/sorghum_logo.svg"
       }
     }
   },