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

[arvados.git] / apps / workbench / app / views / pipeline_instances / _show_event_log.html.erb

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
index 74806a53d2415af2c8370769d861ddc42a13187f..c35562befd474ab2f5031eacbd24c344579fbafb 100644 (file)
--- a/apps/workbench/app/views/pipeline_instances/_show_event_log.html.erb
+++ b/apps/workbench/app/views/pipeline_instances/_show_event_log.html.erb
@@ -1,24 +1,8 @@
-<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>
+<% if !@object.state.in? ['Complete', 'Failed'] %>
+  <span>
+    <h3>Log for pipeline</h3>
+    <image hidden=true id="pipeline_event_log_img" src="/favicon.ico" onclick="sendToDispatcher();" onload="subscribeToEventLog('<%=$arvados_api_client.discovery[:websocketUrl]%>?api_token=<%=Thread.current[:arvados_api_token]%>', '<%=@object.uuid%>', 'pipeline_event_log_area')";></image>
 
-<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>
+    <textarea row="10" cols="80" id="pipeline_event_log_area"></textarea>
+  </span>
+<% end %>