X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/0b187b107128a57c1f0c00057d39979ab53d4137..6f62739bee508c9b2b8c4ce2f2593fe1714cfda6:/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 b5df9f38a8..4112802935 100644
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -126,7 +126,11 @@ module ApplicationHelper
           else
             begin
               if resource_class.name == 'Collection'
-                link_name = collections_for_object(link_uuid).andand.first.andand.friendly_link_name
+                if CollectionsHelper.match(link_uuid)
+                  link_name = collection_for_pdh(link_uuid).andand.first.andand.portable_data_hash
+                else
+                  link_name = collections_for_object(link_uuid).andand.first.andand.friendly_link_name
+                end
               else
                 link_name = object_for_dataclass(resource_class, link_uuid).andand.friendly_link_name
               end
@@ -270,10 +274,10 @@ module ApplicationHelper
       "data-placement" => "bottom",
       "data-type" => input_type,
       "data-title" => "Edit #{attr.to_s.gsub '_', ' '}",
-      "data-name" => attr,
+      "data-name" => htmloptions['selection_name'] || attr,
       "data-object-uuid" => object.uuid,
       "data-toggle" => "manual",
-      "data-value" => attrvalue,
+      "data-value" => htmloptions['data-value'] || attrvalue,
       "id" => span_id,
       :class => "editable #{is_textile?( object, attr ) ? 'editable-textile' : ''}"
     }.merge(htmloptions).merge(ajax_options)
@@ -580,6 +584,30 @@ module ApplicationHelper
     end
   end
 
+  # yields collection id (pdh or uuid), and full file_path
+  def cwl_input_collections(path, &b)
+    case path
+    when ArvadosBase
+      path.class.columns.each do |c|
+        cwl_input_collections(path[c.name.to_sym], &b)
+      end
+    when Hash
+      path.each do |k, v|
+        cwl_input_collections(v, &b)
+      end
+    when Array
+      path.each do |v|
+        cwl_input_collections(v, &b)
+      end
+    when String
+      if m = /[a-f0-9]{32}\+\d+/.match(path)
+        yield m[0], path.split('keep:')[-1]
+      elsif m = /[0-9a-z]{5}-4zz18-[0-9a-z]{15}/.match(path)
+        yield m[0], path.split('keep:')[-1]
+      end
+    end
+  end
+
   def render_arvados_object_list_start(list, button_text, button_href,
                                        params={}, *rest, &block)
     show_max = params.delete(:show_max) || 3
@@ -603,6 +631,7 @@ module ApplicationHelper
 
   RESOURCE_CLASS_ICONS = {
     "Collection" => "fa-archive",
+    "ContainerRequest" => "fa-gears",
     "Group" => "fa-users",
     "Human" => "fa-male",  # FIXME: Use a more inclusive icon.
     "Job" => "fa-gears",
@@ -617,6 +646,7 @@ module ApplicationHelper
     "Trait" => "fa-clipboard",
     "User" => "fa-user",
     "VirtualMachine" => "fa-terminal",
+    "Workflow" => "fa-gears",
   }
   DEFAULT_ICON_CLASS = "fa-cube"