X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9ab992cca7091b621cb465694f6439b1e62604a7..11c6f1d759040f2af8a68d80ae78dd57a9b2d976:/apps/workbench/app/controllers/collections_controller.rb?ds=sidebyside diff --git a/apps/workbench/app/controllers/collections_controller.rb b/apps/workbench/app/controllers/collections_controller.rb index e7d29e45f9..3089a1ed3f 100644 --- a/apps/workbench/app/controllers/collections_controller.rb +++ b/apps/workbench/app/controllers/collections_controller.rb @@ -1,9 +1,39 @@ class CollectionsController < ApplicationController - skip_before_filter :find_object_by_uuid, :only => [:graph] + skip_before_filter :find_object_by_uuid, :only => [:provenance] skip_before_filter :check_user_agreements, :only => [:show_file] - def graph - index + def show_pane_list + %w(Files Attributes Metadata Provenance_graph Used_by JSON API) + end + + def set_persistent + case params[:value] + when 'persistent', 'cache' + persist_links = Link.filter([['owner_uuid', '=', current_user.uuid], + ['link_class', '=', 'resources'], + ['name', '=', 'wants'], + ['tail_uuid', '=', current_user.uuid], + ['head_uuid', '=', @object.uuid]]) + logger.debug persist_links.inspect + else + return unprocessable "Invalid value #{value.inspect}" + end + if params[:value] == 'persistent' + if not persist_links.any? + Link.create(link_class: 'resources', + name: 'wants', + tail_uuid: current_user.uuid, + head_uuid: @object.uuid) + end + else + persist_links.each do |link| + link.destroy || raise + end + end + + respond_to do |f| + f.json { render json: @object } + end end def index @@ -13,14 +43,26 @@ class CollectionsController < ApplicationController Collection.where(any: ['contains', params[:search]])). uniq { |c| c.uuid } else - @collections = Collection.limit(100) + if params[:limit] + limit = params[:limit].to_i + else + limit = 100 + end + + if params[:offset] + offset = params[:offset].to_i + else + offset = 0 + end + + @collections = Collection.limit(limit).offset(offset) end @links = Link.limit(1000). where(head_uuid: @collections.collect(&:uuid)) @collection_info = {} @collections.each do |c| @collection_info[c.uuid] = { - tags: [], + tag_links: [], wanted: false, wanted_by_me: false, provenance: [], @@ -32,7 +74,7 @@ class CollectionsController < ApplicationController info = @collection_info[link.head_uuid] case link.link_class when 'tag' - info[:tags] << link.name + info[:tag_links] << link when 'resources' info[:wanted] = true info[:wanted_by_me] ||= link.tail_uuid == current_user.uuid @@ -56,54 +98,6 @@ class CollectionsController < ApplicationController self.response_body = FileStreamer.new opts end - def generate_edges(gr, uuid, edge_added = false) - m = /([a-f0-9]{32}(\+[0-9]+)?)(\+.*)?/.match(uuid) - if m - # uuid is a collection - uuid = m[1] - gr += "\"#{uuid}\" [href=\"#{collection_path uuid}\"];" - - Job.where(output: uuid).each do |job| - gr += "\"#{job.uuid}\" [href=\"#{job_path job.uuid}\"];" - gr += "\"#{uuid}\" -> \"#{job.uuid}\" [label=\" output\"];" - gr = generate_edges(gr, job.uuid) - end - - Job.where(log: uuid).each do |job| - gr += "\"#{job.uuid}\" [href=\"#{job_path job.uuid}\"];" - gr += "\"#{uuid}\" -> \"#{job.uuid}\" [label=\" log\"];" - gr = generate_edges(gr, job.uuid) - end - - else - # uuid is something else - rsc = ArvadosBase::resource_class_for_uuid uuid - gr += "\"#{uuid}\" [href=\"#{rsc}/#{uuid}\"];" - - if rsc.to_s == "Job" - Job.where(uuid: uuid).each do |job| - job.script_parameters.each do |k, v| - gr += "\"#{job.uuid}\" [href=\"#{job_path job.uuid}\"];" - gr += "\"#{job.uuid}\" -> \"#{v}\" [label=\" #{k}\"];" - gr = generate_edges(gr, v) - end - end - end - - gr - end - - Link.where(head_uuid: uuid, link_class: "provenance", name: "provided").each do |link| - rsc = ArvadosBase::resource_class_for_uuid link.tail_uuid - puts "rsc is #{rsc}" - gr += "\"#{link.tail_uuid}\" [href=\"#{rsc}/#{link.tail_uuid}\"];" - gr += "\"#{link.head_uuid}\" -> \"#{link.tail_uuid}\" [label=\" provided\"];" - generate_edges(gr, link.tail_uuid) - end - - gr - end - def show return super if !@object @provenance = [] @@ -135,12 +129,15 @@ class CollectionsController < ApplicationController Link.where(head_uuid: @sourcedata.keys | @output2job.keys).each do |link| if link.link_class == 'resources' and link.name == 'wants' @protected[link.head_uuid] = true + if link.tail_uuid == current_user.uuid + @is_persistent = true + end end end Link.where(tail_uuid: @sourcedata.keys).each do |link| if link.link_class == 'data_origin' @sourcedata[link.tail_uuid][:data_origins] ||= [] - @sourcedata[link.tail_uuid][:data_origins] << [link.name, link.head_kind, link.head_uuid] + @sourcedata[link.tail_uuid][:data_origins] << [link.name, link.head_uuid] end end Collection.where(uuid: @sourcedata.keys).each do |collection| @@ -149,27 +146,18 @@ class CollectionsController < ApplicationController end end - require 'open3' - - gr = "digraph {" - gr += "node [fontsize=8];" - gr += "edge [dir=back,fontsize=8];" - - gr = generate_edges(gr, @object.uuid) - - gr += "}" - @prov_svg = "" - - Open3.popen2("dot", "-Tsvg") do |stdin, stdout, wait_thr| - stdin.print(gr) - stdin.close - wait_thr.value - @prov_svg = stdout.read() - stdout.close() + Collection.where(uuid: @object.uuid).each do |u| + puts request + @prov_svg = ProvenanceHelper::create_provenance_graph(u.provenance, "provenance_svg", + {:request => request, + :direction => :bottom_up, + :combine_jobs => :script_only}) rescue nil + @used_by_svg = ProvenanceHelper::create_provenance_graph(u.used_by, "used_by_svg", + {:request => request, + :direction => :top_down, + :combine_jobs => :script_only, + :pdata_only => true}) rescue nil end - - @prov_svg = @prov_svg.sub(/<\?xml.*?\?>/m, "") - @prov_svg = @prov_svg.sub(//m, "") end protected