Merge branch 'release-2.2.2'

otto-torino · Aug 3, 2021 · 81f1423 · 81f1423
2 parents 9a88dbc + 867c05a
commit 81f1423
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 26 deletions.
diff --git a/baton/static/baton/app/dist/baton.min.js b/baton/static/baton/app/dist/baton.min.js
diff --git a/baton/static/baton/app/package-lock.json b/baton/static/baton/app/package-lock.json
diff --git a/baton/static/baton/app/package.json b/baton/static/baton/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "baton",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "Django Baton App",
   "main": "index.js",
   "scripts": {

diff --git a/baton/static/baton/app/src/core/Analytics.js b/baton/static/baton/app/src/core/Analytics.js
@@ -51,31 +51,13 @@ class Analytics {
           'access_token': self.token
         }
       })
-      /**
-       * Create a new ActiveUsers instance to be rendered inside of an
-       * element with the id "active-users-container" and poll for changes every
-       * five seconds.
-       */
-      var activeUsers = new gapi.analytics.ext.ActiveUsers({
-        container: self.domIds.activeUsers,
-        ids: 'ga:' + self.viewId,
-        pollingInterval: 5
-      }).execute()
       /**
        * Create a new ViewSelector2 instance to be rendered inside of an
        * element with the id "view-selector-container".
        */
       var viewSelector = new gapi.analytics.ViewSelector({
         container: self.domIds.viewSelector,
       })
-      /**
-       * Update the activeUsers component, the Chartjs charts, and the dashboard
-       * title whenever the user changes the view.
-       */
-      viewSelector.on('viewChange', function (data) {
-        // Start tracking active users for this view.
-        activeUsers.set(data).execute()
-      })
       viewSelector.execute()
 
       let baseQuery = {

diff --git a/baton/static/baton/app/src/core/Tabs.js b/baton/static/baton/app/src/core/Tabs.js
@@ -153,7 +153,7 @@ let Tabs = {
     }
   },
   checkHash: function () {
-    if (location.hash) {
+    if (location.hash && this.nav.find('a[data-bs-target="' + location.hash + '"]').length) {
       const tab = new bootstrap.Tab(this.nav.find('a[data-bs-target="' + location.hash + '"]')[0])
       tab.show()
     }

diff --git a/baton/templates/baton/analytics.html b/baton/templates/baton/analytics.html
@@ -14,7 +14,6 @@
     {% block baton_before_analytics %}{% endblock baton_before_analytics %}
     <h4 class="d-flex justify-content-between">
       Google Analytics
-      <span class="btn btn-info" id="active-users-container"></span>
     </h4>
     <!-- this is just to make the view selector work, no need to display it -->
     <div id="view-selector-container" style="display: none"></div>

diff --git a/docs/conf.py b/docs/conf.py
@@ -54,9 +54,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'2.2.1'
+version = u'2.2.2'
 # The full version, including alpha/beta/rc tags.
-release = u'2.2.1'
+release = u'2.2.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -11,7 +11,7 @@
 
 setup(
     name='django-baton',
-    version='2.2.1',
+    version='2.2.2',
     packages=['baton', 'baton.autodiscover', 'baton.templatetags'],
     include_package_data=True,
     license='MIT License',

diff --git a/testapp/app/db.sqlite3 b/testapp/app/db.sqlite3