[ARVADOS] updated: cbd67fc6ba667bc27ca7e885145a6e34e5596f37
Git user
git at public.curoverse.com
Wed Jun 15 13:30:23 EDT 2016
Summary of changes:
apps/workbench/app/controllers/application_controller.rb | 5 +----
.../app/views/projects/_show_dashboard.html.erb | 4 ++--
.../test/integration/application_layout_test.rb | 16 +++++++++++++---
services/api/test/fixtures/container_requests.yml | 8 ++++----
services/api/test/fixtures/containers.yml | 2 +-
services/api/test/fixtures/pipeline_instances.yml | 10 +++++++---
6 files changed, 28 insertions(+), 17 deletions(-)
via cbd67fc6ba667bc27ca7e885145a6e34e5596f37 (commit)
from 4a6b74c22201ceac36797b7722d52407eec63536 (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 cbd67fc6ba667bc27ca7e885145a6e34e5596f37
Author: radhika <radhika at curoverse.com>
Date: Wed Jun 15 13:27:43 2016 -0400
9372: Corrected dashboard display to list container_requests, not containers as implementd in #9318.
diff --git a/apps/workbench/app/controllers/application_controller.rb b/apps/workbench/app/controllers/application_controller.rb
index dfa5ebc..0ed6294 100644
--- a/apps/workbench/app/controllers/application_controller.rb
+++ b/apps/workbench/app/controllers/application_controller.rb
@@ -835,12 +835,9 @@ class ApplicationController < ActionController::Base
pipelines = PipelineInstance.limit(lim).order(["created_at desc"])
crs = ContainerRequest.limit(lim).order(["created_at desc"]).filter([["requesting_container_uuid", "=", nil]])
- cr_uuids = crs.results.collect { |c| c.container_uuid }
- containers = Container.order(["created_at desc"]).results if cr_uuids.any?
-
procs = {}
pipelines.results.each { |pi| procs[pi] = pi.created_at }
- containers.each { |c| procs[c] = c.created_at } if !containers.nil?
+ crs.results.each { |c| procs[c] = c.created_at }
Hash[procs.sort_by {|key, value| value}].keys.reverse.first(lim)
end
diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index 8c394b1..8abcee4 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -34,7 +34,7 @@
<% _recent_processes.each do |p| %>
<% wu = p.work_unit %>
<% if wu.is_finished? %>
- <div class="dashboard-panel-info-row">
+ <div class="dashboard-panel-info-row row-<%=wu.uuid%>">
<div class="row">
<div class="col-md-6 text-overflow-ellipsis">
<%= link_to_if_arvados_object p, {friendly_name: true} %>
@@ -68,7 +68,7 @@
</div>
<% else %>
- <div class="dashboard-panel-info-row">
+ <div class="dashboard-panel-info-row row-<%=wu.uuid%>">
<div class="clearfix">
<%= link_to_if_arvados_object p, {friendly_name: true} %>
<div class="pull-right" style="width: 40%">
diff --git a/apps/workbench/test/integration/application_layout_test.rb b/apps/workbench/test/integration/application_layout_test.rb
index 8e81c7c..61905f3 100644
--- a/apps/workbench/test/integration/application_layout_test.rb
+++ b/apps/workbench/test/integration/application_layout_test.rb
@@ -256,10 +256,20 @@ class ApplicationLayoutTest < ActionDispatch::IntegrationTest
end
within('.recent-processes') do
- assert_text 'zzzzz-d1hrv-partdonepipelin'
+ assert_text 'running_with_job'
+ within('.row-zzzzz-d1hrv-runningpipeline') do
+ assert_text 'foo'
+ end
+
assert_text 'zzzzz-d1hrv-twodonepipeline'
- assert_text 'zzzzz-dz642-runningcontainr'
- assert_text 'zzzzz-dz642-runningcontain2'
+ within('.row-zzzzz-d1hrv-twodonepipeline')do
+ assert_text 'No output'
+ end
+
+ assert_text 'completed container request'
+ within('.row-zzzzz-xvhdp-cr4completedctr')do
+ assert page.has_link? 'foo_file'
+ end
end
within('.compute-node-actions') do
diff --git a/services/api/test/fixtures/container_requests.yml b/services/api/test/fixtures/container_requests.yml
index 76c2fdc..1e3d773 100644
--- a/services/api/test/fixtures/container_requests.yml
+++ b/services/api/test/fixtures/container_requests.yml
@@ -49,12 +49,12 @@ running-older:
completed:
uuid: zzzzz-xvhdp-cr4completedctr
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
- name: completed
+ name: completed container request
state: Final
priority: 1
- created_at: 2016-01-11 11:11:11.111111111 Z
- updated_at: 2016-01-11 11:11:11.111111111 Z
- modified_at: 2016-01-11 11:11:11.111111111 Z
+ created_at: <%= 2.minute.ago.to_s(:db) %>
+ updated_at: <%= 1.minute.ago.to_s(:db) %>
+ modified_at: <%= 1.minute.ago.to_s(:db) %>
modified_by_user_uuid: zzzzz-tpzed-xurymjxw79nv3jz
container_image: test
cwd: test
diff --git a/services/api/test/fixtures/containers.yml b/services/api/test/fixtures/containers.yml
index c250d40..1796e49 100644
--- a/services/api/test/fixtures/containers.yml
+++ b/services/api/test/fixtures/containers.yml
@@ -76,7 +76,7 @@ completed:
finished_at: 2016-01-12 11:12:13.111111111 Z
container_image: test
cwd: test
- output: test
+ output: zzzzz-4zz18-znfnqtbbv4spc3w
output_path: test
command: ["echo", "hello"]
runtime_constraints:
diff --git a/services/api/test/fixtures/pipeline_instances.yml b/services/api/test/fixtures/pipeline_instances.yml
index ff7864d..04a200d 100644
--- a/services/api/test/fixtures/pipeline_instances.yml
+++ b/services/api/test/fixtures/pipeline_instances.yml
@@ -42,6 +42,7 @@ has_component_with_completed_jobs:
state: Complete
uuid: zzzzz-d1hrv-i3e77t9z5y8j9cc
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: <%= 11.minute.ago.to_s(:db) %>
started_at: <%= 10.minute.ago.to_s(:db) %>
finished_at: <%= 9.minute.ago.to_s(:db) %>
components:
@@ -258,7 +259,7 @@ pipeline_in_publicly_accessible_project:
name: Pipeline in publicly accessible project
pipeline_template_uuid: zzzzz-p5p6p-tmpltpublicproj
state: Complete
- created_at: <%= 1.minute.ago.to_s(:db) %>
+ created_at: <%= 30.minute.ago.to_s(:db) %>
components:
foo:
script: foo
@@ -377,6 +378,7 @@ running_pipeline_with_complete_job:
uuid: zzzzz-d1hrv-partdonepipelin
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
state: RunningOnServer
+ created_at: <%= 15.minute.ago.to_s(:db) %>
components:
previous:
job:
@@ -390,8 +392,9 @@ complete_pipeline_with_two_jobs:
uuid: zzzzz-d1hrv-twodonepipeline
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
state: Complete
- started_at: <%= 10.minute.ago.to_s(:db) %>
- finished_at: <%= 9.minute.ago.to_s(:db) %>
+ created_at: <%= 3.minute.ago.to_s(:db) %>
+ started_at: <%= 2.minute.ago.to_s(:db) %>
+ finished_at: <%= 1.minute.ago.to_s(:db) %>
components:
ancient:
job:
@@ -405,6 +408,7 @@ complete_pipeline_with_two_jobs:
failed_pipeline_with_two_jobs:
uuid: zzzzz-d1hrv-twofailpipeline
owner_uuid: zzzzz-tpzed-xurymjxw79nv3jz
+ created_at: <%= 55.minute.ago.to_s(:db) %>
state: Failed
components:
ancient:
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list