projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2756-eventbus-in-workbench
[arvados.git]
/
apps
/
workbench
/
app
/
controllers
/
pipeline_instances_controller.rb
diff --git
a/apps/workbench/app/controllers/pipeline_instances_controller.rb
b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index 7ca4f6a11ed2d6c6f4c5fdead9362d1eee74df0f..761dc914145904ca92a01ab28fceb8a9e2acd674 100644
(file)
--- a/
apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/
apps/workbench/app/controllers/pipeline_instances_controller.rb
@@
-15,6
+15,12
@@
class PipelineInstancesController < ApplicationController
p.components.each do |k, v|
j = v[:job] || next
p.components.each do |k, v|
j = v[:job] || next
+ # The graph is interested in whether the component is
+ # indicated as persistent, more than whether the job
+ # satisfying it (which could have been reused, or someone
+ # else's) is.
+ j[:output_is_persistent] = v[:output_is_persistent]
+
uuid = j[:uuid].intern
provenance[uuid] = j
pips[uuid] = 0 unless pips[uuid] != nil
uuid = j[:uuid].intern
provenance[uuid] = j
pips[uuid] = 0 unless pips[uuid] != nil
@@
-56,6
+62,7
@@
class PipelineInstancesController < ApplicationController
provenance, pips = graph(@pipelines)
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
provenance, pips = graph(@pipelines)
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
+ :request => request,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
@@
-95,6
+102,7
@@
class PipelineInstancesController < ApplicationController
highscore = {} # attr => how common "normal" is
score = {} # attr => { value => how common }
row[:components].each do |pj|
highscore = {} # attr => how common "normal" is
score = {} # attr => { value => how common }
row[:components].each do |pj|
+ next if pj.nil?
pj.each do |k,v|
vstr = for_comparison v
score[k] ||= {}
pj.each do |k,v|
vstr = for_comparison v
score[k] ||= {}
@@
-113,6
+121,7
@@
class PipelineInstancesController < ApplicationController
# Add a hash in component[:is_normal]: { attr => is_the_value_normal? }
row[:components].each do |pj|
# Add a hash in component[:is_normal]: { attr => is_the_value_normal? }
row[:components].each do |pj|
+ next if pj.nil?
pj[:is_normal] = {}
pj.each do |k,v|
pj[:is_normal][k] = (normal.has_key?(k) && normal[k] == for_comparison(v))
pj[:is_normal] = {}
pj.each do |k,v|
pj[:is_normal][k] = (normal.has_key?(k) && normal[k] == for_comparison(v))
@@
-125,6
+134,7
@@
class PipelineInstancesController < ApplicationController
@pipelines = @objects
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
@pipelines = @objects
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
+ :request => request,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
@@
-132,13
+142,22
@@
class PipelineInstancesController < ApplicationController
end
def show_pane_list
end
def show_pane_list
- %w(Components Graph Attributes Metadata JSON API)
+ panes = %w(Components Graph Attributes Metadata JSON API)
+ if @object and @object.state.in? ['New', 'Ready']
+ panes = %w(Inputs) + panes
+ end
+ panes
end
def compare_pane_list
%w(Compare Graph)
end
end
def compare_pane_list
%w(Compare Graph)
end
+ def index
+ @limit = 20
+ super
+ end
+
protected
def for_comparison v
if v.is_a? Hash or v.is_a? Array
protected
def for_comparison v
if v.is_a? Hash or v.is_a? Array