Merge branch 'master' into 2919-provenance-graph-cutoff

[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 3209d67782b7fd6fb9760cef5523f6476c62b752..d23ced7fbc31335cd5d44217f4448bf5e1f2398b 100644 (file)
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -9,38 +9,66 @@ function run_pipeline_button_state() {
 }
 
 $(document).on('editable:success', function(event, tag, response, newValue) {
+    var $tag = $(tag);
     if ($('.run-pipeline-button').length == 0)
         return;
-    tag = $(tag);
-    if (tag.hasClass("required")) {
+    if ($tag.hasClass("required")) {
         if (newValue && newValue.trim() != "") {
-            tag.removeClass("editable-empty");
-            tag.parent().css("background-color", "");
-            tag.parent().prev().css("background-color", "");
+            $tag.removeClass("editable-empty");
+            $tag.parent().css("background-color", "");
+            $tag.parent().prev().css("background-color", "");
         }
         else {
-            tag.addClass("editable-empty");
-            tag.parent().css("background-color", "#ffdddd");
-            tag.parent().prev().css("background-color", "#ffdddd");
+            $tag.addClass("editable-empty");
+            $tag.parent().css("background-color", "#ffdddd");
+            $tag.parent().prev().css("background-color", "#ffdddd");
         }
     }
-    if (tag.attr('data-name')) {
+    if ($tag.attr('data-name')) {
         // Update other inputs representing the same piece of data
-        $('[data-name="' + tag.attr('data-name') + '"]').html(newValue);
+        $('.editable[data-name="' + $tag.attr('data-name') + '"]').
+            editable('setValue', newValue);
     }
     run_pipeline_button_state();
 });
 
 $(document).on('ready ajax:complete', function() {
     $('a.editable.required').each(function() {
-        if (this.hasClass("editable-empty")) {
-            this.parent().css("background-color", "#ffdddd");
-            this.parent().prev().css("background-color", "#ffdddd");
+        var $tag = $(this);
+        if ($tag.hasClass("editable-empty")) {
+            $tag.parent().css("background-color", "#ffdddd");
+            $tag.parent().prev().css("background-color", "#ffdddd");
         }
         else {
-            this.parent().css("background-color", "");
-            this.parent().prev().css("background-color", "");
+            $tag.parent().css("background-color", "");
+            $tag.parent().prev().css("background-color", "");
         }
     });
     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){
+  parsedData = JSON.parse(eventData);
+
+  propertyText = undefined
+
+  properties = parsedData.properties;
+    if (properties !== null) {
+      propertyText = properties.text;
+    }
+
+    if (propertyText !== undefined) {
+      $(this).append(propertyText + "<br/>");
+    } else {
+      $(this).append(parsedData.summary + "<br/>");
+    }
+});