[ARVADOS] updated: b2b5b792d3713ab3987a621edf98b3b312f1d4e4

[Git user]

Summary of changes:
 .../workbench/app/controllers/all_processes_controller.rb |  9 +++++++--
 apps/workbench/test/integration/all_processes_test.rb     | 15 ++++++++++++---
 2 files changed, 19 insertions(+), 5 deletions(-)

       via  b2b5b792d3713ab3987a621edf98b3b312f1d4e4 (commit)
      from  0fdcd2007487887598dc7b40d733d4222f32c58a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit b2b5b792d3713ab3987a621edf98b3b312f1d4e4
Author: radhika <radhika at curoverse.com>
Date:   Thu Jul 7 17:38:27 2016 -0400

    9319: show all pipeline_instances, jobs, and container_requests in all_processes page, not just top-level objects.

diff --git a/apps/workbench/app/controllers/all_processes_controller.rb b/apps/workbench/app/controllers/all_processes_controller.rb
index 4be7fcf..0837e31 100644
--- a/apps/workbench/app/controllers/all_processes_controller.rb
+++ b/apps/workbench/app/controllers/all_processes_controller.rb
@@ -34,12 +34,17 @@ class AllProcessesController < ApplicationController
     pipelines = PipelineInstance.limit(@limit).order(["created_at desc"]).filter(filters)
     pipelines.results.each { |pi| procs[pi] = pi.created_at }
 
+    # get next page of jobs
+    filters = @filters + [%w(uuid is_a) + [%w(arvados#job)]]
+    jobs = Job.limit(@limit).order(["created_at desc"]).filter(filters)
+    jobs.results.each { |pi| procs[pi] = pi.created_at }
+
     # get next page of container_requests
-    filters = @filters + [%w(uuid is_a) + [%w(arvados#containerRequest)]] + [['requesting_container_uuid', '=', nil]]
+    filters = @filters + [%w(uuid is_a) + [%w(arvados#containerRequest)]]
     crs = ContainerRequest.limit(@limit).order(["created_at desc"]).filter(filters)
     crs.results.each { |c| procs[c] = c.created_at }
 
-    @objects = Hash[procs.sort_by {|key, value| value}].keys.reverse.first(@limit)
+    @objects = Hash[procs.sort_by {|key, value| value}].keys.reverse
 
     @next_page_filters = @filters.reject do |attr,op,val|
       (attr == 'created_at') or (attr == 'uuid' and op == 'not in')
diff --git a/apps/workbench/test/integration/all_processes_test.rb b/apps/workbench/test/integration/all_processes_test.rb
index 4f4e772..e2999d8 100644
--- a/apps/workbench/test/integration/all_processes_test.rb
+++ b/apps/workbench/test/integration/all_processes_test.rb
@@ -9,21 +9,30 @@ class AllProcessesTest < ActionDispatch::IntegrationTest
     [nil, 25, 100,
       ['/pipeline_instances/zzzzz-d1hrv-1yfj61234abcdk3',
        '/pipeline_instances/zzzzz-d1hrv-jobspeccomponts',
-       '/container_requests/zzzzz-xvhdp-cr4completedcr2'],
+       '/jobs/zzzzz-8i9sb-grx15v5mjnsyxk7',
+       '/jobs/zzzzz-8i9sb-n7omg50bvt0m1nf',
+       '/container_requests/zzzzz-xvhdp-cr4completedcr2',
+       '/container_requests/zzzzz-xvhdp-cr4requestercn2'],
       ['/pipeline_instances/zzzzz-d1hrv-scarxiyajtshq3l',
-       '/container_requests/zzzzz-xvhdp-cr4requestercn2']],
+       '/container_requests/zzzzz-xvhdp-oneof60crs00001']],
     ['foo', 10, 25,
       ['/pipeline_instances/zzzzz-d1hrv-1xfj6xkicf2muk2',
-       '/pipeline_instances/zzzzz-d1hrv-jobspeccomponts'],
+       '/pipeline_instances/zzzzz-d1hrv-jobspeccomponts',
+       '/jobs/zzzzz-8i9sb-grx15v5mjnsyxk7'],
       ['/pipeline_instances/zzzzz-d1hrv-1yfj61234abcdk3',
+       '/jobs/zzzzz-8i9sb-n7omg50bvt0m1nf',
        '/container_requests/zzzzz-xvhdp-cr4completedcr2']],
     ['pipeline_with_tagged_collection_input', 1, 1,
       ['/pipeline_instances/zzzzz-d1hrv-1yfj61234abcdk3'],
       ['/pipeline_instances/zzzzz-d1hrv-jobspeccomponts',
+       '/jobs/zzzzz-8i9sb-pshmckwoma9plh7',
+       '/jobs/zzzzz-8i9sb-n7omg50bvt0m1nf',
        '/container_requests/zzzzz-xvhdp-cr4completedcr2']],
     ['no_such_match', 0, 0,
       [],
       ['/pipeline_instances/zzzzz-d1hrv-jobspeccomponts',
+       '/jobs/zzzzz-8i9sb-pshmckwoma9plh7',
+       '/jobs/zzzzz-8i9sb-n7omg50bvt0m1nf',
        '/container_requests/zzzzz-xvhdp-cr4completedcr2']],
   ].each do |search_filter, expected_min, expected_max, expected, not_expected|
     test "scroll all_processes page for search filter '#{search_filter}'" do

-----------------------------------------------------------------------


hooks/post-receive
--