From: Lucas Di Pentima <ldipentima@veritasgenetics.com>
Date: Mon, 12 Feb 2018 17:15:11 +0000 (-0300)
Subject: 11454: Avoid instantiating new SessionDB before autoRedirectToHomeCluster()
X-Git-Tag: 1.1.4~85^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/3c31a5e643b930d1cdf227d2f5b151df48f20601

11454: Avoid instantiating new SessionDB before autoRedirectToHomeCluster()

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
---

diff --git a/apps/workbench/app/assets/javascripts/components/search.js b/apps/workbench/app/assets/javascripts/components/search.js
index f4fde1277b..04572ec3cc 100644
--- a/apps/workbench/app/assets/javascripts/components/search.js
+++ b/apps/workbench/app/assets/javascripts/components/search.js
@@ -104,6 +104,7 @@ window.SearchResultsTable = {
 window.Search = {
     oninit: function(vnode) {
         vnode.state.sessionDB = new SessionDB()
+        vnode.state.sessionDB.autoRedirectToHomeCluster('/search')
         vnode.state.searchEntered = m.stream()
         vnode.state.searchActive = m.stream()
         // When searchActive changes (e.g., when restoring state
diff --git a/apps/workbench/app/assets/javascripts/components/sessions.js b/apps/workbench/app/assets/javascripts/components/sessions.js
index f9e54ad494..e172d3a3f3 100644
--- a/apps/workbench/app/assets/javascripts/components/sessions.js
+++ b/apps/workbench/app/assets/javascripts/components/sessions.js
@@ -12,6 +12,7 @@ $(document).on('ready', function() {
 window.SessionsTable = {
     oninit: function(vnode) {
         vnode.state.db = new SessionDB();
+        vnode.state.db.autoRedirectToHomeCluster('/sessions');
         vnode.state.db.migrateNonFederatedSessions();
         vnode.state.hostToAdd = m.stream('');
         vnode.state.error = m.stream();
diff --git a/apps/workbench/app/views/search/index.html b/apps/workbench/app/views/search/index.html
index c26a643d61..6bcad0b1ae 100644
--- a/apps/workbench/app/views/search/index.html
+++ b/apps/workbench/app/views/search/index.html
@@ -2,11 +2,4 @@
 
 SPDX-License-Identifier: AGPL-3.0 -->
 
-<script type="text/javascript">
-    $(document).on('ready', function() {
-        var db = new SessionDB()
-        db.autoRedirectToHomeCluster('/search')
-    })
-</script>
-
 <div data-mount-mithril="Search"></div>
diff --git a/apps/workbench/app/views/sessions/index.html b/apps/workbench/app/views/sessions/index.html
index ee1f63659e..bf23028ce7 100644
--- a/apps/workbench/app/views/sessions/index.html
+++ b/apps/workbench/app/views/sessions/index.html
@@ -2,11 +2,4 @@
 
 SPDX-License-Identifier: AGPL-3.0 -->
 
-<script type="text/javascript">
-    $(document).on('ready', function() {
-        var db = new SessionDB()
-        db.autoRedirectToHomeCluster('/sessions')
-    })
-</script>
-
 <div data-mount-mithril="SessionsTable"></div>