[ARVADOS] updated: 1.1.3-5-g8dd93ce

[Git user]

Summary of changes:
 apps/workbench/app/assets/javascripts/components/search.js   | 2 +-
 apps/workbench/app/assets/javascripts/components/sessions.js | 9 ++-------
 apps/workbench/app/assets/javascripts/models/session_db.js   | 8 ++++----
 3 files changed, 7 insertions(+), 12 deletions(-)

       via  8dd93ce870df1f438fab7fceebe6abdec9763199 (commit)
       via  55b80c76014dbcad964b3d9e0956ce93d4cfb00b (commit)
      from  80eedd862b4956ed840af233dce0c3608fe627b2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 8dd93ce870df1f438fab7fceebe6abdec9763199
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Feb 12 13:40:11 2018 -0300

    11454: A couple of fixes/enhancements:
    
    * Only try to migrate non federated sessions on /sessions page.
    * autoLoadRemoteHosts only loads missing remotes, without reactivating
    disabled sessions.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/components/sessions.js b/apps/workbench/app/assets/javascripts/components/sessions.js
index f8fa96a..f9e54ad 100644
--- a/apps/workbench/app/assets/javascripts/components/sessions.js
+++ b/apps/workbench/app/assets/javascripts/components/sessions.js
@@ -6,13 +6,13 @@ $(document).on('ready', function() {
     var db = new SessionDB();
     db.checkForNewToken();
     db.fillMissingUUIDs();
-    db.migrateNonFederatedSessions();
     db.autoLoadRemoteHosts();
 });
 
 window.SessionsTable = {
     oninit: function(vnode) {
         vnode.state.db = new SessionDB();
+        vnode.state.db.migrateNonFederatedSessions();
         vnode.state.hostToAdd = m.stream('');
         vnode.state.error = m.stream();
         vnode.state.checking = m.stream();
diff --git a/apps/workbench/app/assets/javascripts/models/session_db.js b/apps/workbench/app/assets/javascripts/models/session_db.js
index 93279a2..fab8fe3 100644
--- a/apps/workbench/app/assets/javascripts/models/session_db.js
+++ b/apps/workbench/app/assets/javascripts/models/session_db.js
@@ -279,14 +279,14 @@ window.SessionDB = function() {
                 }
             });
         },
-        // If remoteHosts is listed on the local API discovery doc, try to add any
-        // listed remote without an active session.
+        // If remoteHosts is populated on the local API discovery doc, try to
+        // add any listed missing session.
         autoLoadRemoteHosts: function() {
-            var activeSessions = db.loadActive();
+            var sessions = db.loadAll();
             var doc = db.discoveryDoc(db.loadLocal());
             doc.map(function(d) {
                 Object.keys(d.remoteHosts).map(function(uuidPrefix) {
-                    if (!(uuidPrefix in Object.keys(activeSessions))) {
+                    if (!(sessions[uuidPrefix])) {
                         db.findAPI(d.remoteHosts[uuidPrefix]).then(function(baseURL) {
                             db.login(baseURL, false);
                         });

commit 55b80c76014dbcad964b3d9e0956ce93d4cfb00b
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Mon Feb 12 13:12:07 2018 -0300

    11454: Removes workbench links on /sessions page.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/app/assets/javascripts/components/search.js b/apps/workbench/app/assets/javascripts/components/search.js
index 2f37d78..f4fde12 100644
--- a/apps/workbench/app/assets/javascripts/components/search.js
+++ b/apps/workbench/app/assets/javascripts/components/search.js
@@ -65,7 +65,7 @@ window.SearchResultsTable = {
                             method: 'GET'
                         }, [
                             tokenParam !== '' &&
-                                m('input[type=hidden][name=api_token][value='+tokenParam+']'),
+                                m('input[type=hidden][name=api_token]', {value: tokenParam}),
                             item.workbenchBaseURL() &&
                                 m('button.btn.btn-xs.btn-default[type=submit]', {
                                     'data-original-title': 'show '+item.objectType.description,
diff --git a/apps/workbench/app/assets/javascripts/components/sessions.js b/apps/workbench/app/assets/javascripts/components/sessions.js
index be11b50..f8fa96a 100644
--- a/apps/workbench/app/assets/javascripts/components/sessions.js
+++ b/apps/workbench/app/assets/javascripts/components/sessions.js
@@ -43,12 +43,7 @@ window.SessionsTable = {
                                 m('td', session.user.is_active ?
                                     m('span.label.label-success', 'logged in') :
                                     m('span.label.label-warning', 'inactive')),
-                                m('td', {title: session.baseURL}, [
-                                    session.isFromRails ? uuidPrefix :
-                                    m('a', {
-                                        href: db.workbenchBaseURL(session) + '?api_token=' + session.token
-                                    }, uuidPrefix)
-                                ]),
+                                m('td', {title: session.baseURL}, uuidPrefix),
                                 m('td', session.user.username),
                                 m('td', session.user.email),
                                 m('td', session.isFromRails ? null : m('button.btn.btn-xs.btn-default', {

-----------------------------------------------------------------------


hooks/post-receive
--