From 445fffcc570bce1ab4321a9fcacd664c5477c300 Mon Sep 17 00:00:00 2001
From: setlen <peter.selten98@gmail.com>
Date: Fri, 12 Feb 2021 01:28:32 +0100
Subject: [PATCH 1/4] Add support for Plausible analytics and Matomo analytics
 Solves #10954

---
 client/src/galaxy.library.js                  | 25 ++++++++++++-
 lib/galaxy/config/sample/galaxy.yml.sample    |  8 ++++
 lib/galaxy/managers/configuration.py          |  4 ++
 lib/galaxy/webapps/galaxy/config_schema.yml   | 28 ++++++++++++++
 lib/tool_shed/webapp/config_schema.yml        | 28 ++++++++++++++
 lib/tool_shed/webapp/templates/base.mako      |  6 +++
 .../webapp/templates/base/base_panels.mako    |  6 +++
 .../webapp/templates/galaxy_client_app.mako   | 37 +++++++++++++++++++
 .../webapps/tool_shed/base_panels.mako        |  6 +++
 templates/base.mako                           |  6 +++
 templates/base/base_panels.mako               |  6 +++
 templates/galaxy_client_app.mako              | 37 +++++++++++++++++++
 templates/js-app.mako                         |  8 +++-
 13 files changed, 202 insertions(+), 3 deletions(-)

