You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2015/03/17 19:20:24 UTC
ambari git commit: AMBARI-10107 RU: include info about completed /
total in RU progress popup. (atkach)
Repository: ambari
Updated Branches:
refs/heads/trunk ed021fa82 -> a67fc09e2
AMBARI-10107 RU: include info about completed / total in RU progress popup. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a67fc09e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a67fc09e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a67fc09e
Branch: refs/heads/trunk
Commit: a67fc09e2559cae9c01738fc8ec44ec70c717937
Parents: ed021fa
Author: Andrii Tkach <at...@hortonworks.com>
Authored: Tue Mar 17 17:34:15 2015 +0200
Committer: Andrii Tkach <at...@hortonworks.com>
Committed: Tue Mar 17 20:19:38 2015 +0200
----------------------------------------------------------------------
ambari-web/app/assets/data/stack_versions/upgrade.json | 2 ++
.../main/admin/stack_and_upgrade_controller.js | 1 +
ambari-web/app/styles/application.less | 9 +++++++++
.../templates/main/admin/stack_upgrade/upgrade_group.hbs | 4 +++-
.../views/main/admin/stack_upgrade/upgrade_group_view.js | 10 ++++++++++
.../main/admin/stack_and_upgrade_controller_test.js | 4 +++-
6 files changed, 28 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/app/assets/data/stack_versions/upgrade.json
----------------------------------------------------------------------
diff --git a/ambari-web/app/assets/data/stack_versions/upgrade.json b/ambari-web/app/assets/data/stack_versions/upgrade.json
index 657fbb0..2b6188b 100644
--- a/ambari-web/app/assets/data/stack_versions/upgrade.json
+++ b/ambari-web/app/assets/data/stack_versions/upgrade.json
@@ -623,6 +623,8 @@
"progress_percent" : 0.0,
"request_id" : 23,
"status" : "IN_PROGRESS",
+ "completed_task_count" : 2,
+ "total_task_count" : 3,
"title" : "Core Slaves"
},
"upgrade_items" : [
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index a40e69e..b8c5768 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -221,6 +221,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
oldData.upgradeGroups.forEach(function (oldGroup) {
oldGroup.set('status', groupsMap[oldGroup.get('group_id')].status);
oldGroup.set('progress_percent', groupsMap[oldGroup.get('group_id')].progress_percent);
+ oldGroup.set('completed_task_count', groupsMap[oldGroup.get('group_id')].completed_task_count);
oldGroup.upgradeItems.forEach(function (item) {
item.set('status', itemsMap[item.get('stage_id')].status);
item.set('progress_percent', itemsMap[item.get('stage_id')].progress_percent);
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index ac974fb..6ec3347 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -5537,4 +5537,13 @@ input[type="checkbox"].align-checkbox {
.bottom-border {
border-bottom: 1px solid #dddddd;
+}
+
+.progress-counter {
+ position: relative;
+ .counters-label {
+ font-weight: bold;
+ left: 45%;
+ position: absolute;
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
index 41807a4..c4d0f51 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_group.hbs
@@ -24,9 +24,11 @@
</div>
{{#if view.content.isRunning}}
<div class="span3">
- {{view App.ProgressBarView
+ {{view view.progressBarView
progressBinding="view.content.progress"
statusBinding="view.content.status"
+ totalTasksBinding="view.content.total_task_count"
+ completedTasksBinding="view.content.completed_task_count"
}}
</div>
<div class="span1">
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/app/views/main/admin/stack_upgrade/upgrade_group_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_group_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_group_view.js
index 2b08cca..1dd6b0d 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_group_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_group_view.js
@@ -23,6 +23,16 @@ App.upgradeGroupView = Em.View.extend({
templateName: require('templates/main/admin/stack_upgrade/upgrade_group'),
/**
+ * customized view of progress bar that show completed/total counters
+ * @class App.ProgressBarView
+ */
+ progressBarView: App.ProgressBarView.extend({
+ classNames: ['progress-counter'],
+ template: Ember.Handlebars.compile('<div class="bar" {{bindAttr style="view.progressWidth"}}></div>' +
+ '<div class="counters-label">{{view.completedTasks}}/{{view.totalTasks}}</div>')
+ }),
+
+ /**
* Only one UpgradeGroup or UpgradeItem could be expanded at a time
* @param {object} event
*/
http://git-wip-us.apache.org/repos/asf/ambari/blob/a67fc09e/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
index 48f3514..e377b9c 100644
--- a/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
+++ b/ambari-web/test/controllers/main/admin/stack_and_upgrade_controller_test.js
@@ -417,7 +417,8 @@ describe('App.MainAdminStackAndUpgradeController', function() {
UpgradeGroup: {
group_id: 1,
status: 'COMPLETED',
- progress_percent: 100
+ progress_percent: 100,
+ completed_task_count: 3
},
upgrade_items: [
{
@@ -435,6 +436,7 @@ describe('App.MainAdminStackAndUpgradeController', function() {
controller.updateUpgradeData(newData);
expect(controller.get('upgradeData.upgradeGroups')[0].get('status')).to.equal('COMPLETED');
expect(controller.get('upgradeData.upgradeGroups')[0].get('progress_percent')).to.equal(100);
+ expect(controller.get('upgradeData.upgradeGroups')[0].get('completed_task_count')).to.equal(3);
expect(controller.get('upgradeData.upgradeGroups')[0].get('upgradeItems')[0].get('status')).to.equal('COMPLETED');
expect(controller.get('upgradeData.upgradeGroups')[0].get('upgradeItems')[0].get('progress_percent')).to.equal(100);
});