X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/63330000144108862a4e2b02a7a8fa124d01163e..dcf97f13fa730ba7af3fee9b6d7044592a30a2be:/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 edcb7fbe85..c42028ff2f 100644 --- a/apps/workbench/app/helpers/application_helper.rb +++ b/apps/workbench/app/helpers/application_helper.rb @@ -52,6 +52,35 @@ module ApplicationHelper ArvadosBase::resource_class_for_uuid(attrvalue, opts) end + # When using {remote:true}, or using {method:...} to use an HTTP + # method other than GET, move the target URI from href to + # data-remote-href. Otherwise, browsers offer features like "open in + # new window" and "copy link address" which bypass Rails' click + # handler and therefore end up at incorrect/nonexistent routes (by + # ignoring data-method) and expect to receive pages rather than + # javascript responses. + # + # See assets/javascripts/link_to_remote.js for supporting code. + def link_to *args, &block + if (args.last and args.last.is_a? Hash and + (args.last[:remote] or + (args.last[:method] and + args.last[:method].to_s.upcase != 'GET'))) + if Rails.env.test? + # Capybara/phantomjs can't click_link without an href, even if + # the click handler means it never gets used. + raw super.gsub(' href="', ' href="#" data-remote-href="') + else + # Regular browsers work as desired: users can click A elements + # without hrefs, and click handlers fire; but there's no "copy + # link address" option in the right-click menu. + raw super.gsub(' href="', ' data-remote-href="') + end + else + super + end + end + ## # Returns HTML that links to the Arvados object specified in +attrvalue+ # Provides various output control and styling options. @@ -93,7 +122,7 @@ module ApplicationHelper if opts[:friendly_name] if attrvalue.respond_to? :friendly_link_name - link_name = attrvalue.friendly_link_name + link_name = attrvalue.friendly_link_name opts[:lookup] else begin if resource_class.name == 'Collection' @@ -133,7 +162,7 @@ module ApplicationHelper end end style_opts[:class] = (style_opts[:class] || '') + ' nowrap' - if opts[:no_link] + if opts[:no_link] or (resource_class == User && !current_user) 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) + raw(tags) @@ -148,13 +177,52 @@ module ApplicationHelper end end + def link_to_arvados_object_if_readable(attrvalue, link_text_if_not_readable, opts={}) + resource_class = resource_class_for_uuid(attrvalue.split('/')[0]) if attrvalue + if !resource_class + return link_to_if_arvados_object attrvalue, opts + end + + readable = object_readable attrvalue, resource_class + if readable + link_to_if_arvados_object attrvalue, opts + elsif opts[:required] and current_user # no need to show this for anonymous user + raw('
') + else + link_text_if_not_readable + end + end + + # This method takes advantage of preloaded collections and objects. + # Hence you can improve performance by first preloading objects + # related to the page context before using this method. + def object_readable attrvalue, resource_class=nil + # if it is a collection filename, check readable for the locator + attrvalue = attrvalue.split('/')[0] if attrvalue + + resource_class = resource_class_for_uuid(attrvalue) if resource_class.nil? + return if resource_class.nil? + + return_value = nil + if resource_class.to_s == 'Collection' + if CollectionsHelper.match(attrvalue) + found = collection_for_pdh(attrvalue) + return_value = found.first if found.any? + else + found = collections_for_object(attrvalue) + return_value = found.first if found.any? + end + else + return_value = object_for_dataclass(resource_class, attrvalue) + end + return_value + end + def render_editable_attribute(object, attr, attrvalue=nil, htmloptions={}) attrvalue = object.send(attr) if attrvalue.nil? - if !object.attribute_editable?(attr, :ever) or - (!object.editable? and - !object.owner_uuid.in?(my_projects.collect(&:uuid))) + if not object.attribute_editable?(attr) if attrvalue && attrvalue.length > 0 - return render_textile_if_textile( object, attr, attrvalue ) + return render_attribute_as_textile( object, attr, attrvalue, false ) else return (attr == 'name' and object.andand.default_name) || '(none)' @@ -162,17 +230,17 @@ module ApplicationHelper end input_type = 'text' - case object.class.attribute_info[attr.to_sym].andand[:type] - when 'text' + attrtype = object.class.attribute_info[attr.to_sym].andand[:type] + if attrtype == 'text' or attr == 'description' input_type = 'textarea' - when 'datetime' + elsif attrtype == 'datetime' input_type = 'date' else input_type = 'text' end attrvalue = attrvalue.to_json if attrvalue.is_a? Hash or attrvalue.is_a? Array - rendervalue = render_textile_if_textile( object, attr, attrvalue ) + rendervalue = render_attribute_as_textile( object, attr, attrvalue, false ) ajax_options = { "data-pk" => { @@ -202,7 +270,9 @@ module ApplicationHelper "id" => span_id, :class => "editable #{is_textile?( object, attr ) ? 'editable-textile' : ''}" }.merge(htmloptions).merge(ajax_options) - edit_button = raw('') + edit_tiptitle = 'edit' + edit_tiptitle = 'Warning: do not use hyphens in the repository name as they will be stripped' if (object.class.to_s == 'Repository' and attr == 'name') + edit_button = raw('') if htmloptions[:btnplacement] == :left edit_button + ' ' + span_tag else @@ -241,11 +311,8 @@ module ApplicationHelper preconfigured_search_str = value_info[:search_for] end - if !object or - !object.attribute_editable?(attr, :ever) or - (!object.editable? and - !object.owner_uuid.in?(my_projects.collect(&:uuid))) - return link_to_if_arvados_object attrvalue + if not object.andand.attribute_editable?(attr) + return link_to_arvados_object_if_readable(attrvalue, attrvalue, {friendly_name: true, required: required}) end if dataclass @@ -266,7 +333,7 @@ module ApplicationHelper dn += '[value]' end - if dataclass == Collection + if (dataclass == Collection) or (dataclass == File) selection_param = object.class.to_s.underscore + dn display_value = attrvalue if value_info.is_a?(Hash) @@ -274,12 +341,14 @@ module ApplicationHelper display_value = link.name elsif value_info[:link_name] display_value = value_info[:link_name] + elsif value_info[:selection_name] + display_value = value_info[:selection_name] end end if (attr == :components) and (subattr.size > 2) - chooser_title = "Choose a dataset for #{object.component_input_title(subattr[0], subattr[2])}:" + chooser_title = "Choose a #{dataclass == Collection ? 'dataset' : 'file'} for #{object.component_input_title(subattr[0], subattr[2])}:" else - chooser_title = "Choose a dataset:" + chooser_title = "Choose a #{dataclass == Collection ? 'dataset' : 'file'}:" end modal_path = choose_collections_path \ ({ title: chooser_title, @@ -290,14 +359,16 @@ module ApplicationHelper preconfigured_search_str: (preconfigured_search_str || ""), action_data: { merge: true, + use_preview_selection: dataclass == File ? true : nil, selection_param: selection_param, success: 'page-refresh' }.to_json, }) + is_readable_input = object_readable attrvalue unless attrvalue.andand.empty? return content_tag('div', :class => 'input-group') do html = text_field_tag(dn, display_value, :class => - "form-control #{'required' if required}") + "form-control #{'required' if required} #{'unreadable-input' if !attrvalue.andand.empty? and !is_readable_input}") html + content_tag('span', :class => 'input-group-btn') do link_to('Choose', modal_path, @@ -309,64 +380,15 @@ module ApplicationHelper end end - if dataclass.andand.is_a?(Class) - datatype = 'select' - elsif dataclass == 'number' - datatype = 'number' - elsif attrvalue.is_a? Array - # TODO: find a way to edit arrays with x-editable - return attrvalue - elsif attrvalue.is_a? Fixnum or attrvalue.is_a? Float - datatype = 'number' - elsif attrvalue.is_a? String + if attrvalue.is_a? String datatype = 'text' + elsif attrvalue.is_a?(Array) or dataclass.andand.is_a?(Class) + # TODO: find a way to edit with x-editable + return attrvalue end - # preload data - preload_uuids = [] - items = [] - selectables = [] - - attrtext = attrvalue - 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? - 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 - itemuuids = [] - items.each do |item| - itemuuids << item.uuid - selectables.append({name: item.uuid, uuid: item.uuid, type: dataclass.to_s}) - end - - 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 - end - - lt = link_to attrtext, '#', { + # When datatype is a String or Fixnum, link_to the attrvalue + lt = link_to attrvalue, '#', { "data-emptytext" => "none", "data-placement" => "bottom", "data-type" => datatype, @@ -381,16 +403,6 @@ module ApplicationHelper :id => id }.merge(htmloptions) - lt += raw("\n") - lt end @@ -451,21 +463,31 @@ module ApplicationHelper end end - def chooser_preview_url_for object + def chooser_preview_url_for object, use_preview_selection=false case object.class.to_s when 'Collection' - polymorphic_path(object, tab_pane: 'chooser_preview') + polymorphic_path(object, tab_pane: 'chooser_preview', use_preview_selection: use_preview_selection) else nil end end + def render_attribute_as_textile( object, attr, attrvalue, truncate ) + if attrvalue && (is_textile? object, attr) + markup = render_markup attrvalue + markup = markup[0,markup.index('

')+4] if (truncate && markup.index('

')) + return markup + else + return attrvalue + end + end + + def render_localized_date(date, opts="") + raw("#{date}") + 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_markup(attrvalue) : attrvalue - end end