From c25c456973ebd634256e8c5eff56397d3381fb0e Mon Sep 17 00:00:00 2001
From: Lucas Di Pentima <ldipentima@veritasgenetics.com>
Date: Tue, 11 Sep 2018 11:44:48 -0300
Subject: [PATCH] 13773: Enhance error/warning runtime status display on
 workbench.

Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima@veritasgenetics.com>
---
 .../views/projects/_show_dashboard.html.erb   |  4 +-
 .../views/work_units/_show_component.html.erb | 40 +++++++++++++------
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/apps/workbench/app/views/projects/_show_dashboard.html.erb b/apps/workbench/app/views/projects/_show_dashboard.html.erb
index cc00e0a8eb..69abf04e68 100644
--- a/apps/workbench/app/views/projects/_show_dashboard.html.erb
+++ b/apps/workbench/app/views/projects/_show_dashboard.html.erb
@@ -100,7 +100,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
             end
             %>
             <% if wu.is_finished? %>
-            <div class="dashboard-panel-info-row row-<%=wu.uuid%>" title="<%=runtime_status_tooltip%>">
+            <div class="dashboard-panel-info-row row-<%=wu.uuid%>" title="<%=sanitize(runtime_status_tooltip)%>">
               <div class="row">
                 <div class="col-md-6 text-overflow-ellipsis">
                   <%= link_to_if_arvados_object p, {friendly_name: true} %>
@@ -125,7 +125,7 @@ SPDX-License-Identifier: AGPL-3.0 %>
 
             </div>
             <% else %>
-            <div class="dashboard-panel-info-row row-<%=wu.uuid%>" title="<%=runtime_status_tooltip%>">
+            <div class="dashboard-panel-info-row row-<%=wu.uuid%>" title="<%=sanitize(runtime_status_tooltip)%>">
               <div class="row">
                 <div class="col-md-6 text-overflow-ellipsis">
                   <%= link_to_if_arvados_object p, {friendly_name: true} %>
diff --git a/apps/workbench/app/views/work_units/_show_component.html.erb b/apps/workbench/app/views/work_units/_show_component.html.erb
index b635b0044d..cac263d1ec 100644
--- a/apps/workbench/app/views/work_units/_show_component.html.erb
+++ b/apps/workbench/app/views/work_units/_show_component.html.erb
@@ -42,29 +42,43 @@ SPDX-License-Identifier: AGPL-3.0 %>
 <div class="container">
   <div class="col-md-12">
     <div class="panel panel-danger">
-      <div class="panel-heading">Error Information</div>
-      <div class="panel-body">
-        <%= wu.runtime_status[:error] %>
-        <%# Show collapsable detailed error information, if any %>
+      <div class="panel-heading">
+        <h4 class="panel-title">
+          <a class="component-detail-panel" data-toggle="collapse" href="#errorDetail">
+            <span class="caret"></span> Error: <%= sanitize(wu.runtime_status[:error]) %>
+          </a>
+        </h4>
+      </div>
+      <div id="errorDetail" class="panel-body panel-collapse collapse">
         <% if wu.runtime_status[:errorDetail] %>
-        <a class="btn btn-sm btn-primary pull-right" data-toggle="collapse" data-target="#errorDetail">Toggle details</a>
-        <div class="clearfix"></div>
-        <div id="errorDetail" class="collapse">
-          <pre><%= wu.runtime_status[:errorDetail] %></pre>
-        </div>
+          <pre><%= sanitize(wu.runtime_status[:errorDetail]) %></pre>
+        <% else %>
+          No detailed information available.
         <% end %>
       </div>
     </div>
   </div>
 </div>
+<% end %>
+
 <%# Display runtime warning message %>
-<% elsif wu.runtime_status.andand[:warning] %>
+<% if wu.runtime_status.andand[:warning] %>
 <div class="container">
   <div class="col-md-12">
     <div class="panel panel-warning">
-      <div class="panel-heading">Warning</div>
-      <div class="panel-body">
-        <%= wu.runtime_status[:warning] %>
+      <div class="panel-heading">
+        <h4 class="panel-title">
+          <a class="component-detail-panel" data-toggle="collapse" href="#warningDetail">
+            <span class="caret"></span> Warning: <%= sanitize(wu.runtime_status[:warning]) %>
+          </a>
+        </h4>
+      </div>
+      <div id="warningDetail" class="panel-body panel-collapse collapse">
+        <% if wu.runtime_status[:warningDetail] %>
+          <pre><%= sanitize(wu.runtime_status[:warningDetail]) %></pre>
+        <% else %>
+          No detailed information available.
+        <% end %>
       </div>
     </div>
   </div>
-- 
2.30.2