$container.find(".spinner").detach();
$container.append(data.content);
$container.attr('data-infinite-content-href', data.next_page_href);
+ ping_all_scrollers();
});
}
}
end
end
+ helper_method :next_page_filters
+ def next_page_filters nextpage_operator
+ next_page_filters = @filters.reject do |attr, op, val|
+ (attr == 'created_at' and op == nextpage_operator) or
+ (attr == 'uuid' and op == 'not in')
+ end
+
+ if @objects.any?
+ last_created_at = @objects.last.created_at
+
+ last_uuids = []
+ @objects.each do |obj|
+ last_uuids << obj.uuid if obj.created_at.eql?(last_created_at)
+ end
+
+ next_page_filters += [['created_at', nextpage_operator, last_created_at]]
+ next_page_filters += [['uuid', 'not in', last_uuids]]
+ end
+
+ next_page_filters
+ end
+
def show
if !@object
return render_not_found("object not found")
@objects = @objects.to_a.sort_by(&:created_at)
@objects.reverse! if nextpage_operator == '<='
@objects = @objects[0..@limit-1]
- @next_page_filters = @filters.reject do |attr,op,val|
- (attr == 'created_at' and op == nextpage_operator) or
- (attr == 'uuid' and op == 'not in')
- end
if @objects.any?
- last_created_at = @objects.last.created_at
-
- last_uuids = []
- @objects.each do |obj|
- last_uuids << obj.uuid if obj.created_at.eql?(last_created_at)
- end
-
- @next_page_filters += [['created_at',
- nextpage_operator,
- last_created_at]]
- @next_page_filters += [['uuid', 'not in', last_uuids]]
+ @next_page_filters = next_page_filters(nextpage_operator)
@next_page_href = url_for(partial: :contents_rows,
limit: @limit,
filters: @next_page_filters.to_json)
--- /dev/null
+class WorkUnitsController < ApplicationController
+ def find_objects_for_index
+ # If it's not the index rows partial display, just return
+ # The /index request will again be invoked to display the
+ # partial at which time, we will be using the objects found.
+ return if !params[:partial]
+
+ @limit = 20
+ @filters = @filters || []
+
+ # get next page of pipeline_instances
+ filters = @filters + [["uuid", "is_a", ["arvados#pipelineInstance"]]]
+ pipelines = PipelineInstance.limit(@limit).order(["created_at desc"]).filter(filters)
+
+ # get next page of jobs
+ filters = @filters + [["uuid", "is_a", ["arvados#job"]]]
+ jobs = Job.limit(@limit).order(["created_at desc"]).filter(filters)
+
+ # get next page of container_requests
+ filters = @filters + [["uuid", "is_a", ["arvados#containerRequest"]]]
+ crs = ContainerRequest.limit(@limit).order(["created_at desc"]).filter(filters)
+ @objects = (jobs.to_a + pipelines.to_a + crs.to_a).sort_by(&:created_at).reverse.first(@limit)
+
+ if @objects.any?
+ @next_page_filters = next_page_filters('<=')
+ @next_page_href = url_for(partial: :all_processes_rows,
+ filters: @next_page_filters.to_json)
+ preload_links_for_objects(@objects.to_a)
+ else
+ @next_page_href = nil
+ end
+ end
+
+ def next_page_href with_params={}
+ @next_page_href
+ end
+end
template = if lookup and lookup[self.pipeline_template_uuid]
lookup[self.pipeline_template_uuid]
else
- PipelineTemplate.where(uuid: self.pipeline_template_uuid).first
+ PipelineTemplate.find(self.pipeline_template_uuid) if self.pipeline_template_uuid
end
if template
template.name
get(:modified_by_user_uuid)
end
+ def owner_uuid
+ get(:owner_uuid)
+ end
+
def created_at
t = get(:created_at)
t = Time.parse(t) if (t.is_a? String)
state = get(:state)
if ["Running", "RunningOnServer", "RunningOnClient"].include? state
"Running"
+ elsif state == 'New'
+ "Not started"
else
state
end
# returns uuid of the user who modified this work unit most recently
end
+ def owner_uuid
+ # returns uuid of the owner of this work unit
+ end
+
def created_at
# returns created_at timestamp
end
<% if object.deletable? %>
- <%= link_to({action: 'destroy', id: object.uuid}, method: :delete, remote: true, data: {confirm: "Really delete #{object.class_for_display.downcase} '#{object.friendly_link_name}'?"}) do %>
+ <%= link_to({controller: object.class.table_name, action: 'destroy', id: object.uuid}, method: :delete, remote: true, data: {confirm: "Really delete #{object.class_for_display.downcase} '#{object.friendly_link_name}'?"}) do %>
<i class="glyphicon glyphicon-trash"></i>
<% end %>
<% end %>
-<%= render(partial: 'work_unit/show_log', locals: {obj: @object, name: @object[:name] || 'this container'}) %>
+<%= render(partial: 'work_units/show_log', locals: {obj: @object, name: @object[:name] || 'this container'}) %>
-<%= render(partial: 'work_unit/show_status', locals: {current_obj: @object, name: @object[:name] || 'this container'}) %>
+<%= render(partial: 'work_units/show_status', locals: {current_obj: @object, name: @object[:name] || 'this container'}) %>
-<%= render(partial: 'work_unit/show_log', locals: {obj: @object, name: @object[:name] || 'this container'}) %>
+<%= render(partial: 'work_units/show_log', locals: {obj: @object, name: @object[:name] || 'this container'}) %>
-<%= render(partial: 'work_unit/show_status', locals: {current_obj: @object, name: @object[:name] || 'this container'}) %>
+<%= render(partial: 'work_units/show_status', locals: {current_obj: @object, name: @object[:name] || 'this container'}) %>
<div class="panel panel-default">
<div class="panel-heading">
-<%= render(partial: 'work_unit/show_status', locals: {current_obj: @object, name: @object[:name] || 'this job'}) %>
+<%= render(partial: 'work_units/show_status', locals: {current_obj: @object, name: @object[:name] || 'this job'}) %>
<div class="panel panel-default">
<div class="panel-heading">
data-object-uuids="<%= @object.uuid %> <%= job_uuids.join(' ') %>"
></div>
- <%= render partial: 'work_unit/show_component', locals: {wu: @object.work_unit(@object.name)} %>
+ <%= render partial: 'work_units/show_component', locals: {wu: @object.work_unit(@object.name)} %>
<% else %>
<%# state is either New or Ready %>
<% end %>
</span>
<span>
- <%= link_to pipeline_instances_path, class: 'btn btn-default btn-xs' do %>
- All pipelines <i class="fa fa-fw fa-arrow-circle-right"></i>
+ <%= link_to all_processes_path, class: 'btn btn-default btn-xs' do %>
+ All processes <i class="fa fa-fw fa-arrow-circle-right"></i>
<% end %>
</span>
</span>
Active for <%= render_runtime(wu_time, false) %>
<% end %>
- <span class="pull-right text-overflow-ellipsis" style="max-width: 100%">
- <% outputs = wu.outputs %>
- <% if outputs.size == 0 %>
- No output.
- <% elsif outputs.size == 1 %>
- <i class="fa fa-fw fa-archive"></i> <%= link_to_if_arvados_object outputs[0], friendly_name: true %>
- <% else %>
- <%= render partial: 'work_unit/show_outputs', locals: {id: wu.uuid, outputs: outputs, align:"pull-right"} %>
- <% end %>
- </span>
+ <%= render partial: 'work_units/show_output', locals: {wu: wu, align: 'pull-right', include_icon: true} %>
</div>
</div>
<% end %>
</span>
<% end %>
- <span>
- <%= link_to jobs_path, class: 'btn btn-default btn-xs' do %>
- All jobs <i class="fa fa-fw fa-arrow-circle-right"></i>
- <% end %>
- </span>
</span>
</div>
<div class="panel-body compute-node-summary-pane">
+++ /dev/null
-<div class="arv-log-refresh-control"
- data-load-throttle="15000"
- ></div>
-<%=
- render(partial: 'work_unit/show_component', locals: {wu: current_obj.work_unit(name)})
-%>
<% if val.size == 1 %>
<%= link_to_arvados_object_if_readable(val[0], 'Output data not available', friendly_name: true) %>
<% else %>
- <%= render partial: 'work_unit/show_outputs', locals: {id: current_obj.uuid, outputs: val, align:""} %>
+ <%= render partial: 'work_units/show_outputs', locals: {id: current_obj.uuid, outputs: val, align:""} %>
<% end %>
<% else %>
<%= val %>
--- /dev/null
+<div class="container">
+ <div class="row">
+ <div class="pull-right">
+ <input type="text" class="form-control filterable-control recent-all-processes-filterable-control"
+ placeholder="Search all processes"
+ data-filterable-target="#all-processes-scroll"
+ value="<%= params[:search] %>">
+ </input>
+ </div>
+ </div>
+ <div>
+ <div>
+ <table class="table table-condensed table-fixedlayout arv-recent-all-processes">
+ <colgroup>
+ <col width="25%" />
+ <col width="10%" />
+ <col width="20%" />
+ <col width="20%" />
+ <col width="20%" />
+ <col width="5%" />
+ </colgroup>
+
+ <thead>
+ <tr class="contain-align-left">
+ <th>
+ Process
+ </th>
+ <th>
+ Status
+ </th>
+ <th>
+ Owner
+ </th>
+ <th>
+ Created at
+ </th>
+ <th>
+ Output
+ </th>
+ <th>
+ </th>
+ </tr>
+ </thead>
+
+ <tbody data-infinite-scroller="#all-processes-scroll" id="all-processes-scroll"
+ data-infinite-content-href="<%= url_for partial: :all_processes_rows %>" >
+ </tbody>
+ </table>
+ </div>
+ </div>
+</div>
--- /dev/null
+<% @objects.each do |obj| %>
+ <% wu = obj.work_unit %>
+ <tr data-object-uuid="<%= wu.uuid %>" >
+ <td>
+ <%= link_to_if_arvados_object obj, friendly_name: true %>
+ </td>
+ <td>
+ <span class="label label-<%= wu.state_bootstrap_class %>"><%= wu.state_label %></span>
+ </td>
+ <td>
+ <%= link_to_if_arvados_object wu.owner_uuid, friendly_name: true %>
+ </td>
+ <td>
+ <%= render_localized_date(wu.created_at) %>
+ </td>
+ <td>
+ <%= render partial: 'work_units/show_output', locals: {wu: wu, align: ''} %>
+ </td>
+ <td>
+ <%= render partial: 'delete_object_button', locals: {object:obj} %>
+ </td>
+ </tr>
+<% end %>
</div>
<div class="col-md-2 pipeline-instance-spacing">
- <%= render partial: 'work_unit/progress', locals: {wu: current_obj} %>
+ <%= render partial: 'work_units/progress', locals: {wu: current_obj} %>
</div>
<% if not current_obj %>
<% if outputs.size == 1 %>
<%= link_to_arvados_object_if_readable(outputs[0], 'Output data not available', link_text: "Output of #{current_obj.label}") %>
<% else %>
- <%= render partial: 'work_unit/show_outputs', locals: {id: current_obj.uuid, outputs: outputs, align:"pull-right"} %>
+ <%= render partial: 'work_units/show_outputs', locals: {id: current_obj.uuid, outputs: outputs, align:"pull-right"} %>
<% end %>
<% else %>
No output.
<div id="collapse<%= i %>" class="panel-collapse collapse <%= if expanded then 'in' end %>">
<div class="panel-body">
- <%= render partial: 'work_unit/show_component', locals: {wu: current_obj} %>
+ <%= render partial: 'work_units/show_component', locals: {wu: current_obj} %>
</div>
</div>
</div>
<% end %>
</div>
<div class="col-md-3">
- <%= render partial: 'work_unit/progress', locals: {wu: wu} %>
+ <%= render partial: 'work_units/progress', locals: {wu: wu} %>
</div>
<div class="col-md-1">
<% if wu.can_cancel? and @object.editable? %>
</div>
<p>
- <%= render(partial: 'work_unit/component_detail', locals: {current_obj: wu}) %>
+ <%= render(partial: 'work_units/component_detail', locals: {current_obj: wu}) %>
</p>
<%# Work unit children %>
<% @descendent_count = 0 if !@descendent_count %>
<% wu.children.each do |c| %>
<% @descendent_count += 1 %>
- <%= render(partial: 'work_unit/show_child', locals: {current_obj: c, i: @descendent_count, expanded: false}) %>
+ <%= render(partial: 'work_units/show_child', locals: {current_obj: c, i: @descendent_count, expanded: false}) %>
<% end %>
<% end %>
--- /dev/null
+<span class="<%=align%> text-overflow-ellipsis" style="max-width: 100%">
+ <% outputs = wu.outputs %>
+ <% if outputs.size == 0 %>
+ No output
+ <% elsif outputs.size == 1 %>
+ <% if defined?(include_icon) && include_icon %>
+ <i class="fa fa-fw fa-archive"></i>
+ <% end %>
+ <%= link_to_if_arvados_object outputs[0], friendly_name: true %>
+ <% else %>
+ <%= render partial: 'work_units/show_outputs', locals: {id: wu.uuid, outputs: outputs, align:align} %>
+ <% end %>
+</span>
--- /dev/null
+<div class="arv-log-refresh-control"
+ data-load-throttle="15000"
+ ></div>
+<%=
+ render(partial: 'work_units/show_component', locals: {wu: current_obj.work_unit(name)})
+%>
--- /dev/null
+<%= render partial: 'work_units/show_all_processes' %>
--- /dev/null
+class ActiveSupport::TimeWithZone
+ def as_json *args
+ strftime "%Y-%m-%dT%H:%M:%S.%NZ"
+ end
+end
get "report_issue_popup" => 'actions#report_issue_popup', :as => :report_issue_popup
post "report_issue" => 'actions#report_issue', :as => :report_issue
get "star" => 'actions#star', :as => :star
+ get "all_processes" => 'work_units#index', :as => :all_processes
resources :nodes
resources :humans
resources :traits
end
[
- ["jobs", "/jobs"],
- ["pipelines", "/pipeline_instances"],
- ["collections", "/collections"],
- ].each do |target,path|
- test "test dashboard button all #{target}" do
- get :index, {}, session_for(:active)
- assert_includes @response.body, "href=\"#{path}\""
- assert_includes @response.body, "All #{target}"
+ [:admin, true],
+ [:active, false],
+ ].each do |user, expect_all_nodes|
+ test "in dashboard other index page links as #{user}" do
+ get :index, {}, session_for(user)
+
+ [["processes", "/all_processes"],
+ ["collections", "/collections"],
+ ].each do |target, path|
+ assert_includes @response.body, "href=\"#{path}\""
+ assert_includes @response.body, "All #{target}"
+ end
+
+ if expect_all_nodes
+ assert_includes @response.body, "href=\"/nodes\""
+ assert_includes @response.body, "All nodes"
+ else
+ assert_not_includes @response.body, "href=\"/nodes\""
+ assert_not_includes @response.body, "All nodes"
+ end
end
end
--- /dev/null
+require 'test_helper'
+
+class WorkUnitsControllerTest < ActionController::TestCase
+ # These tests don't do state-changing API calls.
+ # Save some time by skipping the database reset.
+ reset_api_fixtures :after_each_test, false
+ reset_api_fixtures :after_suite, true
+
+ [
+ ['foo', 10, 25,
+ ['/pipeline_instances/zzzzz-d1hrv-1xfj6xkicf2muk2',
+ '/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 "all_processes page for search filter '#{search_filter}'" do
+ work_units_index(filters: [['any','@@', search_filter]])
+ assert_response :success
+
+ # Verify that expected number of processes are found
+ found_count = json_response['content'].scan('<tr').count
+ if expected_min == expected_max
+ assert_equal(true, found_count == expected_min,
+ "Not found expected number of items. Expected #{expected_min} and found #{found_count}")
+ else
+ assert_equal(true, found_count>=expected_min,
+ "Found too few items. Expected at least #{expected_min} and found #{found_count}")
+ assert_equal(true, found_count<=expected_max,
+ "Found too many items. Expected at most #{expected_max} and found #{found_count}")
+ end
+
+ # verify that all expected uuid links are found
+ expected.each do |link|
+ assert_match /href="#{link}"/, json_response['content']
+ end
+
+ # verify that none of the not_expected uuid links are found
+ not_expected.each do |link|
+ assert_no_match /href="#{link}"/, json_response['content']
+ end
+ end
+ end
+
+ def work_units_index params
+ params = {
+ partial: :all_processes_rows,
+ format: :json,
+ }.merge(params)
+ encoded_params = Hash[params.map { |k,v|
+ [k, (v.is_a?(Array) || v.is_a?(Hash)) ? v.to_json : v]
+ }]
+ get :index, encoded_params, session_for(:active)
+ end
+end
assert_text 'Recent pipelines and processes' # seeing dashboard now
within('.recent-processes-actions') do
assert page.has_link?('Run a pipeline')
- assert page.has_link?('All pipelines')
+ assert page.has_link?('All processes')
end
within('.recent-processes') do
else
assert page.has_no_link?('All nodes')
end
- assert page.has_link? 'All jobs'
end
within('.compute-node-summary-pane') do
--- /dev/null
+require 'integration_helper'
+
+class WorkUnitsTest < ActionDispatch::IntegrationTest
+ setup do
+ need_javascript
+ end
+
+ test "scroll all_processes page" do
+ expected_min, expected_max, expected, not_expected = [
+ 25, 100,
+ ['/pipeline_instances/zzzzz-d1hrv-1yfj61234abcdk3',
+ '/pipeline_instances/zzzzz-d1hrv-jobspeccomponts',
+ '/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-oneof60crs00001']
+ ]
+
+ visit page_with_token('active', "/all_processes")
+
+ page_scrolls = expected_max/20 + 2
+ within('.arv-recent-all-processes') do
+ (0..page_scrolls).each do |i|
+ page.driver.scroll_to 0, 999000
+ begin
+ wait_for_ajax
+ rescue
+ end
+ end
+ end
+
+ # Verify that expected number of processes are found
+ found_items = page.all('tr[data-object-uuid]')
+ found_count = found_items.count
+ if expected_min == expected_max
+ assert_equal(true, found_count == expected_min,
+ "Not found expected number of items. Expected #{expected_min} and found #{found_count}")
+ assert page.has_no_text? 'request failed'
+ else
+ assert_equal(true, found_count>=expected_min,
+ "Found too few items. Expected at least #{expected_min} and found #{found_count}")
+ assert_equal(true, found_count<=expected_max,
+ "Found too many items. Expected at most #{expected_max} and found #{found_count}")
+ end
+
+ # verify that all expected uuid links are found
+ expected.each do |link|
+ assert_selector "a[href=\"#{link}\"]"
+ end
+
+ # verify that none of the not_expected uuid links are found
+ not_expected.each do |link|
+ assert_no_selector "a[href=\"#{link}\"]"
+ end
+ end
+end
projects / arvados.git / commitdiff