[ARVADOS] updated: 4d1e1b22d470d2fec9078c64c058c69850e440d6
git at public.curoverse.com
git at public.curoverse.com
Wed May 21 14:22:42 EDT 2014
Summary of changes:
apps/workbench/app/assets/javascripts/event_log.js | 7 +-
.../app/assets/javascripts/pipeline_instances.js | 2 +-
.../app/assets/stylesheets/collections.css.scss | 46 +++++++++
.../app/controllers/collections_controller.rb | 7 +-
apps/workbench/app/helpers/application_helper.rb | 1 +
apps/workbench/app/models/collection.rb | 21 ++++
.../app/views/collections/_show_files.html.erb | 111 ++++++++++-----------
.../pipeline_instances/_show_components.html.erb | 5 +-
apps/workbench/test/unit/collection_test.rb | 27 +++++
.../test/unit/helpers/collections_helper_test.rb | 8 ++
services/api/config/initializers/secret_token.rb | 7 --
services/api/test/fixtures/collections.yml | 21 ++++
services/keep/src/keep/keep.go | 30 +++++-
13 files changed, 216 insertions(+), 77 deletions(-)
delete mode 100644 services/api/config/initializers/secret_token.rb
via 4d1e1b22d470d2fec9078c64c058c69850e440d6 (commit)
via ebf002120164e185691b6bf418a17b23124614a8 (commit)
via bbaa4e880fd232bd270644bff24e33eb06784f85 (commit)
via 1bb9f9ca3ffe077f2d90d7de65fbee37a717ef23 (commit)
via 0c5de14523d1e90297c091675ee621ce6664f65b (commit)
via cdec3d68520096ca95a66f73ecf22bb0b22363a1 (commit)
via e1d71c83e17ba6d06e2442ed775f7efd4ea32d84 (commit)
via 735a268880783acc77a2b99a5ac32c819c154ad9 (commit)
via 46e29d7fbf2628a01cb31ff7117732293129fd65 (commit)
via ea4b289bea3baebde1d23bbf38ded4e8da7ff298 (commit)
via 8cc0ba260202de5627af49691d259928ad7ffcc6 (commit)
via 43f38dbf96127a4036be5e8b01f9e82d825ad949 (commit)
via 4b6ae0c2b418fd3192b8248b3e8a614502c47060 (commit)
via e5b3a58e1106fe71d781995560f8b197dbaecbca (commit)
via e817beda3c9aefd99b1ce9b9c77cd2f346e14a01 (commit)
via fc16a366bf1061bfc2dc08ab1477c7febf8c3c5a (commit)
via 9a86712b5b6ca3490739e5b75d809be4c853e9a3 (commit)
via 4e9567a57ed7af343e24eeb4dc403a1eb73b1f81 (commit)
from 86a02fd0842381002c46b590d774c561dbbaf19a (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 4d1e1b22d470d2fec9078c64c058c69850e440d6
Merge: bbaa4e8 ebf0021
Author: radhika <radhika at curoverse.com>
Date: Wed May 21 14:20:26 2014 -0400
Merge branch 'master' into 2756-eventbus-in-workbench
commit bbaa4e880fd232bd270644bff24e33eb06784f85
Author: radhika <radhika at curoverse.com>
Date: Wed May 21 14:19:18 2014 -0400
2756: listen for event logs on job uuids.
diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js
index ac3a80a..5823a25 100644
--- a/apps/workbench/app/assets/javascripts/event_log.js
+++ b/apps/workbench/app/assets/javascripts/event_log.js
@@ -40,6 +40,6 @@ function onEventLogDispatcherMessage(event) {
object_uuid = parsedData.object_uuid;
// if there are any listeners for this object uuid or "all", trigger the event
- matches = ".arv-log-event-listener[data-object-uuid=\"" + object_uuid + "\"],.arv-log-event-listener[data-object-uuids~=\"" + "job-id1" + "\"],.arv-log-event-listener[data-object-uuid=\"all\"]";
+ matches = ".arv-log-event-listener[data-object-uuid=\"" + object_uuid + "\"],.arv-log-event-listener[data-object-uuids~=\"" + object_uuid + "\"],.arv-log-event-listener[data-object-uuid=\"all\"]";
$(matches).trigger('arv-log-event', event.data);
}
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
index 602b78e..9a4218d 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -16,6 +16,8 @@
<% end %>
<% end %>
+<% pipeline_job_uuids = [] %>
+
<% if !@object.state.in? ['New', 'Ready', 'Paused'] %>
<table class="table pipeline-components-table">
<colgroup>
@@ -51,6 +53,7 @@
locals: { :j => pj[:job], :title => pj[:name] }) %>
<% if pj[:job].andand[:uuid] %>
<%= link_to(job_status, job_url(id: pj[:job][:uuid])) %>
+ <% pipeline_job_uuids << pj[:job][:uuid] %>
<% else %>
<%= job_status %>
<% end %>
@@ -89,7 +92,7 @@ setInterval(function(){$('a.refresh').click()}, 15000);
<% if !@object.state.in? ['Complete', 'Failed'] %>
<h4>Log for pipeline</h4>
- <div class="arv-log-event-listener arv-log-event-handler-append-logs" id="pipeline_event_log_div" data-object-uuids="job-id1 job-id2"/>
+ <div class="arv-log-event-listener arv-log-event-handler-append-logs" id="pipeline_event_log_div" data-object-uuids="<%=pipeline_job_uuids.join(" ")%>"/>
<% end %>
<% end %>
commit 0c5de14523d1e90297c091675ee621ce6664f65b
Merge: cdec3d6 e1d71c8
Author: radhika <radhika at curoverse.com>
Date: Wed May 21 12:09:43 2014 -0400
Merge branch 'master' into 2756-eventbus-in-workbench
commit cdec3d68520096ca95a66f73ecf22bb0b22363a1
Author: radhika <radhika at curoverse.com>
Date: Wed May 21 12:07:50 2014 -0400
2756: trigger event for any elements that contain this log event's object_uuid in it's data-object-uuids.
diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js
index 9be2979..ac3a80a 100644
--- a/apps/workbench/app/assets/javascripts/event_log.js
+++ b/apps/workbench/app/assets/javascripts/event_log.js
@@ -4,7 +4,7 @@
/* The subscribe method takes a window element id and object id.
Any log events for that particular object id are sent to that window element. */
-function subscribeToEventLog (elementId, listeningOn) {
+function subscribeToEventLog (elementId) {
// if websockets are not supported by browser, do not subscribe for events
websocketsSupported = ('WebSocket' in window);
if (websocketsSupported == false) {
@@ -37,8 +37,9 @@ function onEventLogDispatcherOpen(event) {
/* trigger event for all applicable elements waiting for this event */
function onEventLogDispatcherMessage(event) {
parsedData = JSON.parse(event.data);
- event_uuid = parsedData.object_uuid;
+ object_uuid = parsedData.object_uuid;
- matches = ".arv-log-event-listener[data-object-uuid=\"" + event_uuid + "\"],.arv-log-event-listener[data-object-uuid=\"all\"]";
+ // if there are any listeners for this object uuid or "all", trigger the event
+ matches = ".arv-log-event-listener[data-object-uuid=\"" + object_uuid + "\"],.arv-log-event-listener[data-object-uuids~=\"" + "job-id1" + "\"],.arv-log-event-listener[data-object-uuid=\"all\"]";
$(matches).trigger('arv-log-event', event.data);
}
diff --git a/apps/workbench/app/assets/javascripts/pipeline_instances.js b/apps/workbench/app/assets/javascripts/pipeline_instances.js
index d66cffc..4678022 100644
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -46,7 +46,7 @@
var a = $('.arv-log-event-listener');
if (a.length > 0) {
$('.arv-log-event-listener').each(function() {
- subscribeToEventLog(this.id, this.getAttribute('data-object-uuid'));
+ subscribeToEventLog(this.id);
});
}
});
diff --git a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
index 837fb50..602b78e 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -89,7 +89,7 @@ setInterval(function(){$('a.refresh').click()}, 15000);
<% if !@object.state.in? ['Complete', 'Failed'] %>
<h4>Log for pipeline</h4>
- <div class="arv-log-event-listener arv-log-event-handler-append-logs" id="pipeline_event_log_div" data-object-uuid="<%=@object.uuid%>"/>
+ <div class="arv-log-event-listener arv-log-event-handler-append-logs" id="pipeline_event_log_div" data-object-uuids="job-id1 job-id2"/>
<% end %>
<% end %>
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list