X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/85ce092000d72c5dda03bd4763c9613bb9a46437..a3222e35cda68c8e48a17921c33ac37ecb5c3bac:/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 426a82534d..a219cd5cc3 100644 --- a/apps/workbench/app/helpers/application_helper.rb +++ b/apps/workbench/app/helpers/application_helper.rb @@ -12,7 +12,7 @@ module ApplicationHelper end def render_content_from_database(markup) - raw RedCloth.new(markup).to_html + raw RedCloth.new(markup.to_s).to_html(:refs_arvados, :textile) if markup end def human_readable_bytes_html(n) @@ -79,10 +79,16 @@ module ApplicationHelper # 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 + if attrvalue.is_a? ArvadosBase + object = attrvalue + link_uuid = attrvalue.uuid + else + object = nil + link_uuid = attrvalue + end link_name = opts[:link_text] if !link_name - link_name = link_uuid + link_name = object.andand.default_name || resource_class.default_name if opts[:friendly_name] if attrvalue.respond_to? :friendly_link_name @@ -94,7 +100,7 @@ module ApplicationHelper else link_name = object_for_dataclass(resource_class, link_uuid).andand.friendly_link_name end - rescue RuntimeError + rescue ArvadosApiClient::NotFoundException # If that lookup failed, the link will too. So don't make one. return attrvalue end @@ -124,7 +130,7 @@ module ApplicationHelper 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 + link_to raw(link_name), { controller: resource_class.to_s.tableize, action: 'show', id: ((opts[:name_link].andand.uuid) || link_uuid) }, style_opts end else # just return attrvalue if it is not recognizable as an Arvados object or uuid. @@ -136,8 +142,13 @@ module ApplicationHelper attrvalue = object.send(attr) if attrvalue.nil? if !object.attribute_editable?(attr, :ever) or (!object.editable? and - !object.owner_uuid.in?(my_folders.collect(&:uuid))) - return attrvalue + !object.owner_uuid.in?(my_projects.collect(&:uuid))) + if attrvalue && attrvalue.length > 0 + return render_textile_if_textile( object, attr, attrvalue ) + else + return (attr == 'name' and object.andand.default_name) || + '(none)' + end end input_type = 'text' @@ -151,6 +162,7 @@ module ApplicationHelper end attrvalue = attrvalue.to_json if attrvalue.is_a? Hash or attrvalue.is_a? Array + rendervalue = render_textile_if_textile( object, attr, attrvalue ) ajax_options = { "data-pk" => { @@ -165,16 +177,27 @@ module ApplicationHelper ajax_options['data-pk'][:defaults] = object.attributes end ajax_options['data-pk'] = ajax_options['data-pk'].to_json + @unique_id ||= (Time.now.to_f*1000000).to_i + span_id = object.uuid.to_s + '-' + attr.to_s + '-' + (@unique_id += 1).to_s - content_tag 'span', attrvalue.to_s, { - "data-emptytext" => "none", + span_tag = content_tag 'span', rendervalue, { + "data-emptytext" => (object.andand.default_name || 'none'), "data-placement" => "bottom", "data-type" => input_type, - "data-title" => "Update #{attr.gsub '_', ' '}", + "data-title" => "Edit #{attr.gsub '_', ' '}", "data-name" => attr, "data-object-uuid" => object.uuid, - :class => "editable" + "data-toggle" => "manual", + "data-value" => attrvalue, + "id" => span_id, + :class => "editable #{is_textile?( object, attr ) ? 'editable-textile' : ''}" }.merge(htmloptions).merge(ajax_options) + edit_button = raw('') + if htmloptions[:btnplacement] == :left + edit_button + ' ' + span_tag + else + span_tag + ' ' + edit_button + end end def render_pipeline_component_attribute(object, attr, subattr, value_info, htmloptions={}) @@ -210,7 +233,7 @@ module ApplicationHelper if !object or !object.attribute_editable?(attr, :ever) or (!object.editable? and - !object.owner_uuid.in?(my_folders.collect(&:uuid))) + !object.owner_uuid.in?(my_projects.collect(&:uuid))) return link_to_if_arvados_object attrvalue end @@ -223,6 +246,58 @@ module ApplicationHelper dataclass = ArvadosBase.resource_class_for_uuid(attrvalue) end + id = "#{object.uuid}-#{subattr.join('-')}" + dn = "[#{attr}]" + subattr.each do |a| + dn += "[#{a}]" + end + if value_info.is_a? Hash + dn += '[value]' + end + + if dataclass == Collection + selection_param = object.class.to_s.underscore + dn + display_value = attrvalue + if value_info.is_a?(Hash) + if (link = Link.find? value_info[:link_uuid]) + display_value = link.name + elsif value_info[:link_name] + 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: 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: "#{value_info[:search_for]}", + action_data: { + merge: true, + selection_param: selection_param, + success: 'page-refresh' + }.to_json, + }) + return content_tag('div', :class => 'input-group') do + html = text_field_tag(dn, display_value, + :class => + "form-control #{'required' if required}") + html + content_tag('span', :class => 'input-group-btn') do + link_to('Choose', + modal_path, + { :class => "btn btn-primary", + :remote => true, + :method => 'get', + }) + end + end + end + if dataclass.andand.is_a?(Class) datatype = 'select' elsif dataclass == 'number' @@ -236,22 +311,13 @@ module ApplicationHelper datatype = 'text' end - id = "#{object.uuid}-#{subattr.join('-')}" - dn = "[#{attr}]" - subattr.each do |a| - dn += "[#{a}]" - end - if value_info.is_a? Hash - dn += '[value]' - 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 @@ -265,7 +331,7 @@ module ApplicationHelper if attrvalue and !attrvalue.empty? links_for_object(attrvalue).each do |link| if link.link_class.in? ["tag", "identifier"] - attrtext += " [#{tag.name}]" + attrtext += " [#{link.name}]" end end selectables.append({name: attrtext, uuid: attrvalue, type: dataclass.to_s}) @@ -280,8 +346,8 @@ module ApplicationHelper links_for_object(itemuuid).each do |link| if link.link_class.in? ["tag", "identifier"] selectables.each do |selectable| - if selectable['uuid'] == tag.head_uuid - selectable['name'] += ' [' + tag.name + ']' + if selectable['uuid'] == link.head_uuid + selectable['name'] += ' [' + link.name + ']' end end end @@ -297,8 +363,9 @@ module ApplicationHelper "data-title" => "Set value for #{subattr[-1].to_s}", "data-name" => dn, "data-pk" => "{id: \"#{object.uuid}\", key: \"#{object.class.to_s.underscore}\"}", - "data-showbuttons" => "false", "data-value" => attrvalue, + # "clear" button interferes with form-control's up/down arrows + "data-clear" => false, :class => "editable #{'required' if required} form-control", :id => id }.merge(htmloptions) @@ -327,4 +394,67 @@ module ApplicationHelper button_href, params, *rest) end end + + def render_controller_partial partial, opts + cname = opts.delete :controller_name + begin + render opts.merge(partial: "#{cname}/#{partial}") + rescue ActionView::MissingTemplate + render opts.merge(partial: "application/#{partial}") + end + end + + 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' + else + 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 + +private + def is_textile?( object, attr ) + is_textile = object.textile_attributes.andand.include?(attr) + end + + def render_textile_if_textile( object, attr, attrvalue ) + is_textile?( object, attr ) ? render_content_from_database(attrvalue) : attrvalue + end end