[ARVADOS] updated: 5cf70c36dd291410cdf177786a1a0ea0c25c06cb

[git at public.curoverse.com]

Summary of changes:
 apps/workbench/app/assets/javascripts/event_log.js          | 13 ++++++-------
 apps/workbench/app/assets/javascripts/pipeline_instances.js |  8 ++++----
 apps/workbench/app/views/application/index.html.erb         |  4 ++++
 .../app/views/pipeline_instances/_show_components.html.erb  |  7 +------
 4 files changed, 15 insertions(+), 17 deletions(-)

       via  5cf70c36dd291410cdf177786a1a0ea0c25c06cb (commit)
      from  e6805dea66e86c6cdad036407f16fe17f45b8f94 (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 5cf70c36dd291410cdf177786a1a0ea0c25c06cb
Author: radhika <radhika at curoverse.com>
Date:   Fri May 16 09:34:07 2014 -0400

    2756: ws url storage does not have to be managed by each page subscribing for events. also, html class names to include arv in them.

diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js
index ae27e64..9ff0e7e 100644
--- a/apps/workbench/app/assets/javascripts/event_log.js
+++ b/apps/workbench/app/assets/javascripts/event_log.js
@@ -7,7 +7,7 @@
 
 var event_log_disp;
 
-function subscribeToEventLog (elementId) {
+function subscribeToEventLog (elementId, listeningOn) {
   // if websockets are not supported by browser, do not attempt to subscribe for events
   websocketsSupported = ('WebSocket' in window);
   if (websocketsSupported == false) {
@@ -18,7 +18,7 @@ function subscribeToEventLog (elementId) {
   event_log_disp = $(window).data("arv-websocket");
   if (event_log_disp == null) {
     // create the event log dispatcher
-    event_log_disp = new WebSocket($(window).data("websocket-url"));
+    event_log_disp = new WebSocket(sessionStorage.getItem("arv-websocket-url"));
 
     event_log_disp.onopen = function(event) { onEventLogDispatcherOpen(event) };
     event_log_disp.onmessage = function(event) { onEventLogDispatcherMessage(event) };
@@ -31,7 +31,7 @@ function subscribeToEventLog (elementId) {
   event_log_listener_map = $(window).data("event_log_listener_map");
   if (event_log_listener_map == null)
     event_log_listener_map = {};
-  event_log_listener_map[elementId] = $(window).data("listening-uuid");
+  event_log_listener_map[elementId] = listeningOn;
   $(window).data("event_log_listener_map", event_log_listener_map);
 }
 
@@ -46,14 +46,13 @@ function onEventLogDispatcherMessage(event) {
 
   parsedData = JSON.parse(event.data);
   event_uuid = parsedData.object_uuid;
-  
   for (var key in event_log_listener_map) {
     value = event_log_listener_map[key];
     if (event_uuid === value) {
-      matches = ".event-listener[data-object-uuid=\"" + value + "\"]";
-      $(matches).trigger('arv-event', event.data);
+      matches = ".arv-log-event-listener[data-object-uuid=\"" + value + "\"]";
+      $(matches).trigger('arv-log-event', event.data);
     }
   }
   // also trigger event for any listening for "all"
-  $('.event-listener[data-object-uuid="all"]').trigger('arv-event', event.data);
+  $('.arv-log-event-listener[data-object-uuid="all"]').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 27c2c7f..d66cffc 100644
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -43,15 +43,15 @@
     } );
 
     $(document).on('ajax:complete ready', function() {
-      var a = $('.event-listener');
+      var a = $('.arv-log-event-listener');
       if (a.length > 0) {
-        $('.event-listener').each(function() {
-          subscribeToEventLog(this.id);
+        $('.arv-log-event-listener').each(function() {
+          subscribeToEventLog(this.id, this.getAttribute('data-object-uuid'));
         });
       }
     });
 
-    $(document).on('arv-event', '.event-handler-append-logs', function(event, eventData){
+    $(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(event, eventData){
       parsedData = JSON.parse(eventData);
       summary = parsedData.summary;
       properties = parsedData.properties;
diff --git a/apps/workbench/app/views/application/index.html.erb b/apps/workbench/app/views/application/index.html.erb
index 20af648..013d35a 100644
--- a/apps/workbench/app/views/application/index.html.erb
+++ b/apps/workbench/app/views/application/index.html.erb
@@ -22,3 +22,7 @@
 <% end %>
 
 <%= render partial: 'content', layout: 'content_layout', locals: {pane_list: controller.index_pane_list }%>
+
+<script>
+  sessionStorage.setItem("arv-websocket-url", "<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>");
+</script>
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 1c1c4d9..0673e71 100644
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -111,11 +111,6 @@ setInterval(function(){$('a.refresh').click()}, 15000);
 <% end %>
 
 <% if !@object.state.in? ['Complete', 'Failed'] %>
-  <script>
-    $(window).data("websocket-url", "<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>");
-    $(window).data("listening-uuid", "<%=@object.uuid%>");
-  </script>
-
   <h3>Log for pipeline</h3>
-  <div class="event-listener event-handler-append-logs" data-object-uuid="<%=@object.uuid%>"/>
+  <div class="arv-log-event-listener arv-log-event-handler-append-logs" id="pipeline_event_log_div" data-object-uuid="<%=@object.uuid%>"/>
 <% end %>

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


hooks/post-receive
--