Merge branch 'release/0.3.3'

statgen · Mar 17, 2022 · c7903b1 · c7903b1
2 parents c781107 + bf37fde
commit c7903b1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/assets/js/pages/gwas_region.js b/assets/js/pages/gwas_region.js
@@ -12,7 +12,7 @@ import { createStudyAssocSources } from '../util/lz-helpers';
 function makePlot(template_vars) {
     let state = paramsFromUrl(stateUrlMapping);
     // Fill in default params for any values not provided by the url
-    state.genome_build = template_vars.build;
+    state.genome_build = template_vars.genome_build;
     state = Object.assign(
         { chr: template_vars.chr, start: template_vars.start, end: template_vars.end },
         state

diff --git a/locuszoom_plotting_service/gwas/views.py b/locuszoom_plotting_service/gwas/views.py
@@ -219,7 +219,7 @@ def get_context_data(self, **kwargs):
                 token,
             ),
             'label': gwas.label,
-            'build': gwas.build,
+            'genome_build': gwas.build,
             # Default region for bare URLs is the top hit in the study
             'chr': gwas.top_hit_view.chrom,
             'start': gwas.top_hit_view.start,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,8 +31,8 @@
     "d3": "^5.16.0",
     "d3-tip": "0.9.1",
     "gwas-credible-sets": "^0.1.0",
-    "localzoom": "git+https://github.com/statgen/localzoom.git#eb10524",
-    "locuszoom": "git+https://github.com/statgen/locuszoom.git#674d25c",
+    "localzoom": "git+https://github.com/statgen/localzoom.git#b78103b",
+    "locuszoom": "0.14.0",
     "lodash": "^4.17.21",
     "pako": "^1.0.11",
     "tabulator-tables": "^4.9.3",