X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/f35ca630699460653f03702afec4a57866130421..1b2d73e101e1fb27de201b33142c081e80bb7fc6:/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 981b7cd389..15bf77fa09 100644 --- 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 @@ -11,8 +15,13 @@ module ApplicationHelper Rails.configuration.arvados_v1_base.gsub /https?:\/\/|\/arvados\/v1/,'' end + def current_uuid_prefix + current_api_host[0..4] + end + def render_markup(markup) - raw RedCloth.new(markup.to_s).to_html(:refs_arvados, :textile) if markup + allowed_tags = Rails::Html::Sanitizer.white_list_sanitizer.allowed_tags + %w(table tbody th tr td col colgroup caption thead tfoot) + sanitize(raw(RedCloth.new(markup.to_s).to_html(:refs_arvados, :textile)), tags: allowed_tags) if markup end def human_readable_bytes_html(n) @@ -39,13 +48,6 @@ module ApplicationHelper end return h(n) - #raw = n.to_s - #cooked = '' - #while raw.length > 3 - # cooked = ',' + raw[-3..-1] + cooked - # raw = raw[0..-4] - #end - #cooked = raw + cooked end def resource_class_for_uuid(attrvalue, opts={}) @@ -126,7 +128,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 +276,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) @@ -418,6 +424,30 @@ module ApplicationHelper lt end + def get_cwl_main(workflow) + if workflow[:"$graph"].nil? + return workflow + else + workflow[:"$graph"].each do |tool| + if tool[:id] == "#main" + 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] + 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 +457,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 @@ -510,7 +540,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, @@ -526,7 +556,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, @@ -547,7 +577,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, @@ -584,6 +614,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", @@ -598,6 +629,7 @@ module ApplicationHelper "Trait" => "fa-clipboard", "User" => "fa-user", "VirtualMachine" => "fa-terminal", + "Workflow" => "fa-gears", } DEFAULT_ICON_CLASS = "fa-cube" @@ -645,6 +677,13 @@ module ApplicationHelper render_runtime duration, use_words, round_to_min end + # Keep locators are expected to be of the form \"...\" + JSON_KEEP_LOCATOR_REGEXP = /([0-9a-f]{32}\+\d+[^'"]*?)(?=['"]|\z|$)/ + def keep_locator_in_json str + # Return a list of all matches + str.scan(JSON_KEEP_LOCATOR_REGEXP).flatten + end + private def is_textile?( object, attr ) is_textile = object.textile_attributes.andand.include?(attr)