X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/e08c67024acccb83a30d2010c34862973b883585..e4382e25d68a70a107baeb257e1915972759334c:/apps/workbench/app/helpers/application_helper.rb
diff --git a/apps/workbench/app/helpers/application_helper.rb b/apps/workbench/app/helpers/application_helper.rb
index 784958b8b0..1f0e5e2b1a 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -87,6 +87,7 @@ module ApplicationHelper
link_uuid = attrvalue
end
link_name = opts[:link_text]
+ tags = ""
if !link_name
link_name = object.andand.default_name || resource_class.default_name
@@ -95,24 +96,35 @@ module ApplicationHelper
link_name = attrvalue.friendly_link_name
else
begin
- link_name = resource_class.find(link_uuid).friendly_link_name
- rescue RuntimeError
+ if resource_class.name == 'Collection'
+ link_name = collections_for_object(link_uuid).andand.first.andand.friendly_link_name
+ else
+ link_name = object_for_dataclass(resource_class, link_uuid).andand.friendly_link_name
+ end
+ rescue ArvadosApiClient::NotFoundException
# If that lookup failed, the link will too. So don't make one.
return attrvalue
end
end
end
+ if link_name.nil? or link_name.empty?
+ link_name = attrvalue
+ end
if opts[:with_class_name]
link_name = "#{resource_class.to_s}: #{link_name}"
end
if !opts[:no_tags] and resource_class == Collection
- Link.where(head_uuid: link_uuid, link_class: ["tag", "identifier"]).each do |tag|
- link_name += ' ' + html_escape(tag.name) + ''
+ links_for_object(link_uuid).each do |tag|
+ if tag.link_class.in? ["tag", "identifier"]
+ tags += ' '
+ tags += link_to tag.name, controller: "links", filters: [["link_class", "=", "tag"], ["name", "=", tag.name]].to_json
+ tags += ''
+ end
end
end
if opts[:thumbnail] and resource_class == Collection
# add an image thumbnail if the collection consists of a single image file.
- Collection.where(uuid: link_uuid).each do |c|
+ collections_for_object(link_uuid).each do |c|
if c.files.length == 1 and CollectionsHelper::is_image c.files.first[1]
link_name += " "
link_name += image_tag "#{url_for c}/#{CollectionsHelper::file_path c.files.first}", style: "height: 4em; width: auto"
@@ -124,11 +136,15 @@ module ApplicationHelper
if opts[:no_link]
raw(link_name)
else
- link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: ((opts[:name_link].andand.uuid) || link_uuid) }, style_opts
+ (link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: ((opts[:name_link].andand.uuid) || link_uuid) }, style_opts) + raw(tags)
end
else
# just return attrvalue if it is not recognizable as an Arvados object or uuid.
- attrvalue
+ if attrvalue.nil? or (attrvalue.is_a? String and attrvalue.empty?)
+ "(none)"
+ else
+ attrvalue
+ end
end
end
@@ -171,10 +187,10 @@ module ApplicationHelper
span_id = object.uuid.to_s + '-' + attr.to_s + '-' + (@unique_id += 1).to_s
span_tag = content_tag 'span', attrvalue.to_s, {
- "data-emptytext" => (object.andand.default_name || 'none'),
+ "data-emptytext" => ('(none)'),
"data-placement" => "bottom",
"data-type" => input_type,
- "data-title" => "Edit #{attr.gsub '_', ' '}",
+ "data-title" => "Edit #{attr.to_s.gsub '_', ' '}",
"data-name" => attr,
"data-object-uuid" => object.uuid,
"data-toggle" => "manual",
@@ -217,6 +233,7 @@ module ApplicationHelper
else
attrvalue = ''
end
+ preconfigured_search_str = value_info[:search_for]
end
if !object or
@@ -254,12 +271,18 @@ module ApplicationHelper
display_value = value_info[:link_name]
end
end
+ if (attr == :components) and (subattr.size > 2)
+ chooser_title = "Choose a dataset for #{object.component_input_title(subattr[0], subattr[2])}:"
+ else
+ chooser_title = "Choose a dataset:"
+ end
modal_path = choose_collections_path \
- ({ title: 'Choose a dataset:',
- filters: [['tail_uuid', '=', object.owner_uuid]].to_json,
+ ({ title: chooser_title,
+ filters: [['owner_uuid', '=', object.owner_uuid]].to_json,
action_name: 'OK',
action_href: pipeline_instance_path(id: object.uuid),
action_method: 'patch',
+ preconfigured_search_str: (preconfigured_search_str || ""),
action_data: {
merge: true,
selection_param: selection_param,
@@ -294,27 +317,45 @@ module ApplicationHelper
datatype = 'text'
end
+ # preload data
+ preload_uuids = []
+ items = []
selectables = []
+
attrtext = attrvalue
- if dataclass and dataclass.is_a? Class
+ if dataclass.is_a? Class and dataclass < ArvadosBase
+ objects = get_n_objects_of_class dataclass, 10
+ objects.each do |item|
+ items << item
+ preload_uuids << item.uuid
+ end
+ if attrvalue and !attrvalue.empty?
+ preload_uuids << attrvalue
+ end
+ preload_links_for_objects preload_uuids
+
if attrvalue and !attrvalue.empty?
- Link.where(head_uuid: attrvalue, link_class: ["tag", "identifier"]).each do |tag|
- attrtext += " [#{tag.name}]"
+ links_for_object(attrvalue).each do |link|
+ if link.link_class.in? ["tag", "identifier"]
+ attrtext += " [#{link.name}]"
+ end
end
selectables.append({name: attrtext, uuid: attrvalue, type: dataclass.to_s})
end
- #dataclass.where(uuid: attrvalue).each do |item|
- # selectables.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s})
- #end
itemuuids = []
- dataclass.limit(10).each do |item|
+ items.each do |item|
itemuuids << item.uuid
selectables.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s})
end
- Link.where(head_uuid: itemuuids, link_class: ["tag", "identifier"]).each do |tag|
- selectables.each do |selectable|
- if selectable['uuid'] == tag.head_uuid
- selectable['name'] += ' [' + tag.name + ']'
+
+ itemuuids.each do |itemuuid|
+ links_for_object(itemuuid).each do |link|
+ if link.link_class.in? ["tag", "identifier"]
+ selectables.each do |selectable|
+ if selectable['uuid'] == link.head_uuid
+ selectable['name'] += ' [' + link.name + ']'
+ end
+ end
end
end
end
@@ -368,39 +409,49 @@ module ApplicationHelper
render opts.merge(partial: "application/#{partial}")
end
end
-
- def fa_icon_class_for_object object
- case object.class.to_s.to_sym
- when :User
- 'fa-user'
- when :Group
+
+ RESOURCE_CLASS_ICONS = {
+ "Collection" => "fa-archive",
+ "Group" => "fa-users",
+ "Human" => "fa-male", # FIXME: Use a more inclusive icon.
+ "Job" => "fa-gears",
+ "KeepDisk" => "fa-hdd-o",
+ "KeepService" => "fa-exchange",
+ "Link" => "fa-arrows-h",
+ "Node" => "fa-cloud",
+ "PipelineInstance" => "fa-gears",
+ "PipelineTemplate" => "fa-gears",
+ "Repository" => "fa-code-fork",
+ "Specimen" => "fa-flask",
+ "Trait" => "fa-clipboard",
+ "User" => "fa-user",
+ "VirtualMachine" => "fa-terminal",
+ }
+ DEFAULT_ICON_CLASS = "fa-cube"
+
+ def fa_icon_class_for_class(resource_class, default=DEFAULT_ICON_CLASS)
+ RESOURCE_CLASS_ICONS.fetch(resource_class.to_s, default)
+ end
+
+ def fa_icon_class_for_uuid(uuid, default=DEFAULT_ICON_CLASS)
+ fa_icon_class_for_class(resource_class_for_uuid(uuid), default)
+ end
+
+ def fa_icon_class_for_object(object, default=DEFAULT_ICON_CLASS)
+ case class_name = object.class.to_s
+ when "Group"
object.group_class ? 'fa-folder' : 'fa-users'
- when :Job, :PipelineInstance, :PipelineTemplate
- 'fa-gears'
- when :Collection
- 'fa-archive'
- when :Specimen
- 'fa-flask'
- when :Trait
- 'fa-clipboard'
- when :Human
- 'fa-male'
- when :VirtualMachine
- 'fa-terminal'
- when :Repository
- 'fa-code-fork'
- when :Link
- 'fa-arrows-h'
- when :User
- 'fa-user'
- when :Node
- 'fa-cloud'
- when :KeepService
- 'fa-exchange'
- when :KeepDisk
- 'fa-hdd-o'
else
- 'fa-cube'
+ RESOURCE_CLASS_ICONS.fetch(class_name, default)
+ end
+ end
+
+ def chooser_preview_url_for object
+ case object.class.to_s
+ when 'Collection'
+ polymorphic_path(object, tab_pane: 'chooser_preview')
+ else
+ nil
end
end
end