commit ffacb5d509ae055f8311baa31d3cd3b2f3f46686
author Nasser Grainawi <nasser@codeaurora.org> Mon May 10 19:30:11 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 10 19:30:11 2021 +0000
tree ded5961ab4b8e7d01115ec264eea400409bd1d1e
parent abb78ff103084e246457713be5905fbe25389652
parent 3d4ac97d427567b90cbcc2d97f81c8d7c0206542

Merge changes Ib27f6974,Ic6065991,Ic8aab523,Ifc70a042,I1306e493 into stable-2.16

* changes:
  TaskAttributeFactory: Consistently cache predicates
  task: Remove unthrown exception
  TaskAttributeFactory turn more Exceptions into INVALID tasks
  plugin:task Adds support for names-factory of type change
  Add support for tasks-factory and names-factory keywords

gr-task-plugin/gr-task-plugin.html

diff --git a/gr-task-plugin/gr-task-plugin.html b/gr-task-plugin/gr-task-plugin.html
index 67c1319..d03473b 100644
--- a/gr-task-plugin/gr-task-plugin.html
+++ b/gr-task-plugin/gr-task-plugin.html
@@ -17,13 +17,13 @@
 <dom-module id="gr-task-plugin">
   <template>
       <style>
-        ul { padding-left: 30px; }
-        h3 { padding-left: 5px; }
+        ul { padding-left: 0.5em; }
+        h3 { padding-left: 0.1em; }
       </style>
 
       <div id="tasks" hidden$="[[!_tasks.length]]">
         <h3>Tasks: (Needs + Blocked)</h3>
-        <ul>
+        <ul style="list-style-type:none;">
           <gr-task-plugin-tasks tasks="[[_tasks]]"></gr-task-plugin-tasks>
         </ul>
       </div>
@@ -35,7 +35,36 @@
   <template>
     <template is="dom-repeat" as="task" items="[[tasks]]">
       <template is="dom-if" if="[[task.message]]">
-        <li>[[task.message]]</li>
+        <li>
+          <style>
+            .green {
+              color: greenyellow
+            }
+            .red {
+              color: chocolate
+            }
+          </style>
+          <template is="dom-if" if="[[task.icon.id]]">
+            <gr-tooltip-content
+                has-tooltip
+                title="In Progress">
+                <iron-icon
+                  icon="gr-icons:hourglass"
+                  class="green"
+                  hidden$="[[!task.in_progress]]">
+                </iron-icon>
+            </gr-tooltip-content>
+            <gr-tooltip-content
+                has-tooltip
+                title$="[[task.icon.tooltip]]">
+                <iron-icon
+                  icon="[[task.icon.id]]"
+                  class$="[[task.icon.color]]">
+                </iron-icon>
+            </gr-tooltip-content>
+          </template>
+          [[task.message]]
+        </li>
       </template>
       <gr-task-plugin-tasks tasks="[[task.sub_tasks]]"></gr-task-plugin-tasks>
     </template>

gr-task-plugin/gr-task-plugin.js

diff --git a/gr-task-plugin/gr-task-plugin.js b/gr-task-plugin/gr-task-plugin.js
index 86441d8..47e15c8 100644
--- a/gr-task-plugin/gr-task-plugin.js
+++ b/gr-task-plugin/gr-task-plugin.js
@@ -78,10 +78,28 @@
       }
     },
 
+    _computeIcon(task) {
+      const icon = {};
+      switch (task.status) {
+        case 'FAIL':
+          icon.id = 'gr-icons:close';
+          icon.color = 'red';
+          icon.tooltip = 'Blocked';
+          break;
+        case 'READY':
+          icon.id = 'gr-icons:check';
+          icon.color = 'green';
+          icon.tooltip = 'Needs';
+          break;
+      }
+      return icon;
+    },
+
     _addTasks(tasks) { // rename to process, remove DOM bits
       if (!tasks) return [];
       tasks.forEach(task => {
         task.message = this._computeMessage(task);
+        task.icon = this._computeIcon(task);
         this._addTasks(task.sub_tasks);
       });
       return tasks;