Merge branch 'develop' of https://github.com/statgen/locuszoom-hosted …

…into develop

assets/js/pages/gwas_summary.js

@@ -41,6 +41,10 @@ function createTopHitsTable(selector, data, region_url) {
                     }
                 },
             },
+            {
+                title: 'rsID',
+                field: 'rsid',
+            },
             {
                 title: 'Nearest gene(s)',
                 field: 'nearest_genes',

docs/deploy/index.md

@@ -40,7 +40,7 @@ Make sure to build the UI code (`yarn install && yarn run prod`) before creating
 this step should be automated!!)
 
 Build the docker container in production (or download an appropriate pre-made image):
-`sudo docker-compose -f production.yml build`
+`sudo docker-compose -f production.yml build --pull`
 
 Start the container:
 `sudo docker-compose -f production.yml up -d`
@@ -83,7 +83,7 @@ A sample callback URL for OAuth registration (in local development) would be:
 ## Releasing a new version (checklist)
 - (future) Verify backup status on DB backups
 - `yarn install --from-lockfile && yarn run prod`
-- `docker-compose -f production.yml build`
+- `docker-compose -f production.yml build --pull`
 - `docker-compose -f production.yml up -d`
 - (optional) `docker-compose -f production.yml run --rm django python manage.py migrate`
 

locuszoom_plotting_service/templates/base.html

@@ -125,7 +125,7 @@
       <a href="{% url 'about' %}">FAQ</a> -
       <a href="{% url 'gwas:upload' %}">Upload</a> -
       <a href="https://forms.gle/GWzg9nzaDU5qrXJM8" target="_blank" class="text-success">User Survey</a> -
-      <a href="mailto:locuszoom@googlegroups.com">Contact us</a>
+      <a href="https://groups.google.com/forum/#!forum/locuszoom">Contact us</a>
     </div>
   </div>
 </footer>

locuszoom_plotting_service/templates/pages/about.html

@@ -20,6 +20,11 @@ <h2 class="mt-3">What is this for?</h2>
           <a href="https://groups.google.com/forum/#!forum/locuszoom">mailing list</a> to receive announcements.
         </p>
 
+        <p>
+          This site is operated by the University of Michigan
+          <a href="https://sph.umich.edu/csg/">Center for Statistical Genetics.</a>
+        </p>
+
         <div class="accordion mb-3" id="faq-questions">
           <div class="card">
             <div class="card-header" id="heading-question-privacy">
@@ -170,8 +175,8 @@ <h2 class="mt-3">What is this for?</h2>
               <div class="card-body">
                 <p>
                   There are several ways to reach us, including our
-                  <a href="mailto:locuszoom@googlegroups.com">user group</a> and
-                  <a href="https://github.com/statgen/locuszoom-hosted">public bug tracker</a>. For questions
+                  <a href="https://groups.google.com/forum/#!forum/locuszoom">user group</a> and
+                  <a href="https://github.com/statgen/locuszoom">public bug tracker</a>. For questions
                   involving security or sensitive data, we may be reached at
                   <a href="mailto:[email protected]">[email protected]</a>.
                 </p>

package.json

@@ -31,8 +31,8 @@
     "d3": "3.5.16",
     "d3-tip": "0.9.0",
     "gwas-credible-sets": "^0.1.0",
-    "localzoom": "https://github.com/statgen/localzoom#v0.5.3",
-    "locuszoom": "https://github.com/statgen/locuszoom#42f7c64127893f5f1b00ddf9b81acf369179dc36",
+    "localzoom": "https://github.com/statgen/localzoom#d795a9e",
+    "locuszoom": "0.11.0",
     "pako": "^1.0.8",
     "underscore": "1.8.3",
     "vue": "^2.6.10",

requirements/base.txt

@@ -35,5 +35,5 @@ pyyaml  # Required for OpenAPI rendering
 boltons~=19.1
 scipy~=1.2
 python-magic==0.4.15
-zorp[perf,lookups]==0.3.0
+zorp[perf,lookups]==0.3.3
 genelocator==1.1.1