You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by al...@apache.org on 2014/05/23 16:05:14 UTC
git commit: AMBARI-5870. UI not showing Failed task on large cluster
(Denis Buzhor via alexantonenko)
Repository: ambari
Updated Branches:
refs/heads/trunk 4461d6b1d -> 30d91582f
AMBARI-5870. UI not showing Failed task on large cluster (Denis Buzhor via alexantonenko)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/30d91582
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/30d91582
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/30d91582
Branch: refs/heads/trunk
Commit: 30d91582f9ea8c5a3ed06e37dc18d5ca97eab939
Parents: 4461d6b
Author: Alex Antonenko <hi...@gmail.com>
Authored: Fri May 23 16:59:49 2014 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Fri May 23 16:59:49 2014 +0300
----------------------------------------------------------------------
.../templates/common/host_progress_popup.hbs | 2 +-
ambari-web/app/utils/host_progress_popup.js | 56 ++++++++++++--------
2 files changed, 34 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/30d91582/ambari-web/app/templates/common/host_progress_popup.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/common/host_progress_popup.hbs b/ambari-web/app/templates/common/host_progress_popup.hbs
index c5e006c..016079d 100644
--- a/ambari-web/app/templates/common/host_progress_popup.hbs
+++ b/ambari-web/app/templates/common/host_progress_popup.hbs
@@ -198,7 +198,7 @@
<div class="spinner"></div>
{{/if}}
</div>
-{{#if view.pagination}}
+{{#if view.isPaginate}}
<div class="page-bar pull-right no-borders mtm">
<div class="items-on-page">
<label>{{t common.show}}: {{view view.rowsPerPageSelectView selectionBinding="view.displayLength"}}</label>
http://git-wip-us.apache.org/repos/asf/ambari/blob/30d91582/ambari-web/app/utils/host_progress_popup.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/host_progress_popup.js b/ambari-web/app/utils/host_progress_popup.js
index 2176a4a..005726a 100644
--- a/ambari-web/app/utils/host_progress_popup.js
+++ b/ambari-web/app/utils/host_progress_popup.js
@@ -535,8 +535,17 @@ App.HostPopup = Em.Object.create({
sourceRequestScheduleCommand: null,
hosts: self.get('hosts'),
services: self.get('servicesInfo'),
+ filterMap: {
+ pending: ["pending", "queued"],
+ in_progress: ["in_progress", "upgrading"],
+ failed: ["failed"],
+ completed: ["completed", "success"],
+ aborted: ["aborted"],
+ timedout: ["timedout"]
+ },
- pagination: false,
+ pagination: true,
+ isPaginate: false,
displayLength: "25",
content: function() {
return this.get('hosts') || [];
@@ -616,14 +625,27 @@ App.HostPopup = Em.Object.create({
/**
* Depending on hosts filter, set which hosts should be shown
*/
- visibleHosts: function () {
- this.set("isHostEmptyList", true);
- if (this.get('hostCategory.value') && this.get('hosts')) {
- var filter = this.get('hostCategory.value');
- var hosts = this.get('hosts');
- this.set("isHostEmptyList", this.setVisibility(filter, hosts));
+ filter: function() {
+ var _this = this,
+ filter = this.get('hostCategory.value'),
+ hosts = this.get('content');
+ if (!filter || !hosts.length) return;
+ if (filter === 'all') {
+ this.set('filteredContent', hosts);
+ } else {
+ this.set('filteredContent', hosts.filter(function(item) {
+ return _this.get('filterMap')[filter].contains(item.status);
+ }));
}
- }.observes('hostCategory', 'hosts', 'hosts.@each.status'),
+ this.set("isHostEmptyList", !this.get('pageContent.length'));
+ }.observes('content.length', 'hostCategory.value'),
+
+ /**
+ * Reset startIndex property back to 1 when filter type has been changed.
+ */
+ resetIndex: function() {
+ if (this.get('hostCategory.value')) this.set('startIndex', 1)
+ }.observes('hostCategory.value'),
/**
* Depending on tasks filter, set which tasks should be shown
@@ -650,21 +672,9 @@ App.HostPopup = Em.Object.create({
isEmptyList = !(obj.length > 0);
} else {
obj.forEach(function(item){
- if (filter == "pending") {
- item.set('isVisible', ["pending", "queued"].contains(item.status));
- } else if (filter == "in_progress") {
- item.set('isVisible', ["in_progress", "upgrading"].contains(item.status));
- } else if (filter == "failed") {
- item.set('isVisible', (item.status === "failed"));
- } else if (filter == "completed") {
- item.set('isVisible', ["completed", "success"].contains(item.status));
- } else if (filter == "aborted") {
- item.set('isVisible', (item.status === "aborted"));
- } else if (filter == "timedout") {
- item.set('isVisible', (item.status === "timedout"));
- }
+ item.set('isVisible', this.get('filterMap')[filter].contains(item.status));
isEmptyList = (isEmptyList) ? !item.get('isVisible') : false;
- })
+ }, this)
}
return isEmptyList;
},
@@ -703,7 +713,7 @@ App.HostPopup = Em.Object.create({
} else if (!this.get('isServiceListHidden')) {
this.get('controller').setSelectCount(this.get("services"), this.get('categories'));
}
- this.set('pagination', !!isPaginate);
+ this.set('isPaginate', !!isPaginate);
}.observes('tasks.@each.status', 'hosts.@each.status', 'isTaskListHidden', 'isHostListHidden', 'services.length', 'services.@each.status'),
/**