Merge branch '8784-dir-listings'

[arvados.git] / apps / workbench / app / models / job.rb

diff --git a/apps/workbench/app/models/job.rb b/apps/workbench/app/models/job.rb
index c59bb89fe851306c80278b4b96ce192c9e064ea7..7c55d9e857cfa89a9c448d3c77ccda829b747449 100644 (file)
--- a/apps/workbench/app/models/job.rb
+++ b/apps/workbench/app/models/job.rb
@@ -1,3 +1,7 @@
+# Copyright (C) The Arvados Authors. All rights reserved.
+#
+# SPDX-License-Identifier: AGPL-3.0
+
 class Job < ArvadosBase
   def self.goes_in_projects?
     true
@@ -11,10 +15,6 @@ class Job < ArvadosBase
     %w(description)
   end
 
-  def self.creatable?
-    false
-  end
-
   def default_name
     if script
       x = "\"#{script}\" job"
@@ -31,7 +31,7 @@ class Job < ArvadosBase
   end
 
   def cancel
-    arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {}
+    arvados_api_client.api "jobs/#{self.uuid}/", "cancel", {"cascade" => true}
   end
 
   def self.queue_size
@@ -45,4 +45,19 @@ class Job < ArvadosBase
   def textile_attributes
     [ 'description' ]
   end
+
+  def stderr_log_query(limit=nil)
+    query = Log.where(object_uuid: self.uuid).order("created_at DESC").with_count('none')
+    query = query.limit(limit) if limit
+    query
+  end
+
+  def stderr_log_lines(limit=2000)
+    stderr_log_query(limit).results.reverse.
+      flat_map { |log| log.properties[:text].split("\n") rescue [] }
+  end
+
+  def work_unit(label=nil)
+    JobWorkUnit.new(self, label, self.uuid)
+  end
 end