X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4a3301617ae09e6b28c7b6fd79923ccd60b6b5e9..3bf2514da60ab2e0b7639959b650cc4d93784080:/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 4b17b4eeb8..3c949f4e83 100644
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -1,5 +1,5 @@
 function run_pipeline_button_state() {
-    var a = $('a.editable.required.editable-empty');
+    var a = $('a.editable.required.editable-empty,input.form-control.required[value=]');
     if (a.length > 0) {
         $(".run-pipeline-button").addClass("disabled");
     }
@@ -47,15 +47,6 @@ $(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-log-event-handler-append-logs', function(event, eventData){
     var wasatbottom = ($(this).scrollTop() + $(this).height() >=
                        this.scrollHeight);
@@ -67,15 +58,40 @@ $(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(e
         propertyText = properties.text;
     }
     if (propertyText !== undefined) {
+        propertyText = propertyText.
+            replace(/\n$/, '').
+            replace(/\n/g, '<br/>');
         $(this).append(propertyText + "<br/>");
-    } else {
-        $(this).append(parsedData.summary + "<br/>");
+    } else if (parsedData.summary !== undefined) {
+        if (parsedData.summary.match(/^update of [-a-z0-9]{27}$/))
+            ; // Not helpful.
+        else
+            $(this).append(parsedData.summary + "<br/>");
     }
     if (wasatbottom)
         this.scrollTop = this.scrollHeight;
-}).on('ready ajax:complete', function(){
-    $('.arv-log-event-handler-append-logs').each(function() {
+}).on('arv:pane:loaded', '#Logs,#Log', function(){
+    $('.arv-log-event-handler-append-logs', this).each(function() {
         this.scrollTop = this.scrollHeight;
+        $(this).closest('.tab-pane').on('arv:pane:reload', function(e) {
+            // Do not let this tab auto-refresh.
+            e.stopPropagation();
+        });
+    });
+}).on('ready ajax:complete', function(){
+    $(".arv-log-event-listener[data-object-uuids-live]").each(function() {
+        // Look at data-object-uuid attribute of elements matching
+        // given selector, so the event listener can listen for events
+        // that appeared on the page via ajax.
+        var $listener = $(this);
+        var have_uuids = '' + $listener.attr('data-object-uuids');
+        $($listener.attr('data-object-uuids-live')).each(function() {
+            var this_uuid = $(this).attr('data-object-uuid');
+            if (have_uuids.indexOf(this_uuid) == -1) {
+                have_uuids = have_uuids + ' ' + this_uuid;
+            }
+        });
+        $listener.attr('data-object-uuids', have_uuids);
     });
 });
 
@@ -95,3 +111,9 @@ 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,#Graph-tab,#pipeline-instance-tab-buttons').trigger('arv:pane:reload');
+    }
+}, 15000);