Merge remote-tracking branch 'origin/master' into 4084-log-pane-refresh

[arvados.git] / apps / workbench / app / assets / javascripts / pipeline_instances.js

diff --git a/apps/workbench/app/assets/javascripts/pipeline_instances.js b/apps/workbench/app/assets/javascripts/pipeline_instances.js
index 54595ab4f53ee4978427835b91511c34fad95d5d..78fd195cdca3f26c8163bd030c679428abd658f2 100644 (file)
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -47,36 +47,39 @@ $(document).on('ready ajax:complete', function() {
     run_pipeline_button_state();
 });
 
-$(document).on('ajax:complete ready', function() {
-  var a = $('.arv-log-event-listener');
-  if (a.length > 0) {
-    $('.arv-log-event-listener').each(function() {
-      subscribeToEventLog(this.id);
-    });
-  }
+$(document).on('arv-log-event', '.arv-refresh-on-state-change', function(event, eventData){
+    if (eventData.event_type == "update" &&
+        eventData.properties.old_attributes.state != eventData.properties.new_attributes.state)
+    {
+        $(event.target).trigger('arv:pane:reload');
+    }
+});
+
+$(document).on('arv-log-event', '.arv-log-event-subscribe-to-pipeline-job-uuids', function(event, eventData){
+    if (eventData.event_type == "create" || eventData.event_type == "update") {
+        if (eventData.object_kind == 'arvados#pipelineInstance') {
+            var objs = "";
+            var components = eventData.properties.new_attributes.components;
+            for (a in components) {
+                if (components[a].job && components[a].job.uuid) {
+                    objs += " " + components[a].job.uuid;
+                }
+            }
+            $(event.target).attr("data-object-uuids", eventData.object_uuid + objs);
+        }
+    }
 });
 
 $(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(event, eventData){
-    var wasatbottom = ($(this).scrollTop() + $(this).height() >=
-                       this.scrollHeight);
-    var parsedData = JSON.parse(eventData);
-    var propertyText = undefined;
-    var properties = parsedData.properties;
+    var wasatbottom = ($(this).scrollTop() + $(this).height() >= this.scrollHeight);
 
-    if (properties !== null) {
-        propertyText = properties.text;
-    }
-    if (propertyText !== undefined) {
-        $(this).append(propertyText + "<br/>");
-    } else {
-        $(this).append(parsedData.summary + "<br/>");
+    if (eventData.event_type == "stderr" || eventData.event_type == "stdout") {
+        $(this).append(eventData.properties.text);
     }
-    if (wasatbottom)
-        this.scrollTop = this.scrollHeight;
-}).on('ready ajax:complete', function(){
-    $('.arv-log-event-handler-append-logs').each(function() {
+
+    if (wasatbottom) {
         this.scrollTop = this.scrollHeight;
-    });
+    }
 });
 
 var showhide_compare = function() {