X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2e86954da9d4561cc42d52e8505eb12aa95f6470..fa257c28461627fe6700dd8fd2152e380f8725d4:/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 e25bb57578..7231ff8add 100644 --- a/apps/workbench/app/helpers/application_helper.rb +++ b/apps/workbench/app/helpers/application_helper.rb @@ -36,9 +36,9 @@ module ApplicationHelper end end end - + return h(n) - #raw = n.to_s + #raw = n.to_s #cooked = '' #while raw.length > 3 # cooked = ',' + raw[-3..-1] + cooked @@ -51,6 +51,31 @@ module ApplicationHelper ArvadosBase::resource_class_for_uuid(attrvalue, opts) end + ## + # Returns HTML that links to the Arvados object specified in +attrvalue+ + # Provides various output control and styling options. + # + # +attrvalue+ an Arvados model object or uuid + # + # +opts+ a set of flags to control output: + # + # [:link_text] the link text to use (may include HTML), overrides everything else + # + # [:friendly_name] whether to use the "friendly" name in the link text (by + # calling #friendly_link_name on the object), otherwise use the uuid + # + # [:with_class_name] prefix the link text with the class name of the model + # + # [:no_tags] disable tags in the link text (default is to show tags). + # Currently tags are only shown for Collections. + # + # [:thumbnail] if the object is a collection, show an image thumbnail if the + # collection consists of a single image file. + # + # [:no_link] don't create a link, just return the link text + # + # +style_opts+ additional HTML properties for the anchor tag, passed to link_to + # def link_to_if_arvados_object(attrvalue, opts={}, style_opts={}) if (resource_class = resource_class_for_uuid(attrvalue, opts)) link_uuid = attrvalue.is_a?(ArvadosBase) ? attrvalue.uuid : attrvalue @@ -73,10 +98,29 @@ module ApplicationHelper 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) + '' + 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| + 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" + end + end + end end style_opts[:class] = (style_opts[:class] || '') + ' nowrap' - link_to link_name, { controller: resource_class.to_s.tableize, action: 'show', id: link_uuid }, style_opts + if opts[:no_link] + raw(link_name) + else + link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: link_uuid }, style_opts + end else + # just return attrvalue if it is not recognizable as an Arvados object or uuid. attrvalue end end @@ -112,6 +156,8 @@ module ApplicationHelper def render_pipeline_component_attribute(object, attr, subattr, value_info, htmloptions={}) datatype = nil required = true + attrvalue = value_info + if value_info.is_a? Hash if value_info[:output_of] return raw("#{value_info[:output_of]}") @@ -125,10 +171,9 @@ module ApplicationHelper if value_info[:required] != nil required = value_info[:required] end - end - attrvalue = value_info - if value_info.is_a? Hash + # Pick a suitable attrvalue to show as the current value (i.e., + # the one that would be used if we ran the pipeline right now). if value_info[:value] attrvalue = value_info[:value] elsif value_info[:default] @@ -174,19 +219,32 @@ module ApplicationHelper end items = [] + attrtext = attrvalue if dataclass and dataclass.is_a? Class if attrvalue and !attrvalue.empty? - items.append({name: attrvalue, uuid: attrvalue, type: dataclass.to_s}) + Link.where(head_uuid: attrvalue, link_class: ["tag", "identifier"]).each do |tag| + attrtext += " [#{tag.name}]" + end + items.append({name: attrtext, uuid: attrvalue, type: dataclass.to_s}) end #dataclass.where(uuid: attrvalue).each do |item| # items.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s}) #end + itemuuids = [] dataclass.limit(10).each do |item| + itemuuids << item.uuid items.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s}) end + Link.where(head_uuid: itemuuids, link_class: ["tag", "identifier"]).each do |tag| + items.each do |item| + if item.uuid == tag.head_uuid + item.name += ' [' + tag.name + ']' + end + end + end end - lt = link_to attrvalue, '#', { + lt = link_to attrtext, '#', { "data-emptytext" => "none", "data-placement" => "bottom", "data-type" => datatype, @@ -201,7 +259,7 @@ module ApplicationHelper }.merge(htmloptions) lt += raw("\n") - lt + lt end end