This is an automated email from the ASF dual-hosted git repository.
akovalenko pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 160b6a0 AMBARI-24554 UX issues with yarn containers widget
(akovalenko)
160b6a0 is described below
commit 160b6a043bdb918560fc7475d3f0ab97d7abf6e5
Author: Aleksandr Kovalenko <[email protected]>
AuthorDate: Tue Aug 28 18:24:44 2018 +0300
AMBARI-24554 UX issues with yarn containers widget (akovalenko)
---
ambari-web/app/views/main/dashboard/widgets/yarn_containers.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ambari-web/app/views/main/dashboard/widgets/yarn_containers.js
b/ambari-web/app/views/main/dashboard/widgets/yarn_containers.js
index c4186c5..0369746 100644
--- a/ambari-web/app/views/main/dashboard/widgets/yarn_containers.js
+++ b/ambari-web/app/views/main/dashboard/widgets/yarn_containers.js
@@ -21,7 +21,7 @@ var App = require('app');
function counterOrNA(key) {
var _key = 'model.{0}.length'.format(key);
return Em.computed(_key, function () {
- if (Em.isNone(this.get('model.'+ key)) ||
this.get('model.metricsNotAvailable')) {
+ if (Em.isNone(this.get('model.' + key)) ||
this.get('model.metricsNotAvailable')) {
return Em.I18n.t('services.service.summary.notAvailable');
}
return this.get(_key);
@@ -34,7 +34,7 @@ App.YarnContainersView = App.TextDashboardWidgetView.extend({
return [
this.get('containersAllocated') + ' ' +
Em.I18n.t('dashboard.services.yarn.containers.allocated'),
this.get('containersPending') + ' ' +
Em.I18n.t('dashboard.services.yarn.containers.pending'),
- this.get('containersReserved')+ ' ' +
Em.I18n.t('dashboard.services.yarn.containers.reserved')
+ this.get('containersReserved') + ' ' +
Em.I18n.t('dashboard.services.yarn.containers.reserved')
];
}.property('containersAllocated', 'containersPending', 'containersReserved'),
@@ -70,9 +70,9 @@ App.YarnContainersView = App.TextDashboardWidgetView.extend({
* @type {boolean}
*/
someMetricsNA: function () {
- return Em.isNone(this.get('containersAllocated')) ||
- Em.isNone(this.get('containersPending')) ||
- Em.isNone(this.get('containersReserved'));
+ return this.get('containersAllocated') ===
Em.I18n.t('services.service.summary.notAvailable') ||
+ this.get('containersPending') ===
Em.I18n.t('services.service.summary.notAvailable') ||
+ this.get('containersReserved') ===
Em.I18n.t('services.service.summary.notAvailable');
}.property('containersAllocated', 'containersPending', 'containersReserved'),
/**