X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/241a1049be1eb101723a3714125eef8baa3c33dc..262d1e44ddaf3f014423a4acf96a3a6200279820:/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 ec2e93fc16..21879a57a7 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
@@ -418,6 +422,25 @@ module ApplicationHelper
     lt
   end
 
+  def get_cwl_inputs(workflow)
+    if workflow[:inputs]
+      return workflow[:inputs]
+    else
+      workflow[:"$graph"].each do |tool|
+        if tool[:id] == "#main"
+          return tool[:inputs]
+        end
+      end
+    end
+  end
+
+  def cwl_shortname(id)
+    if id[0] == "#"
+      id = id[1..-1]
+    end
+    return id.split("/")[-1]
+  end
+
   def cwl_input_info(input_schema)
     required = !(input_schema[:type].include? "null")
     if input_schema[:type].is_a? Array
@@ -427,7 +450,7 @@ module ApplicationHelper
     elsif input_schema[:type].is_a? Hash
       primary_type = input_schema[:type]
     end
-    param_id = input_schema[:id]
+    param_id = cwl_shortname(input_schema[:id])
     return required, primary_type, param_id
   end
 
@@ -466,9 +489,10 @@ module ApplicationHelper
       selection_param = object.class.to_s.underscore + dn
       if attrvalue.is_a? Hash
         display_value = attrvalue[:"arv:collection"] || attrvalue[:location]
-        display_value.match /^([0-9a-z]{5}-([0-9a-z]{5})-[0-9a-z]{15})(\/.*)?$/ do |re|
-          if re[3]
-            display_value = "#{Collection.find(re[1]).name} / #{re[3][1..-1]}"
+        re = CollectionsHelper.match_uuid_with_optional_filepath(display_value)
+        if re
+          if re[4]
+            display_value = "#{Collection.find(re[1]).name} / #{re[4][1..-1]}"
           else
             display_value = Collection.find(re[1]).name
           end
@@ -509,7 +533,7 @@ module ApplicationHelper
                      "data-type" => "select",
                      "data-source" => (opt_empty_selection + [{value: "true", text: "true"}, {value: "false", text: "false"}]).to_json,
                      "data-url" => url_for(action: "update", id: object.uuid, controller: object.class.to_s.pluralize.underscore, merge: true),
-                     "data-title" => "Set value for #{input_schema[:id]}",
+                     "data-title" => "Set value for #{cwl_shortname(input_schema[:id])}",
                      "data-name" => dn,
                      "data-pk" => "{id: \"#{object.uuid}\", key: \"#{object.class.to_s.underscore}\"}",
                      "data-value" => attrvalue.to_s,
@@ -525,7 +549,7 @@ module ApplicationHelper
                      "data-type" => "select",
                      "data-source" => (opt_empty_selection + primary_type[:symbols].map {|i| {:value => i, :text => i} }).to_json,
                      "data-url" => url_for(action: "update", id: object.uuid, controller: object.class.to_s.pluralize.underscore, merge: true),
-                     "data-title" => "Set value for #{input_schema[:id]}",
+                     "data-title" => "Set value for #{cwl_shortname(input_schema[:id])}",
                      "data-name" => dn,
                      "data-pk" => "{id: \"#{object.uuid}\", key: \"#{object.class.to_s.underscore}\"}",
                      "data-value" => attrvalue,
@@ -535,7 +559,7 @@ module ApplicationHelper
                      :id => id
                    }.merge(htmloptions)
     elsif primary_type.is_a? String
-      if ["float", "double", "int", "long"].include? primary_type
+      if ["int", "long"].include? primary_type
         datatype = "number"
       else
         datatype = "text"
@@ -546,7 +570,7 @@ module ApplicationHelper
                      "data-placement" => "bottom",
                      "data-type" => datatype,
                      "data-url" => url_for(action: "update", id: object.uuid, controller: object.class.to_s.pluralize.underscore, merge: true),
-                     "data-title" => "Set value for #{input_schema[:id]}",
+                     "data-title" => "Set value for #{cwl_shortname(input_schema[:id])}",
                      "data-name" => dn,
                      "data-pk" => "{id: \"#{object.uuid}\", key: \"#{object.class.to_s.underscore}\"}",
                      "data-value" => attrvalue,