Merge branch 'release/0.4.0'

statgen · Nov 12, 2019 · dbcc3e5 · dbcc3e5
2 parents 3037700 + 9de681b
commit dbcc3e5
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -27,10 +27,12 @@ yarn run serve
 ### Building for production
 The production build is a minified, concatenated bundle suitable for distribution on a server.
 
-In order to use the Sentry error logging feature, you will need to create a file named 
-*.env.production.local* (ignored by git) with the following contents: 
+In order to use the Sentry error logging and Google Analytics feature, you will need to create a 
+file named *.env.production.local* (ignored by git) with the following contents 
+(both values are optional if you don't want to use these features): 
 ```dotenv
 VUE_APP_SENTRY_DSN=https://dsn.example
+VUE_APP_GOOGLE_ANALYTICS_KEY=UA-YOURKEY-1
 ```
 
 Then build the assets to the `dist/` folder.

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "localzoom",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "license": "MIT",
   "main": "lib/LzTabix.umd.min.js",
   "scripts": {
@@ -16,7 +16,7 @@
     "bootstrap": "^4.1.3",
     "bootstrap-vue": "^2.0.0-rc.11",
     "gwas-credible-sets": "^0.1.0",
-    "locuszoom": "https://github.com/statgen/locuszoom#8b06580",
+    "locuszoom": "0.10.0-beta.2",
     "lodash": "^4.17.11",
     "tabix-reader": "https://github.com/abought/tabix-reader",
     "tabulator-tables": "^4.1.4",

diff --git a/public/index.html b/public/index.html
@@ -20,6 +20,17 @@
     }
   </style>
 
+  <!--  Build enhancement: configure google analytics key if environment provides one -->
+  <% if (process.env.NODE_ENV === 'production' && process.env.VUE_APP_GOOGLE_ANALYTICS_KEY) { %>
+      <script async src="https://www.googletagmanager.com/gtag/js?id=<%= VUE_APP_GOOGLE_ANALYTICS_KEY %>"></script>
+      <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag(){dataLayer.push(arguments);}
+        gtag('js', new Date());
+        gtag('config', '<%= VUE_APP_GOOGLE_ANALYTICS_KEY %>');
+      </script>
+  <% }  %>
+
 </head>
 
 <body>

diff --git a/src/components/AdderWizard.vue b/src/components/AdderWizard.vue
@@ -90,6 +90,7 @@ export default {
                         first_data_index = this.file_reader.skip;
                     } else {
                         // Some files use headers that are not comment lines.
+                        // FIXME: handle case where no data rows are found
                         first_data_index = rows.findIndex(text => !isHeader(text));
                     }
                     this.sample_data = rows.slice(first_data_index);

diff --git a/src/util/lz-helpers.js b/src/util/lz-helpers.js
@@ -181,8 +181,11 @@ function getBasicLayout(initial_state = {}, study_panels = [], mods = {}) {
         LocusZoom.Layouts.get('panel', 'genes', { proportional_height: 0.5 }),
     ];
 
+    const dashboard = LocusZoom.Layouts.get('dashboard', 'standard_plot', { unnamespaced: true });
+    dashboard.components.push(LocusZoom.Layouts.get('dashboard_components', 'ldlz2_pop_selector'));
     const extra = Object.assign({
         state: initial_state,
+        dashboard,
         panels,
     }, mods);
     return LocusZoom.Layouts.get('plot', 'standard_association', extra);

diff --git a/yarn.lock b/yarn.lock
@@ -5412,9 +5412,10 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-"locuszoom@https://github.com/statgen/locuszoom#8b06580":
-  version "0.10.0-beta.1"
-  resolved "https://github.com/statgen/locuszoom#8b065804188279ff33cb30619aa555566c834d36"
+[email protected]:
+  version "0.10.0-beta.2"
+  resolved "https://registry.yarnpkg.com/locuszoom/-/locuszoom-0.10.0-beta.2.tgz#7c007c421ee3c1e39f9adab6612874761bb455c6"
+  integrity sha512-SkyquD7OCPJQcCrFoJxHBlA9/U9CNJb+EE1n+O/jnX5CqiFlPUHHrzi8KzBUPZ25DQHdtCHXM7YE+0imHTrYDg==
   dependencies:
     d3 "3.5.17"
     promise-polyfill "^8.1.3"