X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/1062d90268c69372ff98be2d86cf7d9423c31da0..f1e1a1ae570c8f09130e5de2a9fc15c0a6067542:/apps/workbench/app/controllers/work_units_controller.rb?ds=sidebyside diff --git a/apps/workbench/app/controllers/work_units_controller.rb b/apps/workbench/app/controllers/work_units_controller.rb index 0c8ea6e704..1e57e7caab 100644 --- a/apps/workbench/app/controllers/work_units_controller.rb +++ b/apps/workbench/app/controllers/work_units_controller.rb @@ -1,4 +1,13 @@ +# Copyright (C) The Arvados Authors. All rights reserved. +# +# SPDX-License-Identifier: AGPL-3.0 + class WorkUnitsController < ApplicationController + skip_around_filter :require_thread_api_token, if: proc { |ctrl| + Rails.configuration.anonymous_user_token and + 'show_child_component' == ctrl.action_name + } + def find_objects_for_index # If it's not the index rows partial display, just return # The /index request will again be invoked to display the @@ -9,12 +18,16 @@ class WorkUnitsController < ApplicationController @filters = @filters || [] # get next page of pipeline_instances - filters = @filters + [["uuid", "is_a", ["arvados#pipelineInstance"]]] - pipelines = PipelineInstance.limit(@limit).order(["created_at desc"]).filter(filters) + if PipelineInstance.api_exists?(:index) + filters = @filters + [["uuid", "is_a", ["arvados#pipelineInstance"]]] + pipelines = PipelineInstance.limit(@limit).order(["created_at desc"]).filter(filters) + end # get next page of jobs - filters = @filters + [["uuid", "is_a", ["arvados#job"]]] - jobs = Job.limit(@limit).order(["created_at desc"]).filter(filters) + if Job.api_exists?(:index) + filters = @filters + [["uuid", "is_a", ["arvados#job"]]] + jobs = Job.limit(@limit).order(["created_at desc"]).filter(filters) + end # get next page of container_requests filters = @filters + [["uuid", "is_a", ["arvados#containerRequest"]]] @@ -46,12 +59,12 @@ class WorkUnitsController < ApplicationController elsif rc == Workflow # workflow json workflow = Workflow.find? template_uuid - if workflow.workflow + if workflow.definition begin - wf_json = YAML::load(workflow.workflow) + wf_json = ActiveSupport::HashWithIndifferentAccess.new YAML::load(workflow.definition) rescue => e - logger.error "Error converting workflow yaml to json: #{e.message}" - raise ArgumentError, "Error converting workflow yaml to json: #{e.message}" + logger.error "Error converting definition yaml to json: #{e.message}" + raise ArgumentError, "Error converting definition yaml to json: #{e.message}" end end @@ -63,16 +76,26 @@ class WorkUnitsController < ApplicationController attrs['state'] = "Uncommitted" # required - attrs['command'] = ["arvados-cwl-runner", "--local", "--api=containers", "/var/lib/cwl/workflow.json", "/var/lib/cwl/cwl.input.json"] + attrs['command'] = ["arvados-cwl-runner", "--local", "--api=containers", "/var/lib/cwl/workflow.json#main", "/var/lib/cwl/cwl.input.json"] attrs['container_image'] = "arvados/jobs" attrs['cwd'] = "/var/spool/cwl" attrs['output_path'] = "/var/spool/cwl" + input_defaults = {} + if wf_json + inputs = get_cwl_inputs(wf_json) + inputs.each do |input| + if input[:default] + input_defaults[cwl_shortname(input[:id])] = input[:default] + end + end + end + # mounts mounts = { "/var/lib/cwl/cwl.input.json" => { "kind" => "json", - "content" => {} + "content" => input_defaults }, "stdout" => { "kind" => "file", @@ -111,4 +134,53 @@ class WorkUnitsController < ApplicationController render_error status: 422 end end + + def find_object_by_uuid + if params['object_type'] + @object = params['object_type'].constantize.find(params['uuid']) + else + super + end + end + + def show_child_component + data = JSON.load(params[:action_data]) + + current_obj = {} + current_obj_uuid = data['current_obj_uuid'] + current_obj_name = data['current_obj_name'] + current_obj_type = data['current_obj_type'] + current_obj_parent = data['current_obj_parent'] + if current_obj_uuid + resource_class = resource_class_for_uuid current_obj_uuid + obj = object_for_dataclass(resource_class, current_obj_uuid) + current_obj = obj if obj + end + + if current_obj.is_a?(Hash) and !current_obj.any? + if current_obj_parent + resource_class = resource_class_for_uuid current_obj_parent + parent = object_for_dataclass(resource_class, current_obj_parent) + parent_wu = parent.work_unit + children = parent_wu.children + if current_obj_uuid + wu = children.select {|c| c.uuid == current_obj_uuid}.first + else current_obj_name + wu = children.select {|c| c.label.to_s == current_obj_name}.first + end + end + else + if current_obj_type == JobWorkUnit.to_s + wu = JobWorkUnit.new(current_obj, current_obj_name, current_obj_parent) + elsif current_obj_type == PipelineInstanceWorkUnit.to_s + wu = PipelineInstanceWorkUnit.new(current_obj, current_obj_name, current_obj_parent) + elsif current_obj_type == ContainerWorkUnit.to_s + wu = ContainerWorkUnit.new(current_obj, current_obj_name, current_obj_parent) + end + end + + respond_to do |f| + f.html { render(partial: "show_component", locals: {wu: wu}) } + end + end end