Merge branch '12995-wb-merge-acct' refs #12995

[arvados.git] / apps / workbench / app / controllers / jobs_controller.rb

diff --git a/apps/workbench/app/controllers/jobs_controller.rb b/apps/workbench/app/controllers/jobs_controller.rb
index a85a70b26896047f378cd4101043733410a970e3..204dbb76dfa545a19a3c3124b91acd58b6b77607 100644 (file)
--- a/apps/workbench/app/controllers/jobs_controller.rb
+++ b/apps/workbench/app/controllers/jobs_controller.rb
@@ -1,7 +1,12 @@
-class JobsController < ApplicationController
-  skip_around_filter :require_thread_api_token, only: :show
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
 
-  include JobsHelper
+class JobsController < ApplicationController
+  skip_around_filter :require_thread_api_token, if: proc { |ctrl|
+    Rails.configuration.anonymous_user_token and
+    'show' == ctrl.action_name
+  }
 
   def generate_provenance(jobs)
     return if params['tab_pane'] != "Provenance"
@@ -29,6 +34,7 @@ class JobsController < ApplicationController
 
     @svg = ProvenanceHelper::create_provenance_graph nodes, "provenance_svg", {
       :request => request,
+      :direction => :top_down,
       :all_script_parameters => true,
       :script_version_nodes => true}
   end
@@ -60,14 +66,9 @@ class JobsController < ApplicationController
   end
 
   def logs
-    @logs = Log.select(%w(event_type object_uuid event_at properties))
-               .order('event_at DESC')
-               .filter([["event_type",  "=", "stderr"],
-                        ["object_uuid", "in", [@object.uuid]]])
-               .limit(500)
-               .results
-               .to_a
-               .map{ |e| e.serializable_hash.merge({ 'prepend' => true }) }
+    @logs = @object.
+      stderr_log_query(Rails.configuration.running_job_log_records_to_fetch).
+      map { |e| e.serializable_hash.merge({ 'prepend' => true }) }
     respond_to do |format|
       format.json { render json: @logs }
     end
@@ -82,8 +83,6 @@ class JobsController < ApplicationController
   end
 
   def show_pane_list
-    panes = %w(Status Log Details Provenance Advanced)
-    panes.delete 'Log' if !current_user
-    panes
+    %w(Status Log Details Provenance Advanced)
   end
 end