diff --git a/client/src/galaxy.library.js b/client/src/galaxy.library.js
index 45cbb3ad954..0f77a558d40 100644
--- a/client/src/galaxy.library.js
+++ b/client/src/galaxy.library.js
@@ -58,7 +58,7 @@ var LibraryRouter = Backbone.Router.extend({
     },
 
     /**
-     * Track every route change as a page view in Google Analytics.
+     * Track every route change as a page view in Google Analytics or Plausible
      */
     trackPageview: function () {
         var url = Backbone.history.getFragment();
@@ -69,6 +69,13 @@ var LibraryRouter = Backbone.Router.extend({
         if (typeof ga !== "undefined") {
             ga("send", "pageview", `${getAppRoot()}library/list${url}`);
         }
+        if (typeof plausible !== "undefined") {
+            plausible(`pageview ${getAppRoot()}library/list${url}`);
+        }
+        if (typeof window._paq !== "undefined") {
+            window._paq.push(['setCustomUrl', `${getAppRoot()}library/list${url}`]);
+            window._paq.push(['trackPageView']);
+        }
     },
 });
 
@@ -119,6 +126,22 @@ var GalaxyLibrary = Backbone.View.extend({
             ga("create", Galaxy.config.ga_code, "auto");
             ga("send", "pageview");
         }
+        if (Galaxy.config.plausible_server && Galaxy.config.plausible_domain) {
+             document.write("<script async defer data-domain=\""+Galaxy.config.plausible_domain+"\" src=\""+Galaxy.config.plausible_server+"/js/plausible.js\"></script>");
+        }
+        if (Galaxy.config.matomo_server && Galaxy.config.matomo_site_id) {
+            var _paq = window._paq = window._paq || [];
+            /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+            _paq.push(['trackPageView']);
+            _paq.push(['enableLinkTracking']);
+            (function() {
+             var u=Galaxy.config.matomo_server+"/";
+             _paq.push(['setTrackerUrl', u+'matomo.php']);
+             _paq.push(['setSiteId', Galaxy.config.matomo_site_id]);
+             var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+             g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+            })();
+        }
 
         Galaxy.libraries = this;
 
diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
index f55472697b2..be92803ec17 100644
--- a/lib/galaxy/config/sample/galaxy.yml.sample
+++ b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -817,6 +817,14 @@ galaxy:
   # your Google Analytics account.  Example: UA-XXXXXXXX-Y
   #ga_code: null
 
+  # Please enter the URL for the Plausible server (including https) so this can be used for tracking
+  # with Plausible (https://plausible.io/).
+  # plausible_server: null
+
+  # Please enter the URL for the Galaxy server so this can be used for tracking
+  # with Plausible (https://plausible.io/).
+  #plausible_domain: null
+
   # Galaxy can display data at various external browsers.  These options
   # specify which browsers should be available.  URLs and builds
   # available at these browsers are defined in the specified files.
diff --git a/lib/galaxy/managers/configuration.py b/lib/galaxy/managers/configuration.py
index 4fe42582691..c4159269537 100644
--- a/lib/galaxy/managers/configuration.py
+++ b/lib/galaxy/managers/configuration.py
@@ -158,6 +158,10 @@ class ConfigSerializer(base.ModelSerializer):
             'datatypes_disable_auto': _use_config,
             'allow_user_dataset_purge': _defaults_to(False),  # schema default is True
             'ga_code': _use_config,
+            'plausible_server': _use_config,
+            'plausible_domain': _use_config,
+            'matomo_server': _use_config,
+            'matomo_site_id': _use_config,
             'enable_unique_workflow_defaults': _use_config,
             'enable_beta_markdown_export': _use_config,
             'simplified_workflow_run_ui': _use_config,
diff --git a/lib/galaxy/webapps/galaxy/config_schema.yml b/lib/galaxy/webapps/galaxy/config_schema.yml
index 4d45ca8de7a..cb780651ed5 100644
--- a/lib/galaxy/webapps/galaxy/config_schema.yml
+++ b/lib/galaxy/webapps/galaxy/config_schema.yml
@@ -1061,6 +1061,34 @@ mapping:
           You can enter tracking code here to track visitor's behavior
           through your Google Analytics account.  Example: UA-XXXXXXXX-Y
 
+      plausible_server:
+        type: str
+        required: false
+        desc: |
+          Please enter the URL for the Plausible server (including https) so this can be used for tracking
+          with Plausible (https://plausible.io/).
+
+      plausible_domain:
+        type: str
+        required: false
+        desc: |
+          Please enter the URL for the Galaxy server so this can be used for tracking
+          with Plausible (https://plausible.io/).
+
+      matomo_server:
+        type: str
+        required: false
+        desc: |
+          Please enter the URL for the Matomo server (including https) so this can be used for tracking
+          with Matomo (https://matomo.org/).
+
+      matomo_site_id:
+        type: str
+        required: false
+        desc: |
+          Please enter the site ID for the Matomo server so this can be used for tracking
+          with Matomo (https://matomo.org/).
+
       display_servers:
         type: str
         default: hgw1.cse.ucsc.edu,hgw2.cse.ucsc.edu,hgw3.cse.ucsc.edu,hgw4.cse.ucsc.edu,hgw5.cse.ucsc.edu,hgw6.cse.ucsc.edu,hgw7.cse.ucsc.edu,hgw8.cse.ucsc.edu,lowepub.cse.ucsc.edu
diff --git a/lib/tool_shed/webapp/config_schema.yml b/lib/tool_shed/webapp/config_schema.yml
index 1302a11593a..3fadb90539a 100644
--- a/lib/tool_shed/webapp/config_schema.yml
+++ b/lib/tool_shed/webapp/config_schema.yml
@@ -172,6 +172,34 @@ mapping:
           You can enter tracking code here to track visitor's behavior
           through your Google Analytics account. Example: UA-XXXXXXXX-Y
 
+      plausible_server:
+        type: str
+        required: false
+        desc: |
+          Please enter the URL for the Plausible server (including https) so this can be used for tracking
+          with Plausible (https://plausible.io/).
+
+      plausible_domain:
+        type: str
+        required: false
+        desc: |
+          Please enter the URL for the Galaxy server so this can be used for tracking
+          with Plausible (https://plausible.io/).
+
+      matomo_server:
+        type: str
+        required: false
+        desc: |
+          Please enter the URL for the Matomo server (including https) so this can be used for tracking
+          with Matomo (https://matomo.org/).
+
+      matomo_site_id:
+        type: str
+        required: false
+        desc: |
+          Please enter the site ID for the Matomo server so this can be used for tracking
+          with Matomo (https://matomo.org/).
+
       id_secret:
         type: str
         default: changethisinproductiontoo
diff --git a/lib/tool_shed/webapp/templates/base.mako b/lib/tool_shed/webapp/templates/base.mako
index c72f5687ddf..ea1688d42bf 100644
--- a/lib/tool_shed/webapp/templates/base.mako
+++ b/lib/tool_shed/webapp/templates/base.mako
@@ -68,6 +68,12 @@
     %if self.js_app and self.js_app.config and self.js_app.config.ga_code:
         ${ galaxy_client.config_google_analytics(self.js_app.config.ga_code) }
     %endif
+    %if self.js_app and self.js_app.config and self.js_app.config.plausible_server and self.js_app.config.plausible_domain:
+        ${ galaxy_client.config_plausible_analytics(self.js_app.config.plausible_server, self.js_app.config.plausible_domain) }
+    %endif
+    %if self.js_app and self.js_app.config and self.js_app.config.matomo_server and self.js_app.config.matomo_site_id:
+        ${ galaxy_client.config_matomo_analytics(self.js_app.config.matomo_server, self.js_app.config.matomo_site_id) }
+    %endif
 
     %if not form_input_auto_focus is UNDEFINED and form_input_auto_focus:
         <script type="text/javascript">
diff --git a/lib/tool_shed/webapp/templates/base/base_panels.mako b/lib/tool_shed/webapp/templates/base/base_panels.mako
index 1e1f81ac5d6..d57862ba9ad 100644
--- a/lib/tool_shed/webapp/templates/base/base_panels.mako
+++ b/lib/tool_shed/webapp/templates/base/base_panels.mako
@@ -70,6 +70,12 @@
     %if t.webapp.name == 'galaxy' and app.config.ga_code:
         ${galaxy_client.config_google_analytics(app.config.ga_code)}
     %endif
+    %if t.webapp.name == 'galaxy' and app.config.plausible_server and app.config.plausible_domain:
+        ${ galaxy_client.config_plausible_analytics(app.config.plausible_server, app.config.plausible_domain) }
+    %endif
+    %if t.webapp.name == 'galaxy' and app.config.matomo_server and app.config.matomo_site_id:
+        ${ galaxy_client.config_matomo_analytics(app.config.matomo_server, app.config.matomo_site_id) }
+    %endif
 
 </%def>
 
diff --git a/lib/tool_shed/webapp/templates/galaxy_client_app.mako b/lib/tool_shed/webapp/templates/galaxy_client_app.mako
index 07b0f84cc54..2f89b061fdd 100644
--- a/lib/tool_shed/webapp/templates/galaxy_client_app.mako
+++ b/lib/tool_shed/webapp/templates/galaxy_client_app.mako
@@ -70,6 +70,43 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
     </script>
 </%def>
 
+<%def name="config_plausible_analytics(plausible_server, plausible_domain)">
+    <script>
+        console.log("config_plausible_analytics plausible_server:", '${plausible_server}');
+        console.log("config_plausible_analytics plausible_domain:", '${plausible_domain}');
+    </script>
+    %if plausible_server and plausible_domain:
+        <script async defer data-domain="${plausible_domain}" src="${plausible_server}/js/plausible.js"></script>
+    %else:
+        <script>console.warn("Missing plausible server or plausible domain");</script>
+    %endif
+</%def>
+
+<%def name="config_matomo_analytics(matomo_server, matomo_site_id)">
+    <script type="text/javascript">
+        console.log("config_matomo_analytics matomo_server:", '${matomo_server}');
+        console.log("config_matomo_analytics matomo_site_id:", '${matomo_site_id}');
+        %if ga_code:
+            var _paq = window._paq = window._paq || [];
+            /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+            _paq.push(['trackPageView']);
+            _paq.push(['enableLinkTracking']);
+            (function () {
+                var u = "${matomo_server}/";
+                _paq.push(['setTrackerUrl', u + 'matomo.php']);
+                _paq.push(['setSiteId', '${matomo_site_id}']);
+                var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+                g.type = 'text/javascript';
+                g.async = true;
+                g.src = u + 'matomo.js';
+                s.parentNode.insertBefore(g, s);
+            })();
+        %else:
+            console.warn("Missing matomo server or matomo site id");
+        %endif
+    </script>
+</%def>
+
 
 ## ----------------------------------------------------------------------------
 <%def name="get_user_dict()">
diff --git a/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako b/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako
index 95384138be4..e9ceef2c311 100644
--- a/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako
+++ b/lib/tool_shed/webapp/templates/webapps/tool_shed/base_panels.mako
@@ -48,6 +48,12 @@
     %if app.config.ga_code:
         ${ galaxy_client.config_google_analytics(app.config.ga_code)}
     %endif
+    %if app.config.plausible_server and app.config.plausible_domain:
+        ${ galaxy_client.config_plausible_analytics(app.config.plausible_server, app.config.plausible_domain) }
+    %endif
+    %if app.config.matomo_server:
+        ${ galaxy_client.config_matomo_analytics(app.config.matomo_server) }
+    %endif
 
     ## start main tag
     <nav id="masthead" class="navbar navbar-expand fixed-top justify-content-center navbar-dark">
diff --git a/templates/base.mako b/templates/base.mako
index de8fb791252..a7b1aafaf23 100644
--- a/templates/base.mako
+++ b/templates/base.mako
@@ -64,6 +64,12 @@
     %if self.js_app and self.js_app.config and self.js_app.config.ga_code:
         ${ galaxy_client.config_google_analytics(self.js_app.config.ga_code) }
     %endif
+    %if self.js_app and self.js_app.config and self.js_app.config.plausible_server and self.js_app.config.plausible_domain:
+        ${ galaxy_client.config_plausible_analytics(self.js_app.config.plausible_server, self.js_app.config.plausible_domain) }
+    %endif
+    %if self.js_app and self.js_app.config and self.js_app.config.matomo_server and self.js_app.config.matomo_site_id:
+        ${ galaxy_client.config_matomo_analytics(self.js_app.config.matomo_server, self.js_app.config.matomo_site_id) }
+    %endif
 
     %if not form_input_auto_focus is UNDEFINED and form_input_auto_focus:
         <script type="text/javascript">
diff --git a/templates/base/base_panels.mako b/templates/base/base_panels.mako
index b00979259fe..95649fa390f 100644
--- a/templates/base/base_panels.mako
+++ b/templates/base/base_panels.mako
@@ -69,6 +69,12 @@
     %if t.webapp.name == 'galaxy' and app.config.ga_code:
         ${galaxy_client.config_google_analytics(app.config.ga_code)}
     %endif
+    %if t.webapp.name == 'galaxy' and app.config.plausible_server and app.config.plausible_domain:
+        ${ galaxy_client.config_plausible_analytics(app.config.plausible_server, app.config.plausible_domain) }
+    %endif
+    %if t.webapp.name == 'galaxy' and app.config.matomo_server and app.config.matomo_site_id:
+        ${ galaxy_client.config_matomo_analytics(app.config.matomo_server, app.config.matomo_site_id) }
+    %endif
 
 </%def>
 
diff --git a/templates/galaxy_client_app.mako b/templates/galaxy_client_app.mako
index a907b6cec54..cb199e5b299 100644
--- a/templates/galaxy_client_app.mako
+++ b/templates/galaxy_client_app.mako
@@ -71,6 +71,43 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
     </script>
 </%def>
 
+<%def name="config_plausible_analytics(plausible_server, plausible_domain)">
+    <script>
+        console.log("config_plausible_analytics plausible_server:", '${plausible_server}');
+        console.log("config_plausible_analytics plausible_domain:", '${plausible_domain}');
+    </script>
+    %if plausible_server and plausible_domain:
+        <script async defer data-domain="${plausible_domain}" src="${plausible_server}/js/plausible.js"></script>
+        <script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
+    %else:
+        <script>console.warn("Missing plausible server or plausible domain");</script>
+    %endif
+</%def>
+
+<%def name="config_matomo_analytics(matomo_server, matomo_site_id)">
+    <script type="text/javascript">
+        console.log("config_matomo_analytics matomo_server:", '${matomo_server}');
+        console.log("config_matomo_analytics matomo_site_id:", '${matomo_site_id}')
+        %if matomo_server and matomo_site_id:
+            var _paq = window._paq = window._paq || [];
+            /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+            _paq.push(['trackPageView']);
+            _paq.push(['enableLinkTracking']);
+            (function () {
+                var u = "${matomo_server}/";
+                _paq.push(['setTrackerUrl', u + 'matomo.php']);
+                _paq.push(['setSiteId', '${matomo_site_id}']);
+                var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+                g.type = 'text/javascript';
+                g.async = true;
+                g.src = u + 'matomo.js';
+                s.parentNode.insertBefore(g, s);
+            })();
+        %else:
+            console.warn("Missing matomo server or matomo site id");
+        %endif
+    </script>
+</%def>
 
 
 ## ----------------------------------------------------------------------------
diff --git a/templates/js-app.mako b/templates/js-app.mako
index e394a35193b..d1a48754eea 100644
--- a/templates/js-app.mako
+++ b/templates/js-app.mako
@@ -27,7 +27,6 @@
             'jquery-ui/smoothness/jquery-ui',
             'bootstrap-tour',
         )}
-
     </head>
 
     <body scroll="no" class="full-content">
@@ -76,7 +75,12 @@
     %if app.config.ga_code:
         ${ galaxy_client.config_google_analytics(app.config.ga_code) }
     %endif
-
+    %if app.config.plausible_server and app.config.plausible_domain:
+            ${ galaxy_client.config_plausible_analytics(app.config.plausible_server, app.config.plausible_domain) }
+    %endif
+    %if app.config.matomo_server and app.config.matomo_site_id:
+            ${ galaxy_client.config_matomo_analytics(app.config.matomo_server, app.config.matomo_site_id) }
+    %endif
 </%def>
 
 <%def name="js_disabled_warning()">

From c9c2311f105d98c7fc0f6f660fd53bfbd7e7a953 Mon Sep 17 00:00:00 2001
From: setlen <peter.selten98@gmail.com>
Date: Fri, 12 Feb 2021 01:28:50 +0100
Subject: [PATCH 2/4] Add support for Plausible analytics and Matomo analytics
 Also commit tool_shed.yml.sample

---
 lib/galaxy/config/sample/tool_shed.yml.sample | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/galaxy/config/sample/tool_shed.yml.sample b/lib/galaxy/config/sample/tool_shed.yml.sample
index d7e8e6c5aac..b9f0ec180f3 100644
--- a/lib/galaxy/config/sample/tool_shed.yml.sample
+++ b/lib/galaxy/config/sample/tool_shed.yml.sample
@@ -179,6 +179,14 @@ tool_shed:
   # your Google Analytics account. Example: UA-XXXXXXXX-Y
   #ga_code: null
 
+  # Please enter the URL for the Plausible server (including https) so this can be used for tracking
+  # with Plausible (https://plausible.io/).
+  # plausible_server: null
+
+  # Please enter the URL for the Galaxy server so this can be used for tracking
+  # with Plausible (https://plausible.io/).
+  #plausible_domain: null
+
   # The Tool Shed encodes various internal values when these values will
   # be output in some format (for example, in a URL or cookie).  You
   # should set a key to be used by the algorithm that encodes and

From 4677cf9e0d574ca5d8380b63251669700c08ccff Mon Sep 17 00:00:00 2001
From: setlen <peter.selten98@gmail.com>
Date: Fri, 12 Feb 2021 21:23:52 +0100
Subject: [PATCH 3/4] Make sure the options are all documented, remove some
 logging.

---
 client/src/galaxy.library.js                  |  8 ++--
 doc/source/admin/galaxy_options.rst           | 45 +++++++++++++++++++
 lib/galaxy/config/sample/galaxy.yml.sample    | 19 +++++---
 lib/galaxy/config/sample/tool_shed.yml.sample | 19 +++++---
 .../webapp/templates/galaxy_client_app.mako   |  8 ++--
 templates/galaxy_client_app.mako              | 12 ++---
 6 files changed, 87 insertions(+), 24 deletions(-)

diff --git a/client/src/galaxy.library.js b/client/src/galaxy.library.js
index 0f77a558d40..05e76258ca8 100644
--- a/client/src/galaxy.library.js
+++ b/client/src/galaxy.library.js
@@ -69,8 +69,8 @@ var LibraryRouter = Backbone.Router.extend({
         if (typeof ga !== "undefined") {
             ga("send", "pageview", `${getAppRoot()}library/list${url}`);
         }
-        if (typeof plausible !== "undefined") {
-            plausible(`pageview ${getAppRoot()}library/list${url}`);
+        if (typeof window.plausible !== "undefined") {
+            window.plausible(`pageview ${getAppRoot()}library/list${url}`);
         }
         if (typeof window._paq !== "undefined") {
             window._paq.push(['setCustomUrl', `${getAppRoot()}library/list${url}`]);
@@ -138,7 +138,9 @@ var GalaxyLibrary = Backbone.View.extend({
              var u=Galaxy.config.matomo_server+"/";
              _paq.push(['setTrackerUrl', u+'matomo.php']);
              _paq.push(['setSiteId', Galaxy.config.matomo_site_id]);
-             var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+             var d=document;
+             var g=d.createElement('script');
+             var s=d.getElementsByTagName('script')[0];
              g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
             })();
         }
diff --git a/doc/source/admin/galaxy_options.rst b/doc/source/admin/galaxy_options.rst
index 65ebb79d403..5fd1916ec8a 100644
--- a/doc/source/admin/galaxy_options.rst
+++ b/doc/source/admin/galaxy_options.rst
@@ -1468,6 +1468,51 @@
 :Type: str
 
 
+~~~~~~~~~~~~~~~~~~~~
+``plausible_server``
+~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Please enter the URL for the Plausible server (including https) so
+    this can be used for tracking with Plausible
+    (https://plausible.io/).
+:Default: ``None``
+:Type: str
+
+
+~~~~~~~~~~~~~~~~~~~~
+``plausible_domain``
+~~~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Please enter the URL for the Galaxy server so this can be used for
+    tracking with Plausible (https://plausible.io/).
+:Default: ``None``
+:Type: str
+
+
+~~~~~~~~~~~~~~~~~
+``matomo_server``
+~~~~~~~~~~~~~~~~~
+
+:Description:
+    Please enter the URL for the Matomo server (including https) so
+    this can be used for tracking with Matomo (https://matomo.org/).
+:Default: ``None``
+:Type: str
+
+
+~~~~~~~~~~~~~~~~~~
+``matomo_site_id``
+~~~~~~~~~~~~~~~~~~
+
+:Description:
+    Please enter the site ID for the Matomo server so this can be used
+    for tracking with Matomo (https://matomo.org/).
+:Default: ``None``
+:Type: str
+
+
 ~~~~~~~~~~~~~~~~~~~
 ``display_servers``
 ~~~~~~~~~~~~~~~~~~~
diff --git a/lib/galaxy/config/sample/galaxy.yml.sample b/lib/galaxy/config/sample/galaxy.yml.sample
index be92803ec17..132aee92612 100644
--- a/lib/galaxy/config/sample/galaxy.yml.sample
+++ b/lib/galaxy/config/sample/galaxy.yml.sample
@@ -817,14 +817,23 @@ galaxy:
   # your Google Analytics account.  Example: UA-XXXXXXXX-Y
   #ga_code: null
 
-  # Please enter the URL for the Plausible server (including https) so this can be used for tracking
-  # with Plausible (https://plausible.io/).
-  # plausible_server: null
+  # Please enter the URL for the Plausible server (including https) so
+  # this can be used for tracking with Plausible
+  # (https://plausible.io/).
+  #plausible_server: null
 
-  # Please enter the URL for the Galaxy server so this can be used for tracking
-  # with Plausible (https://plausible.io/).
+  # Please enter the URL for the Galaxy server so this can be used for
+  # tracking with Plausible (https://plausible.io/).
   #plausible_domain: null
 
+  # Please enter the URL for the Matomo server (including https) so this
+  # can be used for tracking with Matomo (https://matomo.org/).
+  #matomo_server: null
+
+  # Please enter the site ID for the Matomo server so this can be used
+  # for tracking with Matomo (https://matomo.org/).
+  #matomo_site_id: null
+
   # Galaxy can display data at various external browsers.  These options
   # specify which browsers should be available.  URLs and builds
   # available at these browsers are defined in the specified files.
diff --git a/lib/galaxy/config/sample/tool_shed.yml.sample b/lib/galaxy/config/sample/tool_shed.yml.sample
index b9f0ec180f3..3ba6eb2948e 100644
--- a/lib/galaxy/config/sample/tool_shed.yml.sample
+++ b/lib/galaxy/config/sample/tool_shed.yml.sample
@@ -179,14 +179,23 @@ tool_shed:
   # your Google Analytics account. Example: UA-XXXXXXXX-Y
   #ga_code: null
 
-  # Please enter the URL for the Plausible server (including https) so this can be used for tracking
-  # with Plausible (https://plausible.io/).
-  # plausible_server: null
+  # Please enter the URL for the Plausible server (including https) so
+  # this can be used for tracking with Plausible
+  # (https://plausible.io/).
+  #plausible_server: null
 
-  # Please enter the URL for the Galaxy server so this can be used for tracking
-  # with Plausible (https://plausible.io/).
+  # Please enter the URL for the Galaxy server so this can be used for
+  # tracking with Plausible (https://plausible.io/).
   #plausible_domain: null
 
+  # Please enter the URL for the Matomo server (including https) so this
+  # can be used for tracking with Matomo (https://matomo.org/).
+  #matomo_server: null
+
+  # Please enter the site ID for the Matomo server so this can be used
+  # for tracking with Matomo (https://matomo.org/).
+  #matomo_site_id: null
+
   # The Tool Shed encodes various internal values when these values will
   # be output in some format (for example, in a URL or cookie).  You
   # should set a key to be used by the algorithm that encodes and
diff --git a/lib/tool_shed/webapp/templates/galaxy_client_app.mako b/lib/tool_shed/webapp/templates/galaxy_client_app.mako
index 2f89b061fdd..a8ed317e27b 100644
--- a/lib/tool_shed/webapp/templates/galaxy_client_app.mako
+++ b/lib/tool_shed/webapp/templates/galaxy_client_app.mako
@@ -71,10 +71,6 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
 </%def>
 
 <%def name="config_plausible_analytics(plausible_server, plausible_domain)">
-    <script>
-        console.log("config_plausible_analytics plausible_server:", '${plausible_server}');
-        console.log("config_plausible_analytics plausible_domain:", '${plausible_domain}');
-    </script>
     %if plausible_server and plausible_domain:
         <script async defer data-domain="${plausible_domain}" src="${plausible_server}/js/plausible.js"></script>
     %else:
@@ -95,7 +91,9 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
                 var u = "${matomo_server}/";
                 _paq.push(['setTrackerUrl', u + 'matomo.php']);
                 _paq.push(['setSiteId', '${matomo_site_id}']);
-                var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+                var d = document;
+                var g = d.createElement('script');
+                var s = d.getElementsByTagName('script')[0];
                 g.type = 'text/javascript';
                 g.async = true;
                 g.src = u + 'matomo.js';
diff --git a/templates/galaxy_client_app.mako b/templates/galaxy_client_app.mako
index cb199e5b299..240a9b50616 100644
--- a/templates/galaxy_client_app.mako
+++ b/templates/galaxy_client_app.mako
@@ -72,15 +72,13 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
 </%def>
 
 <%def name="config_plausible_analytics(plausible_server, plausible_domain)">
-    <script>
-        console.log("config_plausible_analytics plausible_server:", '${plausible_server}');
-        console.log("config_plausible_analytics plausible_domain:", '${plausible_domain}');
-    </script>
     %if plausible_server and plausible_domain:
         <script async defer data-domain="${plausible_domain}" src="${plausible_server}/js/plausible.js"></script>
         <script>window.plausible = window.plausible || function() { (window.plausible.q = window.plausible.q || []).push(arguments) }</script>
     %else:
-        <script>console.warn("Missing plausible server or plausible domain");</script>
+        <script>
+            console.warn("Missing plausible server or plausible domain");
+        </script>
     %endif
 </%def>
 
@@ -97,7 +95,9 @@ ${ h.dumps( dictionary, indent=( 2 if trans.debug else 0 ) ) }
                 var u = "${matomo_server}/";
                 _paq.push(['setTrackerUrl', u + 'matomo.php']);
                 _paq.push(['setSiteId', '${matomo_site_id}']);
-                var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+                var d = document;
+                var g = d.createElement('script');
+                var s = d.getElementsByTagName('script')[0];
                 g.type = 'text/javascript';
                 g.async = true;
                 g.src = u + 'matomo.js';

From d03dfc7f611b10b9268640255e4c98691bb101aa Mon Sep 17 00:00:00 2001
From: setlen <peter.selten98@gmail.com>
Date: Fri, 12 Feb 2021 21:43:53 +0100
Subject: [PATCH 4/4] Update code style using prettier

---
 client/src/galaxy.library.js | 37 ++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

diff --git a/client/src/galaxy.library.js b/client/src/galaxy.library.js
index 05e76258ca8..23ae6b7a104 100644
--- a/client/src/galaxy.library.js
+++ b/client/src/galaxy.library.js
@@ -73,8 +73,8 @@ var LibraryRouter = Backbone.Router.extend({
             window.plausible(`pageview ${getAppRoot()}library/list${url}`);
         }
         if (typeof window._paq !== "undefined") {
-            window._paq.push(['setCustomUrl', `${getAppRoot()}library/list${url}`]);
-            window._paq.push(['trackPageView']);
+            window._paq.push(["setCustomUrl", `${getAppRoot()}library/list${url}`]);
+            window._paq.push(["trackPageView"]);
         }
     },
 });
@@ -127,21 +127,30 @@ var GalaxyLibrary = Backbone.View.extend({
             ga("send", "pageview");
         }
         if (Galaxy.config.plausible_server && Galaxy.config.plausible_domain) {
-             document.write("<script async defer data-domain=\""+Galaxy.config.plausible_domain+"\" src=\""+Galaxy.config.plausible_server+"/js/plausible.js\"></script>");
+            document.write(
+                '<script async defer data-domain="' +
+                    Galaxy.config.plausible_domain +
+                    '" src="' +
+                    Galaxy.config.plausible_server +
+                    '/js/plausible.js"></script>'
+            );
         }
         if (Galaxy.config.matomo_server && Galaxy.config.matomo_site_id) {
-            var _paq = window._paq = window._paq || [];
+            var _paq = (window._paq = window._paq || []);
             /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
-            _paq.push(['trackPageView']);
-            _paq.push(['enableLinkTracking']);
-            (function() {
-             var u=Galaxy.config.matomo_server+"/";
-             _paq.push(['setTrackerUrl', u+'matomo.php']);
-             _paq.push(['setSiteId', Galaxy.config.matomo_site_id]);
-             var d=document;
-             var g=d.createElement('script');
-             var s=d.getElementsByTagName('script')[0];
-             g.type='text/javascript'; g.async=true; g.src=u+'matomo.js'; s.parentNode.insertBefore(g,s);
+            _paq.push(["trackPageView"]);
+            _paq.push(["enableLinkTracking"]);
+            (function () {
+                var u = Galaxy.config.matomo_server + "/";
+                _paq.push(["setTrackerUrl", u + "matomo.php"]);
+                _paq.push(["setSiteId", Galaxy.config.matomo_site_id]);
+                var d = document;
+                var g = d.createElement("script");
+                var s = d.getElementsByTagName("script")[0];
+                g.type = "text/javascript";
+                g.async = true;
+                g.src = u + "matomo.js";
+                s.parentNode.insertBefore(g, s);
             })();
         }