toaster: UI fixes

PATCH New bavery 1 participant 4 messages Sep 19, 2016

lore

Share & tools

lore

bavery

author

2016-09-19 02:31 UTC #1 lore raw

PATCH 1/3 toaster: Fix links to tasks with specific outcome

From: Belen Barros Pena <[email protected]>

The build dashboard provides a count of tasks that were executed and not executed, and of tasks that failed (if any). The number is a link to the list of tasks.

Fix the links so that they filter the tasks table by the selected criteria (executed, not executed or failed).

[YOCTO #9832]

Signed-off-by Belen Barros Pena <[email protected]>

Signed-off-by bavery <[email protected]>

---
 lib/toaster/toastergui/templates/builddashboard.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

lib/toaster/toastergui/templates/builddashboard.html +3 -3

index 9e6e1c1..1c390cd 100644
@@ -235,7 +235,7 @@
                           </a>
 
                   {% elif exectask.count > 1%}
-                      <a class="text-danger" href="{% url "tasks" build.id %}?filter=outcome%3A4">{{exectask.count}}</a>
+                      <a class="text-danger" href="{% url "tasks" build.id %}?limit=25&amp;page=1&amp;orderby=order&amp;filter=task_outcome:failed&amp;default_orderby=order&amp;filter_value=on&amp;">{{exectask.count}}</a>
                   {% endif %}
                   </dd>
               {% endif %}

@@ -244,12 +244,12 @@
               Tasks executed
               <span class="glyphicon glyphicon-question-sign get-help" title="'Executed' tasks are those that need to be run in order to generate the task output"></span>
           </dt>
-          <dd><a href="{% url 'tasks' build.pk %}?filter=task_executed%3A1&amp;count=25&amp;search=&amp;page=1&amp;orderby=order%3A%2B">{% query build.task_build task_executed=1 order__gt=0 as exectask%}{{exectask.count}}</a></dd>
+          <dd><a href="{% url 'tasks' build.pk %}?limit=25&amp;page=1&amp;orderby=order&amp;filter=execution_outcome:executed&amp;default_orderby=order&amp;filter_value=on&amp;">{% query build.task_build task_executed=1 order__gt=0 as exectask%}{{exectask.count}}</a></dd>
           <dt>
               Tasks not executed
               <span class="glyphicon glyphicon-question-sign get-help" title="'Not executed' tasks don't need to run because their outcome is provided by another task"></span>
           </dt>
-          <dd><a href="{% url 'tasks' build.pk %}?filter=task_executed%3A0&amp;count=25&amp;search=&amp;page=1&amp;orderby=order%3A%2B">{% query build.task_build task_executed=0 order__gt=0 as noexectask%}{{noexectask.count}}</a></dd>
+          <dd><a href="{% url 'tasks' build.pk %}?limit=25&amp;page=1&amp;orderby=order&amp;filter=execution_outcome:not_executed&amp;default_orderby=order&amp;filter_value=on&amp;">{% query build.task_build task_executed=0 order__gt=0 as noexectask%}{{noexectask.count}}</a></dd>
           <dt>
               Reuse
               <span class="glyphicon glyphicon-question-sign get-help" title="The percentage of 'not executed' tasks over the total number of tasks, which is a measure of the efficiency of your build"></span>

Signature · 1 line

1.9.1

bavery

author

2016-09-19 02:31 UTC #2 lore raw

PATCH 2/3 toaster: Indicate active navigation element

From: Belen Barros Pena <[email protected]>

The left navigation in the build history pages is not showing the active item when you navigate directly to the errors or warnings information in the build summary. Add a special case to make sure the "build summary" item is highlighted.

[YOCTO #9864]

Signed-off-by Belen Barros Pena <[email protected]>

Signed-off-by bavery <[email protected]>

---
 lib/toaster/toastergui/templates/basebuildpage.html | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

lib/toaster/toastergui/templates/basebuildpage.html +5 -2

index 50658e0..01d3117 100644
@@ -38,10 +38,13 @@
             $(this).parent().addClass("active");
           } else {
             /* Special case the configvar as this is part of configuration
-             * page but is a separate url
+             * page but is a separate url, and the direct links to errors
+             * and warnings, which are part of the build dashboard
              */
             if (window.location.pathname === configVarUrl){
               $("#menu-configuration").addClass("active");
+            } else if (currentUrl.indexOf('error') > 1 || currentUrl.indexOf('warning') > 1){
+              $("#menu-dashboard").addClass("active");
             } else {
               $(this).parent().removeClass("active");
             }

@@ -57,7 +60,7 @@
     <div class="row">
       <div id="nav" class="col-md-2">
         <ul class="nav nav-pills nav-stacked" id="build-menu">
-          <li
+          <li id="menu-dashboard"
             {% if request.resolver_match.url_name == 'builddashboard'  %}
               class="active"
             {% endif %} >

Signature · 1 line

1.9.1

bavery

author

2016-09-19 02:31 UTC #3 lore raw

PATCH 3/3 toaster: Remove duplicate layer information

In reply to bavery

From: Belen Barros Pena <[email protected]>

In the custom recipe details page, the layer information is displayed twice in the right hand column. Remove one of the layer entries, since showing the layer information once should be enough.

[YOCTO #10037]

Signed-off-by Belen Barros Pena <[email protected]>

Signed-off-by bavery <[email protected]>

---
 lib/toaster/toastergui/templates/customrecipe.html | 2 --
 1 file changed, 2 deletions(-)

lib/toaster/toastergui/templates/customrecipe.html +0 -2

index f2a8fd2..8b61fb7 100644
@@ -176,8 +176,6 @@
         <a href="{% url 'projectbuilds' project.id%}">{{last_build.completed_on|date:"d/m/y H:i"}}</a>
         </dd>
         {% endif %}
-        <dt>Layer</dt>
-        <dd><a href="{% url 'layerdetails' project.id recipe.layer_version.pk %}">{{recipe.layer_version.layer.name}}</a></dd>
         <dt>Based on</dt>
         <dd><a href="{% url 'recipedetails' project.id recipe.base_recipe.pk %}">{{recipe.base_recipe.name}}</a></dd>
         {% if recipe.get_last_successful_built_target %}

Signature · 1 line

1.9.1