11185: Merge branch 'master' into 11185-wb-disable-reuse

diff --combined apps/workbench/app/controllers/container_requests_controller.rb
index 0fc8cbdae4a30cd27dae6cc251901238a75cc303,ef7665b34d9f46dac52ac0c4c88f84c4127164ea..fd29cd3f7088b5ab2ca4011d7d6d8b9ab26b6182
--- 1/apps/workbench/app/controllers/container_requests_controller.rb
--- 2/apps/workbench/app/controllers/container_requests_controller.rb
+++ b/apps/workbench/app/controllers/container_requests_controller.rb
@@@ -4,14 -4,37 +4,37 @@@ class ContainerRequestsController < App
      'show' == ctrl.action_name
    }
  
+   def generate_provenance(cr)
+     return if params['tab_pane'] != "Provenance"
+ 
+     nodes = {}
+     nodes[cr[:uuid]] = cr
+     if cr[:container_uuid]
+       ContainerRequest.where(requesting_container_uuid: cr[:container_uuid]).each do |child|
+         nodes[child[:uuid]] = child
+       end
+     end
+     @svg = ProvenanceHelper::create_provenance_graph nodes,
+                                                      "provenance_svg",
+                                                      {
+                                                        :request => request,
+                                                        :direction => :top_down,
+                                                      }
+   end
+ 
    def show_pane_list
-     panes = %w(Status Log Advanced)
+     panes = %w(Status Log Provenance Advanced)
      if @object.andand.state == 'Uncommitted'
-       panes = %w(Inputs) + panes - %w(Log)
+       panes = %w(Inputs) + panes - %w(Log Provenance)
      end
      panes
    end
  
+   def show
+     generate_provenance(@object)
+     super
+   end
+ 
    def cancel
      @object.update_attributes! priority: 0
      if params[:return_to]
@@@ -64,26 -87,7 +87,26 @@@
  
      @object = ContainerRequest.new
  
 -    @object.command = src.command
 +    # By default the copied CR won't be reusing containers, unless use_existing=true
 +    # param is passed.
 +    command = src.command
 +    if params[:use_existing]
 +      @object.use_existing = true
 +      # Pass the correct argument to arvados-cwl-runner command.
 +      if src.command[0] == 'arvados-cwl-runner'
 +        command = src.command - ['--disable-reuse']
 +        command.insert(1, '--enable-reuse')
 +      end
 +    else
 +      @object.use_existing = false
 +      # Pass the correct argument to arvados-cwl-runner command.
 +      if src.command[0] == 'arvados-cwl-runner'
 +        command = src.command - ['--enable-reuse']
 +        command.insert(1, '--disable-reuse')
 +      end
 +    end
 +
 +    @object.command = command
      @object.container_image = src.container_image
      @object.cwd = src.cwd
      @object.description = src.description
@@@ -96,6 -100,7 +119,6 @@@
      @object.runtime_constraints = src.runtime_constraints
      @object.scheduling_parameters = src.scheduling_parameters
      @object.state = 'Uncommitted'
 -    @object.use_existing = false
  
      # set owner_uuid to that of source, provided it is a project and writable by current user
      current_project = Group.find(src.owner_uuid) rescue nil

diff --combined apps/workbench/test/controllers/container_requests_controller_test.rb
index 01f740cfa063f60686140900803acd3e8cd3253a,6f5a6daa100a83974526d5f3892ccbec4a491813..bd2f6beb6b45a6270825ba16eb34b2a0b00120ad
--- 1/apps/workbench/test/controllers/container_requests_controller_test.rb
--- 2/apps/workbench/test/controllers/container_requests_controller_test.rb
+++ b/apps/workbench/test/controllers/container_requests_controller_test.rb
@@@ -38,51 -38,43 +38,72 @@@ class ContainerRequestsControllerTest 
      get :show, {id: uuid}, session_for(:active)
      assert_response :success
  
 -   assert_includes @response.body, "href=\"/container_requests/#{uuid}/copy\""
 +   assert_includes @response.body, "action=\"/container_requests/#{uuid}/copy\""
    end
  
 -  test "container request copy" do
 -    completed_cr = api_fixture('container_requests')['completed']
 -    post(:copy,
 -         {
 -           id: completed_cr['uuid']
 -         },
 -         session_for(:active))
 -    assert_response 302
 -    copied_cr = assigns(:object)
 -    assert_not_nil copied_cr
 -    assert_equal 'Uncommitted', copied_cr[:state]
 -    assert_equal "Copy of #{completed_cr['name']}", copied_cr['name']
 -    assert_equal completed_cr['cmd'], copied_cr['cmd']
 -    assert_equal completed_cr['runtime_constraints']['ram'], copied_cr['runtime_constraints'][:ram]
 +  [
 +    ['completed', false, false],
 +    ['completed', true, false],
 +    ['completed-older', false, true],
 +    ['completed-older', true, true],
 +  ].each do |cr_fixture, reuse_enabled, uses_acr|
 +    test "container request #{uses_acr ? '' : 'not'} using arvados-cwl-runner copy #{reuse_enabled ? 'with' : 'without'} reuse enabled" do
 +      completed_cr = api_fixture('container_requests')[cr_fixture]
 +      # Set up post request params
 +      copy_params = {id: completed_cr['uuid']}
 +      if reuse_enabled
 +        copy_params.merge!({use_existing: true})
 +      end
 +      post(:copy, copy_params, session_for(:active))
 +      assert_response 302
 +      copied_cr = assigns(:object)
 +      assert_not_nil copied_cr
 +      assert_equal 'Uncommitted', copied_cr[:state]
 +      assert_equal "Copy of #{completed_cr['name']}", copied_cr['name']
 +      assert_equal completed_cr['cmd'], copied_cr['cmd']
 +      assert_equal completed_cr['runtime_constraints']['ram'], copied_cr['runtime_constraints'][:ram]
 +      if reuse_enabled
 +        assert copied_cr[:use_existing]
 +      else
 +        refute copied_cr[:use_existing]
 +      end
 +      # If the CR's command is arvados-cwl-runner, the appropriate flag should
 +      # be passed to it
 +      if uses_acr
 +        if reuse_enabled
 +          # arvados-cwl-runner's default behavior is to enable reuse
 +          assert_includes copied_cr['command'], 'arvados-cwl-runner'
 +          assert_not_includes copied_cr['command'], '--disable-reuse'
 +        else
 +          assert_includes copied_cr['command'], 'arvados-cwl-runner'
 +          assert_includes copied_cr['command'], '--disable-reuse'
 +          assert_not_includes copied_cr['command'], '--enable-reuse'
 +        end
 +      else
 +        # If no arvados-cwl-runner is being used, the command should be left alone
 +        assert_equal completed_cr['command'], copied_cr['command']
 +      end
 +    end
    end
+ 
+   [
+     ['completed', true],
+     ['running', true],
+     ['queued', true],
+     ['uncommitted', false],
+   ].each do |cr_fixture, should_show|
+     test "provenance tab should #{should_show ? '' : 'not'} be shown on #{cr_fixture} container requests" do
+       cr = api_fixture('container_requests')[cr_fixture]
+       assert_not_nil cr
+       get(:show,
+           {id: cr['uuid']},
+           session_for(:active))
+       assert_response :success
+       if should_show
+         assert_includes @response.body, "href=\"#Provenance\""
+       else
+         assert_not_includes @response.body, "href=\"#Provenance\""
+       end
+     end
+   end
  end