Merge branch 'master' into 2756-eventbus-in-workbench

diff --git a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
index d935b2da9154de7829530087028f66e4ca12465a..933e015635d413c43b0487d0c79d1916bb8496c8 100644 (file)
--- a/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_components.html.erb
@@ -106,3 +106,5 @@ setInterval(function(){$('a.refresh').click()}, 15000);
     <%= render partial: 'show_components_editable', locals: {editable: false} %>
   <% end %>
 <% end %>
+
+<%= render partial: 'show_event_log', locals: {object: @object} %>

diff --git a/apps/workbench/app/views/pipeline_instances/_show_event_log.html.erb b/apps/workbench/app/views/pipeline_instances/_show_event_log.html.erb
new file mode 100644 (file)
index 0000000..74806a5
--- /dev/null
+++ b/apps/workbench/app/views/pipeline_instances/_show_event_log.html.erb
@@ -0,0 +1,24 @@
+<span>
+  <h3>Log for pipeline</h3>
+  <img hidden=true id="pipeline_event_log_img" src="/favicon.ico" onload="subscribeToEventLogs()";></image>
+  <textarea row="10" cols="80" id="pipeline_event_log_area"></textarea>
+</span>
+
+<script>
+  $(function() {
+    displayEventLog = function (content) {
+      $("#pipeline_event_log_area").append(content + "<br>");
+    };
+
+    var dispatcher = new WebSocket('<%= $arvados_api_client.discovery[:websocketUrl] %>?api_token=<%= Thread.current[:arvados_api_token] %>');
+    dispatcher.onmessage = function(event) {
+      //displayEventLog(JSON.parse(event.data));
+      displayEventLog(event.data);
+    };
+
+    subscribeToEventLogs = function () {
+    alert ("got it");
+      dispatcher.send('{"method":"subscribe"}');
+    };
+  });
+</script>