X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6a2406f04875497a7bfad72fc8bcd73b792fefae..333fbec95590cfcb30cfff7dc61e6b8cc41edf18:/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 350b36137a..fa9d6ae5a4 100644
--- a/apps/workbench/app/assets/javascripts/pipeline_instances.js
+++ b/apps/workbench/app/assets/javascripts/pipeline_instances.js
@@ -47,29 +47,65 @@ $(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 (this != event.target) {
+ // Not interested in events sent to child nodes.
+ return;
+ }
+ 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 (this != event.target) {
+ // Not interested in events sent to child nodes.
+ return;
}
- if (propertyText !== undefined) {
- $(this).append(propertyText + "
");
- } else {
- $(this).append(parsedData.summary + "
");
+ if (!((eventData.object_kind == 'arvados#pipelineInstance') &&
+ (eventData.event_type == "create" ||
+ eventData.event_type == "update") &&
+ eventData.properties &&
+ eventData.properties.new_attributes &&
+ eventData.properties.new_attributes.components)) {
+ return;
}
- if (wasatbottom)
- this.scrollTop = this.scrollHeight;
-}).on('ready ajax:complete', function(){
- $('.arv-log-event-handler-append-logs').each(function() {
- this.scrollTop = this.scrollHeight;
+ 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);
+});
+
+$(document).on('ready ajax:success', function() {
+ $('.arv-log-refresh-control').each(function() {
+ var uuids = $(this).attr('data-object-uuids');
+ var $pane = $(this).closest('[data-pane-content-url]');
+ $pane.attr('data-object-uuids', uuids);
});
});
+$(document).on('arv-log-event', '.arv-log-event-handler-append-logs', function(event, eventData){
+ if (this != event.target) {
+ // Not interested in events sent to child nodes.
+ return;
+ }
+ 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;
+ }
+});
+
var showhide_compare = function() {
var form = $('form#compare')[0];
$('input[type=hidden][name="uuids[]"]', form).remove();
@@ -84,11 +120,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-pane,#Graph.tab-pane').trigger('arv:pane:reload');
+$(document).on('change', '[data-object-uuid*=-d1hrv-] input[name="uuids[]"]', function(e) {
+ if(e.target == this) {
+ showhide_compare();
}
-}, 15000);
+});
+$(document).on('ready ajax:success', showhide_compare);