[ARVADOS] updated: babd40cc9e963fd87952b0b23539189b56be10cf

[Git user]

Summary of changes:
 .../app/assets/javascripts/components/collections.js      | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

       via  babd40cc9e963fd87952b0b23539189b56be10cf (commit)
       via  2289f184787fa9db2cf3786a1383dd2ced2b643b (commit)
      from  6ba147122730b917392b791ed589e35656f9be14 (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 babd40cc9e963fd87952b0b23539189b56be10cf
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Aug 8 21:51:43 2017 -0400

    12033: Link collections to remote workbench sites.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/apps/workbench/app/assets/javascripts/components/collections.js b/apps/workbench/app/assets/javascripts/components/collections.js
index ddba2e1..7ab5047 100644
--- a/apps/workbench/app/assets/javascripts/components/collections.js
+++ b/apps/workbench/app/assets/javascripts/components/collections.js
@@ -11,7 +11,7 @@ window.components.collection_table_narrow = {
                 vnode.attrs.items().map(function(item) {
                     return m('tr', [
                         m('td', [
-                            m('a', {href: '/collections/'+item.uuid}, item.name || '(unnamed)'),
+                            m('a', {href: vnode.attrs.session.baseURL.replace('://', '://workbench.')+'/collections/'+item.uuid}, item.name || '(unnamed)'),
                             m('br'),
                             item.modified_at,
                         ]),
@@ -52,6 +52,7 @@ window.components.collection_search = {
     },
     view: function(vnode) {
         var items = vnode.state.items
+        var sessions = vnode.state.sessionDB.loadAll()
         return m('form', {
             onsubmit: function() {
                 vnode.state.searchStart(vnode.state.searchEntered())
@@ -86,6 +87,7 @@ window.components.collection_search = {
                 }}, [
                     m(window.components.collection_table_narrow, {
                         key: key,
+                        session: sessions[key],
                         items: items[key],
                     }),
                 ])

commit 2289f184787fa9db2cf3786a1383dd2ced2b643b
Author: Tom Clegg <tom at curoverse.com>
Date:   Tue Aug 8 21:51:05 2017 -0400

    12033: Fade out stale results.
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at curoverse.com>

diff --git a/apps/workbench/app/assets/javascripts/components/collections.js b/apps/workbench/app/assets/javascripts/components/collections.js
index 5bd667a..ddba2e1 100644
--- a/apps/workbench/app/assets/javascripts/components/collections.js
+++ b/apps/workbench/app/assets/javascripts/components/collections.js
@@ -35,6 +35,7 @@ window.components.collection_search = {
             Object.keys(sessions).map(function(key) {
                 if (!vnode.state.items[key])
                     vnode.state.items[key] = m.stream([])
+                vnode.state.items[key].dirty = true
                 vnode.state.sessionDB.request(sessions[key], 'arvados/v1/collections', {
                     data: {
                         filters: JSON.stringify(!q ? [] : [['any', '@@', q+':*']]),
@@ -44,6 +45,7 @@ window.components.collection_search = {
                         // a newer query is in progress; ignore this result.
                         return
                     vnode.state.items[key](resp.items)
+                    vnode.state.items[key].dirty = false
                 })
             })
         })
@@ -79,8 +81,13 @@ window.components.collection_search = {
                 ]),
             ]),
             m('.row', Object.keys(items).sort().map(function(key) {
-                return m('.col-md-3', {key: key}, [
-                    m(window.components.collection_table_narrow, {key: key, items: items[key]}),
+                return m('.col-md-3', {key: key, style: {
+                    opacity: items[key].dirty ? 0.5 : 1,
+                }}, [
+                    m(window.components.collection_table_narrow, {
+                        key: key,
+                        items: items[key],
+                    }),
                 ])
             })),
         ])

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


hooks/post-receive
--