X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d07841a4b10d5677a6e4f80df1ba4f1a8bd13be9..183bdcd6c6b2c54f8f2558fbdb6bec974c1d16e4:/apps/workbench/app/assets/javascripts/event_log.js

diff --git a/apps/workbench/app/assets/javascripts/event_log.js b/apps/workbench/app/assets/javascripts/event_log.js
index 9be2979c22..8bfa1b0672 100644
--- a/apps/workbench/app/assets/javascripts/event_log.js
+++ b/apps/workbench/app/assets/javascripts/event_log.js
@@ -2,19 +2,18 @@
  * This js establishes a websockets connection with the API Server.
  */
 
-/* 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) {
+/* Subscribe to websockets event log.  Do nothing if already connected. */
+function subscribeToEventLog () {
   // if websockets are not supported by browser, do not subscribe for events
   websocketsSupported = ('WebSocket' in window);
   if (websocketsSupported == false) {
-    return;  
+    return;
   }
 
-  // grab websocket connection from window, if one exists
+  // check if websocket connection is already stored on the window
   event_log_disp = $(window).data("arv-websocket");
   if (event_log_disp == null) {
-    // create the event log dispatcher
+    // need to create new websocket and event log dispatcher
     websocket_url = $('meta[name=arv-websocket-url]').attr("content");
     if (websocket_url == null)
       return;
@@ -29,16 +28,27 @@ function subscribeToEventLog (elementId, listeningOn) {
   }
 }
 
-/* send subscribe message to the websockets server */
+/* Send subscribe message to the websockets server.  Without any filters
+   arguments, this subscribes to all events */
 function onEventLogDispatcherOpen(event) {
   this.send('{"method":"subscribe"}');
 }
 
-/* trigger event for all applicable elements waiting for this 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~=\"" + object_uuid + "\"],.arv-log-event-listener[data-object-uuid=\"all\"],.arv-log-event-listener[data-object-kind=\"" + parsedData.object_kind + "\"]";
   $(matches).trigger('arv-log-event', event.data);
 }
+
+/* Automatically connect if there are any elements on the page that want to
+   received event log events. */
+$(document).on('ajax:complete ready', function() {
+  var a = $('.arv-log-event-listener');
+  if (a.length > 0) {
+    subscribeToEventLog();
+  }
+});