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 350b36137a9e7eb0453a9f803e7e7e810a8fd050..78fd195cdca3f26c8163bd030c679428abd658f2 100644 (file)
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -47,27 +47,39 @@ $(document).on('ready ajax:complete', function() {
     run_pipeline_button_state();
 });
 
-$(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;
+$(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');
+    }
+});
 
-    if (properties !== null) {
-        propertyText = properties.text;
+$(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);
+        }
     }
-    if (propertyText !== undefined) {
-        $(this).append(propertyText + "<br/>");
-    } else {
-        $(this).append(parsedData.summary + "<br/>");
+});
+
+$(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(event, eventData){
+    var wasatbottom = ($(this).scrollTop() + $(this).height() >= this.scrollHeight);
+
+    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() {
@@ -86,9 +98,3 @@ var showhide_compare = function() {
 };
 $('[data-object-uuid*=-d1hrv-] input[name="uuids[]"]').on('click', showhide_compare);
 showhide_compare();
-
-setInterval(function(){
-    if ($('[data-pipeline-state=RunningOnServer],[data-pipeline-state=RunningOnClient]').length > 0) {
-        $('#Components.tab-pane,#Graph.tab-pane').trigger('arv:pane:reload');
-    }
-}, 15000);