Merge branch 'stable-3.2' into stable-3.3
* stable-3.2:
Bump plugin API to 3.2.10
Bump plugin API to 3.1.15
Bump plugin API to 3.0.16
Bump plugin API to 2.16.27
Convert UI filters to links and display always
Change-Id: I2284692d22162eeba39b9d8c17a8204f530965dd
diff --git a/WORKSPACE b/WORKSPACE
index f0b250c..5696cd8 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -8,7 +8,7 @@
load("//:bazlets.bzl", "load_bazlets")
load_bazlets(
- commit = "4a01979a1988c9acd33126226215b95f037fe74a",
+ commit = "b1c8fb66cdd06334245800b3adbc891aa1a4e0c6",
#local_path = "/home/<user>/projects/bazlets",
)
diff --git a/gr-task-plugin/gr-task-plugin.js b/gr-task-plugin/gr-task-plugin.js
index 588fbc7..096a408 100644
--- a/gr-task-plugin/gr-task-plugin.js
+++ b/gr-task-plugin/gr-task-plugin.js
@@ -183,10 +183,12 @@
_show_all_tap() {
this._show_all = 'true';
+ this._expand_all = 'true';
}
_needs_and_blocked_tap() {
this._show_all = 'false';
+ this._expand_all = 'true';
}
_switch_expand() {
diff --git a/gr-task-plugin/gr-task-plugin_html.js b/gr-task-plugin/gr-task-plugin_html.js
index 29316f5..8fa4b32 100644
--- a/gr-task-plugin/gr-task-plugin_html.js
+++ b/gr-task-plugin/gr-task-plugin_html.js
@@ -26,6 +26,11 @@
margin: 0 0 0 0;
}
.cursor { cursor: pointer; }
+ .links {
+ color: blue;
+ cursor: pointer;
+ text-decoration: underline;
+ }
#tasks_header {
align-items: center;
background-color: #fafafa;
@@ -49,14 +54,18 @@
class="cursor"> </iron-icon>
<div style="display: flex; align-items: center; column-gap: 1em;">
<h3 on-tap="_switch_expand" class="cursor"> Tasks </h3>
- <template is="dom-if" if="[[_expand_all]]">
- <gr-button
- on-tap="_show_all_tap"
- disabled="[[_is_show_all(_show_all)]]"> Show All ([[_all_count]]) </gr-button>
- <gr-button
- on-tap="_needs_and_blocked_tap"
- disabled="[[!_is_show_all(_show_all)]]">
- Needs ([[_ready_count]]) + Blocked ([[_fail_count]]) </gr-button>
+ <template is="dom-if" if="[[_is_show_all(_show_all)]]">
+ <p>All ([[_all_count]]) |
+ <span
+ on-click="_needs_and_blocked_tap"
+ class="links">Needs + Blocked ([[_ready_count]], [[_fail_count]])</span>
+ <p>
+ </template>
+ <template is="dom-if" if="[[!_is_show_all(_show_all)]]">
+ <p> <span
+ class="links"
+ on-click="_show_all_tap">All ([[_all_count]])</span>
+ | Needs + Blocked ([[_ready_count]], [[_fail_count]])</p>
</template>
</div>
</div>