X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c7a21e6294f1eb905ace3d717f9dcfb4d4c39f0b..27daf08f38eec505c224e7776678b32d50241e13:/services/api/app/models/pipeline_instance.rb diff --git a/services/api/app/models/pipeline_instance.rb b/services/api/app/models/pipeline_instance.rb index 354c8924e7..77a0736b00 100644 --- a/services/api/app/models/pipeline_instance.rb +++ b/services/api/app/models/pipeline_instance.rb @@ -15,13 +15,14 @@ class PipelineInstance < ArvadosModel api_accessible :user, extend: :common do |t| t.add :pipeline_template_uuid - t.add :pipeline_template, :if => :pipeline_template t.add :name t.add :components - t.add :dependencies t.add :properties t.add :state t.add :components_summary + t.add :description + t.add :started_at + t.add :finished_at end # Supported states for a pipeline instance @@ -36,10 +37,6 @@ class PipelineInstance < ArvadosModel (Complete = 'Complete'), ] - def dependencies - dependency_search(self.components).keys - end - # if all components have input, the pipeline is Ready def components_look_ready? if !self.components || self.components.empty? @@ -115,30 +112,6 @@ class PipelineInstance < ArvadosModel end end - def dependency_search(haystack) - if haystack.is_a? String - if (re = haystack.match /^([0-9a-f]{32}(\+[^,]+)*)+/) - {re[1] => true} - else - {} - end - elsif haystack.is_a? Array - deps = {} - haystack.each do |value| - deps.merge! dependency_search(value) - end - deps - elsif haystack.respond_to? :keys - deps = {} - haystack.each do |key, value| - deps.merge! dependency_search(value) - end - deps - else - {} - end - end - def verify_status changed_attributes = self.changed