projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove bootstrap_components logic from Workbench, now that it happens
[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 49f2a80e9ddf76dc6824544e77b91752ce8b1068..221ed87ad7081af9cd1f015700570cc020a2be14 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,10
+62,12
@@
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,
:pips => pips }
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
:pips => pips }
+ super
end
def compare
end
def compare
@@
-94,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] ||= {}
@@
-112,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))
@@
-121,13
+131,29
@@
class PipelineInstancesController < ApplicationController
provenance, pips = graph(@objects)
provenance, pips = graph(@objects)
+ @pipelines = @objects
+
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
@prov_svg = ProvenanceHelper::create_provenance_graph provenance, "provenance_svg", {
+ :request => request,
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
:pips => pips }
end
:all_script_parameters => true,
:combine_jobs => :script_and_version,
:script_version_nodes => true,
:pips => pips }
end
+ def show_pane_list
+ %w(Components Graph Attributes Metadata JSON API)
+ end
+
+ def compare_pane_list
+ %w(Compare Graph)
+ end
+
+ def index
+ @objects ||= model_class.limit(20).all
+ 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