This is an automated email from the ASF dual-hosted git repository. atkach 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 2fd0d50 AMBARI-23913 New UI Makes it hard to see that a host is in a "Decommissioning" state 2fd0d50 is described below commit 2fd0d503de923d7049d462d935977497549ea2dd Author: Andrii Tkach <atk...@apache.org> AuthorDate: Mon May 21 16:11:13 2018 +0300 AMBARI-23913 New UI Makes it hard to see that a host is in a "Decommissioning" state --- .../host/details/host_components/decommissionable.js | 16 ++++++---------- .../host_component_views/decommissionable_test.js | 19 ------------------- 2 files changed, 6 insertions(+), 29 deletions(-) diff --git a/ambari-web/app/mixins/main/host/details/host_components/decommissionable.js b/ambari-web/app/mixins/main/host/details/host_components/decommissionable.js index d3eb0c5..645db5c 100644 --- a/ambari-web/app/mixins/main/host/details/host_components/decommissionable.js +++ b/ambari-web/app/mixins/main/host/details/host_components/decommissionable.js @@ -109,16 +109,12 @@ App.Decommissionable = Em.Mixin.create({ * @type {String} */ componentTextStatus: function () { - var componentTextStatus = this.get('content.componentTextStatus'); - var hostComponent = this.get('hostComponent'); - if (hostComponent) { - componentTextStatus = hostComponent.get('componentTextStatus'); - if (this.get('isComponentRecommissionAvailable')) { - if (this.get('isComponentDecommissioning')) { - componentTextStatus = Em.I18n.t('hosts.host.decommissioning'); - } else { - componentTextStatus = Em.I18n.t('hosts.host.decommissioned'); - } + let componentTextStatus = this.get('content.componentTextStatus'); + if (this.get('isComponentRecommissionAvailable')) { + if (this.get('isComponentDecommissioning')) { + componentTextStatus = Em.I18n.t('hosts.host.decommissioning'); + } else { + componentTextStatus = Em.I18n.t('hosts.host.decommissioned'); } } return componentTextStatus; diff --git a/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js b/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js index bc3c280..0a6886f 100644 --- a/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js +++ b/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js @@ -51,7 +51,6 @@ describe('App.Decommissionable', function() { var tests = Em.A([ { content: Em.Object.create({componentTextStatus: 'status'}), - hostComponent: null, isComponentRecommissionAvailable: false, isComponentDecommissioning: false, e: 'status', @@ -59,23 +58,6 @@ describe('App.Decommissionable', function() { }, { content: Em.Object.create({componentTextStatus: 'status'}), - hostComponent: Em.Object.create({componentTextStatus: 'new_status'}), - isComponentRecommissionAvailable: false, - isComponentDecommissioning: false, - e: 'new_status', - m: 'get hostComponent status' - }, - { - content: Em.Object.create({componentTextStatus: 'status'}), - hostComponent: Em.Object.create({componentTextStatus: 'new_status'}), - isComponentRecommissionAvailable: false, - isComponentDecommissioning: false, - e: 'new_status', - m: 'get hostComponent status' - }, - { - content: Em.Object.create({componentTextStatus: 'status'}), - hostComponent: Em.Object.create({componentTextStatus: 'new_status'}), isComponentRecommissionAvailable: true, isComponentDecommissioning: true, e: Em.I18n.t('hosts.host.decommissioning'), @@ -83,7 +65,6 @@ describe('App.Decommissionable', function() { }, { content: Em.Object.create({componentTextStatus: 'status'}), - hostComponent: Em.Object.create({componentTextStatus: 'new_status'}), isComponentRecommissionAvailable: true, isComponentDecommissioning: false, e: Em.I18n.t('hosts.host.decommissioned'), -- To stop receiving notification emails like this one, please contact atk...@apache.org.