Replace JBrowse built-in analytics with theme's

soybase · Dec 29, 2024 · f54669f · f54669f
1 parent 724d3f7
commit f54669f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/.github/workflows/build-deploy.yml b/.github/workflows/build-deploy.yml
@@ -59,7 +59,7 @@ jobs:
         id: restore-cache-jbrowse
         with:
           path: ./_site/assets/js/jbrowse
-          key: jbrowse-${{ hashFiles('_data/datastore-metadata/**', '_scripts/jbrowse-tracks.sh', 'Makefile', 'assets/js/jbrowse-config.json') }}
+          key: jbrowse-${{ hashFiles('_data/datastore-metadata/**', '_config.yml', '_scripts/jbrowse-tracks.sh', '_themes/jekyll-theme-legumeinfo/_includes/analytics.html', 'Makefile', 'assets/js/jbrowse-config.json') }}
       - uses: actions/setup-node@v4
         if: steps.restore-cache-jbrowse.outputs.cache-hit != 'true'
         with:
@@ -69,13 +69,13 @@ jobs:
         run: |
           make jbrowse
           rm -rf assets/js/jbrowse/test_data
-          mv assets/js/jbrowse _site/assets/js
+          bundle exec jekyll build --profile --trace # process assets/js/jbrowse/index.html as liquid
       - uses: actions/cache/save@v4
         id: save-cache-jbrowse
         if: steps.restore-cache-jbrowse.outputs.cache-hit != 'true'
         with:
           path: ./_site/assets/js/jbrowse
-          key: jbrowse-${{ hashFiles('_data/datastore-metadata/**', '_scripts/jbrowse-tracks.sh', 'Makefile', 'assets/js/jbrowse-config.json') }}
+          key: jbrowse-${{ hashFiles('_data/datastore-metadata/**', '_config.yml', '_scripts/jbrowse-tracks.sh', '_themes/jekyll-theme-legumeinfo/_includes/analytics.html', 'Makefile', 'assets/js/jbrowse-config.json') }}
       # create artifact.tar from ./_site directory & upload as artifact named 'github-pages'
       - name: Upload Pages artifact
         uses: actions/upload-pages-artifact@v3

diff --git a/Makefile b/Makefile
@@ -74,9 +74,14 @@ pa11y: setup
 
 
 # JBrowse CLI will already be installed globally if using a dev container
+# Ensure JBrowse index.html is parsed by jekyll & inline GA script
 jbrowse: setup
 	if ! { command -v jbrowse || npm ls @jbrowse/cli ; } >/dev/null 2>&1; then npm install $(NPM_INSTALL_OPTIONS) @jbrowse/cli@${JBROWSE_VERSION}; fi
-	if ! [ -d ./assets/js/jbrowse ]; then npx jbrowse create assets/js/jbrowse --tag=v${JBROWSE_VERSION}; fi
+	if ! [ -d ./assets/js/jbrowse ]; then \
+      npx jbrowse create assets/js/jbrowse --tag=v${JBROWSE_VERSION}; \
+      sed -i.bak -e 's/^/---\n---\n/' -e 's/>/>\n/g' assets/js/jbrowse/index.html; \
+      sed -i.bak -e '/<\/script>/r ./_themes/jekyll-theme-legumeinfo/_includes/analytics.html' assets/js/jbrowse/index.html; \
+    fi
 	cp assets/js/jbrowse-config.json assets/js/jbrowse/config.json
 	npm exec -c '_scripts/jbrowse-tracks.sh'
 

diff --git a/assets/js/jbrowse-config.json b/assets/js/jbrowse-config.json
@@ -1,5 +1,6 @@
 {
   "configuration": {
+      "disableAnalytics": true,
       "hierarchical": {
         "defaultCollapsed": {
           "subCategories": true