X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a20ea2d9b6b861829d9daa91990ce064b1000170..3854e6bfcd5344bce5ee0388248cb115e3c5e902:/apps/workbench/app/assets/javascripts/components/collections.js diff --git a/apps/workbench/app/assets/javascripts/components/collections.js b/apps/workbench/app/assets/javascripts/components/collections.js index 6167b2ce7d..33fca6c7b7 100644 --- a/apps/workbench/app/assets/javascripts/components/collections.js +++ b/apps/workbench/app/assets/javascripts/components/collections.js @@ -2,12 +2,11 @@ // // SPDX-License-Identifier: AGPL-3.0 -window.components = window.components || {} -window.components.collection_table = { +window.CollectionsTable = { maybeLoadMore: function(dom) { var loader = this.loader - if (loader.done || !loader.loadMore) - // Can't load more content anyway: no point in + if (loader.state != loader.READY) + // Can't start getting more items anyway: no point in // checking anything else. return var contentRect = dom.getBoundingClientRect() @@ -25,6 +24,7 @@ window.components.collection_table = { window.addEventListener('scroll', vnode.state.maybeLoadMore) window.addEventListener('resize', vnode.state.maybeLoadMore) vnode.state.timer = window.setInterval(vnode.state.maybeLoadMore, 200) + vnode.state.loader = vnode.attrs.loader vnode.state.onupdate(vnode) }, onupdate: function(vnode) { @@ -36,6 +36,7 @@ window.components.collection_table = { window.removeEventListener('resize', vnode.state.maybeLoadMore) }, view: function(vnode) { + var loader = vnode.attrs.loader return m('table.table.table-condensed', [ m('thead', m('tr', [ m('th'), @@ -44,53 +45,81 @@ window.components.collection_table = { m('th', 'last modified'), ])), m('tbody', [ - vnode.attrs.loader.displayable.map(function(item) { + loader.items().map(function(item) { return m('tr', [ - m('td', m('a.btn.btn-xs.btn-default', {href: item.session.baseURL.replace('://', '://workbench.')+'/collections/'+item.uuid}, 'Show')), + m('td', [ + // Guess workbench.{apihostport} is a + // Workbench... unless the host part of + // apihostport is an IPv4 or [IPv6] + // address. + item.session.baseURL.match('://(\\[|\\d+\\.\\d+\\.\\d+\\.\\d+[:/])') ? null : + m('a.btn.btn-xs.btn-default', { + href: item.session.baseURL.replace('://', '://workbench.')+'collections/'+item.uuid, + }, 'Show'), + ]), m('td.arvados-uuid', item.uuid), m('td', item.name || '(unnamed)'), - m('td', m(window.components.datetime, {parse: item.modified_at})), + m('td', m(LocalizedDateTime, {parse: item.modified_at})), ]) }), ]), - m('tfoot', m('tr', [ - vnode.attrs.loader.done ? null : m('th[colspan=4]', m('button.btn.btn-xs', { - className: vnode.attrs.loader.loadMore ? 'btn-primary' : 'btn-default', + loader.state == loader.DONE ? null : m('tfoot', m('tr', [ + m('th[colspan=4]', m('button.btn.btn-xs', { + className: loader.state == loader.LOADING ? 'btn-default' : 'btn-primary', style: { display: 'block', width: '12em', marginLeft: 'auto', marginRight: 'auto', }, - disabled: !vnode.attrs.loader.loadMore, + disabled: loader.state == loader.LOADING, onclick: function() { - vnode.attrs.loader.loadMore() + loader.loadMore() return false }, - }, vnode.attrs.loader.loadMore ? 'Load more' : '(loading)')), + }, loader.state == loader.LOADING ? '(loading)' : 'Load more')), ])), ]) }, } -window.components.collection_search = { +window.CollectionsSearch = { oninit: function(vnode) { - vnode.state.sessionDB = new window.models.SessionDB() - vnode.state.searchEntered = m.stream('') - vnode.state.searchStart = m.stream('') - vnode.state.searchStart.map(function(q) { - vnode.state.loader = new window.models.MultisiteLoader({ - loadFunc: function(session, filters) { - if (q) - filters.push(['any', '@@', q+':*']) - return vnode.state.sessionDB.request(session, 'arvados/v1/collections', { - data: { - filters: JSON.stringify(filters), - count: 'none', + vnode.state.sessionDB = new SessionDB() + vnode.state.searchEntered = m.stream() + vnode.state.searchActive = m.stream() + // When searchActive changes (e.g., when restoring state + // after navigation), update the text field too. + vnode.state.searchActive.map(vnode.state.searchEntered) + // When searchActive changes, create a new loader that filters + // with the given search term. + vnode.state.searchActive.map(function(q) { + var sessions = vnode.state.sessionDB.loadActive() + vnode.state.loader = new MergingLoader({ + children: Object.keys(sessions).map(function(key) { + var session = sessions[key] + return new MultipageLoader({ + sessionKey: key, + loadFunc: function(filters) { + var tsquery = to_tsquery(q) + if (tsquery) { + filters = filters.slice(0) + filters.push(['any', '@@', tsquery]) + } + return vnode.state.sessionDB.request(session, 'arvados/v1/collections', { + data: { + filters: JSON.stringify(filters), + count: 'none', + }, + }).then(function(resp) { + resp.items.map(function(item) { + item.session = session + }) + return resp + }) }, }) - }, - sessionDB: vnode.state.sessionDB, + }) }) }) }, @@ -98,39 +127,47 @@ window.components.collection_search = { var sessions = vnode.state.sessionDB.loadAll() return m('form', { onsubmit: function() { - vnode.state.searchStart(vnode.state.searchEntered()) + vnode.state.searchActive(vnode.state.searchEntered()) + vnode.state.forgetSavedHeight = true return false }, }, [ - m('.row', [ - m('.col-md-6', [ - m('.input-group', [ - m('input#search.form-control[placeholder=Search]', { - oninput: m.withAttr('value', vnode.state.searchEntered), - }), - m('.input-group-btn', [ - m('input.btn.btn-primary[type=submit][value="Search"]'), + m(SaveUIState, { + defaultState: '', + currentState: vnode.state.searchActive, + forgetSavedHeight: vnode.state.forgetSavedHeight, + saveBodyHeight: true, + }), + vnode.state.loader && [ + m('.row', [ + m('.col-md-6', [ + m('.input-group', [ + m('input#search.form-control[placeholder=Search]', { + oninput: m.withAttr('value', vnode.state.searchEntered), + value: vnode.state.searchEntered(), + }), + m('.input-group-btn', [ + m('input.btn.btn-primary[type=submit][value="Search"]'), + ]), ]), ]), + m('.col-md-6', [ + 'Searching sites: ', + vnode.state.loader.children.length == 0 + ? m('span.label.label-xs.label-danger', 'none') + : vnode.state.loader.children.map(function(child) { + return [m('span.label.label-xs', { + className: child.state == child.LOADING ? 'label-warning' : 'label-success', + }, child.sessionKey), ' '] + }), + ' ', + m('a[href="/sessions"]', 'Add/remove sites'), + ]), ]), - m('.col-md-6', [ - 'Searching sites: ', - Object.keys(sessions).length == 0 - ? m('span.label.label-xs.label-danger', 'none') - : Object.keys(sessions).sort().map(function(key) { - return [m('span.label.label-xs', { - className: !vnode.state.loader.pagers[key] ? 'label-default' : - vnode.state.loader.pagers[key].items() ? 'label-success' : - 'label-warning', - }, key), ' '] - }), - ' ', - m('a[href="/sessions"]', 'Add/remove sites'), - ]), - ]), - m(window.components.collection_table, { - loader: vnode.state.loader, - }), + m(CollectionsTable, { + loader: vnode.state.loader, + }), + ], ]) }, }