13558: Merge branch 'master' into wtsi-hgi-13558-debug-log-tag-req-id

[arvados.git] / 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 411280293529ad6eb2c191407aaf3217a895c7d6..106716a0f72f178e826afc6eaaf2908ecb8afe0a 100644 (file)
--- a/apps/workbench/app/helpers/application_helper.rb
+++ b/apps/workbench/app/helpers/application_helper.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 module ApplicationHelper
   def current_user
     controller.current_user
@@ -422,18 +426,23 @@ module ApplicationHelper
     lt
   end
 
-  def get_cwl_inputs(workflow)
-    if workflow[:inputs]
-      return workflow[:inputs]
+  def get_cwl_main(workflow)
+    if workflow[:"$graph"].nil?
+      return workflow
     else
       workflow[:"$graph"].each do |tool|
         if tool[:id] == "#main"
-          return tool[:inputs]
+          return tool
         end
       end
     end
   end
 
+  def get_cwl_inputs(workflow)
+    get_cwl_main(workflow)[:inputs]
+  end
+
+
   def cwl_shortname(id)
     if id[0] == "#"
       id = id[1..-1]
@@ -584,30 +593,6 @@ 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
@@ -694,6 +679,12 @@ module ApplicationHelper
     render_runtime duration, use_words, round_to_min
   end
 
+  # Keep locators are expected to be of the form \"...<pdh/file_path>\"
+  JSON_KEEP_LOCATOR_REGEXP = /(.*)(([0-9a-f]{32}\+\d+)(.*)\"(.*))/
+  def keep_locator_in_json str
+    JSON_KEEP_LOCATOR_REGEXP.match str
+  end
+
 private
   def is_textile?( object, attr )
     is_textile = object.textile_attributes.andand.include?(attr)