X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/75fd99e49f880aac55ae568c76c5151857e6beff..acb392d097b6dc72ce0953d22d245b039b62fccc:/apps/workbench/app/assets/javascripts/components/search.js diff --git a/apps/workbench/app/assets/javascripts/components/search.js b/apps/workbench/app/assets/javascripts/components/search.js index 0839491696..51d352ab82 100644 --- a/apps/workbench/app/assets/javascripts/components/search.js +++ b/apps/workbench/app/assets/javascripts/components/search.js @@ -2,11 +2,6 @@ // // SPDX-License-Identifier: AGPL-3.0 -$(document).on('ready', function() { - var db = new SessionDB() - db.migrateNonFederatedSessions() -}) - window.SearchResultsTable = { maybeLoadMore: function(dom) { var loader = this.loader @@ -46,6 +41,8 @@ window.SearchResultsTable = { collections: m('i.fa.fa-fw.fa-archive'), projects: m('i.fa.fa-fw.fa-folder'), } + var db = new SessionDB() + var sessions = db.loadActive() return m('table.table.table-condensed', [ m('thead', m('tr', [ m('th'), @@ -55,6 +52,13 @@ window.SearchResultsTable = { ])), m('tbody', [ loader.items().map(function(item) { + var session = sessions[item.uuid.slice(0,5)] + var tokenParam = '' + // Add the salted token to search result links from federated + // remote hosts. + if (!session.isFromRails && session.token.indexOf('v2/') == 0) { + tokenParam = '?api_token='+session.token + } return m('tr', [ m('td', [ item.workbenchBaseURL() && @@ -62,7 +66,7 @@ window.SearchResultsTable = { 'data-original-title': 'show '+item.objectType.description, 'data-placement': 'top', 'data-toggle': 'tooltip', - href: item.workbenchBaseURL()+'/'+item.objectType.wb_path+'/'+item.uuid, + href: item.workbenchBaseURL()+'/'+item.objectType.wb_path+'/'+item.uuid+tokenParam, // Bootstrap's tooltip feature oncreate: function(vnode) { $(vnode.dom).tooltip() }, }, iconsMap[item.objectType.wb_path]),