sync: pipeline2 with pipeline2-sync-55cc

components/VFBMain.js

@@ -1195,7 +1195,7 @@ class VFBMain extends React.Component {
     var script = document.createElement('script');
     script.type = 'application/ld+json';
     script.id = 'metaDesc';
-    script.innerHTML = '{"@context": "https://schema.org","@type": "Organization","url": "https://virtualflybrain.org","logo": "https://v2.virtualflybrain.org/images/vfbbrain_icon.png","brand":"Virtual Fly Brain","name":"Virtual Fly Brain",'
+    script.innerHTML = '{"@context": "https://schema.org","@type": "Organization","url": "https://virtualflybrain.org","logo": "https://v2.virtualflybrain.org/images/vfbbrain_icon.png","brand":"Virtual Fly Brain","name":"Virtual Fly Brain","legalName":"Virtual Fly Brain",'
       + '"description":"VFB integrates data curated from the literature with image data from many bulk sources. The search system allows you to search for neurons and neuroanatomical structures using almost any name found in the literature. The query system can identify neurons innervating any specified neuropil or fasciculating with any specified tract. It also allows queries for genes, transgenes and phenotypes expressed in any brain region or neuron. Search and query results combine referenced textual descriptions with 3D images and links to originating data sources. VFB features tens of thousands of 3D images of neurons, clones and expression patterns, registered to standard template brains. Any combination of these images can be viewed together. A BLAST-type query system (NBLAST) allows you to find similar neurons and drivers starting from a registered neuron.",'
       + '"headline":"A hub for fruit fly (Drosophila melanogaster) neuronal anatomy, connectivity & imaging data",'
       + '"affiliation":['
@@ -1206,7 +1206,7 @@ class VFBMain extends React.Component {
       + '{"@type": "Organization","name":"MRC Laboratory of Molecular Biology, Cambridge","logo":"https://v2.virtualflybrain.org/images/vfb/project/logos/MRC-LMB_logo.png","url":"http://www2.mrc-lmb.cam.ac.uk/"},'
       + '{"@type": "Organization","name":"European Bioinformatics Institute (EMBL-EBI), Cambridge","logo":"https://v2.virtualflybrain.org/images/vfb/project/logos/EMBL_EBI_logo_180pixels_RGB.png","url":"http://www.ebi.ac.uk/"}'
       + '],"funder":{"@type": "Organization","name":"Wellcome Trust","logo":"https://v2.virtualflybrain.org/images/vfb/project/logos/wtvm050446.png","url":"https://wellcome.org/"},'
-      + '"sameAs":"https://en.wikipedia.org/wiki/Virtual_Fly_Brain","alternateName":"VFB",'
+      + '"sameAs":["https://en.wikipedia.org/wiki/Virtual_Fly_Brain","https://www.youtube.com/channel/UC1g10aJo13fXpO9VwRJPdHg","https://www.facebook.com/Virtual-Fly-Brain-131151036987118","https://twitter.com/virtualflybrain","https://virtualflybrain.tumblr.com/"],"alternateName":"VFB",'
       + '"subjectOf":['
       + '{"@type": "ScholarlyArticle","citation":"http://dx.doi.org/10.1093/bioinformatics/btr677","sameAs":"http://dx.doi.org/10.1093/bioinformatics/btr677","headline":"The Virtual Fly Brain browser and query interface","name":"The Virtual Fly Brain browser and query interface","datePublished":"2012","author":[{"@type":"person","name":"Milyaev, N."},{"@type":"person","name":"Osumi-Sutherland, D."},{"@type":"person","name":"Reeve, S."},{"@type":"person","name":"Burton, N."},{"@type":"person","name":"Baldock, R. A."},{"@type":"person","name":"Armstrong, J. D."}],"publisher":"Bioinformatics"},'
       + '{"@type": "ScholarlyArticle","citation":"http://dx.doi.org/10.1098/rstb.2017.0380","sameAs":"http://dx.doi.org/10.1098/rstb.2017.0380","headline":"Geppetto: a reusable modular open platform for exploring neuroscience data and models","name":"Geppetto: a reusable modular open platform for exploring neuroscience data and models","author":"Cantarelli, Matteo and Marin, Boris and Quintana, Adrian and Earnshaw, Matt and Court, Robert and Gleeson, Padraig and Dura-Bernal, Salvador and Silver, R. Angus and Idili, Giovanni","publisher": "Philosophical Transactions of the Royal Society B: Biological Sciences","datePublished": "2018"}'
@@ -1281,6 +1281,7 @@ class VFBMain extends React.Component {
         idsList += this.idFromURL;
         // populate page meta for this term for indexing
         try {
+          window.ga('vfb.send', 'pageview', window.location.href );
           if ( window.XMLHttpRequest ) {
             var xhr = new XMLHttpRequest();
             xhr.onload = function () {

components/configuration/VFBMain/queryBuilderConfiguration.js

@@ -123,7 +123,7 @@ var queryResultsColMeta = [
     "order": 7,
     "locked": false,
     "visible": true,
-    "displayName": "#_Downstream_Synapses",
+    "displayName": "Outputs",
     "cssClassName": "query-results-stage-column",
     "sortDirectionCycle": ['asc', 'desc', null]
   },
@@ -132,7 +132,7 @@ var queryResultsColMeta = [
     "order": 8,
     "locked": false,
     "visible": true,
-    "displayName": "#_Tbars",
+    "displayName": "Outputs (Tbars)",
     "cssClassName": "query-results-stage-column",
     "sortDirectionCycle": ['asc', 'desc', null]
   },
@@ -141,7 +141,7 @@ var queryResultsColMeta = [
     "order": 9,
     "locked": false,
     "visible": true,
-    "displayName": "#_Upstream_Synapses",
+    "displayName": "Inputs",
     "cssClassName": "query-results-stage-column",
     "sortDirectionCycle": ['asc', 'desc', null]
   },

components/configuration/VFBMain/searchConfiguration.js

@@ -144,8 +144,8 @@ var searchConfiguration = {
           "enabled": "disabled",
         },
         {
-          "key": "Individual",
-          "filter_name": "Image",
+          "key": "has_image",
+          "filter_name": "Has Image",
           "enabled": "disabled",
         },
         {
@@ -158,6 +158,11 @@ var searchConfiguration = {
           "filter_name": "Neuron",
           "enabled": "disabled",
         },
+        {
+          "key": "DataSet",
+          "filter_name": "Dataset",
+          "enabled": "disabled",
+        },
         {
           "key": "Deprecated",
           "filter_name": "Deprecated",

css/VFBMain.less

@@ -180,6 +180,10 @@
 	max-height: 300px;
 }
 
+#querybuilder th.query-results-images-column {
+	text-align: center !important;
+}
+
 .tutorialMessage{
 	height : 100% !important;
 }
@@ -236,7 +240,7 @@
 
 // query results header
 #querybuilder .griddle th{
-	text-align: left !important;
+	text-align: left;
 }
 
 // query results rows

model/vfb.xmi

@@ -1093,15 +1093,15 @@
   <queries xsi:type="gep_2:CompoundRefQuery"
       id="ref_neuron_region_connectivity_query"
       name="Show connectivity to regions from Neuron X"
-      description="Show connectivity to regions from $NAME"
+      description="Show connectivety per region for $NAME"
       queryChain="//@dataSources.0/@queries.15">
     <matchingCriteria
         type="//@libraries.3/@types.43"/>
   </queries>
   <queries xsi:type="gep_2:CompoundRefQuery"
       id="ref_neuron_neuron_connectivity_query"
       name="Show connectivity to neurons from Neuron X"
-      description="Show synaptic connectivity from $NAME"
+      description="Show neurons connected to $NAME"
       queryChain="//@dataSources.0/@queries.16">
     <matchingCriteria
         type="//@libraries.3/@types.42"/>