projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 0dc16fbb44561c183b338e5b0272f9380565acc6..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
module ApplicationHelper
def current_user
controller.current_user
@@
-274,7
+278,7
@@
module ApplicationHelper
"data-placement" => "bottom",
"data-type" => input_type,
"data-title" => "Edit #{attr.to_s.gsub '_', ' '}",
"data-placement" => "bottom",
"data-type" => input_type,
"data-title" => "Edit #{attr.to_s.gsub '_', ' '}",
- "data-name" => htmloptions['selection_
path
'] || attr,
+ "data-name" => htmloptions['selection_
name
'] || attr,
"data-object-uuid" => object.uuid,
"data-toggle" => "manual",
"data-value" => htmloptions['data-value'] || attrvalue,
"data-object-uuid" => object.uuid,
"data-toggle" => "manual",
"data-value" => htmloptions['data-value'] || attrvalue,
@@
-422,18
+426,23
@@
module ApplicationHelper
lt
end
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"
else
workflow[:"$graph"].each do |tool|
if tool[:id] == "#main"
- return tool
[:inputs]
+ return tool
end
end
end
end
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]
def cwl_shortname(id)
if id[0] == "#"
id = id[1..-1]
@@
-607,6
+616,7
@@
module ApplicationHelper
RESOURCE_CLASS_ICONS = {
"Collection" => "fa-archive",
RESOURCE_CLASS_ICONS = {
"Collection" => "fa-archive",
+ "ContainerRequest" => "fa-gears",
"Group" => "fa-users",
"Human" => "fa-male", # FIXME: Use a more inclusive icon.
"Job" => "fa-gears",
"Group" => "fa-users",
"Human" => "fa-male", # FIXME: Use a more inclusive icon.
"Job" => "fa-gears",
@@
-621,6
+631,7
@@
module ApplicationHelper
"Trait" => "fa-clipboard",
"User" => "fa-user",
"VirtualMachine" => "fa-terminal",
"Trait" => "fa-clipboard",
"User" => "fa-user",
"VirtualMachine" => "fa-terminal",
+ "Workflow" => "fa-gears",
}
DEFAULT_ICON_CLASS = "fa-cube"
}
DEFAULT_ICON_CLASS = "fa-cube"
@@
-668,6
+679,12
@@
module ApplicationHelper
render_runtime duration, use_words, round_to_min
end
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)
private
def is_textile?( object, attr )
is_textile = object.textile_attributes.andand.include?(attr)