[ambari] branch trunk updated: AMBARI-23423 JS error while deploying new service

[atkach]

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 1017292  AMBARI-23423 JS error while deploying new service
1017292 is described below

commit 1017292cf344183ec1dc9733df53d1549f5d520a
Author: Andrii Tkach <atk...@apache.org>
AuthorDate: Tue Apr 3 14:21:47 2018 +0300

    AMBARI-23423 JS error while deploying new service
---
 ambari-web/app/mappers/components_state_mapper.js       | 4 ++--
 ambari-web/app/views/loading.js                         | 5 +++--
 ambari-web/test/mappers/components_state_mapper_test.js | 2 ++
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ambari-web/app/mappers/components_state_mapper.js 
b/ambari-web/app/mappers/components_state_mapper.js
index f7e6122..771b5de 100644
--- a/ambari-web/app/mappers/components_state_mapper.js
+++ b/ambari-web/app/mappers/components_state_mapper.js
@@ -281,7 +281,7 @@ App.componentsStateMapper = App.QuickDataMapper.create({
     const model = 
App.ClientComponent.getModelByComponentName(componentState.componentName);
     const acceptedStates = ['STARTED', 'INSTALLED', 'INIT', 'UNKNOWN', 
'INSTALL_FAILED'];
 
-    if (model && componentState.currentState) {
+    if (model && model.get('isLoaded') && componentState.currentState) {
       if (acceptedStates.contains(componentState.previousState)) {
         const previousStateProp = 
this.statusToProperty(componentState.previousState);
         model.set(previousStateProp, model.get(previousStateProp) - 1);
@@ -318,7 +318,7 @@ App.componentsStateMapper = App.QuickDataMapper.create({
   updateComponentCountOnCreate: function(componentState) {
     const model = 
App.ClientComponent.getModelByComponentName(componentState.componentName);
 
-    if (model) {
+    if (model && model.get('isLoaded')) {
       model.set('initCount', model.get('initCount') + 1);
       model.set('totalCount', model.get('totalCount') + 1);
       this.mapExtendedModelComponents(this.componentStateToJSON(model));
diff --git a/ambari-web/app/views/loading.js b/ambari-web/app/views/loading.js
index 47468bb..90bed92 100644
--- a/ambari-web/app/views/loading.js
+++ b/ambari-web/app/views/loading.js
@@ -19,6 +19,7 @@
 var App = require('app');
 
 App.LoadingView = Em.View.extend({
-    tagName: 'h2',
-    template: Ember.Handlebars.compile('{{t common.loading.eclipses}}')
+  tagName: 'h2',
+  classNames: ['col-md-9', 'align-center'],
+  template: Ember.Handlebars.compile('{{t common.loading.eclipses}}')
 });
\ No newline at end of file
diff --git a/ambari-web/test/mappers/components_state_mapper_test.js 
b/ambari-web/test/mappers/components_state_mapper_test.js
index 1398ffe..58c5737 100644
--- a/ambari-web/test/mappers/components_state_mapper_test.js
+++ b/ambari-web/test/mappers/components_state_mapper_test.js
@@ -139,6 +139,7 @@ describe('App.componentsStateMapper', function () {
     var model;
     beforeEach(function() {
       model = Em.Object.create({
+        isLoaded: true,
         initCount: 1,
         installFailedCount: 0,
         totalCount: 2,
@@ -230,6 +231,7 @@ describe('App.componentsStateMapper', function () {
     var model;
     beforeEach(function() {
       model = Em.Object.create({
+        isLoaded: true,
         initCount: 0,
         totalCount: 0
       });

-- 
To stop receiving notification emails like this one, please contact
atk...@apache.org.