Merge changes Ibb8c134b,I9dcea5be,Ic88538d9 into stable-3.5
* changes:
bazel: Bump to latest 4.x release: 4.2.4
bazel: Move auto-value dep to external_plugin_deps.bzl
Add python3 support
diff --git a/gr-task-plugin/gr-task-plugin.js b/gr-task-plugin/gr-task-plugin.js
index 4813d10..deec593 100644
--- a/gr-task-plugin/gr-task-plugin.js
+++ b/gr-task-plugin/gr-task-plugin.js
@@ -185,10 +185,10 @@
return false;
}
- _computeShowOnNeedsAndBlockedFilter(task) {
+ _computeShowOnNeededAndBlockedFilter(task) {
return this._isFailOrReadyOrInvalid(task) ||
(task.sub_tasks && task.sub_tasks.some(t =>
- this._computeShowOnNeedsAndBlockedFilter(t)));
+ this._computeShowOnNeededAndBlockedFilter(t)));
}
_compute_counts(task) {
@@ -207,7 +207,7 @@
if (!tasks) return [];
tasks.forEach(task => {
task.icon = this._computeIcon(task);
- task.showOnFilter = this._computeShowOnNeedsAndBlockedFilter(task);
+ task.showOnFilter = this._computeShowOnNeededAndBlockedFilter(task);
this._compute_counts(task);
this._addTasks(task.sub_tasks);
});
@@ -219,7 +219,7 @@
this._expand_all = 'true';
}
- _needs_and_blocked_tap() {
+ _needed_and_blocked_tap() {
this._show_all = 'false';
this._expand_all = 'true';
}
diff --git a/gr-task-plugin/gr-task-plugin_html.js b/gr-task-plugin/gr-task-plugin_html.js
index 60ed70b..6ab5fb9 100644
--- a/gr-task-plugin/gr-task-plugin_html.js
+++ b/gr-task-plugin/gr-task-plugin_html.js
@@ -94,15 +94,15 @@
<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>
+ on-click="_needed_and_blocked_tap"
+ class="links">Needed + 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>
+ | Needed + Blocked ([[_ready_count]], [[_fail_count]])</p>
</template>
<gr-button link="" class="show-all-button" on-click="_switch_expand"
>[[_computeShowAllLabelText(_expand_all)]]
diff --git a/gr-task-plugin/gr-task-summary_html.js b/gr-task-plugin/gr-task-summary_html.js
index 18afc66..1b47201 100644
--- a/gr-task-plugin/gr-task-summary_html.js
+++ b/gr-task-plugin/gr-task-summary_html.js
@@ -71,8 +71,8 @@
<tr>
<td class="key">Tasks</td>
<td class="value">
- <gr-task-chip chip_style="ready" hidden$="[[!ready_count]]">[[ready_count]] needs</gr-task-chip>
<gr-task-chip chip_style="fail" hidden$="[[!fail_count]]">[[fail_count]] blocked</gr-task-chip>
+ <gr-task-chip chip_style="ready" hidden$="[[!ready_count]]">[[ready_count]] needed</gr-task-chip>
</td>
</tr>
</table>