Merge branch '12018-tool-docs'

[arvados.git] / apps / workbench / app / assets / javascripts / components / sessions.js

diff --git a/apps/workbench/app/assets/javascripts/components/sessions.js b/apps/workbench/app/assets/javascripts/components/sessions.js
index be4b7e39dd8fd59885cff4c898d6fb9335f7603b..e7cc5055734d4edaa2144d7eb4d704ec7e737736 100644 (file)
--- a/apps/workbench/app/assets/javascripts/components/sessions.js
+++ b/apps/workbench/app/assets/javascripts/components/sessions.js
@@ -3,60 +3,86 @@
 // SPDX-License-Identifier: AGPL-3.0
 
 $(document).on('ready', function() {
-    var db = new window.models.SessionDB()
+    var db = new SessionDB()
     db.checkForNewToken()
     db.fillMissingUUIDs()
 })
 
-window.components = window.components || {}
-window.components.sessions = {
+window.SessionsTable = {
     oninit: function(vnode) {
-        vnode.state.db = new window.models.SessionDB()
+        vnode.state.db = new SessionDB()
         vnode.state.hostToAdd = m.stream('')
+        vnode.state.error = m.stream()
+        vnode.state.checking = m.stream()
     },
     view: function(vnode) {
         var db = vnode.state.db
         var sessions = db.loadAll()
-        return m('container', [
-            m('table.table.table-condensed.table-hover', m('tbody', [
-                Object.keys(sessions).map(function(uuidPrefix) {
-                    var session = sessions[uuidPrefix]
-                    return m('tr', [
-                        session.token && session.user ? [
-                            m('td', m('a.btn.btn-xs.btn-default', {
+        return m('.container', [
+            m('p', [
+                'You can log in to multiple Arvados sites here, then use the ',
+                m('a[href="/search"]', 'multi-site search'),
+                ' page to search collections and projects on all sites at once.',
+            ]),
+            m('table.table.table-condensed.table-hover', [
+                m('thead', m('tr', [
+                    m('th', 'status'),
+                    m('th', 'cluster ID'),
+                    m('th', 'username'),
+                    m('th', 'email'),
+                    m('th', 'actions'),
+                    m('th'),
+                ])),
+                m('tbody', [
+                    Object.keys(sessions).map(function(uuidPrefix) {
+                        var session = sessions[uuidPrefix]
+                        return m('tr', [
+                            session.token && session.user ? [
+                                m('td', m('span.label.label-success', 'logged in')),
+                                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', {
+                                    uuidPrefix: uuidPrefix,
+                                    onclick: m.withAttr('uuidPrefix', db.logout),
+                                }, 'Log out ', m('span.glyphicon.glyphicon-log-out'))),
+                            ] : [
+                                m('td', m('span.label.label-default', 'logged out')),
+                                m('td', {title: session.baseURL}, uuidPrefix),
+                                m('td'),
+                                m('td'),
+                                m('td', m('a.btn.btn-xs.btn-primary', {
+                                    uuidPrefix: uuidPrefix,
+                                    onclick: db.login.bind(db, session.baseURL),
+                                }, 'Log in ', m('span.glyphicon.glyphicon-log-in'))),
+                            ],
+                            m('td', session.isFromRails ? null : m('button.btn.btn-xs.btn-default', {
                                 uuidPrefix: uuidPrefix,
-                                onclick: m.withAttr('uuidPrefix', db.logout),
-                            }, 'log out')),
-                            m('td', m('span.label.label-info', 'logged in')),
-                            m('td', {title: session.baseURL}, uuidPrefix),
-                            m('td', session.user.username),
-                            m('td', session.user.email),
-                        ] : [
-                            m('td', m('a.btn.btn-xs.btn-info', {
-                                uuidPrefix: uuidPrefix,
-                                onclick: m.withAttr('uuidPrefix', db.login),
-                            }, 'log in')),
-                            m('td', 'span.label.label-default', 'logged out'),
-                            m('td', {title: session.baseURL}, uuidPrefix),
-                            m('td'),
-                            m('td'),
-                        ],
-                        m('td', m('a.glyphicon.glyphicon-trash', {
-                            uuidPrefix: uuidPrefix,
-                            onclick: m.withAttr('uuidPrefix', db.trash),
-                        })),
-                    ])
-                }),
-            ])),
+                                onclick: m.withAttr('uuidPrefix', db.trash),
+                            }, 'Remove ', m('span.glyphicon.glyphicon-trash'))),
+                        ])
+                    }),
+                ]),
+            ]),
             m('.row', m('.col-md-6', [
                 m('form', {
                     onsubmit: function() {
-                        db.login(vnode.state.hostToAdd())
+                        vnode.state.error(null)
+                        vnode.state.checking(true)
+                        db.findAPI(vnode.state.hostToAdd())
+                            .then(db.login)
+                            .catch(function() {
+                                vnode.state.error(true)
+                            })
+                            .then(vnode.state.checking.bind(null, null))
                         return false
                     },
                 }, [
-                    m('.input-group', [
-                        m('input.form-control[type=text][name=apiHost][placeholder="API host"]', {
+                    m('p', [
+                        'To add a remote Arvados site, paste the remote site\'s host here (see "ARVADOS_API_HOST" on the "current token" page).',
+                    ]),
+                    m('.input-group', { className: vnode.state.error() && 'has-error' }, [
+                        m('input.form-control[type=text][name=apiHost][placeholder="zzzzz.arvadosapi.com"]', {
                             oninput: m.withAttr('value', vnode.state.hostToAdd),
                         }),
                         m('.input-group-btn', [
@@ -66,6 +92,9 @@ window.components.sessions = {
                         ]),
                     ]),
                 ]),
+                m('p'),
+                vnode.state.error() && m('p.alert.alert-danger', 'Request failed. Make sure this is a working API server address.'),
+                vnode.state.checking() && m('p.alert.alert-info', 'Checking...'),
             ])),
         ])
     },