projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
19129: Select specific fields to speed up dashboard loading
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
projects
/
_show_dashboard.html.erb
diff --git
a/apps/workbench/app/views/projects/_show_dashboard.html.erb
b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index d4ea2de155af7384a844d0c4593314ebd201867c..f26d89780b2238d5dc47d07912fd5a1a6832d864 100644
(file)
--- a/
apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/
apps/workbench/app/views/projects/_show_dashboard.html.erb
@@
-8,7
+8,10
@@
SPDX-License-Identifier: AGPL-3.0 %>
# preload container_uuids of any container requests
recent_crs = recent_procs.map {|p| p if p.is_a?(ContainerRequest)}.compact.uniq
recent_cr_containers = recent_crs.map {|cr| cr.container_uuid}.compact.uniq
# preload container_uuids of any container requests
recent_crs = recent_procs.map {|p| p if p.is_a?(ContainerRequest)}.compact.uniq
recent_cr_containers = recent_crs.map {|cr| cr.container_uuid}.compact.uniq
- preload_objects_for_dataclass(Container, recent_cr_containers) if recent_cr_containers.andand.any?
+ if recent_cr_containers.andand.any?
+ preload_objects_for_dataclass(Container, recent_cr_containers, nil,
+ ["uuid", "started_at", "finished_at", "state", "runtime_status", "created_at", "modified_at"])
+ end
wus = {}
outputs = []
wus = {}
outputs = []
@@
-23,7
+26,7
@@
SPDX-License-Identifier: AGPL-3.0 %>
collection_pdhs = outputs.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact
collection_uuids = outputs - collection_pdhs
collection_pdhs = outputs.select {|x| !(m = CollectionsHelper.match(x)).nil?}.uniq.compact
collection_uuids = outputs - collection_pdhs
- if Rails.configuration.
show_recent_collections_on_d
ashboard
+ if Rails.configuration.
Workbench.ShowRecentCollectionsOnD
ashboard
recent_cs = recent_collections(8)
collection_uuids = collection_uuids + recent_cs[:collections].collect {|c| c.uuid}
collection_uuids.flatten.uniq
recent_cs = recent_collections(8)
collection_uuids = collection_uuids + recent_cs[:collections].collect {|c| c.uuid}
collection_uuids.flatten.uniq
@@
-36,13
+39,13
@@
SPDX-License-Identifier: AGPL-3.0 %>
<%
recent_procs_panel_width = 6
<%
recent_procs_panel_width = 6
- if !PipelineInstance.api_exists?(:
index
)
+ if !PipelineInstance.api_exists?(:
create
)
recent_procs_title = 'Recent processes'
run_proc_title = 'Choose a workflow to run:'
show_node_status = false
# Recent processes panel should take the entire width when is the only one
# being rendered.
recent_procs_title = 'Recent processes'
run_proc_title = 'Choose a workflow to run:'
show_node_status = false
# Recent processes panel should take the entire width when is the only one
# being rendered.
- if !Rails.configuration.
show_recent_collections_on_d
ashboard
+ if !Rails.configuration.
Workbench.ShowRecentCollectionsOnD
ashboard
recent_procs_panel_width = 12
end
else
recent_procs_panel_width = 12
end
else
@@
-187,7
+190,17
@@
SPDX-License-Identifier: AGPL-3.0 %>
</div>
</div>
<% end %>
</div>
</div>
<% end %>
- <% if Rails.configuration.show_recent_collections_on_dashboard %>
+ <% if Container.api_exists?(:index) %>
+ <div class="panel panel-default" style="min-height: 10.5em">
+ <div class="panel-heading"><span class="panel-title">Container status</span></div>
+ <div class="panel-body containers-summary-pane">
+ <div>
+ <%= render partial: 'container_summary' %>
+ </div>
+ </div>
+ </div>
+ <% end %>
+ <% if Rails.configuration.Workbench.ShowRecentCollectionsOnDashboard %>
<div class="panel panel-default">
<div class="panel-heading"><span class="panel-title">Recent collections</span>
<span class="pull-right">
<div class="panel panel-default">
<div class="panel-heading"><span class="panel-title">Recent collections</span>
<span class="pull-right">